From f8d5ea30e64615e10187bec9c7534952ea6b8f44 Mon Sep 17 00:00:00 2001 From: pero1203 Date: Tue, 11 Jan 2022 14:40:28 +0100 Subject: [PATCH] Redesign - dodani novi logotipi, dodan logo za lastno namestitev --- admin/survey/SurveyAdmin.php | 10 +- frontend/simple/classes/DisplayController.php | 2 +- function.php | 2 +- public/css/admin_new.css | 2756 +++++++++-------- public/img/logo/1ka_logo_eng.svg | 26 +- public/img/logo/1ka_logo_namestitev.svg | 22 + public/img/logo/1ka_logo_slo.svg | 24 +- .../admin_new/components/header/top_line.scss | 5 + 8 files changed, 1466 insertions(+), 1381 deletions(-) create mode 100644 public/img/logo/1ka_logo_namestitev.svg diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php index 3581650b1..3b97b76a5 100644 --- a/admin/survey/SurveyAdmin.php +++ b/admin/survey/SurveyAdmin.php @@ -723,7 +723,15 @@ class SurveyAdmin global $lang; global $site_url; - $logo_class = ($lang['id'] != "1") ? ' class="english"' : ''; + // Logo glede na jezik in namestitev + if(isLastnaInstalacija() || isVirtual()) + $logo_class = ' class="namestitev"'; + elseif($lang['id'] != "1") + $logo_class = ' class="english"'; + else + $logo_class = ''; + + $url = ($site_url == "https://www.1ka.si/" && $lang['id'] != "1") ? "https://www.1ka.si/d/en/" : $site_url; echo '
'; diff --git a/frontend/simple/classes/DisplayController.php b/frontend/simple/classes/DisplayController.php index 3c998b998..ba80f2aa0 100644 --- a/frontend/simple/classes/DisplayController.php +++ b/frontend/simple/classes/DisplayController.php @@ -119,7 +119,7 @@ class DisplayController{ echo '