diff --git a/admin/survey/BranchingAjax.php b/admin/survey/BranchingAjax.php index 7c526c011..838524629 100644 --- a/admin/survey/BranchingAjax.php +++ b/admin/survey/BranchingAjax.php @@ -2258,7 +2258,16 @@ class BranchingAjax { $rowanketa = SurveyInfo::getInstance()->getSurveyRow(); - echo ''; + + $tip_lang = ''; + if ($type == 1 && $view == 4) //splošen komentar na strani testiranje + $tip_lang = 'S'; + if ($type == 0 && $view == 1) //splošen komentar v dropdownu + $tip_lang = 'S'; + if ($spremenljivka != 0) //komentar na vprašanja + $tip_lang = 'Q'; + + echo ''; if ($buttons) { echo '
'; diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index da1ca95a7..7c8a9a2f8 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -6890,19 +6890,6 @@ class SurveyAdminSettings { echo '
'; - // Dodajanje novega komentarja - - echo '
'; - echo $lang['srv_add_comment_toggle']; - echo '
'; - - echo '
'; - echo '
'; - $ba = new BranchingAjax($this->anketa); - $ba->add_comment_field(0, '1', '4', false); - echo '
'; - echo '
'; - $sql = sisplet_query("SELECT * FROM post WHERE tid='$rowa[thread]' ".$only_unresolved." "); $rows = (mysqli_num_rows($sql) == 0) ? 0 : mysqli_num_rows($sql) - 1; if ($rows > 0){ @@ -6994,6 +6981,20 @@ class SurveyAdminSettings { } } + // Dodajanje novega komentarja + + echo '
'; + echo ''; + echo $lang['srv_survey_general_comment']; + echo '
'; + + echo '
'; + echo '
'; + $ba = new BranchingAjax($this->anketa); + $ba->add_comment_field(0, '1', '4', false); + echo '
'; + echo '
'; + echo ''; @@ -7103,19 +7104,6 @@ class SurveyAdminSettings { echo '

'.$lang['srv_no_comments'].'

'; } } - /* Dodajanje novega komentarja - echo '
'; - echo $lang['srv_add_comment_toggle']; - echo '
'; - - echo '
'; - echo '
'; - $ba = new BranchingAjax($this->anketa); - $ba->add_comment_field(0, '4', '5', false); - echo '
'; - - echo '
';*/ - echo ''; echo ''; // div.komentarji_anketa_holder @@ -7696,21 +7684,6 @@ class SurveyAdminSettings { echo ''; - if ($addfieldposition == '' || $addfieldposition == 0) { - - echo '
'; - echo $lang['srv_add_comment_toggle']; - echo '
'; - - echo '
'; - - echo '
'; - $ba = new BranchingAjax($this->anketa); - $ba->add_comment_field($spr_id, '1', '4', false); - echo '
'; - echo '
'; - } - // komentarji urednikov if ($row1['thread'] > 0) { @@ -7794,8 +7767,24 @@ class SurveyAdminSettings { } + if ($addfieldposition == '' || $addfieldposition == 0) { + + echo '
'; + echo ''; + echo $lang['srv_question_comment']; + echo '
'; + + echo '
'; + + echo '
'; + $ba = new BranchingAjax($this->anketa); + $ba->add_comment_field($spr_id, '1', '4', false); + echo '
'; + echo '
'; + } + echo ''; - + echo '
'; diff --git a/lang/1.php b/lang/1.php index 7ba79a001..0812a0a73 100644 --- a/lang/1.php +++ b/lang/1.php @@ -3587,9 +3587,9 @@ $lang = array ( "srv_advanced_options_note" => "Za uporabo nekaterih naprednih opcij potrebujete status managerja!
Zaprosite za status managerja.", "user_see_hour_views" => "Uporabnik vidi vpoglede v svoje časovnice", "srv_survey_comment" => "Dodaj komentarje o anketi", - "srv_survey_general_comment" => "Dodaj splošen komentar na anketo", + "srv_survey_general_comment" => "Dodaj splošni komentar na anketo", "srv_survey_comments" => "Poglej komentarje o anketi", - "srv_question_comment" => "Dodaj komentar o vprašanju", + "srv_question_comment" => "Dodaj komentar na vprašanje", "srv_question_comments" => "Poglej komentarje o vprašanju", "srv_forum_intro" => "Tema vsebuje komentarje na vprašanje: ", "srv_forum_intro_if" => "Tema vsebuje komentarje na if: ", @@ -4922,8 +4922,8 @@ $lang = array ( "desc2" => "Padajoče brez preteklih (samo za datume)", "archive_date" => "Zapis datuma v arhivu: ", "srv_comments_add_comment" => "Nov komentar", - "srv_comments_add_comment0" => "Nov splošni komentar na anketo", - "srv_comments_add_comment1" => "Nov komentar na vprašanje", + "srv_comments_add_commentS" => "Nov splošni komentar na anketo", + "srv_comments_add_commentQ" => "Nov komentar na vprašanje", "srv_comments_unresolved" => "Samo nerešeni komentarji", "srv_comments_marks" => "Označevanje komentarjev", "srv_comments_marks_0" => "Enostavno (Končano)", diff --git a/lang/2.php b/lang/2.php index bf78c24da..7dfaa7a47 100644 --- a/lang/2.php +++ b/lang/2.php @@ -3558,9 +3558,9 @@ $lang = array ( "srv_advanced_options_note" => "Some advanced options are only available for users with the status of manager.
For manager status contact us at email: info@1ka.si or phone: 01/5805278.", "user_see_hour_views" => "User sees views of his timetables", "srv_survey_comment" => "Comment survey", - "srv_survey_general_comment" => "Comment survey", + "srv_survey_general_comment" => "Add a general survey comment", "srv_survey_comments" => "View survey comments", - "srv_question_comment" => "Comment question", + "srv_question_comment" => "Add a question comment", "srv_question_comments" => "View question comments", "srv_forum_intro" => "This thread has comments about question: ", "srv_forum_if" => "This thread has comments about if: ", @@ -4896,8 +4896,8 @@ $lang = array ( "srv_chart_settings_fullScale" => "Full scale", "srv_chart_open_answers_settings" => "Open answers settings", "srv_comments_add_comment" => "New comment", - "srv_comments_add_comment0" => "New general survey comment", - "srv_comments_add_comment1" => "New question comment", + "srv_comments_add_commentS" => "New general survey comment", + "srv_comments_add_commentQ" => "New question comment", "srv_comments_unresolved" => "Display only unresolved comments", "srv_comments_marks" => "Labelling comments", "srv_comments_marks_0" => "Simple (done)", diff --git a/public/css/admin_new.css b/public/css/admin_new.css index a79590848..31f8e9126 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -25149,13 +25149,12 @@ div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa.ko div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.add_comment_toggle, div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.add_comment_toggle { transition: 0.3s; - border: 1px solid #E5E5E5; - border-radius: 2px; - width: 100%; - padding: 9px 8px; - margin-bottom: 16px; - color: #777777; - cursor: text; + font-size: 14px !important; + color: #1E88E5; +} +div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.add_comment_toggle span, +div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.add_comment_toggle span { + font-size: inherit !important; } div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_type, div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_type { @@ -25452,13 +25451,12 @@ div.page_komentarji_anketa ul div.question_comment_holder div.question_comment.e div.page_komentarji ul div.question_comment_holder div.question_comment div.add_comment_toggle, div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.add_comment_toggle { transition: 0.3s; - border: 1px solid #E5E5E5; - border-radius: 2px; - width: 100%; - padding: 9px 8px; - margin-bottom: 16px; - color: #777777; - cursor: text; + font-size: 14px !important; + color: #1E88E5; +} +div.page_komentarji ul div.question_comment_holder div.question_comment div.add_comment_toggle span, +div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.add_comment_toggle span { + font-size: inherit !important; } div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_type, div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_type { diff --git a/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss b/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss index cf5eab95d..68be4a3f5 100644 --- a/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss +++ b/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss @@ -102,15 +102,11 @@ div.page_komentarji_anketa { div.add_comment_toggle { transition: 0.3s; - - border: 1px solid $gray; - border-radius: 2px; - width: 100%; - padding: 9px 8px; - margin-bottom: 16px; - color: $very-dark-gray; - - cursor: text; + font-size: 14px !important; + color: $blue; + span { + font-size: inherit !important; + } } div.comment_type { @@ -425,15 +421,11 @@ div.page_komentarji_anketa { div.add_comment_toggle { transition: 0.3s; - - border: 1px solid $gray; - border-radius: 2px; - width: 100%; - padding: 9px 8px; - margin-bottom: 16px; - color: $very-dark-gray; - - cursor: text; + font-size: 14px !important; + color: $blue; + span { + font-size: inherit !important; + } } div.comment_type {