From d6e5963b4f4e72720d74d33826cf25bed7615a44 Mon Sep 17 00:00:00 2001 From: pero1203 Date: Tue, 25 May 2021 09:37:42 +0200 Subject: [PATCH] Manjsi popravki --- admin/survey/Branching.php | 18 +++++++++--------- admin/survey/SurveyAdminSettings.php | 13 ++++++++----- lang/1.php | 7 ++++--- lang/2.php | 1 + public/css/admin.css | 16 ++++++++++++++++ resources/sass/admin/comments.scss | 9 +++++++++ resources/sass/admin/icons/standard.scss | 8 ++++++++ sql/update2.sql | 6 +++++- 8 files changed, 60 insertions(+), 18 deletions(-) diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php index 5cb29e147..26bf5a7c9 100644 --- a/admin/survey/Branching.php +++ b/admin/survey/Branching.php @@ -679,7 +679,7 @@ class Branching { # find & replace if ($row['locked'] == 0) { echo '

'; - echo ''.$lang['srv_find_replace'].''; + echo ''.$lang['srv_find_replace_words'].''; echo '

'; } @@ -6836,7 +6836,8 @@ class Branching { } if ( ! ( mysqli_num_rows($sql1)==1 && $spr_id==0 ) ) { - echo '
'.$lang['srv_add_cond'].': + echo '
'.$lang['srv_add_cond'].' '.Help::display('DataPiping').': +  AND ,  AND NOT ,  OR , @@ -7227,7 +7228,7 @@ class Branching { // right_bracket buttons if ($row_count['count'] != 1 || $row['right_bracket']>0 || $row['left_bracket']>0) { - echo ''; + echo ''; if ($row['right_bracket'] > 0) echo ''; @@ -7235,24 +7236,23 @@ class Branching { echo ''; echo ''; - } else { - echo ''; + } + else { + echo ''; } echo ''; // move - echo ''; + echo ''; if ($row_count['count'] != 1 ) echo ''; echo ''; // remove - echo ''; + echo ''; if ($row_count['count'] != 1 ) echo ''."\n"; - //else - //echo ''."\n"; echo ''; diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index 313f37fd9..6cfe45ef7 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -830,13 +830,16 @@ class SurveyAdminSettings { echo ''; } - - #'.$lang['srv_detail_settings'].'' echo '

'; - echo '

'.$lang['srv_detail_settings'].'

'; + - echo '

'.$lang['comments'].'
'; - echo ''.$lang['srv_vabila'].'

'; + echo '

'.$lang['comments'].'

'; + echo '

'.$lang['srv_vabila'].'

'; + + echo '

'; + echo ' '.$lang['srv_detail_settings'].' '; + echo ' '; + echo '

'; echo ''; diff --git a/lang/1.php b/lang/1.php index fd7fff6b2..1c68a3a7c 100644 --- a/lang/1.php +++ b/lang/1.php @@ -2144,9 +2144,9 @@ $lang = array ( "srv_loop_edit" => "Uredi zanko", "srv_select_spr" => "Izberite spremenljivko", "srv_add_cond" => "Dodaj naslednji pogoj z operatorjem", - "srv_if_label" => "Ime pogoja", - "srv_block_label" => "Ime bloka", - "srv_loop_label" => "Ime zanke", + "srv_if_label" => "Interno ime pogoja", + "srv_block_label" => "Interno ime bloka", + "srv_loop_label" => "Interno ime zanke", "srv_error_oklepaji" => "Nepravilno postavljeni oklepaji!", "srv_error_spremenljivka"=> "Izberite spremenljivko!", "srv_error_calculation" => "Nepravilno postavljena kalkulacija!", @@ -5258,6 +5258,7 @@ $lang = array ( "s_website_only" => "Po spletnem mestu", "s_survey_and_website" => "Povsod", "srv_find_replace" => 'Poišči in zamenjaj', + "srv_find_replace_words" => 'Poišči in zamenjaj besede', "srv_find" => 'Poišči', "srv_replace_with" => 'Zamenjaj z', "srv_replace" => 'Zamenjaj', diff --git a/lang/2.php b/lang/2.php index 1f2d59a6a..f8c062992 100644 --- a/lang/2.php +++ b/lang/2.php @@ -5220,6 +5220,7 @@ $lang = array ( "s_website_only" => "Website content", "s_survey_and_website" => "Everything", "srv_find_replace" => 'Find and replace', + "srv_find_replace_words" => 'Find and replace words', "srv_find" => 'Find', "srv_replace_with" => 'Replace with', "srv_replace" => 'Replace', diff --git a/public/css/admin.css b/public/css/admin.css index 331975830..2ae9583d4 100644 --- a/public/css/admin.css +++ b/public/css/admin.css @@ -7457,6 +7457,16 @@ span.faicon.arrow2_l::before { content: ""; } +span.faicon.arrow2_d::before { + font-size: 14px; + content: ""; +} + +span.faicon.arrow2_u::before { + font-size: 14px; + content: ""; +} + span.faicon.arrow_large2_r::before { font-size: 35px; content: ""; @@ -19938,6 +19948,12 @@ and open the template in the editor. .comments_on_alert { margin-bottom: 10px; } +.comments_on_alert a { + font-weight: 500; +} +.comments_on_alert a:hover { + color: #166dba; +} .comment_qtip_title_secondLine { color: grey; diff --git a/resources/sass/admin/comments.scss b/resources/sass/admin/comments.scss index 31c186615..9257a4e71 100644 --- a/resources/sass/admin/comments.scss +++ b/resources/sass/admin/comments.scss @@ -58,6 +58,15 @@ and open the template in the editor. } .comments_on_alert { margin-bottom: 10px; + + a{ + //color: white; + font-weight: 500; + + &:hover{ + color: $strong_blue_darken; + } + } } .comment_qtip_title_secondLine { color: $grey_normal; diff --git a/resources/sass/admin/icons/standard.scss b/resources/sass/admin/icons/standard.scss index effbc3b56..b8a501f6d 100644 --- a/resources/sass/admin/icons/standard.scss +++ b/resources/sass/admin/icons/standard.scss @@ -480,6 +480,14 @@ span.faicon.arrow2_l::before{ font-size: 14px; content: "\f053"; } +span.faicon.arrow2_d::before{ + font-size: 14px; + content: "\f078"; +} +span.faicon.arrow2_u::before{ + font-size: 14px; + content: "\f077"; +} span.faicon.arrow_large2_r::before{ font-size: 35px; diff --git a/sql/update2.sql b/sql/update2.sql index 5664870a1..47f0ea37d 100644 --- a/sql/update2.sql +++ b/sql/update2.sql @@ -9494,4 +9494,8 @@ UPDATE misc SET value='21.03.30' WHERE what="version"; # Drupal verzija je bila posodobljena in vpišemo na 1ka.si in te UPDATE misc SET value='7.80' WHERE what="drupal version"; -UPDATE misc SET value='21.05.24' WHERE what="version"; \ No newline at end of file +UPDATE misc SET value='21.05.24' WHERE what="version"; + +INSERT INTO srv_help (help, what) VALUES ('Operatorji', 'srv_if_operator'); + +UPDATE misc SET value='21.05.25' WHERE what="version";