diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php
index a0ab65963..2ffce1c48 100644
--- a/admin/survey/SurveyAdmin.php
+++ b/admin/survey/SurveyAdmin.php
@@ -747,17 +747,17 @@ class SurveyAdmin
global $site_url;
// Logo glede na jezik in namestitev
- if(isLastnaInstalacija() || isVirtual() || isAAI())
- $logo_class = ' class="namestitev"';
- elseif($lang['id'] != "1")
- $logo_class = ' class="english"';
- else
- $logo_class = '';
+ $logo_class = '';
+ if(isLastnaInstalacija() || isVirtual() || isAAI())
+ $logo_class = 'namestitev';
+
+ if($lang['id'] != "1")
+ $logo_class .= ' english';
$url = ($site_url == "https://www.1ka.si/" && $lang['id'] != "1") ? "https://www.1ka.si/d/en/" : $site_url;
- echo '
';
diff --git a/main/survey/app/Controllers/DisplayController.php b/main/survey/app/Controllers/DisplayController.php
index b3c251131..626953359 100644
--- a/main/survey/app/Controllers/DisplayController.php
+++ b/main/survey/app/Controllers/DisplayController.php
@@ -39,8 +39,8 @@ class DisplayController extends Controller
return new DisplayController();
}
- public function logo()
- {
+ public function logo(){
+
// Za gorenje posebej prikazemo logo
if(Common::checkModule('gorenje')){
SurveyGorenje::logoGorenje(get('anketa'), get('usr_id'));
@@ -53,7 +53,7 @@ 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"';
+ $class = 'english';
if (strpos(self::$site_url, 'www.1ka.si') !== false)
$url = self::$site_url.'d/en/';
@@ -61,10 +61,10 @@ class DisplayController extends Controller
// Ce gre za lastno namestitev, AAI ali virtualko prikazemo logo "namestitev"
if(isLastnaInstalacija() || isVirtual() || isAAI()){
- $class = ' class="namestitev"';
+ $class .= ' namestitev';
}
- echo '';
+ echo '';
}
/**
diff --git a/main/survey/skins/1kaBlack.css b/main/survey/skins/1kaBlack.css
index 4978d8a2b..31fc97cd1 100644
--- a/main/survey/skins/1kaBlack.css
+++ b/main/survey/skins/1kaBlack.css
@@ -106,6 +106,10 @@ h1.evalvacija {
background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
}
+#logo.namestitev.english {
+ background: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
.header_settings_holder {
top: 0px;
right: 20px;
diff --git a/main/survey/skins/1kaBlue.css b/main/survey/skins/1kaBlue.css
index 710f854e6..dacdd86af 100644
--- a/main/survey/skins/1kaBlue.css
+++ b/main/survey/skins/1kaBlue.css
@@ -106,6 +106,10 @@ h1.evalvacija {
background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
}
+#logo.namestitev.english {
+ background: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
.header_settings_holder {
top: 0px;
right: 20px;
diff --git a/main/survey/skins/1kaGreen.css b/main/survey/skins/1kaGreen.css
index b67a4d3e3..eebb06f42 100644
--- a/main/survey/skins/1kaGreen.css
+++ b/main/survey/skins/1kaGreen.css
@@ -106,6 +106,10 @@ h1.evalvacija {
background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
}
+#logo.namestitev.english {
+ background: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
.header_settings_holder {
top: 0px;
right: 20px;
diff --git a/main/survey/skins/1kaNature.css b/main/survey/skins/1kaNature.css
index bbfcb45d0..d912be966 100644
--- a/main/survey/skins/1kaNature.css
+++ b/main/survey/skins/1kaNature.css
@@ -106,6 +106,10 @@ h1.evalvacija {
background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
}
+#logo.namestitev.english {
+ background: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
.header_settings_holder {
top: 0px;
right: 20px;
diff --git a/main/survey/skins/1kaOffice.css b/main/survey/skins/1kaOffice.css
index 5de4991b4..d82ceea3e 100644
--- a/main/survey/skins/1kaOffice.css
+++ b/main/survey/skins/1kaOffice.css
@@ -106,6 +106,10 @@ h1.evalvacija {
background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
}
+#logo.namestitev.english {
+ background: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
.header_settings_holder {
top: 0px;
right: 20px;
diff --git a/main/survey/skins/1kaOrange.css b/main/survey/skins/1kaOrange.css
index 116eee5e6..ad8dbca32 100644
--- a/main/survey/skins/1kaOrange.css
+++ b/main/survey/skins/1kaOrange.css
@@ -106,6 +106,10 @@ h1.evalvacija {
background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
}
+#logo.namestitev.english {
+ background: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
.header_settings_holder {
top: 0px;
right: 20px;
diff --git a/main/survey/skins/1kaPurple.css b/main/survey/skins/1kaPurple.css
index 53cf1d414..e4204719c 100644
--- a/main/survey/skins/1kaPurple.css
+++ b/main/survey/skins/1kaPurple.css
@@ -106,6 +106,10 @@ h1.evalvacija {
background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
}
+#logo.namestitev.english {
+ background: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
.header_settings_holder {
top: 0px;
right: 20px;
diff --git a/main/survey/skins/1kaRed.css b/main/survey/skins/1kaRed.css
index 055b25600..1b13f5199 100644
--- a/main/survey/skins/1kaRed.css
+++ b/main/survey/skins/1kaRed.css
@@ -106,6 +106,10 @@ h1.evalvacija {
background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
}
+#logo.namestitev.english {
+ background: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
.header_settings_holder {
top: 0px;
right: 20px;
diff --git a/main/survey/skins/Cdi.css b/main/survey/skins/Cdi.css
index 8d9de34ac..a72ead8ff 100644
--- a/main/survey/skins/Cdi.css
+++ b/main/survey/skins/Cdi.css
@@ -106,6 +106,10 @@ h1.evalvacija {
background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
}
+#logo.namestitev.english {
+ background: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
.header_settings_holder {
top: 0px;
right: 20px;
diff --git a/main/survey/skins/Fdv.css b/main/survey/skins/Fdv.css
index 30c347982..53b51a2da 100644
--- a/main/survey/skins/Fdv.css
+++ b/main/survey/skins/Fdv.css
@@ -106,6 +106,10 @@ h1.evalvacija {
background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
}
+#logo.namestitev.english {
+ background: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
.header_settings_holder {
top: 0px;
right: 20px;
diff --git a/main/survey/skins/MobileBlack.css b/main/survey/skins/MobileBlack.css
index 17077ed68..ecd33605d 100644
--- a/main/survey/skins/MobileBlack.css
+++ b/main/survey/skins/MobileBlack.css
@@ -229,4 +229,8 @@ button.ui-datepicker-trigger:hover {
background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
}
+#footer_survey #logo.namestitev.english {
+ background-image: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
/*# sourceMappingURL=MobileBlack.css.map */
diff --git a/main/survey/skins/MobileBlue.css b/main/survey/skins/MobileBlue.css
index f8659e8a7..9b1829583 100644
--- a/main/survey/skins/MobileBlue.css
+++ b/main/survey/skins/MobileBlue.css
@@ -228,4 +228,8 @@ button.ui-datepicker-trigger:hover {
background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
}
+#footer_survey #logo.namestitev.english {
+ background-image: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
/*# sourceMappingURL=MobileBlue.css.map */
diff --git a/main/survey/skins/MobileCdi.css b/main/survey/skins/MobileCdi.css
index 9588ebb35..e1c05af22 100644
--- a/main/survey/skins/MobileCdi.css
+++ b/main/survey/skins/MobileCdi.css
@@ -229,6 +229,10 @@ button.ui-datepicker-trigger:hover {
background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
}
+#footer_survey #logo.namestitev.english {
+ background-image: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
/* Popravimo se logo */
#footer_survey #logo {
background-image: url("../../../public/img/logo/cdi_slo.png");
diff --git a/main/survey/skins/MobileFdv.css b/main/survey/skins/MobileFdv.css
index 995058d55..1cc34d4f0 100644
--- a/main/survey/skins/MobileFdv.css
+++ b/main/survey/skins/MobileFdv.css
@@ -229,6 +229,10 @@ button.ui-datepicker-trigger:hover {
background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
}
+#footer_survey #logo.namestitev.english {
+ background-image: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
/* Popravimo se logo */
#footer_survey #logo {
background-image: url("../../../public/img/logo/fdv.png");
diff --git a/main/survey/skins/MobileGreen.css b/main/survey/skins/MobileGreen.css
index 4564b4fdf..984d7c2db 100644
--- a/main/survey/skins/MobileGreen.css
+++ b/main/survey/skins/MobileGreen.css
@@ -228,4 +228,8 @@ button.ui-datepicker-trigger:hover {
background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
}
+#footer_survey #logo.namestitev.english {
+ background-image: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
/*# sourceMappingURL=MobileGreen.css.map */
diff --git a/main/survey/skins/MobileOrange.css b/main/survey/skins/MobileOrange.css
index 706d13f54..4304d2f6b 100644
--- a/main/survey/skins/MobileOrange.css
+++ b/main/survey/skins/MobileOrange.css
@@ -228,4 +228,8 @@ button.ui-datepicker-trigger:hover {
background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
}
+#footer_survey #logo.namestitev.english {
+ background-image: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
/*# sourceMappingURL=MobileOrange.css.map */
diff --git a/main/survey/skins/MobilePurple.css b/main/survey/skins/MobilePurple.css
index 86ea387e2..3570fe2d6 100644
--- a/main/survey/skins/MobilePurple.css
+++ b/main/survey/skins/MobilePurple.css
@@ -229,4 +229,8 @@ button.ui-datepicker-trigger:hover {
background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
}
+#footer_survey #logo.namestitev.english {
+ background-image: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
/*# sourceMappingURL=MobilePurple.css.map */
diff --git a/main/survey/skins/MobileRed.css b/main/survey/skins/MobileRed.css
index 8444e2fcd..0dc10a9fd 100644
--- a/main/survey/skins/MobileRed.css
+++ b/main/survey/skins/MobileRed.css
@@ -229,4 +229,8 @@ button.ui-datepicker-trigger:hover {
background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
}
+#footer_survey #logo.namestitev.english {
+ background-image: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
/*# sourceMappingURL=MobileRed.css.map */
diff --git a/main/survey/skins/MobileUni.css b/main/survey/skins/MobileUni.css
index 016affa6d..abd14de8b 100644
--- a/main/survey/skins/MobileUni.css
+++ b/main/survey/skins/MobileUni.css
@@ -229,6 +229,10 @@ button.ui-datepicker-trigger:hover {
background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
}
+#footer_survey #logo.namestitev.english {
+ background-image: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
/* Popravimo se logo */
#footer_survey #logo {
background-image: url("../../../public/img/logo/uni.png");
diff --git a/main/survey/skins/Uni.css b/main/survey/skins/Uni.css
index 50d489f06..044296c72 100644
--- a/main/survey/skins/Uni.css
+++ b/main/survey/skins/Uni.css
@@ -106,6 +106,10 @@ h1.evalvacija {
background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
}
+#logo.namestitev.english {
+ background: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
.header_settings_holder {
top: 0px;
right: 20px;
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index ab2972f6d..a252bd7c3 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -8619,6 +8619,9 @@ header #top_line #logo_holder.english a {
header #top_line #logo_holder.namestitev a {
background-image: url(../img/logo/1ka_logo_namestitev.svg);
}
+header #top_line #logo_holder.namestitev.english a {
+ background-image: url(../img/logo/1ka_logo_installation.svg);
+}
header #top_line .setting_box {
cursor: pointer;
display: flex;
diff --git a/public/css/main.css b/public/css/main.css
index 1b290266f..8a773b9ed 100644
--- a/public/css/main.css
+++ b/public/css/main.css
@@ -7369,7 +7369,6 @@ button.ui-datepicker-trigger::before {
margin-left: auto;
}
#preview-window #preview_switch {
- font-family: Open Sans, Arial, Sans-Serif !important;
box-sizing: border-box;
width: 100%;
padding-bottom: 16px;
@@ -7418,7 +7417,6 @@ button.ui-datepicker-trigger::before {
border-left: none;
}
#preview-window #preview-holder {
- font-family: Open Sans, Arial, Sans-Serif !important;
z-index: 100;
box-sizing: border-box;
width: 100%;
@@ -7737,7 +7735,7 @@ span.faicon.empty {
border-radius: 2px;
resize: none;
padding: 9px 7px;
- font-family: Open Sans, Arial, Sans-Serif !important;
+ font-family: Source Sans Pro, sans-serif !important;
}
#comment_dropdown_test_survey .first_holder_div textarea:focus {
border: 1px solid #1E88E5 !important;
@@ -7755,7 +7753,7 @@ span.faicon.empty {
font-size: 12px !important;
width: fit-content;
padding: 5px 16px;
- font-family: Open Sans, Arial, Sans-Serif !important;
+ font-family: Source Sans Pro, sans-serif !important;
}
button,
@@ -7763,7 +7761,7 @@ submit {
box-sizing: border-box;
cursor: pointer;
font-weight: 600;
- font-family: Open Sans, Arial, Sans-Serif;
+ font-family: Source Sans Pro, sans-serif;
box-shadow: none;
border: 0;
transition: 0.3s;
diff --git a/public/css/main_mobile.css b/public/css/main_mobile.css
index 2037184bc..b44934dfd 100644
--- a/public/css/main_mobile.css
+++ b/public/css/main_mobile.css
@@ -45,7 +45,6 @@ body .center {
}
/* Warning bar (preview, cookie) */
#cookie_alert, #test_alert {
- font-family: Open Sans, Arial, Sans-Serif;
height: 26px;
line-height: 25px;
color: #ffffff;
diff --git a/public/img/logo/1ka_logo_installation.svg b/public/img/logo/1ka_logo_installation.svg
new file mode 100644
index 000000000..a590596e0
--- /dev/null
+++ b/public/img/logo/1ka_logo_installation.svg
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/sass/admin_new/components/header/top_line.scss b/resources/sass/admin_new/components/header/top_line.scss
index 22e9934c7..1cf497d3c 100644
--- a/resources/sass/admin_new/components/header/top_line.scss
+++ b/resources/sass/admin_new/components/header/top_line.scss
@@ -33,6 +33,10 @@ header #top_line{
&.namestitev a{
background-image: url(../img/logo/1ka_logo_namestitev.svg);
}
+
+ &.namestitev.english a{
+ background-image: url(../img/logo/1ka_logo_installation.svg);
+ }
}
diff --git a/resources/sass/main/skins/1ka/1ka.scss b/resources/sass/main/skins/1ka/1ka.scss
index 729e8ada1..237f7b081 100644
--- a/resources/sass/main/skins/1ka/1ka.scss
+++ b/resources/sass/main/skins/1ka/1ka.scss
@@ -124,6 +124,9 @@ h1.evalvacija{
#logo.namestitev{
background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
}
+#logo.namestitev.english{
+ background: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
.header_settings_holder{
diff --git a/resources/sass/main/skins/1ka_mobile/Mobile.scss b/resources/sass/main/skins/1ka_mobile/Mobile.scss
index 56985506d..a49898d2a 100644
--- a/resources/sass/main/skins/1ka_mobile/Mobile.scss
+++ b/resources/sass/main/skins/1ka_mobile/Mobile.scss
@@ -284,4 +284,7 @@ button.ui-datepicker-trigger{
#footer_survey #logo.namestitev{
background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
}
+#footer_survey #logo.namestitev.english{
+ background-image: url("../../../public/img/logo/1ka_logo_installation.svg");
+}