may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.1ka.si/git/1ka

Browse Source
This commit is contained in:
pero1203 2022-09-02 16:21:37 +02:00
commit 3d7028422d
9 changed files with 561 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
admin/survey/BranchingAjax.php
View File

@ -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 $admin_type;
global $global_user_id; global $global_user_id;
global $lang; global $lang;
@ -2327,15 +2327,17 @@ class BranchingAjax {
echo '<textarea name="vsebina" placeholder="'.$lang['srv_comments_add_comment'].'" id="vsebina_'.$spremenljivka.'_'.$view.'"></textarea>'; echo '<textarea name="vsebina" placeholder="'.$lang['srv_comments_add_comment'].'" id="vsebina_'.$spremenljivka.'_'.$view.'"></textarea>';
echo '<div class="button_holder bottom0">'; if ($buttons) {
echo '<div class="button_holder bottom0">';
if($_GET['a'] == 'comment_manage') if($_GET['a'] == 'comment_manage')
echo ' <button class="medium white-blue" onClick="closeCommentQtip(\''.$spremenljivka.'_'.$view.'\');">'.$lang['edit1338'].'</button>'; echo ' <button class="medium white-blue" onClick="closeCommentQtip(\''.$spremenljivka.'_'.$view.'\');">'.$lang['edit1338'].'</button>';
else else
echo ' <button class="medium white-blue" onClick="toggleAddComment(\''.$spremenljivka.'_'.$view.'\');">'.$lang['edit1338'].'</button>'; echo ' <button class="medium white-blue" onClick="toggleAddComment(\''.$spremenljivka.'_'.$view.'\');">'.$lang['edit1338'].'</button>';
echo ' <button class="medium blue" onclick="add_comment(\''.$spremenljivka.'\', \''.$type.'\', \''.$view.'\', $(\'#vsebina_'.$spremenljivka.'_'.$view.'\').val()); return false;">'.$lang['srv_comments_new'].'</button>'; echo ' <button class="medium blue" onclick="add_comment(\''.$spremenljivka.'\', \''.$type.'\', \''.$view.'\', $(\'#vsebina_'.$spremenljivka.'_'.$view.'\').val()); return false;">'.$lang['srv_comments_new'].'</button>';
echo '</div>'; echo '</div>';
}
if (($type == 0 || $view==3) && ($admin_type == 0 || $global_user_id==$rowanketa['insert_uid'])) { if (($type == 0 || $view==3) && ($admin_type == 0 || $global_user_id==$rowanketa['insert_uid'])) {
echo '<div class="comment_bottom">'; echo '<div class="comment_bottom">';

81
admin/survey/SurveyAdmin.php
View File

@ -1406,22 +1406,79 @@ class SurveyAdmin
if ($nereseno > 99) if ($nereseno > 99)
$nereseno = '99+'; $nereseno = '99+';
echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=komentarji" title="' . $lang['srv_view_comment'] . '" ><div class="fa-stack has_comment"><span class="faicon comments" title="' . $lang['srv_view_comment'] . '">'; echo '<div class="fa-stack has_comment"><span class="faicon comments" id="nereseno" onclick="toggleCommentDropdown(); return false;">';
echo '<span class="comment_number">'.$nereseno.'</span>'; echo '<span class="comment_number">'.$nereseno.'</span>';
echo '</span></div></a>';
} }
else { else {
echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=komentarji" title="' . $lang['srv_view_comment'] . '" ><div class="fa-stack"><span class="faicon comments" title="' . $lang['srv_view_comment'] . '">'; echo '<div class="fa-stack" ><span class="faicon comments" id="vkljuceno" onclick="toggleCommentDropdown(); return false;">';
echo '</span></div></a>';
} }
} }
else{ else{
if ($nereseno > 0) if ($nereseno > 0)
echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='. $row['id'].'&a=urejanje" title="' . $lang['srv_view_comment'] . '" ><div class="fa-stack"><span class="faicon comments icon-orange fa-stack-1x user_access_locked" title="' . $lang['srv_view_comment'] . '"></span></div></a>'; echo '<div class="fa-stack"><span class="faicon comments icon-orange fa-stack-1x user_access_locked">';
else else
echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=urejanje" title="' . $lang['srv_view_comment'] . '" ><div class="fa-stack"><span class="faicon comments user_access_locked" title="' . $lang['srv_view_comment'] . '"></span></div></a>'; echo '<div class="fa-stack"><span class="faicon comments user_access_locked">';
} }
echo '</span></div>'; //zaključi ikono
//dropdown na klik ikone
echo '<div id="comment_dropdown" class="displayNone">';
echo '<div class="title">';
echo '<span class="faicon comment_dropdown"></span>';
echo $lang['comments'];
echo '</div>';
$comment_link = 'window.location.href=\'' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=komentarji\'; return false;';
echo '<div class="links" onclick="'.$comment_link.'">';
echo $lang['srv_testiranje_komentarji_anketa_title'];
echo ' (' . $comment_count['question']['unresolved'];
echo '/' . $comment_count['question']['all'] . ')';
echo '<span class="faicon fa-angle-right"></span>';
echo '</div>';
$comment_link = 'window.location.href=\'' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=komentarji_anketa\'; return false;';
echo '<div class="links" onclick="'.$comment_link.'">';
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 '<span class="faicon fa-angle-right"></span>';
echo '</div>';
echo '<div id="comment_field">';
$ba = new BranchingAjax($this->anketa);
$ba->add_comment_field(0, '1', '4', false, false);
echo '</div>';
echo '<div class="button_holder">';
echo ' <button class="small blue" onclick="toggleCommentDropdown(); return false;">'.$lang['srv_zapri'].'</button>';
echo '<div class="options">';
echo '<div class="square" onclick="CommentDropdownClearText(); return false;">';
echo '<span class="faicon fa-times"></span>';
echo '</div>';
echo '<div class="square blue" onclick="add_comment(\'0\', \'1\', \'4\', $(\'#vsebina_0_4\').val()); return false;">';
echo '<span class="faicon fa-paper-plane"></span>';
echo '</div>';
echo '</div>';
echo '</div>'; //button holder
echo '</div>'; //comment_dropdown
// Klik izven - zapremo dropdown
echo '<script>
$(document).mouseup(function(e){
var container = $("#comment_dropdown");
if (!container.is(e.target) && container.has(e.target).length === 0){
$("#comment_dropdown").addClass("displayNone");
}
});
</script>';
echo '</div>'; echo '</div>';
echo '</li>'; echo '</li>';
} }
@ -1433,12 +1490,14 @@ class SurveyAdmin
// Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik
if($userAccess->checkUserAccess('komentarji')) { if($userAccess->checkUserAccess('komentarji')) {
echo '<a href="' . $site_url . 'admin/survey/ajax.php?anketa='.$row['id'].'&a=comments_onoff&do=on" title="' . $lang['srv_preview_comments'] . '"><div class="fa-stack inactive_comments"><span class="faicon comments" title="' . $lang['srv_preview_comments'] . '">'; $comment_link = 'window.location.href=\'' . $site_url . 'admin/survey/ajax.php?anketa='.$row['id'].'&a=comments_onoff&do=on\'; return false;';
echo '<div class="fa-stack inactive_comments" onclick="'.$comment_link.'"><span class="faicon comments" title="' . $lang['srv_preview_comments'] . '">';
} }
else else {
echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=urejanje" title="' . $lang['srv_preview_comments'] . '"><div class="fa-stack"><span class="faicon comments user_access_locked" title="' . $lang['srv_preview_comments'] . '">'; $comment_link = 'window.location.href=\'' . $site_url . 'admin/survey/ajax.php?anketa='.$row['id'].'&a=urejanje\'; return false;';
echo '<div class="fa-stack" onclick="'.$comment_link.'"><span class="faicon comments user_access_locked" title="' . $lang['srv_preview_comments'] . '">';
echo '</span></div></a>'; }
echo '</span></div>';
echo '</div>'; echo '</div>';
echo '</li>'; echo '</li>';

2
admin/survey/SurveyAdminAjax.php
View File

@ -4912,7 +4912,7 @@ class SurveyAdminAjax {
$row = mysqli_fetch_array($sql); $row = mysqli_fetch_array($sql);
$f = new Forum(); $f = new Forum();
$vsebina = $row['vsebina'].'<blockquote style="margin-left:20px"><b>'.$f->user($global_user_id).'</b> ('.$f->datetime1(date('Y-m-d h:i:s')).'):<br />'.$vsebina.'</blockquote>'; $vsebina = $row['vsebina'].'<blockquote><span class="semi-bold">'.$f->user($global_user_id).'</span> <span class="gray">('.$f->datetime1(date('Y-m-d h:i:s')).')</span><div class="answer">'.$vsebina.'</div></blockquote>';
sisplet_query("UPDATE post SET vsebina='$vsebina' WHERE id='$id'"); sisplet_query("UPDATE post SET vsebina='$vsebina' WHERE id='$id'");

30
admin/survey/SurveyAdminSettings.php
View File

@ -6920,7 +6920,7 @@ class SurveyAdminSettings {
$datetime = date("d.m.Y G:i", $datetime); $datetime = date("d.m.Y G:i", $datetime);
echo '<p>'.$lang['srv_comments_user'].'<span class="user">'.$f->user($row['uid']).'</span> ('.$datetime.')</p>'; echo '<p>'.$lang['srv_comments_user'].'<span class="user">'.$f->user($row['uid']).'</span> <span class="date">('.$datetime.')</span></p>';
if ($admin_type <= 1 || $rowa['insert_uid']==$global_user_id || $commentmarks_who==0) { if ($admin_type <= 1 || $rowa['insert_uid']==$global_user_id || $commentmarks_who==0) {
@ -7021,7 +7021,7 @@ class SurveyAdminSettings {
echo '<div class="by">'; echo '<div class="by">';
if($row['usr_id'] == 0){ if($row['usr_id'] == 0){
echo '<p>Respondent ('.$datetime.')</p>'; echo '<p>Respondent <span class="date">('.$datetime.')</span></p>';
} }
else{ else{
$sqlU = sisplet_query("SELECT name FROM users WHERE id='$row[usr_id]'"); $sqlU = sisplet_query("SELECT name FROM users WHERE id='$row[usr_id]'");
@ -7029,7 +7029,7 @@ class SurveyAdminSettings {
$user = $rowU['name']; $user = $rowU['name'];
echo '<p>'.$lang['srv_comments_user'].'<span class="user">'.$user.'</span> ('.$datetime.')</p>'; echo '<p>'.$lang['srv_comments_user'].'<span class="user">'.$user.'</span> <span class="date">('.$datetime.')</span></p>';
} }
@ -7686,6 +7686,16 @@ class SurveyAdminSettings {
echo '<div class="question_comment editor">'; echo '<div class="question_comment editor">';
echo '<div class="comment_type">';
echo $lang['srv_admin_comment'].':';
/*Sort
echo '<span class="faicon pointer blue fa-sort-amount-down"></span>';
echo '<span class="faicon pointer blue fa-sort-amount-up"></span>';*/
echo '</div>';
if ($addfieldposition == '' || $addfieldposition == 0) { if ($addfieldposition == '' || $addfieldposition == 0) {
echo '<div id="comment_toggle_'.$spr_id.'_'.'4'.'" class="add_comment_toggle" onClick="toggleAddComment(\''.$spr_id.'_'.'4'.'\')">'; echo '<div id="comment_toggle_'.$spr_id.'_'.'4'.'" class="add_comment_toggle" onClick="toggleAddComment(\''.$spr_id.'_'.'4'.'\')">';
@ -7706,16 +7716,6 @@ class SurveyAdminSettings {
if (mysqli_num_rows($sqlt) > 0) { if (mysqli_num_rows($sqlt) > 0) {
echo '<div class="comment_type">';
echo $lang['srv_admin_comment'].':';
/*Sort
echo '<span class="faicon pointer blue fa-sort-amount-down"></span>';
echo '<span class="faicon pointer blue fa-sort-amount-up"></span>';*/
echo '</div>';
$i = 0; $i = 0;
while ($rowt = mysqli_fetch_array($sqlt)) { while ($rowt = mysqli_fetch_array($sqlt)) {
@ -7727,7 +7727,7 @@ class SurveyAdminSettings {
$datetime = strtotime($rowt['time']); $datetime = strtotime($rowt['time']);
$datetime = date("d.m.Y G:i", $datetime); $datetime = date("d.m.Y G:i", $datetime);
echo '<p>'.$lang['srv_comments_user'].'<span class="user">'.$f->user($rowt['uid']).'</span> ('.$datetime.')</p>'; echo '<p>'.$lang['srv_comments_user'].'<span class="user">'.$f->user($rowt['uid']).'</span> <span class="date">('.$datetime.')</span></p>';
if ($admin_type <= 1 || $rowi['insert_uid']==$global_user_id || $commentmarks_who==0) { 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); $datetime = date("d.m.Y G:i", $datetime);
} }
echo '<p>Respondent ('.$datetime.')</p>'; echo '<p>Respondent <span class="date">('.$datetime.')</span></p>';
if ($admin_type <= 1 || $rowi['insert_uid']==$global_user_id || $commentmarks_who==0) { if ($admin_type <= 1 || $rowi['insert_uid']==$global_user_id || $commentmarks_who==0) {

7
admin/survey/script/script.js
View File

@ -5712,3 +5712,10 @@ function toggleAddUser(){
$("#new_user_option").toggleClass('displayNone'); $("#new_user_option").toggleClass('displayNone');
$("#existing_user_option").toggleClass('displayNone'); $("#existing_user_option").toggleClass('displayNone');
} }
function CommentDropdownClearText () {
$("#vsebina_0_4").value = '';
}
function toggleCommentDropdown () {
$("#comment_dropdown").toggleClass('displayNone');
}

22
frontend/drupal9/web/themes/custom/pro1ka/templates/parts/footer.html.twig
View File

@ -4,14 +4,30 @@
<div class="row flex"> <div class="row flex">
<div class="col-6-blue vert-center"> <div class="col-6-blue vert-center">
<div class="div-block-17"> <div class="div-block-17">
<h3 class="side-title">Orodje za anketiranje 1KA lahko z omejenimi funkcionalnostmi preizkusite tudi brezplačno</h3> <h3 class="side-title">
{% if language.id == 'sl' %}
Orodje 1KA je brezplačno za osnovne uporabnike.
{% else %}
1KA is free to use for basic users
{% endif %}
</h3>
<div class="buttons-row"> <div class="buttons-row">
<a href="{% if uporabnik %}/admin/survey{% else %}#{% endif %}" class="button main-button-white shrink w-inline-block {% if uporabnik is empty%}modal-goto-registration{% endif %}"> <a href="{% if uporabnik %}/admin/survey{% else %}#{% endif %}" class="button main-button-white shrink w-inline-block {% if uporabnik is empty%}modal-goto-registration{% endif %}">
<div class="button-label">Preizkusite</div><img src="/tema1ka/svg/icons8-chevron-right.svg" loading="lazy" alt="" class="button-right-arrow"> <div class="button-label">{% if language.id == 'sl' %}
Ustvarite anketo
{% else %}
Create a survey
{% endif %}
</div><img src="/tema1ka/svg/icons8-chevron-right.svg" loading="lazy" alt="" class="button-right-arrow">
<div class="button-flyin main"></div> <div class="button-flyin main"></div>
</a> </a>
<a href="/d/sl/cenik/zasebni-paketi/" class="button secondary-button-white shrink w-inline-block"> <a href="/d/sl/cenik/zasebni-paketi/" class="button secondary-button-white shrink w-inline-block">
<div class="button-label">Vsi paketi</div><img src="/tema1ka/svg/icons8-chevron-right-bela.svg" loading="lazy" alt="" class="button-right-arrow"> <div class="button-label">{% if language.id == 'sl' %}
Vsi paketi
{% else %}
See pricing
{% endif %}
</div><img src="/tema1ka/svg/icons8-chevron-right-bela.svg" loading="lazy" alt="" class="button-right-arrow">
<div class="button-flyin"></div> <div class="button-flyin"></div>
</a> </a>
</div> </div>

197
public/css/admin_new.css
View File

@ -6148,6 +6148,10 @@ span.faicon.screwdriver::before {
font-weight: 600 !important; 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 license header, choose License Headers in Project Properties.
To change this template file, choose Tools | Templates To change this template file, choose Tools | Templates
@ -25168,8 +25172,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 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 { div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .user {
font-size: 14px !important;
font-weight: 600; 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 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 { div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by p {
font-size: 14px !important; font-size: 14px !important;
@ -25186,6 +25196,14 @@ div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa di
margin-right: 16px; margin-right: 16px;
cursor: pointer; 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 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 { div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .options_dropdown {
position: absolute; position: absolute;
@ -25196,8 +25214,7 @@ div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa di
width: auto; width: auto;
padding: 20px 16px; padding: 20px 16px;
background: #FFFFFF; background: #FFFFFF;
border: 1px solid #E5E5E5; box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.14);
box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.15);
flex-direction: column; flex-direction: column;
} }
div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .options_dropdown .line, div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .options_dropdown .line,
@ -25218,16 +25235,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 { div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .options_dropdown .line a {
white-space: nowrap; white-space: nowrap;
text-decoration: none; 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 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 { div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .options_dropdown .line p {
font-size: 14px !important; 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 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 { div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .content {
margin: 16px 0; margin: 16px 0;
@ -25405,6 +25418,19 @@ div.page_komentarji_anketa ul div.question_comment_holder div.question_comment.e
padding-right: 62px; padding-right: 62px;
margin-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 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 { div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.add_comment_toggle {
transition: 0.3s; transition: 0.3s;
@ -25449,8 +25475,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 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 { div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by .user {
font-size: 14px !important;
font-weight: 600; 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 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 { div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by p {
font-size: 14px !important; font-size: 14px !important;
@ -25467,6 +25499,14 @@ div.page_komentarji_anketa ul div.question_comment_holder div.question_comment d
margin-right: 16px; margin-right: 16px;
cursor: pointer; 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 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 { div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown {
position: absolute; position: absolute;
@ -25477,8 +25517,7 @@ div.page_komentarji_anketa ul div.question_comment_holder div.question_comment d
width: auto; width: auto;
padding: 20px 16px; padding: 20px 16px;
background: #FFFFFF; background: #FFFFFF;
border: 1px solid #E5E5E5; box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.14);
box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.15);
flex-direction: column; flex-direction: column;
} }
div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown .line, div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown .line,
@ -25499,6 +25538,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 { div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown .line a {
white-space: nowrap; white-space: nowrap;
text-decoration: none; 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 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 { div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown .line p {
@ -25517,10 +25557,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 { div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .content blockquote {
font-size: 14px !important; font-size: 14px !important;
border-left: 1px solid #E5E5E5; border-left: 1px solid #E5E5E5;
padding-left: 8px; margin-inline: 0;
padding-left: 20px;
margin-left: 0 !important;
margin-block-start: 0; margin-block-start: 0;
margin-block-end: 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 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) { div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .content blockquote:not(:last-of-type) {
padding-bottom: 16px; padding-bottom: 16px;
@ -25529,6 +25576,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 { div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .content blockquote:first-of-type {
margin-top: 16px; 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 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 { div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .bottom_options {
display: flex; display: flex;
@ -25618,20 +25674,25 @@ div.page_komentarji_anketa ul div.question_comment_holder div.question_comment .
margin: 0px 3px; margin: 0px 3px;
} }
#quick_comments_link a { #quick_comments_link {
position: relative;
text-decoration: none; text-decoration: none;
} }
#quick_comments_link a span.link { #quick_comments_link span.link {
display: inline-block; display: inline-block;
padding: 3px !important; padding: 3px !important;
padding-bottom: 5px !important; padding-bottom: 5px !important;
font-size: 11px; font-size: 11px;
vertical-align: top; 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; position: relative;
} }
#quick_comments_link a .fa-stack .comments .comment_number { #quick_comments_link .fa-stack .comments .comment_number {
position: absolute; position: absolute;
color: #1E88E5; color: #1E88E5;
left: 0; left: 0;
@ -25645,7 +25706,7 @@ div.page_komentarji_anketa ul div.question_comment_holder div.question_comment .
text-align: center; text-align: center;
width: 100%; width: 100%;
} }
#quick_comments_link a .fa-stack.has_comment::after { #quick_comments_link .fa-stack.has_comment::after {
content: "•"; content: "•";
font-size: 50px; font-size: 50px;
color: #FF8787; color: #FF8787;
@ -25654,9 +25715,113 @@ div.page_komentarji_anketa ul div.question_comment_holder div.question_comment .
right: -13px; right: -13px;
z-index: 999; 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; 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: "";
}
#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 { #quick_comments_link.newCss {
text-align: center; text-align: center;

4
resources/sass/admin_new/basic/icons/standard.scss
View File

@ -707,3 +707,7 @@ span.faicon.screwdriver::before{
font-weight: 600 !important; font-weight: 600 !important;
} }
span.faicon.fa-x::before{
content: "\58";
}

308
resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
View File

@ -142,9 +142,15 @@ div.page_komentarji_anketa {
.by { .by {
.user { .user {
font-size: 14px !important;
font-weight: $semi-bold; font-weight: $semi-bold;
} }
.date {
font-size: 14px !important;
color: $very-dark-gray2;
}
p { p {
font-size: 14px !important; font-size: 14px !important;
} }
@ -159,6 +165,16 @@ div.page_komentarji_anketa {
.solve { .solve {
margin-right: 16px; margin-right: 16px;
cursor: pointer; cursor: pointer;
p {
span.faicon {
font-size: 14px !important;
}
}
}
span.faicon {
font-size: 14px !important;
} }
color: $blue; color: $blue;
@ -177,9 +193,8 @@ div.page_komentarji_anketa {
width: auto; width: auto;
padding: 20px 16px; padding: 20px 16px;
background: $white; 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; flex-direction: column;
@ -201,6 +216,8 @@ div.page_komentarji_anketa {
a { a {
white-space: nowrap; white-space: nowrap;
text-decoration: none; text-decoration: none;
font-size: 14px !important;
} }
p { p {
@ -211,11 +228,6 @@ div.page_komentarji_anketa {
} }
} }
.date {
font-size: 14px;
color: $very-dark-gray2;
}
.content { .content {
margin: 16px 0; margin: 16px 0;
} }
@ -395,6 +407,20 @@ div.page_komentarji_anketa {
border-right: 1px solid $gray; border-right: 1px solid $gray;
padding-right: 62px; padding-right: 62px;
margin-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 { div.add_comment_toggle {
@ -439,9 +465,15 @@ div.page_komentarji_anketa {
.by { .by {
.user { .user {
font-size: 14px !important;
font-weight: $semi-bold; font-weight: $semi-bold;
} }
.date {
font-size: 14px !important;
color: $very-dark-gray2;
}
p { p {
font-size: 14px !important; font-size: 14px !important;
} }
@ -456,6 +488,16 @@ div.page_komentarji_anketa {
.solve { .solve {
margin-right: 16px; margin-right: 16px;
cursor: pointer; cursor: pointer;
p {
span.faicon {
font-size: 14px !important;
}
}
}
span.faicon {
font-size: 14px !important;
} }
color: $blue; color: $blue;
@ -474,9 +516,8 @@ div.page_komentarji_anketa {
width: auto; width: auto;
padding: 20px 16px; padding: 20px 16px;
background: $white; 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; flex-direction: column;
@ -499,6 +540,7 @@ div.page_komentarji_anketa {
a { a {
white-space: nowrap; white-space: nowrap;
text-decoration: none; text-decoration: none;
font-size: 14px !important;
} }
p { p {
@ -519,8 +561,13 @@ div.page_komentarji_anketa {
blockquote { blockquote {
font-size: 14px !important; font-size: 14px !important;
span, p {
font-size: 14px !important;
}
border-left: 1px solid $gray; border-left: 1px solid $gray;
padding-left: 8px; margin-inline: 0;
padding-left: 20px;
margin-left: 0 !important;
margin-block-start: 0; margin-block-start: 0;
margin-block-end: 0; margin-block-end: 0;
@ -531,6 +578,15 @@ div.page_komentarji_anketa {
&:first-of-type { &:first-of-type {
margin-top: 16px; margin-top: 16px;
} }
.answer {
margin: 16px 0;
font-size: 16px !important;
&:first-of-type {
margin-bottom: 0px;
}
}
} }
} }
@ -625,60 +681,200 @@ div.page_komentarji_anketa {
margin: 0px 3px; margin: 0px 3px;
} }
#quick_comments_link { #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; 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;
.fa-stack {
.comments {
position: relative; position: relative;
.comment_number { top: -45px;
position: absolute; right: -13px;
color: $blue; z-index: 999;
left: 0;
transform: translateX(-50%);
top: 35%;
transform: translateY(-50%);
z-index: 99;
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; font-weight: 400;
font-size: 14px !important;
text-align: center; content: "\f27a";
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;
} }
} }
} }
}
.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 { #quick_comments_link.newCss {
text-align: center; text-align: center;