diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php index 5c05a694a..de0529dd7 100644 --- a/admin/survey/SurveyAdmin.php +++ b/admin/survey/SurveyAdmin.php @@ -826,15 +826,15 @@ class SurveyAdmin if ($hierarhija_type == 10) { echo ''; - echo ' '; - echo ' '.$lang['settings'].''; - echo ' '; + echo ''; + echo ''.$lang['settings'].''; + echo ''; } else { echo ''; - echo ' '; - echo ' '.$lang['settings'].''; - echo ' '; + echo ''; + echo ''.$lang['settings'].''; + echo ''; } echo ' '; @@ -929,10 +929,10 @@ class SurveyAdmin echo '
    '; // Moje ankete - echo '
  1. '; - echo ' '; + echo '
  2. '; + echo ' '; + echo ' '; + echo ' '; echo '
    3. '; 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 '
  3. '; + echo ''; + echo ''; + echo ''; + echo '
    4. '; + } + // Ikona za vklop jezika, če je v globalnih nastavitvah vklopljena opcija + //elseif (UserSetting::getInstance()->getUserSetting('showLanguageShortcut')) { + else{ + echo '
  4. '; + echo ''; + echo ''; + echo ''; + echo '
    5. '; + } + + + // Ikonca ce je izklopljeno prilagajanje za mobitel (mobile friendly) + $mobile_friendly = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_friendly'); + if ($mobile_friendly == 0) { + echo '
  5. '; + echo ''; + echo ''; + echo ''; + echo '
    6. '; + } + + #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 '
    ' . $sas->testiranje_komentarji_komentarji_na_vprasanje() . '
    '; + echo '
    ' . $sas->testiranje_komentarji_komentarji_na_vprasanje() . '
    '; else - echo '
    '; + echo '
    '; } else{ if ($sas->testiranje_komentarji_komentarji_na_vprasanje() > 0) echo '
    ' . $sas->testiranje_komentarji_komentarji_na_vprasanje() . '
    '; else - echo '
    '; + echo '
    '; } echo ''; @@ -1399,9 +1433,9 @@ class SurveyAdmin // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik if($userAccess->checkUserAccess('komentarji')) - echo '
    '; + echo '
    '; else - echo '
    '; + echo '
    '; echo '
    '; @@ -1418,36 +1452,6 @@ class SurveyAdmin } } - // ikonco za jezik prikazujemo po potrebi - if ($row['multilang'] == 1) { - $p = new Prevajanje($this->anketa); - global $lang1; - - echo '
  6. '; - echo ''; - echo ''; - echo ''; - echo '
    7. '; - } - elseif (UserSetting::getInstance()->getUserSetting('showLanguageShortcut')) { - // Ikona za vklop jezika, če je v globalnih nastavitvah vklopljena opcija - echo '
  7. '; - echo ''; - echo ''; - echo ''; - echo '
    8. '; - } - - // Ikonca ce je izklopljeno prilagajanje za mobitel (mobile friendly) - $mobile_friendly = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_friendly'); - if ($mobile_friendly == 0) { - echo '
  8. '; - echo ''; - echo ''; - echo ''; - echo '
    9. '; - } - echo '
'; } @@ -4222,12 +4226,12 @@ class SurveyAdmin if($userAccess->checkUserAccess('komentarji')){ echo ''; - echo '
'; + echo '
'; echo ''; } else{ echo ''; - echo '
'; + echo '
'; echo ''; } } @@ -4248,7 +4252,7 @@ class SurveyAdmin if($userAccess->checkUserAccess('komentarji')){ echo ''; - echo '
' . $comment_count_text . '
'; + echo '
' . $comment_count_text . '
'; // 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 ''; - echo '
' . $comment_count_text . '
'; + echo '
' . $comment_count_text . '
'; echo ''; } } @@ -5947,46 +5951,7 @@ class SurveyAdmin // Predogled in testiranje (ikona monitor) echo '
'; - - echo '
'; - echo ''.$lang['srv_poglejanketo2'].' '; - - /*echo '
'; - - echo '
'; - echo ' '; - echo $lang['srv_monitor_toolbox_title']; - echo ' '; - echo '
'; - - echo '
'; - - // 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 ' '; - echo ' ' . $lang['srv_preview'] . ' PC'; - echo '  (' . $lang['srv_preview_mobile'] . ', '; - echo ' ' . $lang['srv_preview_tablet'] . ')'; - echo ' '; - } - else{ - echo ' '; - echo ' ' . $lang['srv_preview'] . ' PC'; - echo ' '; - } - - echo ' '; - echo ' (' . $lang['srv_monitor_toolbox_preview'] . ')'; - echo ' '; - - echo '
'; - - echo '
'; // expanded-tooltip bottom - */ - - echo '
'; // tooltip - + echo ' '.$lang['srv_poglejanketo2'].' '; echo '
'; } diff --git a/admin/survey/classes/class.SurveyList.php b/admin/survey/classes/class.SurveyList.php index e756424e8..2c886670a 100644 --- a/admin/survey/classes/class.SurveyList.php +++ b/admin/survey/classes/class.SurveyList.php @@ -647,9 +647,10 @@ class SurveyList { echo '
    '; + echo '
  1. '; echo ''; - echo '
    '. $lang['srv_pregledovanje'] . '
    '; + echo '
    '. $lang['srv_pregledovanje'] . '
    '; echo '    '; echo '
    2. '; diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 3634fc688..afcb459cb 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -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; diff --git a/resources/sass/admin_new/basic/icons/standard.scss b/resources/sass/admin_new/basic/icons/standard.scss index 93c39581b..927ad444f 100644 --- a/resources/sass/admin_new/basic/icons/standard.scss +++ b/resources/sass/admin_new/basic/icons/standard.scss @@ -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"; diff --git a/resources/sass/admin_new/components/header/navigation.scss b/resources/sass/admin_new/components/header/navigation.scss index 03107a3be..dafae8088 100644 --- a/resources/sass/admin_new/components/header/navigation.scss +++ b/resources/sass/admin_new/components/header/navigation.scss @@ -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; } } } diff --git a/resources/sass/admin_new/components/header/top_line.scss b/resources/sass/admin_new/components/header/top_line.scss index a194a1450..c7385e32c 100644 --- a/resources/sass/admin_new/components/header/top_line.scss +++ b/resources/sass/admin_new/components/header/top_line.scss @@ -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{