From 9e738304499ab8b7dac3cd1d38bcfde7d00c1805 Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Tue, 7 Jun 2022 13:23:08 +0200 Subject: [PATCH 1/7] [Redizajn 1KA] Popupi: Analize > Grafi > Nastavitve - Barve [V DELU - 2] --- .../surveyAnalysis/class.SurveyChart.php | 33 +++++++----- public/css/admin_new.css | 49 +++++++++++------ .../components/popup/page_specific.scss | 2 +- .../pages/survey_analysis/page_charts.scss | 12 +++-- .../pages/survey_analysis/popups/chart.scss | 52 ++++++++++++++----- 5 files changed, 101 insertions(+), 47 deletions(-) diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyChart.php b/admin/survey/classes/surveyAnalysis/class.SurveyChart.php index 19b8c4659..7983d3f52 100644 --- a/admin/survey/classes/surveyAnalysis/class.SurveyChart.php +++ b/admin/survey/classes/surveyAnalysis/class.SurveyChart.php @@ -10384,7 +10384,6 @@ class SurveyChart { echo '

'.$lang['srv_chart_skin_long'].'

'; echo '
✕
'; - echo '

'.$lang['srv_chart_skin_info'].'

'; // Opozorilo na vrhu if(!is_numeric($skin)){ @@ -10412,8 +10411,9 @@ class SurveyChart { '; + echo '
'; echo '
'; - + // Prednastavljeni skini echo ''.$lang['srv_chart_skin_default'].':'; echo ''; @@ -10449,14 +10449,17 @@ class SurveyChart { // Ce je izbran custom skin imamo na dnu gumba brisi in preimenuj if(is_numeric($skin)){ - echo ''.$lang['srv_rename_profile'].'
'."\n"; - echo ''.$lang['srv_delete_profile'].''."\n"; + + echo '
'; + echo ''; + echo ''; + echo '
'; } - echo '
'; + echo '
'; #left - echo '
'; + echo '
'; // ce je numeric je custom skin if(is_numeric($skin)){ @@ -10475,12 +10478,6 @@ class SurveyChart { $default_colors = self::getDefaultColors($skin); } - - // Izbira custom skina - echo '
'; - - echo '
'; - for($i=0; $i<7; $i++){ $name = 'color'.($i+1); @@ -10492,8 +10489,18 @@ class SurveyChart { // reset na default barvo echo '
'.$lang['srv_chart_advanced_default_color'].''; + + echo '
'; #middle + + echo '
'; + + // Izbira custom skina + echo '
'; + + echo '
'; - echo '
'; + echo '
'; #right + echo '
'; #wrap echo '
'; diff --git a/public/css/admin_new.css b/public/css/admin_new.css index f6d72f493..c9774f407 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -29267,7 +29267,7 @@ ul.vrednost_sort input[type=text] { border-bottom: 1px solid #E5E5E5; } -#chart_settings_profiles_right #div_chart_skin_previews { +#chart_settings_profiles_middle #div_chart_skin_previews { position: fixed; top: 100px; left: 90px; @@ -29280,22 +29280,23 @@ ul.vrednost_sort input[type=text] { -moz-box-shadow: 0 0 20px black; -webkit-box-shadow: 0 0 20px black; } -#chart_settings_profiles_right .div_chart_skin_preview { +#chart_settings_profiles_middle .div_chart_skin_preview { display: none; width: 200px; height: 120px; } -#chart_settings_profiles_right .div_chart_skin_preview table tr td { +#chart_settings_profiles_middle .div_chart_skin_preview table tr td { width: 50px; height: 18px; } -#chart_settings_profiles_right .form-item { +#chart_settings_profiles_middle .form-item { padding: 3px; width: 200px; } + #chart_settings_profiles_right .colorwell { - width: 70px; - height: 20px; + width: 265px; + height: 265px; font-size: 11px; } @@ -31267,9 +31268,7 @@ input#endDate { display: none; position: relative; z-index: 90; - width: 650px; - height: 500px; - padding: 10px; + width: 850px; } #div_chart_settings_profiles .as_link { color: #1E88E5 !important; @@ -31287,15 +31286,31 @@ input#endDate { border-radius: 2px; margin-bottom: 16px; } -#div_chart_settings_profiles #chart_settings_profiles_left { - float: left; - width: 30%; - height: 200px; +#div_chart_settings_profiles #chart_settings_profiles_wrap { + display: flex; + flex-direction: row; + gap: 64px; } -#div_chart_settings_profiles #chart_settings_profiles_right { - padding: 20px; - width: 60%; - float: right; +#div_chart_settings_profiles #chart_settings_profiles_wrap #chart_settings_profiles_left { + width: 33%; +} +#div_chart_settings_profiles #chart_settings_profiles_wrap #chart_settings_profiles_left .button_holder { + flex-direction: column; + gap: 8px; + justify-content: center !important; +} +#div_chart_settings_profiles #chart_settings_profiles_wrap #chart_settings_profiles_left .button_holder button { + width: 100%; +} +#div_chart_settings_profiles #chart_settings_profiles_wrap #chart_settings_profiles_middle { + width: 33%; +} +#div_chart_settings_profiles #chart_settings_profiles_wrap #chart_settings_profiles_right { + width: 33%; +} +#div_chart_settings_profiles #chart_settings_profiles_wrap #chart_settings_profiles_right #chart_custom_skin #picker #farbtastic { + width: 265px; + height: 265px; } /* popup edit chart */ diff --git a/resources/sass/admin_new/components/popup/page_specific.scss b/resources/sass/admin_new/components/popup/page_specific.scss index 2b7124639..dc3e16d8d 100644 --- a/resources/sass/admin_new/components/popup/page_specific.scss +++ b/resources/sass/admin_new/components/popup/page_specific.scss @@ -645,4 +645,4 @@ div#div_analiza_archive_name { } } } -} +} \ No newline at end of file diff --git a/resources/sass/admin_new/pages/survey_analysis/page_charts.scss b/resources/sass/admin_new/pages/survey_analysis/page_charts.scss index 6afcdf1c3..c86079c3c 100644 --- a/resources/sass/admin_new/pages/survey_analysis/page_charts.scss +++ b/resources/sass/admin_new/pages/survey_analysis/page_charts.scss @@ -469,8 +469,9 @@ ul.vrednost_sort { border-bottom: 1px solid $gray; } } -#chart_settings_profiles_right { - #div_chart_skin_previews { + +#chart_settings_profiles_middle { + #div_chart_skin_previews { position: fixed; top: 100px; left: 90px; @@ -500,9 +501,12 @@ ul.vrednost_sort { padding: 3px; width: 200px; } +} + +#chart_settings_profiles_right { .colorwell { - width: 70px; - height: 20px; + width: 265px; + height:265px; font-size: 11px; } } diff --git a/resources/sass/admin_new/pages/survey_analysis/popups/chart.scss b/resources/sass/admin_new/pages/survey_analysis/popups/chart.scss index f799a5539..a631b532c 100644 --- a/resources/sass/admin_new/pages/survey_analysis/popups/chart.scss +++ b/resources/sass/admin_new/pages/survey_analysis/popups/chart.scss @@ -9,9 +9,7 @@ position: relative; z-index: 90; - width: 650px; - height: 500px; - padding: 10px; + width: 850px; .as_link { color: $blue !important; @@ -31,15 +29,45 @@ border-radius: 2px; margin-bottom: 16px; } - #chart_settings_profiles_left { - float: left; - width: 30%; - height: 200px; - } - #chart_settings_profiles_right { - padding: 20px; - width: 60%; - float: right; + + #chart_settings_profiles_wrap { + display: flex; + flex-direction: row; + gap: 64px; + + #chart_settings_profiles_left { + width: 33%; + + .button_holder { + flex-direction: column; + gap: 8px; + justify-content: center !important; + + button { + width: 100%; + } + } + } + #chart_settings_profiles_middle { + width: 33%; + + } + + #chart_settings_profiles_right{ + width: 33%; + + #chart_custom_skin { + + #picker { + + #farbtastic { + width: 265px; + height: 265px; + } + } + + } + } } } From 7f197e7ba950cf9612e846a5f7356ca1a1f7a711 Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Tue, 7 Jun 2022 20:25:43 +0200 Subject: [PATCH 2/7] [Redizajn 1KA] Popupi: Analize > Grafi > Nastavitve - Barve - v1 --- .../surveyAnalysis/class.SurveyChart.php | 50 +- lang/1.php | 2 + lang/2.php | 2 + public/css/admin_new.css | 3014 ++++++++--------- resources/sass/admin/analysis/charts.scss | 36 - .../pages/survey_analysis/page_charts.scss | 56 +- .../pages/survey_analysis/popups/chart.scss | 110 +- 7 files changed, 1615 insertions(+), 1655 deletions(-) diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyChart.php b/admin/survey/classes/surveyAnalysis/class.SurveyChart.php index 7983d3f52..066d9de7e 100644 --- a/admin/survey/classes/surveyAnalysis/class.SurveyChart.php +++ b/admin/survey/classes/surveyAnalysis/class.SurveyChart.php @@ -10385,13 +10385,6 @@ class SurveyChart { echo '

'.$lang['srv_chart_skin_long'].'

'; echo '
✕
'; - // Opozorilo na vrhu - if(!is_numeric($skin)){ - echo '
'; - echo $lang['srv_chart_skin_warning']; - echo '
'; - } - echo '