From 146bc5b1de1332f5f260e79dd5eac176fd6c0a75 Mon Sep 17 00:00:00 2001 From: pero1203 Date: Fri, 27 May 2022 12:02:31 +0200 Subject: [PATCH] Redesign - popravki napak - drag dodajanja vprasanja, komentarji --- admin/survey/SurveyAdminSettings.php | 20 +++++++++---- admin/survey/script/branching.js | 12 ++------ lang/1.php | 6 ++-- lang/2.php | 6 ++-- public/css/admin_new.css | 29 ++++++++++++++----- .../admin_new/pages/survey_edit/toolbox.scss | 4 +-- .../pages/survey_testiranje/komentarji.scss | 26 ++++++++++++++++- 7 files changed, 75 insertions(+), 28 deletions(-) diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index b174f72ae..fae47ac97 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -1131,7 +1131,17 @@ class SurveyAdminSettings { $preview_disable_test_insert = SurveySetting::getInstance()->getSurveyMiscSetting('preview_disable_test_insert'); if ( isset($_GET['show']) && $_GET['show']=='on_alert' ) { - echo '
'.$lang['srv_comments_on_alert'].' '.$lang['srv_off'].'. '.$lang['srv_comments_on_alert2'].' '.$lang['srv_anl_more'].'
'; + echo '
'; + + echo '
'.$lang['srv_comments_on_alert'].'
'; + + echo '
'; + echo $lang['srv_comments_on_alert1'].' '.$lang['srv_here'].'. '; + echo $lang['srv_comments_on_alert2']; + echo ' '.$lang['srv_more_info'].'.'; + echo '
'; + + echo '
'; } $css_width = ''; @@ -10577,10 +10587,10 @@ class SurveyAdminSettings { if ($admin_type == '0' || $admin_type == '1') { echo '
'; - echo ''; - echo ''; + echo ' '; + echo ' '; echo '
'; } diff --git a/admin/survey/script/branching.js b/admin/survey/script/branching.js index b91aa375e..8a686ad33 100644 --- a/admin/survey/script/branching.js +++ b/admin/survey/script/branching.js @@ -636,7 +636,7 @@ function branching_struktura() { // nastavimo droppable $('li.drop', $('#branching')).droppable({ - accept: '.spr, .if, .block, .endif, .endblock, .new_spr, .new_adv, .new_if, .new_block, .new_loop, .new_pb, .loop, .endloop', + accept: '.spr, .if, .block, .endif, .endblock, .new_spr, .new_if, .new_block, .new_loop, .new_pb, .loop, .endloop', hoverClass: 'branchinghover', tolerance: 'pointer', drop: function (e, ui) { @@ -658,9 +658,6 @@ function branching_struktura() { spremenljivka_new(spr, _if, endif, copy, tip, podtip, drop); } - } else if ($(ui.draggable).hasClass('new_adv')) { // nova advanced spremenljivka (odpre se popup za izbiro) - toolbox_add_advanced(); - } else if ($(ui.draggable).hasClass('new_if')) { // nov if iz toolbox var spr = $(this).attr('spr'); var _if = $(this).attr('if'); @@ -718,7 +715,7 @@ var is_new_spr_dragable = false; // gledamo ali vlečemo new_spr da skrbimo za s // inicializira toolbox na levi strani function init_toolbox() { - $('.new_spr:not(.user_access_locked), .new_adv:not(.user_access_locked), .new_if:not(.user_access_locked), .new_block:not(.user_access_locked), .new_loop:not(.user_access_locked), .new_pb', '#toolbox_basic').draggable({ + $('.new_spr:not(.user_access_locked), .new_if:not(.user_access_locked), .new_block:not(.user_access_locked), .new_loop:not(.user_access_locked), .new_pb', '#toolbox_basic').draggable({ start: function (e, ui) { is_new_spr_dragable = true; $('#toolbox_add_advanced').addClass('dragging'); @@ -739,7 +736,7 @@ function init_toolbox() { }).bind('click', function (event) { var ta = $(event.target); - ta = $(ta).closest('.new_spr, .new_adv, .new_if, .new_block, .new_loop'); + ta = $(ta).closest('.new_spr, .new_if, .new_block, .new_loop'); if (ta.hasClass('new_spr')) { // nova spremenljivka (iz toolboxa) @@ -758,9 +755,6 @@ function init_toolbox() { } } - else if (ta.hasClass('new_adv')) { // nova spremenljivka advanced (prikaze se popup z vsemi tipi vprasanj) - toolbox_add_advanced(); - } else if (ta.hasClass('new_if')) { // nov if iz toolbox $('html, body').animate({scrollTop: $('body').height() + $('#branching').height()}); // scrollamo na dno zaslona if_new(0, 0, 1, 0); diff --git a/lang/1.php b/lang/1.php index c5b9d1a23..838549b37 100644 --- a/lang/1.php +++ b/lang/1.php @@ -3001,6 +3001,7 @@ $lang = array ( "srv_orientacija_horizontalna_3" => "Vodoravno", "srv_orientacija_expand" => "Z razpiranjem", "srv_dynamic_multigrid" => "Postopno reševanje", + "srv_more_info" => "Več informacij", "srv_more" => "več", "srv_less" => "manj", "user_tracker" => "Nadzor uporabnika", @@ -3697,7 +3698,7 @@ $lang = array ( "srv_language_admin" => "Jezik za urednike", "srv_language_admin_0" => "Jezik", "srv_language_admin_1" => "Osnovni jezik", - "srv_language_admin_survey" => "jezik administrativnega vmesnika", + "srv_language_admin_survey" => "Jezik administrativnega vmesnika", "srv_language_admin_surveyA" => "Trenutni ", "srv_language_admin_surveyB" => " je Slovenščina.", "srv_language_std_bes1" => "Standardne besede lahko urejate v ", @@ -6658,7 +6659,8 @@ $lang = array ( 'srv_data_column_naslov_map' => 'Naslov', 'srv_data_column_vrednost_map' => 'Vrednost', 'srv_data_column_koordinate_map' => 'Koordinate', - 'srv_comments_on_alert' => 'Komentarji so sedaj vklopljeni.', + 'srv_comments_on_alert' => 'Komentarji so sedaj vklopljeni', + 'srv_comments_on_alert1' => 'Če vklop komentarjev ni bil storjen namerno, lahko komentarje izklopite', 'srv_comments_on_alert2' => 'Dodatne nastavitve lahko uredite spodaj.', 'srv_off' => 'Izklopi', 'srv_para_neodgovori' => 'Neodgovor spremenljivke', diff --git a/lang/2.php b/lang/2.php index 9e051420a..225447495 100644 --- a/lang/2.php +++ b/lang/2.php @@ -2973,6 +2973,7 @@ $lang = array ( "srv_orientacija_expand" => "Expanding", "srv_dynamic_multigrid" => "Step by step mode", "srv_analiza_filter_all" => "All entries", + "srv_more_info" => "More information", "srv_more" => "more", "srv_less" => "less", "user_tracker" => "Tracker", @@ -3665,7 +3666,7 @@ $lang = array ( "srv_language_admin" => "Language for editors", "srv_language_admin_0" => "Language", "srv_language_admin_1" => "Basic language for ", - "srv_language_admin_survey" => "language for survey editors", + "srv_language_admin_survey" => "Language for survey editors", "srv_language_admin_surveyA" => "The current ", "srv_language_admin_surveyB" => " is English.", "srv_language_std_bes1" => "Standard words can be edited in the ", @@ -6541,7 +6542,8 @@ $lang = array ( 'srv_data_column_naslov_map' => 'Address', 'srv_data_column_vrednost_map' => 'Value', 'srv_data_column_koordinate_map' => 'Coordinates', - 'srv_comments_on_alert' => 'Comments are now enabled.', + 'srv_comments_on_alert' => 'Comments are now enabled', + 'srv_comments_on_alert1' => 'If the enabling of comments was not done intentionally, you can turn off the comments', 'srv_comments_on_alert2' => 'You can edit extra settings below.', 'srv_off' => 'Turn off', 'srv_para_neodgovori' => 'Item nonresponse', diff --git a/public/css/admin_new.css b/public/css/admin_new.css index dae94a016..c0eb1e71a 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -13348,17 +13348,17 @@ div.drop_setting_transition { .toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option { padding: 8px 16px 8px 16px; } -.toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a, -.toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a:hover { +.toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a:not(.help), +.toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a:hover:not(.help) { color: #333333; text-decoration: none; } -.toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a .faicon, -.toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a:hover .faicon { +.toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a:not(.help) .faicon, +.toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a:hover:not(.help) .faicon { margin-right: 8px; } -.toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a .faicon:before, -.toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a:hover .faicon:before { +.toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a:not(.help) .faicon:before, +.toolbox_expand#toolbox_advanced_settings_holder .toolbox_expand_segment .segment_option a:hover:not(.help) .faicon:before { font-size: 14px; color: #1E88E5; } @@ -22615,7 +22615,22 @@ div.page_komentarji_anketa ul div.question_comment_holder div.question_comment d } .comments_on_alert { - margin-bottom: 10px; + margin-bottom: 32px; + padding: 16px 32px; + border: 1px solid #E5E5E5; + box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2); +} +.comments_on_alert .title { + font-weight: 600; + font-size: 16px; + text-transform: uppercase; + padding-bottom: 8px; + margin-bottom: 8px; + border-bottom: 1px #E5E5E5 solid; +} +.comments_on_alert .title .faicon { + margin-right: 8px; + color: #1E88E5; } .comments_on_alert a { font-weight: 500; diff --git a/resources/sass/admin_new/pages/survey_edit/toolbox.scss b/resources/sass/admin_new/pages/survey_edit/toolbox.scss index a6dc74046..757b85e22 100644 --- a/resources/sass/admin_new/pages/survey_edit/toolbox.scss +++ b/resources/sass/admin_new/pages/survey_edit/toolbox.scss @@ -333,8 +333,8 @@ .segment_option{ padding: 8px 16px 8px 16px; - a, - a:hover{ + a:not(.help), + a:hover:not(.help){ color: $black; text-decoration: none; diff --git a/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss b/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss index 138ebd605..90f077eb3 100644 --- a/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss +++ b/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss @@ -313,7 +313,31 @@ div.page_komentarji_anketa { } } .comments_on_alert { - margin-bottom: 10px; + margin-bottom: 32px; + padding: 16px 32px; + + border: 1px solid $gray; + box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2); + + .title{ + font-weight: 600; + font-size: 16px; + text-transform: uppercase; + + padding-bottom: 8px; + margin-bottom: 8px; + + border-bottom: 1px $gray solid; + + .faicon{ + margin-right: 8px; + color: $blue; + } + } + + .text{ + + } a{ //color: white;