From 8288ddbd1a69789a46f6df59f7e02808f2292f5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nejc=20Kova=C4=8D?= Date: Mon, 8 Aug 2022 17:36:20 +0200 Subject: [PATCH] urejanje --> oblika : meatball ikone toggle + show settings --- admin/survey/classes/class.SurveyTheme.php | 109 ++++++++++-------- admin/survey/script/urejanje_oblika.js | 40 ++++++- public/css/admin_new.css | 26 ++++- .../pages/survey_edit/oblika_teme.scss | 8 +- 4 files changed, 122 insertions(+), 61 deletions(-) diff --git a/admin/survey/classes/class.SurveyTheme.php b/admin/survey/classes/class.SurveyTheme.php index b9e8544c8..2c3678553 100644 --- a/admin/survey/classes/class.SurveyTheme.php +++ b/admin/survey/classes/class.SurveyTheme.php @@ -595,39 +595,42 @@ class SurveyTheme { // show_settings(\''.$row['id'].'\'); // div z setingsi - //
- echo '
'; + echo '
'; - echo ''; + echo ''; - //Aktiviraj - echo '
'; - echo ''; - echo $lang['srv_te_theme_activate']; - echo '
'; + echo '
'; - //Predogled - echo '
'; - echo ''; - echo $lang['srv_poglejanketo2']; - echo '
'; - - //Prilagodi - echo '
'; - echo ''; - echo $lang['srv_te_theme_edit']; - echo '
'; - - //Izbriši - if ($groupId == -1) { - echo '
'; - echo ''; - echo $lang['srv_anketadelete_txt']; + //Aktiviraj + echo '
'; + echo ''; + echo $lang['srv_te_theme_activate']; echo '
'; - } + + //Predogled + echo '
'; + echo ''; + echo $lang['srv_poglejanketo2']; + echo '
'; + + //Prilagodi + echo '
'; + echo ''; + echo $lang['srv_te_theme_edit']; + echo '
'; + + //Izbriši + if ($groupId == -1) { + echo '
'; + echo ''; + echo $lang['srv_anketadelete_txt']; + echo '
'; + } + + echo '
'; // additional_settings echo '
'; //div.options @@ -653,35 +656,39 @@ class SurveyTheme { echo '
'; //Gumbi - echo '
'; + echo '
'; - echo ''; + echo ''; - //Aktiviraj - echo '
'; - echo ''; - echo $lang['srv_te_theme_activate']; - echo '
'; - //Predogled - echo '
'; - echo ''; - echo $lang['srv_poglejanketo2']; - echo '
'; - - //Prilagodi - echo '
'; - echo ''; - echo $lang['srv_te_theme_edit']; - echo '
'; - - //Izbriši - if ($groupId == -1) { - echo '
'; - echo ''; - echo $lang['srv_anketadelete_txt']; + echo '
'; + //Aktiviraj + echo '
'; + echo ''; + echo $lang['srv_te_theme_activate']; echo '
'; - } + + //Predogled + echo '
'; + echo ''; + echo $lang['srv_poglejanketo2']; + echo '
'; + + //Prilagodi + echo '
'; + echo ''; + echo $lang['srv_te_theme_edit']; + echo '
'; + + //Izbriši + if ($groupId == -1) { + echo '
'; + echo ''; + echo $lang['srv_anketadelete_txt']; + echo '
'; + } + + echo '
'; //additional settings echo '
'; //div.options diff --git a/admin/survey/script/urejanje_oblika.js b/admin/survey/script/urejanje_oblika.js index ed921eb1f..0e580772f 100644 --- a/admin/survey/script/urejanje_oblika.js +++ b/admin/survey/script/urejanje_oblika.js @@ -12,8 +12,6 @@ function teme_options(){ } toggle_id.classList.toggle('active'); - - } function teme_options2(){ @@ -24,6 +22,40 @@ function teme_options2(){ toggle_id.classList.remove('active'); } } - toggle_id.classList.toggle('active'); -} \ No newline at end of file +} + +function show_settings(id_of_element){ + + // var options = document.getElementsByClassName("options"+id_of_element)[0]; + var options = document.getElementById("options"+id_of_element); + var additional_settings = document.getElementById("additional_settings_"+id_of_element); + + + // document.onclick = function(e){ + // if(e.target.id !== additional_settings && e.target.id !== options ){ + // additional_settings.classList.remove('active'); + // } + // } + additional_settings.classList.toggle("active"); + +} + + +function show_settings_mobile(id_of_element){ + + // var options = document.getElementsByClassName("options_mobile"+id_of_element)[0]; + var options = document.getElementById("options_mobile"+id_of_element); + var additional_settings = document.getElementById("additional_settings_mobile_"+id_of_element); + + + // document.onclick = function(e){ + // if(e.target.id !== additional_settings && e.target.id !== options ){ + // additional_settings.classList.remove('active'); + // } + // } + additional_settings.classList.toggle("active"); + +} + + diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 2fcc51cac..b9a8efc74 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -10012,7 +10012,8 @@ textarea:focus { margin-top: 16px; } .box-container .num_box { - border: #1E88E5 solid 1px; + border: unset; + background-color: white; margin: 0px; padding: 0px; } @@ -10032,7 +10033,7 @@ textarea:focus { margin-right: 8px; } .box-container .num_box .box_text { - padding: 0px 16px 16px 16px; + padding: 5px 16px 16px 16px; font-size: 16px; line-height: 20px; color: #808080; @@ -10040,11 +10041,15 @@ textarea:focus { align-items: center; } .box-container .num_box .box_text .num_of_surveys { - font-size: 40px; + font-size: 32px; color: #333; font-weight: 400; margin-right: 5px; } +.box-container .checked { + border: #1E88E5 solid 1px; + background-color: #FFEFEF; +} .box-container .num_box2 { margin: 0px 32px; } @@ -11100,9 +11105,19 @@ table.variableView { } table.gdpr_surveys { - table-layout: fixed; + table-layout: auto; width: 100%; } +table.gdpr_surveys th { + background-color: #F8F8F8; +} +table.gdpr_surveys tr { + background-color: #FFEFEF; +} +table.gdpr_surveys th, +table.gdpr_surveys td { + border: 1px solid #E5E5E5; +} table.gdpr_surveys tr.red_row td { background-color: #FFEFEF !important; } @@ -20754,9 +20769,10 @@ div.page_tema div.theme_list div.options { } div.page_tema div.theme_list div.options div.buttons-window { position: absolute; - bottom: 12px; + bottom: 15px; max-width: 113px; display: none; + margin-right: 5px; } div.page_tema div.theme_list div.options div.buttons-window.active { display: block; diff --git a/resources/sass/admin_new/pages/survey_edit/oblika_teme.scss b/resources/sass/admin_new/pages/survey_edit/oblika_teme.scss index f224fff20..abdb6d933 100644 --- a/resources/sass/admin_new/pages/survey_edit/oblika_teme.scss +++ b/resources/sass/admin_new/pages/survey_edit/oblika_teme.scss @@ -55,6 +55,10 @@ div.page_tema { } } + + + + //Gumbi div.options { display: flex; @@ -63,9 +67,11 @@ div.page_tema { div.buttons-window{ position: absolute; - bottom: 12px; + bottom: 15px; max-width: 113px; display: none; + + margin-right: 5px; } div.buttons-window.active { display: block;