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

Dodan logo za anglesko verzijo instalacije (1ka installation)

Browse Source
This commit is contained in:
pero1203 2022-10-26 09:25:31 +02:00
parent 1a5aecfb6a
commit 1ced340753
30 changed files with 148 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
admin/survey/SurveyAdmin.php
View File

@ -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 '<div id="logo_holder" '.$logo_class.'>';
echo '<div id="logo_holder" class="'.$logo_class.'">';
echo ' <a href="'.$url.'" title="'.$lang['srv_1cs'].'"></a>';
echo '</div>';
}

5
frontend/simple/classes/DisplayController.php
View File

@ -124,12 +124,13 @@ class DisplayController{
echo ' <a href="'.$site_url.$this->root.'index.php">';
if(isAAI()){
echo ' <img src="'.$site_url.'/public/img/logo/1KA_namestitev.svg">';
echo ' <img src="'.$site_url.'/public/img/logo/'.($this->lang_id == 1 ? '1KA_logo_namestitev.svg' : '1KA_logo_installation.svg').'">';
echo ' <img src="'.$site_url.'/public/img/logo/Arnes.svg"">';
}
else{
echo ' <img src="'.$site_url.'/public/img/logo/1KA_namestitev.svg">';
echo ' <img src="'.$site_url.'/public/img/logo/'.($this->lang_id == 1 ? '1KA_logo_namestitev.svg' : '1KA_logo_installation.svg').'">';
}
echo ' </a>';
echo '</div>';

10
main/survey/app/Controllers/DisplayController.php
View File

@ -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 '<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>';
echo '<div id="logo" class="'.$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>';
}
/**

4
main/survey/skins/1kaBlack.css
View File

@ -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;

4
main/survey/skins/1kaBlue.css
View File

@ -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;

4
main/survey/skins/1kaGreen.css
View File

@ -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;

4
main/survey/skins/1kaNature.css
View File

@ -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;

4
main/survey/skins/1kaOffice.css
View File

@ -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;

4
main/survey/skins/1kaOrange.css
View File

@ -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;

4
main/survey/skins/1kaPurple.css
View File

@ -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;

4
main/survey/skins/1kaRed.css
View File

@ -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;

4
main/survey/skins/Cdi.css
View File

@ -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;

4
main/survey/skins/Fdv.css
View File

@ -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;

4
main/survey/skins/MobileBlack.css
View File

@ -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 */

4
main/survey/skins/MobileBlue.css
View File

@ -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 */

4
main/survey/skins/MobileCdi.css
View File

@ -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");

4
main/survey/skins/MobileFdv.css
View File

@ -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");

4
main/survey/skins/MobileGreen.css
View File

@ -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 */

4
main/survey/skins/MobileOrange.css
View File

@ -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 */

4
main/survey/skins/MobilePurple.css
View File

@ -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 */

4
main/survey/skins/MobileRed.css
View File

@ -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 */

4
main/survey/skins/MobileUni.css
View File

@ -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");

4
main/survey/skins/Uni.css
View File

@ -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;

3
public/css/admin_new.css
View File

@ -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;

8
public/css/main.css
View File

@ -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;

1
public/css/main_mobile.css
View File

@ -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;

37
public/img/logo/1ka_logo_installation.svg Normal file
View File

@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 26.5.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 549.9 291.8" style="enable-background:new 0 0 549.9 291.8;" xml:space="preserve">
<style type="text/css">
.st0{fill:#0082FF;}
.st1{fill:#707070;}
</style>
<g>
<path class="st0" d="M88.2,0v230.4H46.5V21.8H0V0H88.2z"/>
<g>
<rect x="118.4" class="st1" width="39.8" height="230.4"/>
<path class="st1" d="M434.2,0h-55.8l-78.1,202.5L214,112.6L322.5,0h-47.8L166.9,112.6l111.3,117.8h51l17-45.6h119.7l17,45.6h40.4
L434.2,0z M354.6,163l51.7-136.7L457.6,163H354.6z"/>
</g>
</g>
<g>
<path class="st1" d="M45.8,251.5h9v40.9h-9V251.5z"/>
<path class="st1" d="M65,251.5h8.3l19.2,25.2v-25.2h8.9v40.9h-7.7l-19.8-26v26H65V251.5z"/>
<path class="st1" d="M108.4,286.5l5.3-6.4c3.7,3,7.5,5,12.2,5c3.7,0,5.9-1.5,5.9-3.9v-0.1c0-2.3-1.4-3.5-8.2-5.2
c-8.2-2.1-13.6-4.4-13.6-12.5v-0.1c0-7.4,6-12.3,14.3-12.3c6,0,11.1,1.9,15.2,5.2l-4.7,6.8c-3.6-2.5-7.2-4-10.6-4s-5.3,1.6-5.3,3.6
v0.1c0,2.7,1.8,3.6,8.8,5.4c8.3,2.2,13,5.1,13,12.3v0.1c0,8.1-6.2,12.7-15,12.7C119.6,293,113.3,290.8,108.4,286.5z"/>
<path class="st1" d="M157.3,259.8h-12.5v-8.3h33.9v8.3h-12.5v32.6h-9V259.8z"/>
<path class="st1" d="M194.4,251.2h8.3l17.5,41.2h-9.4l-3.7-9.2h-17.3l-3.7,9.2h-9.2L194.4,251.2z M203.9,275.3l-5.4-13.3l-5.4,13.3
H203.9z"/>
<path class="st1" d="M226.6,251.5h9v32.8H256v8.2h-29.4V251.5z"/>
<path class="st1" d="M262.8,251.5h9v32.8h20.4v8.2h-29.4V251.5z"/>
<path class="st1" d="M313,251.2h8.3l17.5,41.2h-9.4l-3.7-9.2h-17.3l-3.7,9.2h-9.2L313,251.2z M322.5,275.3l-5.4-13.3l-5.4,13.3
H322.5z"/>
<path class="st1" d="M349.5,259.8H337v-8.3H371v8.3h-12.5v32.6h-9V259.8z"/>
<path class="st1" d="M378.3,251.5h9v40.9h-9V251.5z"/>
<path class="st1" d="M395.7,272.1v-0.1c0-11.6,9.2-21.2,21.8-21.2c12.6,0,21.7,9.4,21.7,21.1v0.1c0,11.6-9.2,21.2-21.8,21.2
S395.7,283.7,395.7,272.1z M429.8,272.1v-0.1c0-7-5.1-12.9-12.4-12.9s-12.3,5.7-12.3,12.8v0.1c0,7,5.1,12.9,12.4,12.9
C424.8,284.8,429.8,279.1,429.8,272.1z"/>
<path class="st1" d="M447.2,251.5h8.3l19.2,25.2v-25.2h8.9v40.9h-7.7l-19.8-26v26h-8.9V251.5z"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

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

@ -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);
}
}

3
resources/sass/main/skins/1ka/1ka.scss
View File

@ -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{

3
resources/sass/main/skins/1ka_mobile/Mobile.scss
View File

@ -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");
}