From 4a9223eeab7dbacad469b769d3a5b353e17834a8 Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Fri, 1 Apr 2022 01:45:51 +0200 Subject: [PATCH] =?UTF-8?q?[Redizajn=201KA]=20-=20Testiranje=20-->=20Komen?= =?UTF-8?q?tarji=20-=20v1=20(splo=C5=A1ni=20komentarji)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/survey/BranchingAjax.php | 4 +- admin/survey/SurveyAdminSettings.php | 159 +++++++++++------- lang/1.php | 5 + lang/2.php | 5 + public/css/admin_new.css | 105 +++++++++++- .../sass/admin_new/basic/icons/export.scss | 1 - .../my_surveys/testiranje/komentarji.scss | 111 +++++++++++- 7 files changed, 323 insertions(+), 67 deletions(-) diff --git a/admin/survey/BranchingAjax.php b/admin/survey/BranchingAjax.php index 32cc9e1ab..8180be4e8 100644 --- a/admin/survey/BranchingAjax.php +++ b/admin/survey/BranchingAjax.php @@ -2324,8 +2324,8 @@ class BranchingAjax { $rowanketa = SurveyInfo::getInstance()->getSurveyRow(); - echo '
'; - echo ''; + echo ''; + echo ''; if (($type == 0 || $view==3) && ($admin_type == 0 || $global_user_id==$rowanketa['insert_uid'])) { diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index a5f6d08ba..fe1a7b032 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -7050,7 +7050,7 @@ class SurveyAdminSettings { $rowa = SurveyInfo::getInstance()->getSurveyRow(); echo '
'; - + echo $lang['srv_komentarji_imate'].' '; if(($comment_count['survey_resp']['unresolved']+$comment_count['survey_admin']['unresolved']) > 0) echo ''; echo $this->string_format((int)($comment_count['survey_resp']['unresolved']+$comment_count['survey_admin']['unresolved']), 'srv_cnt_komentarji'); @@ -7059,11 +7059,10 @@ class SurveyAdminSettings { echo ' '.$lang['srv_komentarji_odskupno'].' '; echo $this->string_format((int)($comment_count['survey_resp']['all']+$comment_count['survey_admin']['all']), 'srv_cnt_komentarji_survey_od'); echo '
'; - + /* - ZAČASNO ZAKOMENTIRAN TOOLTIP (prekriva vsebino za redizajn) @TG echo ' '; - echo ' '.$lang['srv_survey_testdata'].''; echo ' ('.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.') '; echo ''; echo '' . $lang['srv_survey_testdata2'] . ': '.$lang['srv_testdata_text'].''; @@ -7071,6 +7070,10 @@ class SurveyAdminSettings { echo ''; echo ''; // expanded-tooltip bottom echo ''; // tooltip */ + + echo '
'; + echo ' '.$lang['srv_survey_testdata'].''; + echo '
'; # VV: privzeto naj bodo samo nerešeni komentarji @@ -7078,14 +7081,13 @@ class SurveyAdminSettings { $_GET['only_unresolved'] = 1; } - - echo ''; - # samo nerešeni komentarji if ($commentmarks == 0) { - echo ''; + echo '
'; + echo ''; + echo ''; + echo '
'; + } else { echo $lang['move_show'].': '; } - echo ' '.Help::display('srv_comments_only_unresolved').''; + //echo ' '.Help::display('srv_comments_only_unresolved'); $only_unresolved = " "; switch($_GET['only_unresolved']){ @@ -7118,32 +7120,47 @@ class SurveyAdminSettings { default: break; } + + echo '
'; // Splosni komentarji urednikov - levo echo '
'; - echo ''.$lang['srv_comments_anketa_ured'].' ('.$comment_count['survey_admin']['unresolved'].'/'.$comment_count['survey_admin']['all'].')'; + echo '
'.$lang['srv_comments_anketa_ured'].' ('.$comment_count['survey_admin']['unresolved'].'/'.$comment_count['survey_admin']['all'].')'; - 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){ - echo ''; - echo '
'; $i=0; while ($row = mysqli_fetch_array($sql)) { if (($i != 0 && $sortpostorder==0) || ($i < $rows && $sortpostorder==1)) { - if ($row['ocena'] == 0) echo ''; + /*if ($row['ocena'] == 0) echo ''; elseif ($row['ocena'] == 1) echo ''; elseif ($row['ocena'] == 2) echo ''; elseif ($row['ocena'] == 3) echo ''; - else echo ''; + else echo '';*/ - echo ''.$f->user($row['uid']).' ('.$f->datetime1($row['time']).'):'; + echo '
'; + + echo '
'; + echo $lang['srv_comments_user'].''.$f->user($row['uid']).''.$lang['srv_comments_user2']; + echo '
'; + + $datetime = strtotime($row['time']); + $datetime = date("d.m.Y G:i", $datetime); + + echo '
'; + echo $datetime; + echo '
'; + + echo '
'; + echo $row['vsebina']; + echo '
'; + - echo '
'; + echo '
'; if ($commentmarks == 1) { echo ' '; } else { - // Checkbox za "Koncano" + /*// Checkbox za "Koncano" echo '= 2?' checked':'').' />'; - echo ''; + echo ''; */ + + if ($row['ocena']==0) { + echo '

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

'; + } + else { + echo '

'.$lang['srv_comments_archived'].'

'; + } } echo '
'; - - echo '
'.$row['vsebina'].'
'; - echo ''; + echo '
'; } $i++; - } + } } // Nimamo komentarja else{ @@ -7175,42 +7198,36 @@ class SurveyAdminSettings { echo $lang['srv_no_comments']; } } - - echo '
'; - + // Dodajanje novega komentarja - echo ''; - echo '

'.$lang['srv_comments_add_comment'].'

'; - echo '
'; $ba = new BranchingAjax($this->anketa); $ba->add_comment_field(0, '1', '4', false); - echo '

'; - + echo '
'; + + echo '
'; echo '
'; // Splosni komentarji respondentov - desno echo '
'; - echo ''.$lang['srv_comments_anketa_resp'].' ('.$comment_count['survey_resp']['unresolved'].'/'.$comment_count['survey_resp']['all'].')'; - - echo '
'; + echo '
'.$lang['srv_comments_anketa_resp'].' ('.$comment_count['survey_resp']['unresolved'].'/'.$comment_count['survey_resp']['all'].')'; $sql = sisplet_query("SELECT * FROM srv_comment_resp WHERE ank_id='$this->anketa' ".$only_unresolved." ORDER BY comment_time $orderby, id $orderby"); if (mysqli_num_rows($sql) > 0) { - echo ''; - echo '
'; - while ($row = mysqli_fetch_array($sql)) { + + echo '
'; - if ($row['ocena'] == 0) echo ''; + /*if ($row['ocena'] == 0) echo ''; elseif ($row['ocena'] == 1) echo ''; elseif ($row['ocena'] == 2) echo ''; elseif ($row['ocena'] == 3) echo ''; - else echo ''; - + else echo '';*/ + $datetime = strtotime($row['comment_time']); - $datetime = date("d.m G:i", $datetime); + $datetime = date("d.m.Y G:i", $datetime); if($row['usr_id'] == 0){ $user = $lang['guest']; @@ -7221,10 +7238,21 @@ class SurveyAdminSettings { $user = $rowU['name']; } + + echo '
'; + echo $lang['srv_comments_user'].''.$user.''.$lang['srv_comments_user2']; + echo '
'; + + echo '
'; + echo $datetime; + echo '
'; + + echo '
'; + echo $row['comment']; + echo '
'; - echo ''.$user.' ('.$datetime.'):'; - echo '
'; + echo '
'; if ($commentmarks == 1) { echo ' '; } else { - // Checkbox za "Koncano" + /*// Checkbox za "Koncano" echo '= 2?' checked':'').' />'; - echo ''; + echo ''; */ + + if ($row['ocena']==0) { + echo '

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

'; + } + else { + echo '

'.$lang['srv_comments_archived'].'

'; + } } echo '
'; - echo '
'.$row['comment'].'
'; - - echo ''; + echo '
'; + } } // Nimamo komentarja @@ -7254,21 +7289,19 @@ class SurveyAdminSettings { echo $lang['srv_no_comments']; } } - - echo '
'; - // Dodajanje novega komentarja - echo ''; - echo '

'.$lang['srv_comments_add_comment'].'

'; - echo '
'; $ba = new BranchingAjax($this->anketa); - $ba->add_comment_field(0, '4', '5', false); - echo '

'; - + $ba->add_comment_field(0, '1', '5', false); echo '
'; - - + echo '
'; + + echo ''; + echo '
'; + + echo '
'; // div.komentarji_anketa_holder + } function testiranje_komentarji_komentarji_na_anketo ($return = true) { @@ -7544,8 +7577,6 @@ class SurveyAdminSettings { /* - ZAČASNO ZAKOMENTIRAN TOOLTIP (prekriva vsebino za redizajn) @TGecho ' '; - echo ' '.$lang['srv_survey_testdata'].''; - echo ' ('.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.') '; echo ''; echo '' . $lang['srv_survey_testdata2'] . ': '.$lang['srv_testdata_text'].''; echo '

'.$lang['srv_preview_testdata_longtext'].'

'; @@ -7553,6 +7584,10 @@ class SurveyAdminSettings { echo ''; // expanded-tooltip bottom echo ''; // tooltip */ + echo '
'; + echo ''.$lang['srv_survey_testdata'].''; + echo '
'; + # VV: privzeto naj bodo samo nerešeni komentarji if (!isset($_GET['only_unresolved'])) { diff --git a/lang/1.php b/lang/1.php index a8db5a3f2..f0f86d1b6 100644 --- a/lang/1.php +++ b/lang/1.php @@ -4513,6 +4513,11 @@ $lang = array ( "srv_comments_anketa_ured" => "Splošni komentarji urednikov", "srv_comments_anketa_resp" => "Splošni komentarji respondentov", "srv_comments_link" => "Pregled komentarjev", + "srv_comments_user" => "Uporabnik ", + "srv_comments_user2" => " je komentiral:", + "srv_comments_archive" => "Arhiviraj komentar", + "srv_comments_archived" => "Komentar je arhiviran", + "srv_comments_new" => "Komentiraj", "srv_zanka_profile_all" => "Brez", "srv_zanka_profile_session" => "Začasno", "srv_zanka_note" => "Skupina za: ", diff --git a/lang/2.php b/lang/2.php index 958da1335..daecd2252 100644 --- a/lang/2.php +++ b/lang/2.php @@ -4488,6 +4488,11 @@ $lang = array ( "srv_comments_napredno" => "You can edit advanced settings below", "srv_comments_anketa_ured" => "Administrative comments to the survey", "srv_comments_anketa_resp" => "Respondent comments to the survey", + "srv_comments_user" => "User ", + "srv_comments_user2" => " commented:", + "srv_comments_archive" => "Archive comment", + "srv_comments_archived" => "Comment has already been archived", + "srv_comments_new" => "Comment", "srv_zanka_profile_all" => "Without", "srv_zanka_profile_session" => "Temporary", "srv_zanka_note" => "Loop for: ", diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 8fe28f494..f1731ccab 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -6627,7 +6627,6 @@ span.faicon.xml.black::before { } span.faicon.arhiv::before { - font-size: 16px; content: "\f187"; } @@ -10498,6 +10497,110 @@ div#srv_diagnostic div.button_holder button { margin: 0 0 0 8px; } +div.page_komentarji div#comment_question_note, +div.page_komentarji_anketa div#comment_question_note { + margin-bottom: 16px; + font-size: 20px; +} +div.page_komentarji div#comment_question_note span, +div.page_komentarji_anketa div#comment_question_note span { + font-size: inherit; +} +div.page_komentarji div.testni_vnos, +div.page_komentarji_anketa div.testni_vnos { + margin-bottom: 16px; +} +div.page_komentarji div.testni_vnos a, +div.page_komentarji_anketa div.testni_vnos a { + text-decoration: none; +} +div.page_komentarji div.testni_vnos .monitor, +div.page_komentarji_anketa div.testni_vnos .monitor { + position: relative; +} +div.page_komentarji div.testni_vnos .monitor:after, +div.page_komentarji_anketa div.testni_vnos .monitor:after { + content: "T"; + position: absolute; + top: 2px; + left: 37%; + font-family: Source Sans Pro, sans-serif; + font-size: 8px; +} +div.page_komentarji div.setting_holder, +div.page_komentarji_anketa div.setting_holder { + display: flex; + flex-direction: column; +} +div.page_komentarji div.komentarji_anketa_holder, +div.page_komentarji_anketa div.komentarji_anketa_holder { + margin-top: 32px; + display: flex; + flex-direction: row; + gap: 32px; + width: 100%; +} +div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa, +div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa { + width: 50%; +} +div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset, +div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset { + padding: 32px 24px; +} +div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box, +div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box { + width: 100%; + display: flex; + flex-direction: column; + border-bottom: 1px solid #E5E5E5; + margin-bottom: 16px; +} +div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .by, +div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .by { + margin-bottom: 4px; +} +div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .by .user, +div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .by .user { + font-weight: 600; +} +div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .date, +div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .date { + font-size: 14px; + color: #808080; +} +div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .content, +div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .content { + margin: 16px 0; +} +div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .archive_comment, +div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .archive_comment { + margin-bottom: 16px; + cursor: pointer; + color: #1E88E5; + transition: 0.2s; +} +div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .archived_comment, +div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .archived_comment { + margin-bottom: 16px; + color: #808080; +} +div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.new_comment, +div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.new_comment { + display: flex; + flex-direction: column; +} +div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.new_comment textarea, +div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.new_comment textarea { + width: 100%; + height: 100px; +} +div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.new_comment button, +div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.new_comment button { + width: fit-content; + margin-top: 8px; +} + #placeholder.komentarji { margin: 0px; } diff --git a/resources/sass/admin_new/basic/icons/export.scss b/resources/sass/admin_new/basic/icons/export.scss index e7624cbe6..1dd89d539 100644 --- a/resources/sass/admin_new/basic/icons/export.scss +++ b/resources/sass/admin_new/basic/icons/export.scss @@ -122,7 +122,6 @@ span.faicon.xml.black::before{ // Arhiv span.faicon.arhiv::before{ - font-size: 16px; content: "\f187"; } span.faicon.arhiv_mail::before{ diff --git a/resources/sass/admin_new/pages/my_surveys/testiranje/komentarji.scss b/resources/sass/admin_new/pages/my_surveys/testiranje/komentarji.scss index 183b9a963..7f1395d64 100644 --- a/resources/sass/admin_new/pages/my_surveys/testiranje/komentarji.scss +++ b/resources/sass/admin_new/pages/my_surveys/testiranje/komentarji.scss @@ -1,10 +1,119 @@ -div.page_komentarji { +div.page_komentarji, +div.page_komentarji_anketa { div#comment_question_note { + margin-bottom: 16px; + font-size: 20px; + span { + font-size: inherit; + } + } + + div.testni_vnos { + margin-bottom: 16px; + + a { + text-decoration: none; + } + + .monitor { + position: relative; + + &:after{ + content: "T"; + + position: absolute; + top: 2px; + left: 37%; + + font-family: $font_family; + font-size: 8px; + } + } + } + + div.setting_holder { + display: flex; + flex-direction: column; + } + + div.komentarji_anketa_holder { + margin-top: 32px; + display: flex; + flex-direction: row; + gap: 32px; + width: 100%; + + div.komentarji_anketa { + width: 50%; + + fieldset { + padding: 32px 24px; + + div.comment_box { + width: 100%; + display: flex; + flex-direction: column; + + border-bottom: 1px solid $gray; + + margin-bottom: 16px; + + .by { + margin-bottom: 4px; + .user { + font-weight: $semi-bold; + } + } + + .date { + font-size: 14px; + color: $very-dark-gray2; + } + + .content { + margin: 16px 0; + } + + .archive_comment { + margin-bottom: 16px; + + cursor: pointer; + color: $blue; + + transition: 0.2s; + &:hover { + $color: darken ($blue, 3%); + } + } + + .archived_comment { + margin-bottom: 16px; + color: $very-dark-gray2 + } + } + + div.new_comment { + display: flex; + flex-direction: column; + + textarea { + width: 100%; + height: 100px; + } + + button { + width: fit-content; + margin-top: 8px; + } + } + } + } } } +//////////////////////////////// #placeholder.komentarji{ margin: 0px;