diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php index 0a3ff75fc..d50065bf8 100644 --- a/admin/survey/SurveyAdminAjax.php +++ b/admin/survey/SurveyAdminAjax.php @@ -4912,7 +4912,7 @@ class SurveyAdminAjax { $row = mysqli_fetch_array($sql); $f = new Forum(); - $vsebina = $row['vsebina'].'
'.$f->user($global_user_id).' ('.$f->datetime1(date('Y-m-d h:i:s')).'):
'.$vsebina.'
'; + $vsebina = $row['vsebina'].'
'.$f->user($global_user_id).' ('.$f->datetime1(date('Y-m-d h:i:s')).')
'.$vsebina.'
'; sisplet_query("UPDATE post SET vsebina='$vsebina' WHERE id='$id'"); diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index fef300057..c3863f1a6 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -6920,7 +6920,7 @@ class SurveyAdminSettings { $datetime = date("d.m.Y G:i", $datetime); - echo '

'.$lang['srv_comments_user'].''.$f->user($row['uid']).' ('.$datetime.')

'; + echo '

'.$lang['srv_comments_user'].''.$f->user($row['uid']).' ('.$datetime.')

'; if ($admin_type <= 1 || $rowa['insert_uid']==$global_user_id || $commentmarks_who==0) { @@ -7021,7 +7021,7 @@ class SurveyAdminSettings { echo '
'; if($row['usr_id'] == 0){ - echo '

Respondent ('.$datetime.')

'; + echo '

Respondent ('.$datetime.')

'; } else{ $sqlU = sisplet_query("SELECT name FROM users WHERE id='$row[usr_id]'"); @@ -7029,7 +7029,7 @@ class SurveyAdminSettings { $user = $rowU['name']; - echo '

'.$lang['srv_comments_user'].''.$user.' ('.$datetime.')

'; + echo '

'.$lang['srv_comments_user'].''.$user.' ('.$datetime.')

'; } @@ -7686,6 +7686,16 @@ class SurveyAdminSettings { echo '
'; + echo '
'; + + echo $lang['srv_admin_comment'].':'; + + /*Sort + echo ''; + echo '';*/ + + echo '
'; + if ($addfieldposition == '' || $addfieldposition == 0) { echo '
'; @@ -7706,16 +7716,6 @@ class SurveyAdminSettings { if (mysqli_num_rows($sqlt) > 0) { - echo '
'; - - echo $lang['srv_admin_comment'].':'; - - /*Sort - echo ''; - echo '';*/ - - echo '
'; - $i = 0; while ($rowt = mysqli_fetch_array($sqlt)) { @@ -7727,7 +7727,7 @@ class SurveyAdminSettings { $datetime = strtotime($rowt['time']); $datetime = date("d.m.Y G:i", $datetime); - echo '

'.$lang['srv_comments_user'].''.$f->user($rowt['uid']).' ('.$datetime.')

'; + echo '

'.$lang['srv_comments_user'].''.$f->user($rowt['uid']).' ('.$datetime.')

'; if ($admin_type <= 1 || $rowi['insert_uid']==$global_user_id || $commentmarks_who==0) { @@ -7839,7 +7839,7 @@ class SurveyAdminSettings { $datetime = date("d.m.Y G:i", $datetime); } - echo '

Respondent ('.$datetime.')

'; + echo '

Respondent ('.$datetime.')

'; if ($admin_type <= 1 || $rowi['insert_uid']==$global_user_id || $commentmarks_who==0) { diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 102e613ce..0d72e95df 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -25162,8 +25162,14 @@ div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa di } div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .user, div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .user { + font-size: 14px !important; font-weight: 600; } +div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .date, +div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .date { + font-size: 14px !important; + color: #808080; +} div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by p, div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by p { font-size: 14px !important; @@ -25180,6 +25186,14 @@ div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa di margin-right: 16px; cursor: pointer; } +div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .solve p span.faicon, +div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .solve p span.faicon { + font-size: 14px !important; +} +div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options span.faicon, +div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options span.faicon { + font-size: 14px !important; +} div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .options_dropdown, div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .options_dropdown { position: absolute; @@ -25190,8 +25204,7 @@ div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa di width: auto; padding: 20px 16px; background: #FFFFFF; - border: 1px solid #E5E5E5; - box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.15); + box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.14); flex-direction: column; } div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .options_dropdown .line, @@ -25212,16 +25225,12 @@ div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comme div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .options_dropdown .line a { white-space: nowrap; text-decoration: none; + font-size: 14px !important; } div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .options_dropdown .line p, div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .options_dropdown .line p { font-size: 14px !important; } -div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .date, -div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .date { - font-size: 14px; - color: #808080; -} div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .content, div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .content { margin: 16px 0; @@ -25399,6 +25408,19 @@ div.page_komentarji_anketa ul div.question_comment_holder div.question_comment.e padding-right: 62px; margin-right: 62px; } +div.page_komentarji ul div.question_comment_holder div.question_comment.editor div.comment_type, +div.page_komentarji_anketa ul div.question_comment_holder div.question_comment.editor div.comment_type { + font-weight: 600; + margin-bottom: 16px; + text-transform: uppercase; + display: flex; + flex-direction: row; + justify-content: space-between; +} +div.page_komentarji ul div.question_comment_holder div.question_comment.editor div.comment_type .fa-sort-amount-up, +div.page_komentarji_anketa ul div.question_comment_holder div.question_comment.editor div.comment_type .fa-sort-amount-up { + display: none; +} 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; @@ -25443,8 +25465,14 @@ div.page_komentarji_anketa ul div.question_comment_holder div.question_comment d } div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .by .user, div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by .user { + font-size: 14px !important; font-weight: 600; } +div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .by .date, +div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by .date { + font-size: 14px !important; + color: #808080; +} div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .by p, div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by p { font-size: 14px !important; @@ -25461,6 +25489,14 @@ div.page_komentarji_anketa ul div.question_comment_holder div.question_comment d margin-right: 16px; cursor: pointer; } +div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .by .options .solve p span.faicon, +div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by .options .solve p span.faicon { + font-size: 14px !important; +} +div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .by .options span.faicon, +div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by .options span.faicon { + font-size: 14px !important; +} div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown, div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown { position: absolute; @@ -25471,8 +25507,7 @@ div.page_komentarji_anketa ul div.question_comment_holder div.question_comment d width: auto; padding: 20px 16px; background: #FFFFFF; - border: 1px solid #E5E5E5; - box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.15); + box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.14); flex-direction: column; } div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown .line, @@ -25493,6 +25528,7 @@ div.page_komentarji ul div.question_comment_holder div.question_comment div.comm div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown .line a { white-space: nowrap; text-decoration: none; + font-size: 14px !important; } div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown .line p, div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown .line p { @@ -25511,10 +25547,17 @@ div.page_komentarji ul div.question_comment_holder div.question_comment div.comm div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .content blockquote { font-size: 14px !important; border-left: 1px solid #E5E5E5; - padding-left: 8px; + margin-inline: 0; + padding-left: 20px; + margin-left: 0 !important; margin-block-start: 0; margin-block-end: 0; } +div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .content blockquote span, div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .content blockquote p, +div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .content blockquote span, +div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .content blockquote p { + font-size: 14px !important; +} div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .content blockquote:not(:last-of-type), div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .content blockquote:not(:last-of-type) { padding-bottom: 16px; @@ -25523,6 +25566,15 @@ div.page_komentarji ul div.question_comment_holder div.question_comment div.comm div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .content blockquote:first-of-type { margin-top: 16px; } +div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .content blockquote .answer, +div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .content blockquote .answer { + margin: 16px 0; + font-size: 16px !important; +} +div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .content blockquote .answer:first-of-type, +div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .content blockquote .answer:first-of-type { + margin-bottom: 0px; +} div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .bottom_options, div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .bottom_options { display: flex; diff --git a/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss b/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss index 15b0f7cc6..73ba4a2d7 100644 --- a/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss +++ b/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss @@ -142,9 +142,15 @@ div.page_komentarji_anketa { .by { .user { + font-size: 14px !important; font-weight: $semi-bold; } + .date { + font-size: 14px !important; + color: $very-dark-gray2; + } + p { font-size: 14px !important; } @@ -159,6 +165,16 @@ div.page_komentarji_anketa { .solve { margin-right: 16px; cursor: pointer; + + p { + span.faicon { + font-size: 14px !important; + } + } + } + + span.faicon { + font-size: 14px !important; } color: $blue; @@ -177,9 +193,8 @@ div.page_komentarji_anketa { width: auto; padding: 20px 16px; background: $white; - border: 1px solid $gray; - box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.15); + box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.14); flex-direction: column; @@ -201,6 +216,8 @@ div.page_komentarji_anketa { a { white-space: nowrap; text-decoration: none; + font-size: 14px !important; + } p { @@ -211,11 +228,6 @@ div.page_komentarji_anketa { } } - .date { - font-size: 14px; - color: $very-dark-gray2; - } - .content { margin: 16px 0; } @@ -395,6 +407,20 @@ div.page_komentarji_anketa { border-right: 1px solid $gray; padding-right: 62px; margin-right: 62px; + + div.comment_type { + font-weight: $semi-bold; + margin-bottom: 16px; + text-transform: uppercase; + + display: flex; + flex-direction: row; + justify-content: space-between; + + .fa-sort-amount-up { + display: none; + } + } } div.add_comment_toggle { @@ -439,9 +465,15 @@ div.page_komentarji_anketa { .by { .user { + font-size: 14px !important; font-weight: $semi-bold; } - + + .date { + font-size: 14px !important; + color: $very-dark-gray2; + } + p { font-size: 14px !important; } @@ -456,6 +488,16 @@ div.page_komentarji_anketa { .solve { margin-right: 16px; cursor: pointer; + + p { + span.faicon { + font-size: 14px !important; + } + } + } + + span.faicon { + font-size: 14px !important; } color: $blue; @@ -474,9 +516,8 @@ div.page_komentarji_anketa { width: auto; padding: 20px 16px; background: $white; - border: 1px solid $gray; - box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.15); + box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.14); flex-direction: column; @@ -499,6 +540,7 @@ div.page_komentarji_anketa { a { white-space: nowrap; text-decoration: none; + font-size: 14px !important; } p { @@ -519,8 +561,13 @@ div.page_komentarji_anketa { blockquote { font-size: 14px !important; + span, p { + font-size: 14px !important; + } border-left: 1px solid $gray; - padding-left: 8px; + margin-inline: 0; + padding-left: 20px; + margin-left: 0 !important; margin-block-start: 0; margin-block-end: 0; @@ -531,6 +578,15 @@ div.page_komentarji_anketa { &:first-of-type { margin-top: 16px; } + + .answer { + margin: 16px 0; + font-size: 16px !important; + + &:first-of-type { + margin-bottom: 0px; + } + } } }