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

Redesign - popravki - napredni statusi (boxi), ikone za komentarje

Browse Source
This commit is contained in:
pero1203 2022-05-27 11:17:54 +02:00
parent 3fde81cfa9
commit 15473f33da
8 changed files with 1552 additions and 1523 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
admin/survey/SurveyAdmin.php
View File

@ -1425,15 +1425,15 @@ class SurveyAdmin
if($userAccess->checkUserAccess('komentarji')){
if ($sas->testiranje_komentarji_komentarji_na_vprasanje() > 0)
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_num" title="' . $lang['srv_view_comment'] . '"><strong class="fa-stack-1x">' . $sas->testiranje_komentarji_komentarji_na_vprasanje() . '</strong></span></div></a>';
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'] . '"></span></div></a>';
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_empty" title="' . $lang['srv_view_comment'] . '"></span></div></a>';
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'] . '"></span></div></a>';
}
else{
if ($sas->testiranje_komentarji_komentarji_na_vprasanje() > 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_num icon-orange fa-stack-1x user_access_locked" title="' . $lang['srv_view_comment'] . '"><strong class="fa-stack-1x">' . $sas->testiranje_komentarji_komentarji_na_vprasanje() . '</strong></span></div></a>';
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>';
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_empty user_access_locked" title="' . $lang['srv_view_comment'] . '"></span></div></a>';
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>';
@ -1887,7 +1887,7 @@ class SurveyAdmin
# Gumb za novo stran napredni statusi
echo '<li class="' . ($_GET['a'] == A_STATUS_ADVANCED ? ' active' : '') . '">';
echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_STATUS_ADVANCED . '" title="' . $lang['srv_status_advanced'] . '">';
echo $lang['srv_status_advanced'] . ' >></a>';
echo $lang['srv_status_advanced'] . '<span class="faicon arrow2_r"></span></a>';
echo '</li>';
echo '</ul>';
@ -4318,12 +4318,12 @@ class SurveyAdmin
if($userAccess->checkUserAccess('komentarji')){
echo '<a href="#" onclick="return false;" class="surveycomment srv_ico" id="surveycomment_0_' . $view . '" type="0" view="' . $view . '" spremenljivka="0">';
echo ' <div class="fa-stack"><span class="faicon comments" title="' . $lang['srv_survey_general_comment'] . '"></div></span>';
echo ' <div class="fa-stack"><span class="faicon comments_empty" title="' . $lang['srv_survey_general_comment'] . '"></div></span>';
echo '</a>';
}
else{
echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='. $row['id'].'&a=urejanje" class="surveycomment srv_ico" id="surveycomment_0_' . $view . '" type="0" view="' . $view . '" spremenljivka="0">';
echo ' <div class="fa-stack"><span class="faicon comments user_access_locked" title="' . $lang['srv_survey_general_comment'] . '"></div></span>';
echo ' <div class="fa-stack"><span class="faicon comments_empty user_access_locked" title="' . $lang['srv_survey_general_comment'] . '"></div></span>';
echo '</a>';
}
}
@ -4344,7 +4344,7 @@ class SurveyAdmin
if($userAccess->checkUserAccess('komentarji')){
echo '<a href="#" onclick="return false;" class="surveycomment srv_ico" id="surveycomment_0_' . $view . '" type="0" view="' . $view . '" spremenljivka="0">';
echo '<div class="fa-stack"><span class="faicon comments_num" title="' . $lang['srv_survey_general_comment'] . '"><strong class="fa-stack-1x">' . $comment_count_text . '</strong></span></div>';
echo '<div class="fa-stack"><span class="faicon comments_empty" title="' . $lang['srv_survey_general_comment'] . '"></span></div>';
// ali prikazemo okno odprto - je dodan tak admin komentar
$sqlf1 = sisplet_query("SELECT id FROM post p WHERE p.tid='$row[thread]' AND p.ocena='5'");
@ -4359,7 +4359,7 @@ class SurveyAdmin
}
else{
echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='. $row['id'].'&a=urejanje" class="surveycomment srv_ico" id="surveycomment_0_' . $view . '" type="0" view="' . $view . '" spremenljivka="0">';
echo ' <div class="fa-stack"><span class="faicon comments_num user_access_locked" title="' . $lang['srv_survey_general_comment'] . '"><strong class="fa-stack-1x">' . $comment_count_text . '</strong></span></div>';
echo ' <div class="fa-stack"><span class="faicon comments_empty user_access_locked" title="' . $lang['srv_survey_general_comment'] . '"></span></div>';
echo '</a>';
}
}

2
admin/survey/SurveyAdminSettings.php
View File

@ -1169,7 +1169,7 @@ class SurveyAdminSettings {
$d = new Dostop();
echo '<div class="button" title="'.$lang['srv_view_comment'].'" onClick="window.location.href=\'index.php?anketa='.$this->anketa.'&a=komentarji\';">';
echo '<span class="faicon comments_num blue"></span>';
echo '<span class="faicon comments blue"></span>';
echo $lang['srv_admin_s_comments_view'];
echo '</div>';

2943
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

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

@ -249,21 +249,14 @@ span.faicon.mobile_off::after{
margin-left: -23px;
}
span.faicon.comments::before{
content: "\f27a";
content: "\f27a";
font-weight: 700;
}
span.faicon.comments_empty::before{
content: "\f27a";
font-weight: 400;
}
span.faicon.comments_num::before{
content: "\f27a";
}
span.faicon.comments_num {
strong {
color: white;
font-family: $font_family;
margin-top: -2px;
}
}
@mixin icon_link(){
content: "\f0c1";
}

40
resources/sass/admin_new/components/header/navigation.scss
View File

@ -117,35 +117,16 @@ header{
&:hover {
color: $white !important;
}
}
span.comments_blue_off {
margin-top: 4px !important;
}
span.comments_orange_off {
margin-top: 4px !important;
}
span.comments_blue_on {
margin-top: -1px !important;
}
span.comments_orange_on {
margin-top: -1px !important;
.faicon{
line-height: 25px;
&:before{
font-size: 24px;
}
}
}
span.sprites.comments_blue_on {
color: $white;
font-size: 11px;
font-weight: bold;
line-height: 12px;
text-align: center;
}
span.sprites.comments_orange_on {
color: $white;
font-size: 11px;
font-weight: bold;
line-height: 12px;
text-align: center;
}
}
// Vklopljeni moduli na desni
@ -210,6 +191,15 @@ header{
font-size: 15px;
color: $very-dark-gray2;
text-decoration: none;
.faicon.arrow2_r{
margin-left: 8px;
&:before{
font-size: 10px;
vertical-align: 1px;
}
}
}
&.active,

45
resources/sass/admin_new/pages/survey_status/status_advanced.scss Normal file
View File

@ -0,0 +1,45 @@
.page_status_advanced {
.status_advanced{
display: flex;
align-items: center;
flex-wrap: wrap;
position: relative;
width: 100%;
a{
width: 25%;
min-width: 290px;
text-decoration: none;
}
.status_advanced_box{
cursor: pointer;
display: flex;
align-items: center;
justify-content: center;
box-sizing: border-box;
padding: 16px;
margin: 0 16px 16px 0;
font-size: 16px;
font-weight: 600;
text-transform: uppercase;
color: $black;
background-color: #fff;
border: 1px solid $gray;
transition: .2s;
&:hover{
background-color: $light-gray;
}
}
}
}

1
resources/sass/admin_new/pages/survey_status/survey_status.scss
View File

@ -1,2 +1,3 @@
@import "summary";
@import "nonresponse";
@import "status_advanced";

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

@ -295,9 +295,6 @@ div.page_komentarji_anketa {
margin: 0px 3px;
}
#quick_comments_link {
margin-bottom: 1px !important;
margin-left: 3px !important;
padding-bottom: 3px !important;
a {
span.link {
display: inline-block;
@ -309,10 +306,8 @@ div.page_komentarji_anketa {
}
}
#quick_comments_link.newCss {
height: 20px !important;
line-height: 20px !important;
text-align: center;
margin-top: 8px !important;
img {
vertical-align: middle;
}