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

Redesign - dodani novi logotipi, dodan logo za lastno namestitev

Browse Source
This commit is contained in:
pero1203 2022-01-11 14:40:28 +01:00
parent 6177b36a46
commit f8d5ea30e6
8 changed files with 1466 additions and 1381 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
admin/survey/SurveyAdmin.php
View File

@ -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 '<div id="logo_holder" '.$logo_class.'>';

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

@ -119,7 +119,7 @@ class DisplayController{
echo '<div class="logo ">';
echo ' <a href="'.$site_url.$this->root.'index.php">';
echo ' <img src="'.$site_url.'/public/img/logo/1ka_logo_'.($this->lang_id != 1 ? 'eng' : 'slo').'.svg">';
echo ' <img src="'.$site_url.'/public/img/logo/1ka_logo_namestitev.svg">';
if(isAAI()){
echo ' <img src="'.$site_url.'/public/img/logo/arnes_logo.png" style="margin-left:30px;">';
}

2
function.php
View File

@ -675,7 +675,7 @@ function isDebug(){
// Funkcija za tip instalacije - lastna instalacija
function isLastnaInstalacija(){
return (AppSettings::getInstance()->getSetting('installation_type') === '0') ? true : false;
return (AppSettings::getInstance()->getSetting('installation_type') == '0') ? true : false;
}
// Funkcija za tip instalacije - WWW

2756
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

26
public/img/logo/1ka_logo_eng.svg
View File

@ -1 +1,25 @@
<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 975.01 542.87"><defs><style>.cls-1{fill:#0082ff;}.cls-2{fill:#707070;}</style></defs><title>1ka_logo</title><path class="cls-1" d="M181.15,232V639.67H107.33V270.57H25V232Z" transform="translate(-24.99 -231.95)"/><path class="cls-2" d="M234.53,232H305V639.67H234.53Zm276.55,0h84.61L403.75,431.27l199.89,208.4H517.32l-197-208.4Z" transform="translate(-24.99 -231.95)"/><path class="cls-2" d="M879.61,639.67,849.52,559H637.71l-30.1,80.63H537.2L694.49,232H793.3L951.16,639.67ZM652.47,520.42H834.75L743.9,278.52Z" transform="translate(-24.99 -231.95)"/><path class="cls-1" d="M111.88,700.43h55.65V715.2H127.78V730h34.63v14.77H127.78v15.33h40.31v14.76H111.88Z" transform="translate(-24.99 -231.95)"/><path class="cls-1" d="M182.86,700.43h14.76l34.64,45.43V700.43h15.9v73.82H235.1l-35.77-47.13v47.13h-15.9V700.43Z" transform="translate(-24.99 -231.95)"/><path class="cls-2" d="M266.33,700.43H282.8V732.8l30.1-32.37h19.87l-30.1,31.24,31.8,42.58H314.6l-22.71-31.8-8.52,9.09v22.71H266.9V700.43Z" transform="translate(-24.99 -231.95)"/><path class="cls-2" d="M343.56,700.43H360v59.06h36.91v14.76H343.56Z" transform="translate(-24.99 -231.95)"/><path class="cls-2" d="M410,700.43h16.47v73.82H410Z" transform="translate(-24.99 -231.95)"/><path class="cls-2" d="M444.64,700.43h16.47V732.8l30.09-32.37h19.88L481,731.67l31.8,42.58H493.47l-22.71-31.8-8.52,9.09v22.71H445.77V700.43Z" transform="translate(-24.99 -231.95)"/><path class="cls-2" d="M579.22,699.87H594l31.8,74.38h-17l-6.82-16.46H570.7l-6.81,16.46H547.42Zm17,43.72-9.66-23.85L577,743.59Z" transform="translate(-24.99 -231.95)"/><path class="cls-2" d="M637.71,700.43h14.76l34.64,45.43V700.43H703v73.82H689.38l-35.77-47.13v47.13h-15.9Z" transform="translate(-24.99 -231.95)"/><path class="cls-2" d="M721.18,700.43h16.47V732.8l30.1-32.37h19.87l-30.09,31.24,31.8,42.58H768.88l-22.71-31.8-8.52,9.09v22.71H721.18Z" transform="translate(-24.99 -231.95)"/><path class="cls-2" d="M798.41,700.43h55.65V715.2H814.31V730H849v14.77H814.31v15.33h40.32v14.76H798.41V700.43Z" transform="translate(-24.99 -231.95)"/><path class="cls-2" d="M886.43,715.2H863.71V700.43H925V715.2H902.33v59H885.86Z" transform="translate(-24.99 -231.95)"/><path class="cls-2" d="M953.44,699.87H968.2l31.8,74.38H983l-6.81-16.46H944.92l-6.82,16.46H922.2ZM971,743.59l-9.65-23.85-9.66,23.85Z" transform="translate(-24.99 -231.95)"/></svg>
<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="549.92126" height="291.79956" viewBox="0 0 549.92126 291.79956">
<g>
<path d="M43.07422,271.80665V271.691c0-11.48817,9.06377-20.899,21.53375-20.899,12.471,0,21.419,9.29513,21.419,20.7833v.11568c0,11.48914-9.06377,20.89994-21.53375,20.89994C52.02231,292.59091,43.07422,283.29578,43.07422,271.80665Zm33.65766,0V271.691c0-6.92809-5.08014-12.70134-12.23862-12.70134-7.15944,0-12.12391,5.65854-12.12391,12.58566v.11568c0,6.92809,5.08014,12.70133,12.23862,12.70133C71.76742,284.3923,76.73188,278.73474,76.73188,271.80665Z" style="fill: #0082ff"/>
<path d="M89.14548,251.48509h8.19861l18.93632,24.8826v-24.8826h8.77507v40.41272h-7.56384l-19.5711-25.69138v25.69138H89.14548Z" style="fill: #0082ff"/>
<path d="M129.96356,251.48509h30.48282V259.394H138.796v8.19861h19.053v7.90893H138.796v8.48635h21.93911v7.9099H129.96356Z" style="fill: #0082ff"/>
<path d="M162.06394,271.80665V271.691c0-11.48817,8.65938-20.899,21.073-20.899,7.62022,0,12.1803,2.54007,15.93354,6.235l-5.65757,6.5237c-3.11749-2.82878-6.29331-4.56105-10.33429-4.56105-6.81241,0-11.71952,5.65854-11.71952,12.58566v.11568c0,6.92809,4.79143,12.70133,11.71952,12.70133,4.6184,0,7.44816-1.847,10.623-4.73408l5.65756,5.71589c-4.15666,4.44537-8.776,7.2168-16.56928,7.2168A20.3987,20.3987,0,0,1,162.06394,271.80665Z" style="fill: #707070"/>
<path d="M201.66885,251.48509h8.89074v32.32979h20.14949v8.08293H201.66885Z" style="fill: #707070"/>
<path d="M233.01877,251.48509h8.89074v40.41272h-8.89074Z" style="fill: #707070"/>
<path d="M245.43042,271.80665V271.691c0-11.48817,8.66133-20.899,21.073-20.899,7.62119,0,12.18224,2.54007,15.93451,6.235l-5.65757,6.5237c-3.11749-2.82878-6.29331-4.56105-10.33429-4.56105-6.81241,0-11.7205,5.65854-11.7205,12.58566v.11568c0,6.92809,4.79241,12.70133,11.7205,12.70133,4.6184,0,7.44718-1.847,10.623-4.73408l5.65757,5.71589c-4.15666,4.44537-8.77506,7.2168-16.56928,7.2168A20.4001,20.4001,0,0,1,245.43042,271.80665Z" style="fill: #707070"/>
<path d="M285.03631,251.48509h8.89074v17.6658l16.39625-17.6658H321.062L304.60741,268.6318l17.205,23.266H311.13111l-12.52733-17.20406-4.67673,4.84879v12.35527h-8.89074Z" style="fill: #707070"/>
<path d="M332.14673,286.00889l5.25415-6.29234c3.63659,3.00181,7.44719,4.90711,12.06559,4.90711,3.63756,0,5.83157-1.44355,5.83157-3.8106v-.11567c0-2.25137-1.3862-3.40621-8.14028-5.13847-8.14029-2.07833-13.39444-4.3297-13.39444-12.3543v-.11568c0-7.33248,5.88892-12.18127,14.14489-12.18127a23.39143,23.39143,0,0,1,15.01,5.1375l-4.6184,6.6977c-3.57924-2.48272-7.10112-3.98362-10.50733-3.98362s-5.19582,1.55826-5.19582,3.52188v.11471c0,2.65575,1.73129,3.52188,8.7177,5.3115,8.19764,2.13666,12.81605,5.08112,12.81605,12.12391v.11568c0,8.02461-6.11931,12.52831-14.837,12.52831A25.71954,25.71954,0,0,1,332.14673,286.00889Z" style="fill: #707070"/>
<path d="M366.44209,274.57808v-23.093h8.89074v22.86163c0,6.582,3.29052,9.98823,8.71771,9.98823,5.42621,0,8.7177-3.29053,8.7177-9.69952V251.48509H401.659v22.80428c0,12.23959-6.87073,18.24322-17.72412,18.24322C373.08049,292.53259,366.44209,286.47063,366.44209,274.57808Z" style="fill: #707070"/>
<path d="M405.93132,251.48509H424.4059c5.13847,0,9.1221,1.44259,11.77785,4.09834a12.68824,12.68824,0,0,1,3.46356,9.23777v.11568c0,6.5237-3.52188,10.622-8.66035,12.52733l9.87255,14.4336H430.46786l-8.66035-12.93269h-6.98545v12.93269h-8.89074Zm17.89716,19.62846c4.32969,0,6.81241-2.30872,6.81241-5.71493V265.283c0-3.8106-2.65575-5.77325-6.98544-5.77325h-8.83339v11.60385Z" style="fill: #707070"/>
<path d="M438.26305,251.48509h9.8152l10.56468,28.46184,10.56566-28.46184h9.58384l-16.3389,40.70143H454.602Z" style="fill: #707070"/>
<path d="M480.236,251.48509H510.7188V259.394H489.06937v8.19861h19.051v7.90893h-19.051v8.48635h21.93814v7.9099H480.236Z" style="fill: #707070"/>
<path d="M525.50041,275.96331l-15.53012-24.47822h10.39164l9.6412,16.22225,9.8152-16.22225h10.10293l-15.53011,24.30518v16.10754h-8.89074Z" style="fill: #707070"/>
</g>
<g>
<path d="M88.24409,0V230.3973H46.5287V21.82037H0V0Z" style="fill: #0082ff"/>
<g>
<rect x="118.40753" width="39.79004" height="230.39728" style="fill: #707070"/>
<path d="M434.16089,0H378.32642L300.21021,202.48206,214.032,112.63153,322.49194,0H274.67975L166.86157,112.63153l111.348,117.76575h51.02118l17.007-45.566h119.691l17.00708,45.566h40.43189ZM354.58081,163.01086,406.24365,26.31281l51.342,136.69805Z" style="fill: #707070"/>
</g>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

22
public/img/logo/1ka_logo_namestitev.svg Normal file
View File

@ -0,0 +1,22 @@
<svg width="550" height="292" viewBox="0 0 550 292" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_207_2)">
<path d="M45.5531 251.412H53.7884L72.8119 276.409V251.412H81.6283V292.011H74.0306L54.3685 266.201V292.011H45.5531V251.412Z" fill="#707070"/>
<path d="M105.292 251.122H113.528L130.927 292.011H121.589L117.877 282.905H100.71L96.9984 292.011H87.892L105.292 251.122ZM114.688 275.018L109.294 261.852L103.9 275.018H114.688Z" fill="#707070"/>
<path d="M137.192 251.412H146.82L157.492 268.579L168.162 251.412H177.79V292.011H168.916V265.505L157.492 282.847H157.259L145.95 265.68V292.011H137.192V251.412Z" fill="#707070"/>
<path d="M187.536 251.412H218.159V259.358H196.41V267.594H215.548V275.539H196.41V284.065H218.449V292.011H187.536V251.412Z" fill="#707070"/>
<path d="M223.612 286.095L228.89 279.774C232.543 282.789 236.371 284.703 241.011 284.703C244.665 284.703 246.87 283.253 246.87 280.875V280.759C246.87 278.497 245.477 277.337 238.692 275.597C230.514 273.509 225.236 271.247 225.236 263.186V263.069C225.236 255.703 231.152 250.832 239.446 250.832C244.92 250.743 250.253 252.569 254.525 255.993L249.885 262.722C246.289 260.228 242.751 258.72 239.33 258.72C235.908 258.72 234.11 260.285 234.11 262.258V262.373C234.11 265.041 235.849 265.911 242.868 267.709C251.103 269.856 255.743 272.814 255.743 279.889V280.005C255.743 288.066 249.595 292.591 240.837 292.591C234.493 292.614 228.361 290.302 223.612 286.095V286.095Z" fill="#707070"/>
<path d="M272.099 259.648H259.745V251.412H293.385V259.648H281.032V292.011H272.099V259.648Z" fill="#707070"/>
<path d="M300.636 251.412H309.568V292.011H300.636V251.412Z" fill="#707070"/>
<path d="M329.171 259.648H316.818V251.412H350.457V259.648H338.104V292.011H329.171V259.648Z" fill="#707070"/>
<path d="M357.302 251.412H387.925V259.358H366.176V267.594H385.315V275.539H366.176V284.065H388.215V292.011H357.302V251.412Z" fill="#707070"/>
<path d="M392.682 251.412H402.542L413.156 280.005L423.77 251.412H433.398L416.984 292.301H409.096L392.682 251.412Z" fill="#707070"/>
<path d="M88.2441 0V230.397H46.5287V21.8204H0V0H88.2441Z" fill="#707070"/>
<path d="M158.198 0H118.407V230.397H158.198V0Z" fill="#707070"/>
<path d="M434.161 0H378.326L300.21 202.482L214.032 112.632L322.492 0H274.68L166.861 112.632L278.209 230.397H329.231L346.238 184.831H465.929L482.936 230.397H523.368L434.161 0ZM354.581 163.011L406.244 26.3128L457.586 163.011H354.581Z" fill="#707070"/>
</g>
<defs>
<clipPath id="clip0_207_2">
<rect width="549.921" height="291.8" fill="white"/>
</clipPath>
</defs>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

24
public/img/logo/1ka_logo_slo.svg
View File

@ -1 +1,23 @@
<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 975.01 542.87"><defs><style>.cls-1{fill:#0082ff;}.cls-2{fill:#707070;}</style></defs><title>1ka_logo</title><path class="cls-1" d="M181.15,232V639.67H107.33V270.57H25V232Z" transform="translate(-24.99 -231.95)"/><path class="cls-2" d="M234.53,232H305V639.67H234.53Zm276.55,0h84.61L403.75,431.27l199.89,208.4H517.32l-197-208.4Z" transform="translate(-24.99 -231.95)"/><path class="cls-2" d="M879.61,639.67,849.52,559H637.71l-30.1,80.63H537.2L694.49,232H793.3L951.16,639.67ZM652.47,520.42H834.75L743.9,278.52Z" transform="translate(-24.99 -231.95)"/><path class="cls-1" d="M111.88,700.43h55.65V715.2H127.78V730h34.63v14.77H127.78v15.33h40.31v14.76H111.88Z" transform="translate(-24.99 -231.95)"/><path class="cls-1" d="M182.86,700.43h14.76l34.64,45.43V700.43h15.9v73.82H235.1l-35.77-47.13v47.13h-15.9V700.43Z" transform="translate(-24.99 -231.95)"/><path class="cls-2" d="M266.33,700.43H282.8V732.8l30.1-32.37h19.87l-30.1,31.24,31.8,42.58H314.6l-22.71-31.8-8.52,9.09v22.71H266.9V700.43Z" transform="translate(-24.99 -231.95)"/><path class="cls-2" d="M343.56,700.43H360v59.06h36.91v14.76H343.56Z" transform="translate(-24.99 -231.95)"/><path class="cls-2" d="M410,700.43h16.47v73.82H410Z" transform="translate(-24.99 -231.95)"/><path class="cls-2" d="M444.64,700.43h16.47V732.8l30.09-32.37h19.88L481,731.67l31.8,42.58H493.47l-22.71-31.8-8.52,9.09v22.71H445.77V700.43Z" transform="translate(-24.99 -231.95)"/><path class="cls-2" d="M579.22,699.87H594l31.8,74.38h-17l-6.82-16.46H570.7l-6.81,16.46H547.42Zm17,43.72-9.66-23.85L577,743.59Z" transform="translate(-24.99 -231.95)"/><path class="cls-2" d="M637.71,700.43h14.76l34.64,45.43V700.43H703v73.82H689.38l-35.77-47.13v47.13h-15.9Z" transform="translate(-24.99 -231.95)"/><path class="cls-2" d="M721.18,700.43h16.47V732.8l30.1-32.37h19.87l-30.09,31.24,31.8,42.58H768.88l-22.71-31.8-8.52,9.09v22.71H721.18Z" transform="translate(-24.99 -231.95)"/><path class="cls-2" d="M798.41,700.43h55.65V715.2H814.31V730H849v14.77H814.31v15.33h40.32v14.76H798.41V700.43Z" transform="translate(-24.99 -231.95)"/><path class="cls-2" d="M886.43,715.2H863.71V700.43H925V715.2H902.33v59H885.86Z" transform="translate(-24.99 -231.95)"/><path class="cls-2" d="M953.44,699.87H968.2l31.8,74.38H983l-6.81-16.46H944.92l-6.82,16.46H922.2ZM971,743.59l-9.65-23.85-9.66,23.85Z" transform="translate(-24.99 -231.95)"/></svg>
<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="549.92126" height="291.79956" viewBox="0 0 549.92126 291.79956">
<g>
<path d="M45.35432,250.5385h31.719v8.23241H54.54547v8.53079H74.37078v8.2276H54.54547v8.82919h22.8287v8.23242H45.35432Z" style="fill: #0082ff"/>
<path d="M85.62615,250.5385H94.157l19.70541,25.89079V250.5385h9.13v42.05235H115.122L94.7586,265.85874v26.73211H85.62615Z" style="fill: #0082ff"/>
<path d="M133.1105,250.5385h9.25231v18.38231l17.0616-18.38231h11.17222l-17.1203,17.84425,17.90294,24.2081h-11.116L147.2274,274.6879l-4.86461,5.048v12.85489h-9.2523Z" style="fill: #707070"/>
<path d="M176.9874,250.5385h9.2523v33.64378h20.965v8.40851H176.9874Z" style="fill: #707070"/>
<path d="M214.61292,250.5385h9.2523v42.05235h-9.2523Z" style="fill: #707070"/>
<path d="M234.38686,250.5385h9.2523v18.38231l17.06158-18.38231H271.873L254.7527,268.38275l17.90294,24.2081H261.54208L248.50375,274.6879l-4.86461,5.048v12.85489h-9.2523Z" style="fill: #707070"/>
<path d="M310.71158,250.24013h8.53079l18.02277,42.35072h-9.673L323.74741,283.16H305.9668l-3.84473,9.43084h-9.43085Zm9.73166,24.751-5.58612-13.63754L309.271,274.99118Z" style="fill: #707070"/>
<path d="M343.7782,250.5385H352.309l19.70548,25.89079V250.5385h9.13v42.05235H373.274l-20.36338-26.73211v26.73211h-9.13244Z" style="fill: #707070"/>
<path d="M391.26257,250.5385h9.25229v18.38231l17.06162-18.38231h11.17221l-17.1203,17.84425,17.90295,24.2081H418.41782L405.37949,274.6879l-4.86463,5.048v12.85489h-9.25229Z" style="fill: #707070"/>
<path d="M435.13943,250.5385h31.719v8.23241H444.3306v8.53079h19.82528v8.2276H444.3306v8.82919h22.8287v8.23242H435.13943Z" style="fill: #707070"/>
<path d="M485.20407,259.06931H472.4079v-8.53079h34.84222v8.53079H494.45639v33.52154H485.2041Z" style="fill: #707070"/>
<path d="M523.36768,250.24013h8.53082l18.02276,42.35072h-9.673L536.40356,283.16H518.62292l-3.84472,9.43084h-9.43329Zm9.73169,24.751-5.58613-13.63754-5.58612,13.63754Z" style="fill: #707070"/>
</g>
<g>
<path d="M88.24409,0V230.3973H46.5287V21.82037H0V0Z" style="fill: #0082ff"/>
<g>
<rect x="118.40753" width="39.79004" height="230.39728" style="fill: #707070"/>
<path d="M434.16089,0H378.32648L300.21014,202.48206,214.032,112.63153,322.492,0H274.67975L166.86157,112.63153l111.348,117.76575h51.02112l17.007-45.566h119.6911l17.007,45.566h40.43189ZM354.58081,163.01086l51.6629-136.69805,51.342,136.69805Z" style="fill: #707070"/>
</g>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

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

@ -23,11 +23,16 @@ header #top_line{
background-image: url(../img/logo/1ka_logo_slo.svg);
background-repeat: no-repeat;
background-size: contain;
}
&.english a{
background-image: url(../img/logo/1ka_logo_eng.svg);
}
&.namestitev a{
background-image: url(../img/logo/1ka_logo_namestitev.svg);
}
}