From 44bbaef130804d18b28a7327820ba7b30f960893 Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Thu, 1 Sep 2022 14:18:35 +0200 Subject: [PATCH 1/3] [Redizajn 1KA v2] Testiranje --> Komentarji - v2 --- admin/survey/SurveyAdminAjax.php | 2 +- admin/survey/SurveyAdminSettings.php | 30 +++---- public/css/admin_new.css | 72 ++++++++++++++--- .../pages/survey_testiranje/komentarji.scss | 78 ++++++++++++++++--- 4 files changed, 145 insertions(+), 37 deletions(-) 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; + } + } } } From 4aeae01ef1e752fdc1bd660b9fe96ba245ded046 Mon Sep 17 00:00:00 2001 From: urospodkriznik Date: Thu, 1 Sep 2022 14:34:46 +0200 Subject: [PATCH 2/3] drupal - prevod footer --- .../pro1ka/templates/parts/footer.html.twig | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/frontend/drupal9/web/themes/custom/pro1ka/templates/parts/footer.html.twig b/frontend/drupal9/web/themes/custom/pro1ka/templates/parts/footer.html.twig index 2c51abe56..48a8b0990 100644 --- a/frontend/drupal9/web/themes/custom/pro1ka/templates/parts/footer.html.twig +++ b/frontend/drupal9/web/themes/custom/pro1ka/templates/parts/footer.html.twig @@ -4,14 +4,30 @@
-

Orodje za anketiranje 1KA lahko z omejenimi funkcionalnostmi preizkusite tudi brezplačno

+

+ {% if language.id == 'sl' %} + Orodje 1KA je brezplačno za osnovne uporabnike. + {% else %} + 1KA is free to use for basic users + {% endif %} +

-
Preizkusite
+
{% if language.id == 'sl' %} + Ustvarite anketo + {% else %} + Create a survey + {% endif %} +
-
Vsi paketi
+
{% if language.id == 'sl' %} + Vsi paketi + {% else %} + See pricing + {% endif %} +
From 31f840c33195b7c4058943d0894a5b44eabaead9 Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Fri, 2 Sep 2022 06:00:20 +0200 Subject: [PATCH 3/3] [Redizajn 1KA v2] Testiranje --> Komentarji - dropdown - v delu --- admin/survey/BranchingAjax.php | 18 +- admin/survey/SurveyAdmin.php | 81 +++++- admin/survey/script/script.js | 7 + public/css/admin_new.css | 125 +++++++++- .../sass/admin_new/basic/icons/standard.scss | 4 + .../pages/survey_testiranje/komentarji.scss | 234 ++++++++++++++---- 6 files changed, 397 insertions(+), 72 deletions(-) diff --git a/admin/survey/BranchingAjax.php b/admin/survey/BranchingAjax.php index 7aa3182f8..531b6a3ba 100644 --- a/admin/survey/BranchingAjax.php +++ b/admin/survey/BranchingAjax.php @@ -2317,7 +2317,7 @@ class BranchingAjax { } } - function add_comment_field ($spremenljivka, $type, $view, $form=true) { + function add_comment_field ($spremenljivka, $type, $view, $form=true, $buttons=true) { global $admin_type; global $global_user_id; global $lang; @@ -2327,15 +2327,17 @@ class BranchingAjax { echo ''; - echo '
'; + if ($buttons) { + echo '
'; - if($_GET['a'] == 'comment_manage') - echo ' '; - else - echo ' '; + if($_GET['a'] == 'comment_manage') + echo ' '; + else + echo ' '; - echo ' '; - echo '
'; + echo ' '; + echo '
'; + } if (($type == 0 || $view==3) && ($admin_type == 0 || $global_user_id==$rowanketa['insert_uid'])) { echo '
'; diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php index 14b09b545..21566691b 100644 --- a/admin/survey/SurveyAdmin.php +++ b/admin/survey/SurveyAdmin.php @@ -1406,22 +1406,79 @@ class SurveyAdmin if ($nereseno > 99) $nereseno = '99+'; - echo '
'; + echo '
'; echo ''.$nereseno.''; - echo '
'; + } else { - echo '
'; - echo '
'; + echo '
'; } } else{ if ($nereseno > 0) - echo '
'; + echo '
'; else - echo '
'; + echo '
'; } + echo '
'; //zaključi ikono + + //dropdown na klik ikone + echo '
'; + + echo '
'; + echo ''; + echo $lang['comments']; + echo '
'; + + $comment_link = 'window.location.href=\'' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=komentarji\'; return false;'; + echo '
'; + echo $lang['srv_testiranje_komentarji_anketa_title']; + echo ' (' . $comment_count['question']['unresolved']; + echo '/' . $comment_count['question']['all'] . ')'; + echo ''; + echo '
'; + + $comment_link = 'window.location.href=\'' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=komentarji_anketa\'; return false;'; + echo '
'; + echo $lang['srv_testiranje_komentarji_title']; + echo ' (' . ($comment_count['survey_resp']['unresolved'] + $comment_count['survey_admin']['unresolved']); //nerešeni + echo '/' . ($comment_count['survey_resp']['all'] + $comment_count['survey_admin']['all']) . ')'; //vsi + echo ''; + echo '
'; + + echo '
'; + $ba = new BranchingAjax($this->anketa); + $ba->add_comment_field(0, '1', '4', false, false); + echo '
'; + + echo '
'; + echo ' '; + + echo '
'; + echo '
'; + echo ''; + echo '
'; + echo '
'; + echo ''; + echo '
'; + echo '
'; + + echo '
'; //button holder + + echo '
'; //comment_dropdown + + // Klik izven - zapremo dropdown + echo ''; + echo '
'; echo ''; } @@ -1433,12 +1490,14 @@ class SurveyAdmin // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik if($userAccess->checkUserAccess('komentarji')) { - echo '
'; + $comment_link = 'window.location.href=\'' . $site_url . 'admin/survey/ajax.php?anketa='.$row['id'].'&a=comments_onoff&do=on\'; return false;'; + echo '
'; } - else - echo '
'; - - echo '
'; + else { + $comment_link = 'window.location.href=\'' . $site_url . 'admin/survey/ajax.php?anketa='.$row['id'].'&a=urejanje\'; return false;'; + echo '
'; + } + echo '
'; echo '
'; echo ''; diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js index 06a1c0a59..b80c0c43f 100644 --- a/admin/survey/script/script.js +++ b/admin/survey/script/script.js @@ -5711,4 +5711,11 @@ function toggleAddUser(){ $("#new_user_option").toggleClass('displayNone'); $("#existing_user_option").toggleClass('displayNone'); +} +function CommentDropdownClearText () { + $("#vsebina_0_4").value = ''; +} + +function toggleCommentDropdown () { + $("#comment_dropdown").toggleClass('displayNone'); } \ No newline at end of file diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 0d72e95df..6a36ba837 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -6148,6 +6148,10 @@ span.faicon.screwdriver::before { font-weight: 600 !important; } +span.faicon.fa-x::before { + content: "X"; +} + /* To change this license header, choose License Headers in Project Properties. To change this template file, choose Tools | Templates @@ -25664,20 +25668,25 @@ div.page_komentarji_anketa ul div.question_comment_holder div.question_comment . margin: 0px 3px; } -#quick_comments_link a { +#quick_comments_link { + position: relative; text-decoration: none; } -#quick_comments_link a span.link { +#quick_comments_link span.link { display: inline-block; padding: 3px !important; padding-bottom: 5px !important; font-size: 11px; vertical-align: top; } -#quick_comments_link a .fa-stack .comments { +#quick_comments_link .fa-stack { + color: #FFFFFF !important; + cursor: pointer; +} +#quick_comments_link .fa-stack .comments { position: relative; } -#quick_comments_link a .fa-stack .comments .comment_number { +#quick_comments_link .fa-stack .comments .comment_number { position: absolute; color: #1E88E5; left: 0; @@ -25691,7 +25700,7 @@ div.page_komentarji_anketa ul div.question_comment_holder div.question_comment . text-align: center; width: 100%; } -#quick_comments_link a .fa-stack.has_comment::after { +#quick_comments_link .fa-stack.has_comment::after { content: "•"; font-size: 50px; color: #FF8787; @@ -25700,9 +25709,113 @@ div.page_komentarji_anketa ul div.question_comment_holder div.question_comment . right: -13px; z-index: 999; } -#quick_comments_link a .fa-stack.inactive_comments span.faicon::before { +#quick_comments_link .fa-stack.inactive_comments span.faicon::before { color: #0059ab !important; } +#quick_comments_link #comment_dropdown { + position: absolute; + background-color: #FFFFFF; + top: 35px; + right: 0; + width: 305px; + z-index: 9999; + box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.12); + border-radius: 2px; + font-family: Source Sans Pro, sans-serif; + padding: 12px; + cursor: auto !important; +} +#quick_comments_link #comment_dropdown .title { + width: 100%; + margin-bottom: 16px; + padding-bottom: 12px; + font-weight: 600; + font-size: 16px; + text-transform: uppercase; + border-bottom: 1px #E5E5E5 solid; + font-size: 14px !important; + color: #333333; + display: flex; + flex-direction: row; + align-content: center; +} +#quick_comments_link #comment_dropdown .title span.faicon.comment_dropdown { + margin-right: 6px; + line-height: 17px !important; +} +#quick_comments_link #comment_dropdown .title span.faicon.comment_dropdown::before { + color: #1E88E5 !important; + font-weight: 400; + font-size: 14px !important; + content: "\f27a"; +} +#quick_comments_link #comment_dropdown .links { + margin-bottom: 16px; + color: #1E88E5; + font-weight: 400; + font-size: 14px !important; + display: flex; + flex-direction: row; + align-content: center; + cursor: pointer; + width: fit-content; +} +#quick_comments_link #comment_dropdown .links span.faicon { + margin-left: 8px; + line-height: 17px !important; +} +#quick_comments_link #comment_dropdown .links span.faicon::before { + color: #1E88E5 !important; + font-size: 14px !important; +} +#quick_comments_link #comment_dropdown #comment_field { + padding-top: 16px; + border-top: 1px solid #E5E5E5; + margin-bottom: 10px; +} +#quick_comments_link #comment_dropdown #comment_field textarea { + height: 130px; + width: 100%; + margin: 0; +} +#quick_comments_link #comment_dropdown .button_holder { + display: flex; + flex-direction: row; + justify-content: space-between; + padding-top: 8px; + border-top: 1px solid #E5E5E5; + margin-bottom: 0; +} +#quick_comments_link #comment_dropdown .button_holder button { + min-width: 128px; +} +#quick_comments_link #comment_dropdown .button_holder .options { + display: flex; + flex-direction: row; +} +#quick_comments_link #comment_dropdown .button_holder .options .square { + box-sizing: border-box; + border: 1px solid #1E88E5; + width: 28px; + height: 28px; + margin-left: 8px; + display: flex; + justify-content: center; + align-content: center; + color: #1E88E5; + font-size: 14px !important; + cursor: pointer; +} +#quick_comments_link #comment_dropdown .button_holder .options .square.blue { + background-color: #1E88E5; +} +#quick_comments_link #comment_dropdown .button_holder .options .square.blue span.faicon::before { + font-size: 14px !important; + color: #FFFFFF; +} +#quick_comments_link #comment_dropdown .button_holder .options .square span.faicon::before { + font-size: 16px !important; +} #quick_comments_link.newCss { text-align: center; diff --git a/resources/sass/admin_new/basic/icons/standard.scss b/resources/sass/admin_new/basic/icons/standard.scss index d46b83ab3..34f01fdc8 100644 --- a/resources/sass/admin_new/basic/icons/standard.scss +++ b/resources/sass/admin_new/basic/icons/standard.scss @@ -706,4 +706,8 @@ span.faicon.screwdriver::before{ content: "\f7d9"; font-weight: 600 !important; +} + +span.faicon.fa-x::before{ + content: "\58"; } \ No newline at end of file diff --git a/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss b/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss index 73ba4a2d7..3a82ab665 100644 --- a/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss +++ b/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss @@ -681,60 +681,200 @@ div.page_komentarji_anketa { margin: 0px 3px; } #quick_comments_link { - a { - span.link { - display: inline-block; - padding: 3px !important; - padding-bottom: 5px !important; - font-size: 11px; - vertical-align: top; - } - - text-decoration: none; - .fa-stack { - .comments { + position:relative; + + span.link { + display: inline-block; + padding: 3px !important; + padding-bottom: 5px !important; + font-size: 11px; + vertical-align: top; + } + + text-decoration: none; + + .fa-stack { + .comments { + position: relative; + .comment_number { + position: absolute; + color: $blue; + left: 0; + transform: translateX(-50%); + top: 35%; + transform: translateY(-50%); + z-index: 99; + + font-family: $font_family; + font-size: 14px; + font-weight: 400; + + text-align: center; + width: 100%; + } + } + + &.has_comment { + &::after { + content: "•"; + font-size: 50px; + color: $coral; + position: relative; - .comment_number { - position: absolute; - color: $blue; - left: 0; - transform: translateX(-50%); - top: 35%; - transform: translateY(-50%); - z-index: 99; + top: -45px; + right: -13px; + z-index: 999; + + } + } - font-family: $font_family; - font-size: 14px; + color: $white !important; + cursor: pointer; + + &.inactive_comments { + span.faicon::before { + color: $dark-blue !important; + } + } + } + + #comment_dropdown { + position: absolute; + background-color: $white; + top: 35px; + right: 0; + width: 305px; + + z-index: 9999; + + box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.12); + border-radius: 2px; + + font-family: $font_family; + + padding: 12px; + + cursor: auto !important; + + .title { + width: 100%; + margin-bottom: 16px; + padding-bottom: 12px; + + font-weight: 600; + font-size: 16px; + text-transform: uppercase; + + border-bottom: 1px $gray solid; + + font-size: 14px !important; + color: $black; + + display: flex; + flex-direction: row; + align-content: center; + + span.faicon.comment_dropdown { + margin-right: 6px; + line-height: 17px !important; + &::before{ + color: $blue !important; font-weight: 400; - - text-align: center; - width: 100%; - } - - } - - &.has_comment { - &::after { - content: "•"; - font-size: 50px; - color: $coral; - - position: relative; - top: -45px; - right: -13px; - z-index: 999; - - } - } - - &.inactive_comments { - span.faicon::before { - color: $dark-blue !important; + font-size: 14px !important; + content: "\f27a"; } } } - } + + .links { + margin-bottom: 16px; + color: $blue; + + font-weight: 400; + font-size: 14px !important; + + display: flex; + flex-direction: row; + align-content: center; + + cursor: pointer; + width: fit-content; + + + span.faicon { + margin-left: 8px; + line-height: 17px !important; + &::before{ + color: $blue !important; + font-size: 14px !important; + } + } + + } + + #comment_field { + + padding-top: 16px; + border-top: 1px solid $gray; + margin-bottom: 10px; + + textarea { + height: 130px; + width: 100%; + margin: 0; + } + } + + .button_holder { + display: flex; + flex-direction: row; + justify-content: space-between; + padding-top: 8px; + border-top: 1px solid $gray; + + margin-bottom: 0; + + button { + min-width: 128px; + } + + .options { + display: flex; + flex-direction: row; + + .square { + box-sizing: border-box; + border: 1px solid $blue; + width: 28px; + height: 28px; + margin-left: 8px; + + display: flex; + justify-content: center; + align-content: center; + + color: $blue; + font-size: 14px !important; + + cursor: pointer; + + &.blue { + background-color: $blue; + span.faicon::before { + font-size: 14px !important; + color: $white; + } + } + + span.faicon::before { + $font_weight: 400; + font-size: 16px !important; + } + } + } + } + } } #quick_comments_link.newCss { text-align: center;