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

Redesign - popravki headerja

Browse Source
This commit is contained in:
pero1203 2022-03-18 12:30:24 +01:00
parent e2f2d8b93a
commit b75bea1fac
6 changed files with 135 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

143
admin/survey/SurveyAdmin.php
View File

@ -826,15 +826,15 @@ class SurveyAdmin
if ($hierarhija_type == 10) {
echo '<a href="#" title="' . $lang['srv_survey_settings'] . '" style="cursor:text !important;">';
echo ' <span class="faicon wheel_32"></span>';
echo ' <span class="text">'.$lang['settings'].'</span>';
echo '</a> ';
echo '<span class="faicon wheel_32"></span>';
echo '<span class="text">'.$lang['settings'].'</span>';
echo '</a>';
}
else {
echo '<a href="' . $site_url . 'admin/survey/index.php?anketa=' . $this->anketa . '&a=nastavitve" title="' . $lang['srv_survey_settings'] . '">';
echo ' <span class="faicon wheel_32"></span>';
echo ' <span class="text">'.$lang['settings'].'</span>';
echo '</a> ';
echo '<span class="faicon wheel_32"></span>';
echo '<span class="text">'.$lang['settings'].'</span>';
echo '</a>';
}
echo '</div> ';
@ -929,10 +929,10 @@ class SurveyAdmin
echo '<ol class="navigation_buttons_list '.($this->isAnketar == true ? ' displayNone' : '').'">';
// Moje ankete
echo '<li>';
echo ' <div id="mojeAnketeLink">';
echo ' <a href="index.php?a=pregledovanje" title="' . $lang['srv_pregledovanje'] . ' (' . strtolower($lang['srv_create_survey']) . ', ' . strtolower($lang['srv_library']) . ')"><span class="faicon clipboard_notes"></span>'.$lang['srv_pregledovanje'].'</a>';
echo ' </div>';
echo '<li class="active_off">';
echo ' <a href="index.php?a=pregledovanje" title="' . $lang['srv_pregledovanje'] . ' (' . strtolower($lang['srv_create_survey']) . ', ' . strtolower($lang['srv_library']) . ')">';
echo ' <div id="mojeAnketeLink"><span class="faicon clipboard_notes"></span>'.$lang['srv_pregledovanje'].'</div>';
echo ' </a>';
echo '</li>';
if ($this->skin == 0 && $this->isAnketar == false) {
@ -1363,6 +1363,40 @@ class SurveyAdmin
if(SurveyInfo::getInstance()->checkSurveyModule('hierarhija') && $hierarhija_type == 10)
$hierarhija_prikaz = false;
// ikonco za jezik prikazujemo po potrebi
if ($row['multilang'] == 1) {
$p = new Prevajanje($this->anketa);
global $lang1;
echo '<li>';
echo '<a href="index.php?anketa=' . $this->anketa . '&a=prevajanje" class="srv_ico" title="' . $lang['lang'] . ': ' . $lang['lang_short'] . ' | ' . $lang1['lang_short'] . $lang_more . '">';
echo '<span class="faicon language"></span>';
echo '</a>';
echo '</li>';
}
// Ikona za vklop jezika, če je v globalnih nastavitvah vklopljena opcija
//elseif (UserSetting::getInstance()->getUserSetting('showLanguageShortcut')) {
else{
echo '<li>';
echo '<a href="index.php?anketa=' . $this->anketa . '&a=prevajanje" class="srv_ico" title="' . $lang['lang'] . '">';
echo '<span class="faicon language gray"></span>';
echo '</a>';
echo '</li>';
}
// Ikonca ce je izklopljeno prilagajanje za mobitel (mobile friendly)
$mobile_friendly = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_friendly');
if ($mobile_friendly == 0) {
echo '<li>';
echo '<a href="index.php?anketa=' . $this->anketa . '&a=mobile_settings" class="srv_ico" title="' . $lang['srv_settings_mobile_friendly_off'] . '">';
echo '<span class="faicon mobile_off"></span>';
echo '</a>';
echo '</li>';
}
#ikonco za komentarje prikazujemo po potrebi
if ($this->survey_type > 1 && $hierarhija_prikaz) {
@ -1377,15 +1411,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 icon-orange fa-stack-1x" 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_num" title="' . $lang['srv_view_comment'] . '"><strong class="fa-stack-1x">' . $sas->testiranje_komentarji_komentarji_na_vprasanje() . '</strong></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 fa-stack-1x icon-orange" 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_empty" 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>';
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 fa-stack-1x icon-orange 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_empty user_access_locked" title="' . $lang['srv_view_comment'] . '"></span></div></a>';
}
echo '</div>';
@ -1399,9 +1433,9 @@ class SurveyAdmin
// Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik
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"><span class="faicon comments fa-stack-1x icon-blue" title="' . $lang['srv_preview_comments'] . '">';
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"><span class="faicon comments" title="' . $lang['srv_preview_comments'] . '">';
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 fa-stack-1x icon-blue user_access_locked" title="' . $lang['srv_preview_comments'] . '">';
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'] . '">';
echo '</span></div></a>';
@ -1418,36 +1452,6 @@ class SurveyAdmin
}
}
// ikonco za jezik prikazujemo po potrebi
if ($row['multilang'] == 1) {
$p = new Prevajanje($this->anketa);
global $lang1;
echo '<li>';
echo '<a href="index.php?anketa=' . $this->anketa . '&a=prevajanje" class="srv_ico" title="' . $lang['lang'] . ': ' . $lang['lang_short'] . ' | ' . $lang1['lang_short'] . $lang_more . '">';
echo '<span class="faicon language"></span>';
echo '</a>';
echo '</li>';
}
elseif (UserSetting::getInstance()->getUserSetting('showLanguageShortcut')) {
// Ikona za vklop jezika, če je v globalnih nastavitvah vklopljena opcija
echo '<li>';
echo '<a href="index.php?anketa=' . $this->anketa . '&a=prevajanje" class="srv_ico" title="' . $lang['lang'] . '">';
echo '<span class="faicon language gray"></span>';
echo '</a>';
echo '</li>';
}
// Ikonca ce je izklopljeno prilagajanje za mobitel (mobile friendly)
$mobile_friendly = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_friendly');
if ($mobile_friendly == 0) {
echo '<li>';
echo '<a href="index.php?anketa=' . $this->anketa . '&a=mobile_settings" class="srv_ico" title="' . $lang['srv_settings_mobile_friendly_off'] . '">';
echo '<span class="faicon mobile_off"></span>';
echo '</a>';
echo '</li>';
}
echo '</ol>';
}
@ -4222,12 +4226,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 fa-stack-1x icon-blue" title="' . $lang['srv_survey_general_comment'] . '"></div></span>';
echo ' <div class="fa-stack"><span class="faicon comments" 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 fa-stack-1x icon-blue user_access_locked" title="' . $lang['srv_survey_general_comment'] . '"></div></span>';
echo ' <div class="fa-stack"><span class="faicon comments user_access_locked" title="' . $lang['srv_survey_general_comment'] . '"></div></span>';
echo '</a>';
}
}
@ -4248,7 +4252,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 icon-blue fa-stack-1x" 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_num" title="' . $lang['srv_survey_general_comment'] . '"><strong class="fa-stack-1x">' . $comment_count_text . '</strong></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'");
@ -4263,7 +4267,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 icon-blue fa-stack-1x 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_num user_access_locked" title="' . $lang['srv_survey_general_comment'] . '"><strong class="fa-stack-1x">' . $comment_count_text . '</strong></span></div>';
echo '</a>';
}
}
@ -5947,46 +5951,7 @@ class SurveyAdmin
// Predogled in testiranje (ikona monitor)
echo '<div class="anketa_header_preview setting_box">';
echo '<div class="tooltip monitor">';
echo '<a href="' . $link . '&preview=on' . $preview_options . '" target="_blank" title="'.$lang['srv_monitor_toolbox_title'].'"><span class="faicon monitor"></span><span class="text">'.$lang['srv_poglejanketo2'].'</span></a> ';
/*echo '<div id="tooltip_preview_content" class="expanded-tooltip bottom">';
echo '<div class="block">';
echo ' <span class="line semi-bold">';
echo $lang['srv_monitor_toolbox_title'];
echo ' </span>';
echo '</div>';
echo '<div class="block">';
// Ce imamo izklopljene mobilne prilagoditve ne pustimo preview-ja na mobile, ker itak ne prikaze scalano
$mobile_friendly = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_friendly');
if($mobile_friendly != '0'){
echo ' <span class="line semi-bold">';
echo ' <a href="' . $link . '&preview=on' . $preview_options . '" target="_blank">' . $lang['srv_preview'] . ' PC</a>';
echo ' &nbsp;(<a href="' . $link . '&preview=on&mobile=1' . $preview_options . '" target="_blank">' . $lang['srv_preview_mobile'] . '</a>, ';
echo ' <a href="' . $link . '&preview=on&mobile=2' . $preview_options . '" target="_blank">' . $lang['srv_preview_tablet'] . '</a>)';
echo ' </span>';
}
else{
echo ' <span class="line semi-bold">';
echo ' <a href="' . $link . '&preview=on' . $preview_options . '" target="_blank">' . $lang['srv_preview'] . ' PC</a>';
echo ' </span>';
}
echo ' <span class="line">';
echo ' (' . $lang['srv_monitor_toolbox_preview'] . ')';
echo ' </span>';
echo '</div>';
echo '</div>'; // expanded-tooltip bottom
*/
echo '</div>'; // tooltip
echo ' <a href="' . $link . '&preview=on' . $preview_options . '" target="_blank" title="'.$lang['srv_monitor_toolbox_title'].'"><span class="faicon monitor"></span><span class="text">'.$lang['srv_poglejanketo2'].'</span></a> ';
echo '</div>';
}

3
admin/survey/classes/class.SurveyList.php
View File

@ -647,9 +647,10 @@ class SurveyList {
echo '<ol class="navigation_buttons_list">';
echo '<li class="moja1ka active_'.$css_1.'">';
echo '<a href="index.php?a=pregledovanje" title="' . $lang['srv_pregledovanje'] . '">';
echo '<div class="smaller-singlebutton-'.$css_1.'">'. $lang['srv_pregledovanje'] . '</div>';
echo '<div class="smaller-singlebutton-'.$css_1.'"><span class="faicon clipboard_notes"></span>'. $lang['srv_pregledovanje'] . '</div>';
echo '</a>';
echo '</li>';

55
public/css/admin_new.css
View File

@ -5409,22 +5409,20 @@ span.faicon.export::before {
font-size: 24px;
content: "\f56f";
}*/
span.faicon.import {
width: 32px;
}
/*span.faicon.import{
width: 32px;
}*/
span.faicon.import::before {
font-size: 24px;
font-weight: 400;
content: "";
}
span.faicon.import::after {
font-size: 14px;
content: "";
display: inline-block;
}
/*span.faicon.import::after{
font-size: 14px;
content: "\f061";
display: inline-block;
}*/
span.faicon.library::before {
font-size: 24px;
content: "";
@ -5595,6 +5593,12 @@ span.faicon.comments::before {
content: "";
}
span.faicon.comments_empty::before {
font-size: 24px;
font-weight: 400;
content: "";
}
span.faicon.comments_num::before {
font-size: 24px;
content: "";
@ -8014,7 +8018,7 @@ header #top_line #anketa_header_settings {
margin-left: 30px;
}
header #top_line #anketa_header_settings .anketa_header_naslov a {
font-size: 20px;
font-size: 16px;
color: #333333;
text-decoration: none;
font-weight: 600;
@ -8061,7 +8065,11 @@ header #top_line #anketa_header_settings .anketa_header_activation .anketa_heade
}
header #top_line #anketa_header_settings .anketa_header_activation .anketa_header_preview {
display: flex;
flex-direction: column;
align-items: center;
}
header #top_line #anketa_header_settings .anketa_header_activation .anketa_header_preview a {
padding: 0 16px;
line-height: 28px;
}
header #top_line #anketa_header_settings .anketa_header_activation .anketa_header_preview .block {
display: flex;
@ -8079,7 +8087,7 @@ header #top_line #anketa_header_settings .anketa_header_activation .anketa_heade
margin-bottom: 0;
}
header #top_line #anketa_header_settings .anketa_header_activation .anketa_header_url {
color: #777777;
color: #C4C4C4;
}
header #top_line #anketa_header_settings .anketa_header_activation .anketa_header_url a {
padding: 0 16px;
@ -8190,6 +8198,7 @@ header #top_line #xtradiv .xtraname {
cursor: pointer;
width: auto;
font-weight: 400;
font-size: 14px;
color: #1E88E5;
}
header #top_line #xtradiv .xtraname:hover {
@ -8292,24 +8301,35 @@ header #surveyNavigation #firstNavigation ol li {
list-style-type: none;
}
header #surveyNavigation #firstNavigation ol.navigation_buttons_list {
padding-top: 11px;
padding-top: 10px;
}
header #surveyNavigation #firstNavigation ol.navigation_buttons_list li {
padding: 14px 32px;
padding: 0;
transition: 0.2s;
}
header #surveyNavigation #firstNavigation ol.navigation_buttons_list li a {
color: #FFFFFF;
text-decoration: none;
}
header #surveyNavigation #firstNavigation ol.navigation_buttons_list li a div {
padding: 0 32px;
height: 50px;
line-height: 50px;
}
header #surveyNavigation #firstNavigation ol.navigation_buttons_list li.active_on {
background-color: #FFFFFF;
}
header #surveyNavigation #firstNavigation ol.navigation_buttons_list li.active_on a {
color: #1E88E5;
}
header #surveyNavigation #firstNavigation ol.navigation_buttons_list li.active_off:hover {
background-color: #187bd1;
}
header #surveyNavigation #firstNavigation ol.navigation_buttons_list li.moja1ka .faicon,
header #surveyNavigation #firstNavigation ol.navigation_buttons_list li #mojeAnketeLink .faicon {
margin-right: 8px;
}
header #surveyNavigation #firstNavigation ol.navigation_buttons_list li.moja1ka .faicon:before,
header #surveyNavigation #firstNavigation ol.navigation_buttons_list li #mojeAnketeLink .faicon:before {
font-size: 16px;
}
@ -8324,6 +8344,9 @@ header #surveyNavigation #firstNavigation ol.quick_settings li {
header #surveyNavigation #firstNavigation ol.quick_settings li a span::before {
color: white;
}
header #surveyNavigation #firstNavigation ol.quick_settings li .faicon.language.gray:before {
color: #0059ab;
}
header #surveyNavigation #firstNavigation ol.quick_settings #quick_comments_link.newCss {
font-size: 12px;
}
@ -8427,7 +8450,7 @@ header #secondNavigation #secondNavigation_links a {
margin-left: 16px;
}
header #secondNavigation #secondNavigation_links a span::before {
font-size: 20px !important;
font-size: 18px !important;
}
header #topSettingsHolder {
display: flex;

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

@ -85,19 +85,19 @@ span.faicon.export::before{
content: "\f56f";
}*/
span.faicon.import{
/*span.faicon.import{
width: 32px;
}
}*/
span.faicon.import::before{
font-size: 24px;
font-weight: 400;
content: "\f1c2";
}
span.faicon.import::after{
/*span.faicon.import::after{
font-size: 14px;
content: "\f061";
display: inline-block;
}
}*/
@ -251,6 +251,11 @@ span.faicon.comments::before{
font-size: 24px;
content: "\f27a";
}
span.faicon.comments_empty::before{
font-size: 24px;
font-weight: 400;
content: "\f27a";
}
span.faicon.comments_num::before{
font-size: 24px;
content: "\f27a";

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

@ -41,12 +41,20 @@ header{
}
&.navigation_buttons_list{
padding-top: 11px;
padding-top: 10px;
li{
padding: 14px 32px;
padding: 0;
transition: 0.2s;
a {
div{
padding: 0 32px;
height: 50px;
line-height: 50px;
}
color: $white;
text-decoration: none;
}
@ -57,8 +65,13 @@ header{
a {
color: $blue;
}
}
}
&.active_off:hover{
background-color: darken($blue, 5%);
}
&.moja1ka,
#mojeAnketeLink {
.faicon{
@ -66,8 +79,7 @@ header{
&:before{
font-size: 16px;
}
}
}
}
@ -88,6 +100,10 @@ header{
a span::before{
color: white;
}
.faicon.language.gray:before{
color: $dark-blue;
}
}
#quick_comments_link.newCss {
@ -218,7 +234,7 @@ header{
margin-left: 16px;
span::before{
font-size: 20px !important;
font-size: 18px !important;
}
}
}

12
resources/sass/admin_new/components/header/top_line.scss
View File

@ -87,7 +87,7 @@ header #top_line{
.anketa_header_naslov {
a {
font-size: 20px;
font-size: 16px;
color: $black;
text-decoration: none;
font-weight: 600;
@ -153,7 +153,12 @@ header #top_line{
.anketa_header_preview{
display: flex;
flex-direction: column;
align-items: center;
a{
padding: 0 16px;
line-height: 28px;
}
.block{
display: flex;
@ -178,7 +183,7 @@ header #top_line{
}
.anketa_header_url{
color: $very-dark-gray;
color: $dark-gray;
a{
padding: 0 16px;
@ -336,6 +341,7 @@ header #top_line{
width: auto;
font-weight: 400;
font-size: 14px;
color: $blue;
&:hover{