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

AAI naslovnica - design prenesen v scss, popravki povezav, gdpr-ja

Browse Source
This commit is contained in:
pero1203 2022-06-20 11:56:54 +02:00
parent e943e7cc7b
commit 3900abc7ff
10 changed files with 1706 additions and 1040 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
admin/survey/classes/class.GDPR.php
View File

@ -1985,8 +1985,7 @@ class GDPR{
// Poslji prosnjo
echo ' <p>'.$lang['srv_gdpr_drupal_end'].'</p>';
//echo ' <input name="submit" value="'.$lang['srv_potrdi'].'" class="regfield" type="submit"><br />';
echo ' <input name="submit" value="'.$lang['srv_potrdi'].'" class="regfield" type="button" onClick="sendGDPRRequest();"><br />';
echo ' <input name="submit" value="'.$lang['srv_potrdi2'].'" class="regfield" type="button" onClick="sendGDPRRequest();">';
echo ' </form>';
}

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

@ -475,42 +475,45 @@ class DisplayController{
echo '<img class="povezave_img" src="public/img/icons/icon_kako_deluje.svg" alt="kako deluje">';
echo '<h2>'.$lang["povezave__kako_deluje_h2"].'</h2>';
echo '<p> '.$lang["povezave__kako_deluje_text"].' </p>';
echo '<a id="povezave-btn"href="https://www.1ka.si/d/sl/pomoc"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
if($lang['id'] == '1')
echo '<a id="povezave-btn"href="https://www.1ka.si/d/sl/pomoc" target="_blank"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
else
echo '<a id="povezave-btn"href="https://www.1ka.si/d/en/help" target="_blank"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
echo '</div>';
echo '<div class= "col"> ';
echo '<img class="povezave_img" src="public/img/icons/icon_o_1ka.svg" alt="o 1ka">';
echo '<h2>'.$lang["povezave_o_1ka_h2"].'</h2>';
echo '<p> '.$lang["povezave_o_1ka_text"].' </p>';
echo ' <a id="povezave-btn" href="https://www.1ka.si/d/sl/o-1ka/splosen-opis"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
if($lang['id'] == '1')
echo ' <a id="povezave-btn" href="https://www.1ka.si/d/sl/o-1ka/splosen-opis" target="_blank"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
else
echo ' <a id="povezave-btn" href="https://www.1ka.si/d/en/about/general-description" target="_blank"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
echo '</div>';
echo '<div class= "col"> ';
echo '<img class="povezave_img" src="public/img/icons/icon_1ka_podpora.svg" alt="1ka podpora">';
echo '<h2>'.$lang["povezave_1ka_podpora_h2"].'</h2>';
echo '<p> '.$lang["povezave_1ka_podpora_text"].' </p>';
echo ' <a id="povezave-btn" href="https://www.1ka.si/d/sl/pomoc"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
if($lang['id'] == '1')
echo ' <a id="povezave-btn" href="https://www.1ka.si/help1KA" target="_blank"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
else
echo ' <a id="povezave-btn" href="https://www.1ka.si/a/72864?Q1=292032&language=2" target="_blank"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
echo '</div>';
echo '<div class= "col"> ';
echo '<img class="povezave_img" src="public/img/icons/icon_arnes_podpora.svg" alt="arnes podpora">';
echo '<h2>'.$lang["povezave_arnes_podpora_h2"].'</h2>';
echo '<p> '.$lang["povezave_arnes_podpora_text"].' </p>';
echo ' <a id="povezave-btn" href="https://www.arnes.si/zavod-arnes/kontakti/"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
if($lang['id'] == '1')
echo ' <a id="povezave-btn" href="https://www.arnes.si/zavod-arnes/kontakti/" target="_blank"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
else
echo ' <a id="povezave-btn" href="https://www.arnes.si/about-arnes/contact-us/" target="_blank"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
echo '</div>';
echo '</div>';
echo '</div>';
echo '</div>';
// APP SUBTITLE
/*echo '<div class="app_subtitle">';
echo $lang['app_aai_installation'];
echo '</div>';*/
echo '</div>';
}
// Izris okna za login na prvi strani

1513
frontend/simple/css/aai.css
View File

File diff suppressed because it is too large Load Diff

83
frontend/simple/css/style.css
View File

@ -273,13 +273,6 @@ footer .footer_content .col .logo_holder img {
background-color: #4ca0ea;
}
.aai .cookie_notice button {
background-color: #e35205;
}
.aai .cookie_notice button:hover {
background-color: #fa6c21;
}
body.landing_page #main,
body.register #main,
body.login #main,
@ -723,82 +716,6 @@ body.reset_password_activate div.label {
}
/******************************/
body.landing_page #content.aai #main,
body.register #content.aai #main,
body.login #content.aai #main,
body.login_noEmail #content.aai #main {
min-height: auto;
background-image: url("../img/landing_page_image_aai.png");
}
body.landing_page #content.aai #main .landing_page_window,
body.register #content.aai #main .landing_page_window,
body.login #content.aai #main .landing_page_window,
body.login_noEmail #content.aai #main .landing_page_window {
width: 500px;
padding: 50px;
margin-top: 70px;
text-align: center;
box-shadow: 1px 1px 4px 1px #999;
}
body.landing_page #content.aai #main .landing_page_window .app_title,
body.register #content.aai #main .landing_page_window .app_title,
body.login #content.aai #main .landing_page_window .app_title,
body.login_noEmail #content.aai #main .landing_page_window .app_title {
width: 500px;
margin: 0;
color: #333;
}
body.landing_page #content.aai #main .landing_page_window .arnes_logo,
body.register #content.aai #main .landing_page_window .arnes_logo,
body.login #content.aai #main .landing_page_window .arnes_logo,
body.login_noEmail #content.aai #main .landing_page_window .arnes_logo {
margin: 30px 0;
}
body.landing_page #content.aai #main .landing_page_window .arnes_logo img,
body.register #content.aai #main .landing_page_window .arnes_logo img,
body.login #content.aai #main .landing_page_window .arnes_logo img,
body.login_noEmail #content.aai #main .landing_page_window .arnes_logo img {
width: 200px;
height: auto;
}
body.landing_page #content.aai #main .landing_page_window .tab,
body.register #content.aai #main .landing_page_window .tab,
body.login #content.aai #main .landing_page_window .tab,
body.login_noEmail #content.aai #main .landing_page_window .tab {
font-size: 16px;
text-transform: none;
line-height: 24px;
}
body.landing_page #content.aai #main .landing_page_window input[type=button],
body.register #content.aai #main .landing_page_window input[type=button],
body.login #content.aai #main .landing_page_window input[type=button],
body.login_noEmail #content.aai #main .landing_page_window input[type=button] {
width: auto;
padding: 18px 30px;
margin: 30px 0 10px 0;
font-weight: 600;
text-transform: none;
background-color: #e35205;
border-radius: 5px;
}
body.landing_page #content.aai #main .landing_page_window input[type=button]:hover,
body.register #content.aai #main .landing_page_window input[type=button]:hover,
body.login #content.aai #main .landing_page_window input[type=button]:hover,
body.login_noEmail #content.aai #main .landing_page_window input[type=button]:hover {
background-color: #fa6c21;
}
body.landing_page #content.aai #main .app_subtitle,
body.register #content.aai #main .app_subtitle,
body.login #content.aai #main .app_subtitle,
body.login_noEmail #content.aai #main .app_subtitle {
width: 500px;
margin: 10px auto;
color: #333;
font-size: 20px;
font-weight: 600;
text-shadow: none;
}
/* Mobile prilagoditve */
@media screen and (max-width: 700px) {
header nav {

1
lang/1.php
View File

@ -2355,6 +2355,7 @@ $lang = array (
"srv_statistics_edit" => "Uvodni tekst h rezultatom",
"srv_zapri" => "Zapri",
"srv_potrdi" => "Potrdi",
"srv_potrdi2" => "Potrdi",
"srv_potrdi_new" => "Ustvari novo anketo",
"srv_create_new" => "Kreiraj",
"srv_create_survey" => "Ustvari Anketo",

1
lang/2.php
View File

@ -2340,6 +2340,7 @@ $lang = array (
"srv_statistics_edit" => "Intro text for results",
"srv_zapri" => "Close",
"srv_potrdi" => "Confirm",
"srv_potrdi2" => "Submit",
"srv_potrdi_new" => "Confirm",
"srv_create_new" => "Create",
"srv_create_survey" => "Create Survey",

1031
resources/sass/frontend_simple/aai.scss Normal file
View File

File diff suppressed because it is too large Load Diff

69
resources/sass/frontend_simple/modules/aai.scss
View File

@ -1,69 +0,0 @@
body.landing_page,
body.register,
body.login,
body.login_noEmail{
#content.aai #main{
min-height: auto;
background-image: url("../img/landing_page_image_aai.png");
.landing_page_window{
width: 500px;
padding: 50px;
margin-top: 70px;
text-align: center;
box-shadow: 1px 1px 4px 1px #999;
.app_title{
width: 500px;
margin: 0;
color: #333;
}
.arnes_logo{
margin: 30px 0;
img{
width: 200px;
height: auto;
}
}
.tab{
font-size: 16px;
text-transform: none;
line-height: 24px;
}
input[type="button"]{
width: auto;
padding: 18px 30px;
margin: 30px 0 10px 0;
font-weight: 600;
text-transform: none;
background-color: rgb(227, 82, 5);
border-radius: 5px;
&:hover{
background-color: lighten(rgb(227, 82, 5), 10%);
}
}
}
.app_subtitle{
width: 500px;
margin: 10px auto;
color: #333;
font-size: 20px;
font-weight: 600;
text-shadow: none;
}
}
}

11
resources/sass/frontend_simple/modules/cookie.scss
View File

@ -53,14 +53,3 @@
}
}
}
.aai .cookie_notice{
button{
background-color: #e35205;
&:hover{
background-color: #fa6c21;
}
}
}

3
resources/sass/frontend_simple/style.scss
View File

@ -23,9 +23,6 @@
@import "./modules/landing_page.scss";
@import "./modules/pages.scss";
// AAI
@import "./modules/aai.scss";
// Mobile popravki
@import "./basic/mobile.scss";