ai popravki blalblab

This commit is contained in:
DESKTOP-B5Q2TUL\Win10 2022-05-27 10:03:52 +02:00
parent ad81009446
commit cb83387a1c

View File

@ -73,7 +73,7 @@ class DisplayController{
echo ' <meta name = "viewport" content = "user-scalable=no, initial-scale=1.0, maximum-scale=1.0, width=device-width">'; echo ' <meta name = "viewport" content = "user-scalable=no, initial-scale=1.0, maximum-scale=1.0, width=device-width">';
echo ' <meta name="keywords" content="web survey software, internet survey, online survey, web questionaires">'; echo ' <meta name="keywords" content="web survey software, internet survey, online survey, web questionaires">';
echo ' <meta name="keywords" content="spletne ankete, spletna anketa, spletno anketiranje, internetne ankete, slovenščina, slovenski jezik, software, softver, programska oprema, orodje za spletne ankete, internetno anketiranje, online vprašalniki, ankete po internetu, internet, internetne ankete, anketa" lang="si">'; echo ' <meta name="keywords" content="spletne , spletna anketa, spletno anketiranje, internetne ankete, slovenščina, slovenski jezik, software, softver, programska oprema, orodje za spletne ankete, internetno anketiranje, online vprašalniki, ankete po internetu, internet, internetne ankete, anketa" lang="si">';
echo ' <meta name="description" content="1KA je orodje za spletne ankete, hkrati pa je tudi on-line platforma (gostitelj), na kateri se lahko spletna anketa brezplačno izdela.">'; echo ' <meta name="description" content="1KA je orodje za spletne ankete, hkrati pa je tudi on-line platforma (gostitelj), na kateri se lahko spletna anketa brezplačno izdela.">';
echo ' <meta name="abstract" content="1KA je orodje za spletne ankete">'; echo ' <meta name="abstract" content="1KA je orodje za spletne ankete">';
echo ' <meta name="author" content="CDI, FDV">'; echo ' <meta name="author" content="CDI, FDV">';
@ -94,6 +94,9 @@ class DisplayController{
echo ' <!-- CSS -->'; echo ' <!-- CSS -->';
echo ' <link type="text/css" href="'.$site_url.'frontend/simple/css/style.css" rel="stylesheet" />'; echo ' <link type="text/css" href="'.$site_url.'frontend/simple/css/style.css" rel="stylesheet" />';
if(isAAI()){
echo ' <link type="text/css" href="'.$site_url.'frontend/simple/css/aai.css" rel="stylesheet" />';
}
echo ' <link type="text/css" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/themes/smoothness/jquery-ui.css" rel="stylesheet" /">'; echo ' <link type="text/css" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/themes/smoothness/jquery-ui.css" rel="stylesheet" /">';
echo ' <!-- JAVASCRIPT -->'; echo ' <!-- JAVASCRIPT -->';
@ -119,7 +122,7 @@ class DisplayController{
echo '<div class="logo ">'; echo '<div class="logo ">';
echo ' <a href="'.$site_url.$this->root.'index.php">'; echo ' <a href="'.$site_url.$this->root.'index.php">';
echo ' <img src="'.$site_url.'/public/img/logo/1ka_logo_namestitev.svg">'; echo ' <img src="'.$site_url.'/public/img/logo/1ka_'.($this->lang_id != 1 ? 'eng' : 'slo').'.svg">';
if(isAAI()){ if(isAAI()){
echo ' <img src="'.$site_url.'/public/img/logo/arnes_logo.png" style="margin-left:30px;">'; echo ' <img src="'.$site_url.'/public/img/logo/arnes_logo.png" style="margin-left:30px;">';
} }
@ -128,8 +131,57 @@ class DisplayController{
echo '</div>'; echo '</div>';
echo '<div class="mobile">';
echo ' <div id="nav-icon3">';
echo ' <span></span> ';
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">' ;
// GDPR zahtevek je prisoten samo na virtualkah in na lastno zahtevo
echo '<span class="menu_item '.($this->stran == 'gdpr' ? 'active' : '').'">';
echo ' <a href="index.php?a=gdpr">'.$lang['srv_gdpr_drupal_tab'].'</a>';
echo '</span>';
// Preklop jezika
echo '<span class="menu_item lang_switch">';
$params = '?' . (isset($_GET['a']) ? 'a='.$_GET['a'].'&' : '') . (isset($_GET['b']) ? 'b='.$_GET['b'].'&' : '');
if($this->lang_id == 1){
echo ' <a href="'.$site_url.$this->root.'index.php'.$params.'lang_id=1">';
echo ' <div class="flag eng">'.$lang['lang_flag'].' </div> ';
echo ' </a>';
}
else{
echo ' <a href="'.$site_url.$this->root.'index.php'.$params.'lang_id=2">';
echo ' <div class="flag eng">'.$lang['lang_flag'].' </div> ';
echo ' </a>';
}
echo '</span>';
// AAI PRIJAVA
echo '<span class="menu_item ">';
echo '<a id="header-btn" href="https://idp.uni-lj.si/simplesaml/module.php/core/loginuserpassorg.php?AuthState=_37d7b155b8685940ef2887cd2c204e1cd9f46213e8%3Ahttps%3A%2F%2Fidp.uni-lj.si%2Fsimplesaml%2Fsaml2%2Fidp%2FSSOService.php%3Fspentityid%3Dhttps%253A%252F%252F1ka.arnes.si%252Fsp%252F202005292157%26RelayState%3Dcookie%253A1650096713_0820%26cookieTime%3D1650096713c>">'.$lang['AAI_prijava'].' </a> ';
echo '</span>';
echo '</div>';
echo '</div>';
echo '<script type="text/javascript" src="frontend/simple/script/nav-mobile.js"></script> ';
// Navigacija // Navigacija
echo '<nav>'; echo '<nav class=nav-desktop>';
// Hidden polje z lang_id-jem // Hidden polje z lang_id-jem
echo ' <input type="hidden" name="lang_id" value="'.$this->lang_id.'" />'; echo ' <input type="hidden" name="lang_id" value="'.$this->lang_id.'" />';
@ -144,17 +196,28 @@ class DisplayController{
$params = '?' . (isset($_GET['a']) ? 'a='.$_GET['a'].'&' : '') . (isset($_GET['b']) ? 'b='.$_GET['b'].'&' : ''); $params = '?' . (isset($_GET['a']) ? 'a='.$_GET['a'].'&' : '') . (isset($_GET['b']) ? 'b='.$_GET['b'].'&' : '');
if($this->lang_id == 1){ if($this->lang_id == 1){
echo ' <a href="'.$site_url.$this->root.'index.php'.$params.'lang_id=2">'; echo ' <a href="'.$site_url.$this->root.'index.php'.$params.'lang_id=2">';
echo ' <div class="flag eng"></div> <span>English</span>'; echo ' <div class= "flag" >'.$lang['lang_flag'].' </div> ';
echo ' </a>'; echo ' </a>';
} }
else{ else{
echo ' <a href="'.$site_url.$this->root.'index.php'.$params.'lang_id=1">'; echo ' <a href="'.$site_url.$this->root.'index.php'.$params.'lang_id=1">';
echo ' <div class="flag slo"></div> <span>Slovenščina</span>'; echo ' <div class = "flag" > <img src="public/img/flags/english_flag.svg" alt="english flag"> <span>SLO</span> </div> ';
echo '</a>'; echo '</a>';
} }
echo '</span>'; echo '</span>';
// AAI PRIJAVA
echo '<span class="menu_item ">';
echo '<a id="header-btn" href="https://idp.uni-lj.si/simplesaml/module.php/core/loginuserpassorg.php?AuthState=_37d7b155b8685940ef2887cd2c204e1cd9f46213e8%3Ahttps%3A%2F%2Fidp.uni-lj.si%2Fsimplesaml%2Fsaml2%2Fidp%2FSSOService.php%3Fspentityid%3Dhttps%253A%252F%252F1ka.arnes.si%252Fsp%252F202005292157%26RelayState%3Dcookie%253A1650096713_0820%26cookieTime%3D1650096713c>">'.$lang['AAI_prijava'].' </a> ';
echo '</span>';
echo '</nav>'; echo '</nav>';
} }
// Izris vsebine // Izris vsebine
@ -232,48 +295,63 @@ class DisplayController{
// Izris footerja // Izris footerja
public function displayFooter(){ public function displayFooter(){
global $lang; global $lang;
global $site_url;
// Stolpec 1 // Stolpec 1
echo '<div class="col">'; echo '<div class="col col1">';
echo ' <h2>'.$lang['simple_footer_about'].'</h2>'; echo ' <h2>'.$lang['simple_footer_about'].'</h2>';
echo ' <span>'.$lang['simple_footer_about_1ka'].'</span>'; echo '<div class="col1-flex">';
if(isAAI()) echo ' <span>'.$lang['simple_footer_about_1ka'].'</span>';
echo ' <span>'.$lang['simple_footer_about_faq'].'</span>'; if(isAAI())
echo ' <span>'.$lang['simple_footer_about_general'].'</span>'; echo ' <span>'.$lang['simple_footer_about_faq'].'</span>';
echo ' <span>'.$lang['simple_footer_about_privacy'].'</span>'; echo ' <span>'.$lang['simple_footer_about_general'].'</span>';
echo ' <span>'.$lang['simple_footer_about_cookies'].'</span>'; echo ' <span>'.$lang['simple_footer_about_privacy'].'</span>';
echo ' <span>'.$lang['simple_footer_about_antispam'].'</span>'; echo ' <span>'.$lang['simple_footer_about_cookies'].'</span>';
echo ' <div class="follow">'.$lang['simple_footer_about_follow'].': '; echo ' <span>'.$lang['simple_footer_about_antispam'].'</span>';
echo ' <a href="https://twitter.com/enklikanketa" target="_blank"><span class="icon twitter"></span></a>'; // echo ' <div class="follow">'.$lang['simple_footer_about_follow'].': ';
echo ' <a href="https://www.facebook.com/1KA-123545614388521/" target="_blank"><span class="icon fb"></span></a>'; // echo ' <a href="https://twitter.com/enklikanketa" target="_blank"><span class="icon twitter"></span></a>';
echo ' </div>'; // echo ' <a href="https://www.facebook.com/1KA-123545614388521/" target="_blank"><span class="icon fb"></span></a>';
// echo ' </div>';
echo '</div>';
echo '</div>'; echo '</div>';
// Stolpec 2 // Stolpec 2
echo '<div class="col">'; echo '<div class="col col2">';
echo ' <h2>'.$lang['simple_footer_company'].'</h2>'; echo ' <h2>'.$lang['simple_footer_company'].'</h2>';
if(isAAI()) {
echo ' <span><a href="https://www.arnes.si/">Arnes</a></span>'; echo ' <a href="https://1ka.arnes.si/"> Arnes </a>';
}
else { echo ' <span class="semi-bold">'.AppSettings::getInstance()->getSetting('app_settings-owner').'</span>';
echo ' <h2>'.$lang['simple_footer_company'].'</h2>'; echo ' <span><a href="mailto:'.AppSettings::getInstance()->getSetting('app_settings-admin_email').'">'.AppSettings::getInstance()->getSetting('app_settings-admin_email').'</a></span>';
echo ' <span class="semi-bold">'.AppSettings::getInstance()->getSetting('app_settings-owner').'</span>'; echo ' <span><a href="'.AppSettings::getInstance()->getSetting('app_settings-owner_website').'" target="_blank">'.AppSettings::getInstance()->getSetting('app_settings-owner_website').'</a></span>';
echo ' <span><a href="mailto:'.AppSettings::getInstance()->getSetting('app_settings-admin_email').'">'.AppSettings::getInstance()->getSetting('app_settings-admin_email').'</a></span>';
echo ' <span><a href="'.AppSettings::getInstance()->getSetting('app_settings-owner_website').'" target="_blank">'.AppSettings::getInstance()->getSetting('app_settings-owner_website').'</a></span>';
}
echo '</div>'; echo '</div>';
// Stolpec 3 - logotipi // stolpec 3 - spremljajte nas
echo '<div class="col">'; echo '<div class="col col3">';
echo ' <h2>'.$lang['simple_footer_about_follow'].'</h2>';
echo ' <div class= "social_logo_flex">';
echo ' <a href="https://www.facebook.com/1KAenklikanketa/"> <img src="public/img/social/fb_orange.svg" alt="Facebook logo"> </a>';
echo ' <a href="https://twitter.com/enklikanketa"> <img src="public/img/social/twitter_orange.svg" alt="Twitter logo"> </a>';
echo ' </div>';
echo '</div>';
// Stolpec 4 - logotipi
echo '<div class="col col4">';
echo ' <h2>'.$lang['simple_footer_namestitev'].'</h2>';
// Logotipa FDV in CDI - samo pri virtualkah // Logotipa FDV in CDI - samo pri virtualkah
if(isVirtual() || isAAI()){ if(isVirtual() || isAAI()){
echo '<div class="logo_holder">'; echo '<div class="logo_holder">';
echo ' <img src="public/img/logo/ministrstvo.svg" alt="ministrstvo za izobraževanje znanost in šport">';
echo ' <img class="arnes-logo" src="'.$site_url.'/public/img/logo/arnes_logo.png">';
echo ' <img src="'.$site_url.'/public/img/logo/fdv.png">'; echo ' <img src="'.$site_url.'/public/img/logo/fdv.png">';
echo ' <img src="'.$site_url.'/public/img/logo/cdi_'.($this->lang_id != 1 ? 'eng' : 'slo').'.png">';
echo '</div>'; echo '</div>';
} }
@ -352,33 +430,67 @@ class DisplayController{
// Izris okna na prvi strani - AAI // Izris okna na prvi strani - AAI
private function displayFrontPageFormAAI(){ private function displayFrontPageFormAAI(){
global $lang; global $lang;
global $site_url;
// HERO
echo '<div class= "hero-container"> ';
// WHITE BOX FOR LOGIN / REGISTRATION echo '<div class="text">';
echo '<div class="landing_page_window">'; echo '<h1>'.$lang["hero_heading"].'</h1>';
echo '<p>'.$lang["hero_text"].'</p>';
// APP TITLE - aai
echo '<div class="app_title" style="text-transform: initial;">'.AppSettings::getInstance()->getSetting('app_settings-app_name').'</div>'; echo '<a href="https://idp.uni-lj.si/simplesaml/module.php/core/loginuserpassorg.php?AuthState=_3500459a6006c401ca27bd4fb483cc9a05e8e2c5f9%3Ahttps%3A%2F%2Fidp.uni-lj.si%2Fsimplesaml%2Fsaml2%2Fidp%2FSSOService.php%3Fspentityid%3Dhttps%253A%252F%252F1ka.arnes.si%252Fsp%252F202005292157%26RelayState%3Dcookie%253A1650096713_0820%26cookieTime%3D1650880771"> '.$lang["AAI_prijava"].' <img src="public/img/icons/chevron.svg"></a>';
// AAI logo
//echo '<div class="arnes_logo"><img src="'.$site_url.'/public/img/logo/arnes_logo.png"></div>';
// AAI text
echo ' <div class="tabs">';
echo ' <div class="tab full_width">'.$lang['app_aai_installation_text'].'</div>';
echo ' </div>';
// AAI login/register
echo ' <a href="'.$site_url.'/aai"><input type="button" name="aai-login" title="'.$lang['aaiPopupTitle'].'" value="'.$lang['aaiPopupTitle'].'"></a>';
echo '</div>';
echo '<img src="public/img/icons/hero.svg" alt="hero image">';
echo '</div>'; echo '</div>';
// POMEMBNE POVEZAVE
echo '<h2 class="title">'.$lang["povezave_pomembne_povezave"].'</h2>';
echo '<div class="povezave">';
echo '<div class= "col"> ';
echo '<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.svg" alt="hero image"> </a>';
echo '</div>';
echo '<div class= "col"> ';
echo '<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.svg" alt="hero image"> </a>';
echo '</div>';
echo '<div class= "col"> ';
echo '<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.svg" alt="hero image"> </a>';
echo '</div>';
echo '<div class= "col"> ';
echo '<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.svg" alt="hero image"> </a>';
echo '</div>';
echo '</div>';
// APP SUBTITLE // APP SUBTITLE
/*echo '<div class="app_subtitle">'; /*echo '<div class="app_subtitle">';
echo $lang['app_aai_installation']; echo $lang['app_aai_installation'];
echo '</div>';*/ echo '</div>';*/
} }
// Izris okna za login na prvi strani // Izris okna za login na prvi strani
@ -477,7 +589,7 @@ class DisplayController{
echo ' <span class="subtitle">'.$lang['cms_register_user_text'].'</span>'; echo ' <span class="subtitle">'.$lang['cms_register_user_text'].'</span>';
// Email // Email
echo ' <label for="email" '.(isset($error['email']) ? 'class="red"' : '').'>'.$lang['email'].':</label>'; echo ' <label for="email" '.(isset($error['email']) ? 'class="red"' : '').''.$lang['email'].':</label>';
echo ' <input class="regfield '.(isset($error['email']) ? 'red' : '').'" id="email" name="email" value="'.$email.'" placeholder="'.$lang['email'].'" type="text">'; echo ' <input class="regfield '.(isset($error['email']) ? 'red' : '').'" id="email" name="email" value="'.$email.'" placeholder="'.$lang['email'].'" type="text">';
// Ime // Ime
@ -538,6 +650,7 @@ class DisplayController{
echo ' <input name="submit" value="'.$lang['next1'].'" class="regfield" type="submit">'; echo ' <input name="submit" value="'.$lang['next1'].'" class="regfield" type="submit">';
echo '</form>'; echo '</form>';
echo 'hello there';
} }
@ -763,7 +876,7 @@ class DisplayController{
echo ' <p><span class="label edit"><label for="pass">'.$lang['password'].':</label></span>'; echo ' <p><span class="label edit"><label for="pass">'.$lang['password'].':</label></span>';
echo ' <a href="'.$url_edit.'">'.($geslo == '' ? $lang['no1'] : $lang['yes']).'</a></p>'; echo ' <a href="'.$url_edit.'">'.($geslo == '' ? $lang['no1'] : $lang['yes']).'</a></p>';
echo ' <br /><input name="submit" value="'.$lang['next1'].'" class="regfield" type="submit"><br />'; echo ' <br /><input name="submit" value="'.$lang['next1'].'" class="regfield" type="submit"><br />';
echo ' </form>'; echo ' </form>';