Logo - urejena zadnja verzija logotipa za vse tipe instalacije

admin/survey/SurveyAdmin.php

@@ -747,7 +747,7 @@ class SurveyAdmin
         global $site_url;
 
         // Logo glede na jezik in namestitev
-        if(isLastnaInstalacija() || isVirtual())
+        if(isLastnaInstalacija() || isVirtual() || isAAI())
             $logo_class = ' class="namestitev"';
         elseif($lang['id'] != "1")
             $logo_class = ' class="english"';

frontend/simple/classes/DisplayController.php

@@ -116,28 +116,25 @@ class DisplayController{
 	public function displayHeader(){
 		global $site_url;
 		global $lang;
+
         
-        // if(isAAI()){
-        //     echo '<div class="header_container">';
-        // }
-
-
         // Logo v glavi
         echo '<div class="logo ">';
 
         echo '  <a href="'.$site_url.$this->root.'index.php">';
 
-        if(!isAAI()){
-            echo '      <img src="'.$site_url.'/public/img/logo/1ka_logo_'.($this->lang_id != 1 ? 'eng' : 'slo').'.svg">';
-        }
         if(isAAI()){
             echo '      <img src="'.$site_url.'/public/img/logo/1KA_namestitev.svg">';
             echo '      <img src="'.$site_url.'/public/img/logo/Arnes.svg"">';
         }
+        else{
+            echo '      <img src="'.$site_url.'/public/img/logo/1KA_namestitev.svg">';
+        }
         echo '  </a>';
 
         echo '</div>';
         
+        
         // moblie nav ----------------------
 
         
@@ -147,12 +144,6 @@ class DisplayController{
                     echo ' <span></span> ';
                     echo ' <span></span> ';
                     echo ' <span></span> ';
-
-                    // echo '<div id="links">' ;
-                    //     echo '<a href="#news">News</a>';
-                    //     echo ' <a href="#contact">Contact</a>';
-                    //     echo ' <a href="#about">About</a> ';
-                    // echo '</div>';
                 echo ' </div>';
 
                 echo '<div id="links" class="links">' ;

main/survey/app/Controllers/DisplayController.php

@@ -52,11 +52,18 @@ class DisplayController extends Controller
 
         // Logo prikazemo angleski v vseh primerih kjer respondentov jezik ni slovenscina in ce ni custom - popravimo tudi link na angleski frontend
         if (self::$lang['language'] != 'Slovenščina') {
+
             $class = ' class="english"';
+
             if (strpos(self::$site_url, 'www.1ka.si') !== false)
                 $url = self::$site_url.'d/en/';
         }
 
+        // Ce gre za lastno namestitev, AAI ali virtualko prikazemo logo "namestitev"
+        if(isLastnaInstalacija() || isVirtual() || isAAI()){
+            $class = ' class="namestitev"';
+        }
+
         echo '<div id="logo" ' . $class . '><a href="' . $url . '" title="' . self::$lang['srv_1cs'] . ' ' . self::$lang['srv_footer_1ka'] . '" target="_blank">' . self::$lang['srv_1cs'] . '</a><div id="logo_right"></div></div>';
     }
 

main/survey/app/Controllers/HeaderController.php

@@ -925,7 +925,7 @@ class HeaderController extends Controller
             // CSS za custom logo
             echo '<style type="text/css">';
 
-            echo '#logo, #logo.english, #footer_survey #logo, #footer_survey #logo.english {';
+            echo '#logo, #logo.english, #logo.namestitev, #footer_survey #logo, #footer_survey #logo.english, #footer_survey #logo.namestitev {';
         
             echo ' background-image: url('.$css_bg_image.'); ';
             

main/survey/skins/1kaBlack.css

@@ -99,6 +99,10 @@ h1.evalvacija {
   background: url("../../../public/img/logo/1ka_logo_eng.svg");
 }
 
+#logo.namestitev {
+  background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
 .header_settings_holder {
   top: 0px;
   right: 20px;

main/survey/skins/1kaBlue.css

@@ -99,6 +99,10 @@ h1.evalvacija {
   background: url("../../../public/img/logo/1ka_logo_eng.svg");
 }
 
+#logo.namestitev {
+  background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
 .header_settings_holder {
   top: 0px;
   right: 20px;

main/survey/skins/1kaGreen.css

@@ -99,6 +99,10 @@ h1.evalvacija {
   background: url("../../../public/img/logo/1ka_logo_eng.svg");
 }
 
+#logo.namestitev {
+  background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
 .header_settings_holder {
   top: 0px;
   right: 20px;

main/survey/skins/1kaNature.css

@@ -99,6 +99,10 @@ h1.evalvacija {
   background: url("../../../public/img/logo/1ka_logo_eng.svg");
 }
 
+#logo.namestitev {
+  background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
 .header_settings_holder {
   top: 0px;
   right: 20px;

main/survey/skins/1kaOffice.css

@@ -99,6 +99,10 @@ h1.evalvacija {
   background: url("../../../public/img/logo/1ka_logo_eng.svg");
 }
 
+#logo.namestitev {
+  background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
 .header_settings_holder {
   top: 0px;
   right: 20px;

main/survey/skins/1kaOrange.css

@@ -99,6 +99,10 @@ h1.evalvacija {
   background: url("../../../public/img/logo/1ka_logo_eng.svg");
 }
 
+#logo.namestitev {
+  background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
 .header_settings_holder {
   top: 0px;
   right: 20px;

main/survey/skins/1kaPurple.css

@@ -99,6 +99,10 @@ h1.evalvacija {
   background: url("../../../public/img/logo/1ka_logo_eng.svg");
 }
 
+#logo.namestitev {
+  background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
 .header_settings_holder {
   top: 0px;
   right: 20px;

main/survey/skins/1kaRed.css

@@ -99,6 +99,10 @@ h1.evalvacija {
   background: url("../../../public/img/logo/1ka_logo_eng.svg");
 }
 
+#logo.namestitev {
+  background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
 .header_settings_holder {
   top: 0px;
   right: 20px;

main/survey/skins/Cdi.css

@@ -99,6 +99,10 @@ h1.evalvacija {
   background: url("../../../public/img/logo/1ka_logo_eng.svg");
 }
 
+#logo.namestitev {
+  background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
 .header_settings_holder {
   top: 0px;
   right: 20px;

main/survey/skins/Fdv.css

@@ -99,6 +99,10 @@ h1.evalvacija {
   background: url("../../../public/img/logo/1ka_logo_eng.svg");
 }
 
+#logo.namestitev {
+  background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
 .header_settings_holder {
   top: 0px;
   right: 20px;

main/survey/skins/MobileBlack.css

@@ -225,4 +225,8 @@ button.ui-datepicker-trigger:hover {
   background-image: url("../../../public/img/logo/1ka_logo_eng.svg");
 }
 
+#footer_survey #logo.namestitev {
+  background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
 /*# sourceMappingURL=MobileBlack.css.map */

main/survey/skins/MobileBlue.css

@@ -224,4 +224,8 @@ button.ui-datepicker-trigger:hover {
   background-image: url("../../../public/img/logo/1ka_logo_eng.svg");
 }
 
+#footer_survey #logo.namestitev {
+  background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
 /*# sourceMappingURL=MobileBlue.css.map */

main/survey/skins/MobileCdi.css

@@ -225,6 +225,10 @@ button.ui-datepicker-trigger:hover {
   background-image: url("../../../public/img/logo/1ka_logo_eng.svg");
 }
 
+#footer_survey #logo.namestitev {
+  background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
 /* Popravimo se logo */
 #footer_survey #logo {
   background-image: url("../../../public/img/logo/cdi_slo.png");

main/survey/skins/MobileFdv.css

@@ -225,6 +225,10 @@ button.ui-datepicker-trigger:hover {
   background-image: url("../../../public/img/logo/1ka_logo_eng.svg");
 }
 
+#footer_survey #logo.namestitev {
+  background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
 /* Popravimo se logo */
 #footer_survey #logo {
   background-image: url("../../../public/img/logo/fdv.png");

main/survey/skins/MobileGreen.css

@@ -224,4 +224,8 @@ button.ui-datepicker-trigger:hover {
   background-image: url("../../../public/img/logo/1ka_logo_eng.svg");
 }
 
+#footer_survey #logo.namestitev {
+  background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
 /*# sourceMappingURL=MobileGreen.css.map */

main/survey/skins/MobileOrange.css

@@ -224,4 +224,8 @@ button.ui-datepicker-trigger:hover {
   background-image: url("../../../public/img/logo/1ka_logo_eng.svg");
 }
 
+#footer_survey #logo.namestitev {
+  background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
 /*# sourceMappingURL=MobileOrange.css.map */

main/survey/skins/MobilePurple.css

@@ -225,4 +225,8 @@ button.ui-datepicker-trigger:hover {
   background-image: url("../../../public/img/logo/1ka_logo_eng.svg");
 }
 
+#footer_survey #logo.namestitev {
+  background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
 /*# sourceMappingURL=MobilePurple.css.map */

main/survey/skins/MobileRed.css

@@ -225,4 +225,8 @@ button.ui-datepicker-trigger:hover {
   background-image: url("../../../public/img/logo/1ka_logo_eng.svg");
 }
 
+#footer_survey #logo.namestitev {
+  background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
 /*# sourceMappingURL=MobileRed.css.map */

main/survey/skins/MobileUni.css

@@ -225,6 +225,10 @@ button.ui-datepicker-trigger:hover {
   background-image: url("../../../public/img/logo/1ka_logo_eng.svg");
 }
 
+#footer_survey #logo.namestitev {
+  background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
 /* Popravimo se logo */
 #footer_survey #logo {
   background-image: url("../../../public/img/logo/uni.png");

main/survey/skins/Uni.css

@@ -99,6 +99,10 @@ h1.evalvacija {
   background: url("../../../public/img/logo/1ka_logo_eng.svg");
 }
 
+#logo.namestitev {
+  background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
 .header_settings_holder {
   top: 0px;
   right: 20px;

resources/sass/main/skins/1ka/1ka.scss

@@ -112,6 +112,9 @@ h1.evalvacija{
 #logo.english{
 	background: url("../../../public/img/logo/1ka_logo_eng.svg");
 }
+#logo.namestitev{
+	background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
 
 
 .header_settings_holder{

resources/sass/main/skins/1ka_mobile/Mobile.scss

@@ -281,3 +281,7 @@ button.ui-datepicker-trigger{
 #footer_survey #logo.english{
 	background-image: url("../../../public/img/logo/1ka_logo_eng.svg");
 }
+#footer_survey #logo.namestitev{
+	background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+