diff --git a/admin/survey/classes/class.GDPR.php b/admin/survey/classes/class.GDPR.php index 0211672c3..d5a9e612a 100644 --- a/admin/survey/classes/class.GDPR.php +++ b/admin/survey/classes/class.GDPR.php @@ -1540,20 +1540,20 @@ class GDPR{ $naslov = '

'.$lang['srv_gdpr_intro_title'].'

'; $naslov .= '

'.$lang['srv_gdpr_intro'].':

'; - $naslov .= ' '; $naslov .= '

'.$lang['srv_gdpr_intro2']; $naslov .= ' '.$lang['srv_gdpr_intro3'].'

'; diff --git a/admin/survey/classes/class.SurveyCheck.php b/admin/survey/classes/class.SurveyCheck.php index ba8715fb9..2e81972ae 100644 --- a/admin/survey/classes/class.SurveyCheck.php +++ b/admin/survey/classes/class.SurveyCheck.php @@ -84,9 +84,10 @@ class SurveyCheck { // Dobimo stevilo odgovorov na anketo $stevilo_odgovorov = SurveyInfo::getInstance()->getSurveyAnswersCount(); + $stevilo_odgovorov_limit = AppSettings::getInstance()->getSetting('app_limits-response_count_limit'); // Obvestilo (mail adminu) posljemo pri dosezeni stevilki - if($stevilo_odgovorov == AppSettings::getInstance()->getSetting('app_limits-response_count_limit')){ + if($stevilo_odgovorov > 0 && $stevilo_odgovorov % $stevilo_odgovorov_limit === 0){ $this->sendAlert($alert_type='limit_responses', $stevilo_odgovorov); // Deaktiviramo anketo, ce je aktivna ? diff --git a/admin/survey/minify/groupsConfig.php b/admin/survey/minify/groupsConfig.php index d66d59c19..cb3c70ab3 100644 --- a/admin/survey/minify/groupsConfig.php +++ b/admin/survey/minify/groupsConfig.php @@ -97,7 +97,8 @@ return [ dirname(__FILE__).'/../script/custom_column_label_respondent.js', dirname(__FILE__).'/../script/ImageHotSpot/imagemap_question_editor.js', dirname(__FILE__).'/../script/ImageHotSpot/imageHotspot.js', - dirname(__FILE__).'/../script/Chartjs/Chart.js', //source za chartjs grafe + + dirname(__FILE__).'/../script/Chartjs/chart.js', //source za chartjs grafe dirname(__FILE__).'/../script/Chartjs.js', dirname(__FILE__).'/../script/jquery/jquery.imagemapster.js', diff --git a/frontend/simple/classes/DisplayController.php b/frontend/simple/classes/DisplayController.php index d015e05fa..571fa1888 100644 --- a/frontend/simple/classes/DisplayController.php +++ b/frontend/simple/classes/DisplayController.php @@ -648,8 +648,6 @@ class DisplayController{ echo '
'; - // echo ' '.$lang['cms_register_user_text'].''; - // Email echo ' '; echo ' '; @@ -657,11 +655,7 @@ class DisplayController{ // Ime echo ' '; echo ' '; - - // // RECAPTCHA - // if(AppSettings::getInstance()->getSetting('google-secret_captcha') !== false && AppSettings::getInstance()->getSetting('google-recaptcha_sitekey') !== false) - // echo '
'; - + // Geslo echo ' '; echo ' '; @@ -671,20 +665,16 @@ class DisplayController{ echo ' '; // Strinjam se s pogoji - //echo ' '; $terms_url = ($lang['id'] == '1') ? 'https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-storitve-1ka' : 'https://www.1ka.si/d/en/about/terms-of-use'; echo '
'; - echo '
'; // RECAPTCHA if(AppSettings::getInstance()->getSetting('google-secret_captcha') !== false && AppSettings::getInstance()->getSetting('google-recaptcha_sitekey') !== false) echo '
'; - - echo ' '; // Error text if(!empty($error)){ diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css index f89329de0..d31eafa58 100644 --- a/frontend/simple/css/style.css +++ b/frontend/simple/css/style.css @@ -3,7 +3,8 @@ Created on : 28.3.2020 Author : Peter Hrvatin */ -/* BARVE */ /* FONTI */ +/* BARVE */ +/* FONTI */ @import url("https://fonts.googleapis.com/css?family=Montserrat:300,400,400i,600,700&subset=latin-ext"); @import url("https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;600;700&display=swap"); .thin { @@ -458,7 +459,7 @@ body.login_noEmail #main .landing_page_window .agreement { cursor: pointer; display: flex; align-items: baseline; - margin: 17px 0 5px 0; + margin: 16px 0 0 0; } body.landing_page #main .landing_page_window .agreement input, body.register #main .landing_page_window .agreement input, @@ -494,8 +495,7 @@ body.landing_page #main .landing_page_window .g-recaptcha, body.register #main .landing_page_window .g-recaptcha, body.login #main .landing_page_window .g-recaptcha, body.login_noEmail #main .landing_page_window .g-recaptcha { - width: 304px; - margin-top: 20px; + margin-top: 16px; } /*body.register{ @@ -730,13 +730,16 @@ body.reset_password_activate div.label { #main .main_content { min-height: unset; } + /* --------------HAMBURGER---------------------------------- */ .nav-desktop { display: none; } + .mobile { display: block; } + #nav-icon3 { width: 38px; height: 20px; @@ -780,35 +783,42 @@ body.reset_password_activate div.label { #nav-icon3 span:nth-child(4) { top: 18px; } + #nav-icon3.open span:nth-child(1) { top: 9px; width: 0%; left: 50%; } + #nav-icon3.open span:nth-child(2) { -webkit-transform: rotate(45deg); -moz-transform: rotate(45deg); -o-transform: rotate(45deg); transform: rotate(45deg); } + #nav-icon3.open span:nth-child(3) { -webkit-transform: rotate(-45deg); -moz-transform: rotate(-45deg); -o-transform: rotate(-45deg); transform: rotate(-45deg); } + #nav-icon3.open span:nth-child(4) { top: 9px; width: 0%; left: 50%; } + #links { display: none; } + /* */ .aai a { color: #333333; } + #links.open { position: absolute; top: 72px; @@ -818,8 +828,9 @@ body.reset_password_activate div.label { align-items: center; width: 100%; height: 100vh; - background-color: rgb(255, 255, 255); + background-color: white; } + #links .menu_item { font-size: 30px; margin-top: 30px; @@ -831,6 +842,7 @@ body.reset_password_activate div.label { #links .menu_item a:hover { color: #1E88E5; } + body #main .main_content { padding: 10px 20px 40px 20px; } @@ -872,6 +884,7 @@ body #main .main_content input[type=button] { margin: 0; width: 100%; } + body.landing_page, body.login, body.register, @@ -958,6 +971,7 @@ body.login_noEmail #content.aai #main .main_content .app_subtitle { width: 100%; box-sizing: border-box; } + footer { padding: 0 20px; } @@ -988,6 +1002,7 @@ body.login_noEmail #content.aai #main .main_content .app_subtitle { footer .footer_content .logo_holder img { margin: 20px auto 30px auto; } + .cookie_notice { flex-direction: column; } @@ -995,6 +1010,7 @@ body.login_noEmail #content.aai #main .main_content .app_subtitle { margin: 0 0 20px 0; text-align: center; } + body #main .main_content .register_holder h1 { font-size: 50px; font-weight: 300; @@ -1249,16 +1265,6 @@ footer .footer_content .col3 .social_logo_flex a:first-of-type { margin-right: 20px; } -iframe { - max-width: 304px; - width: unset; -} - -.rc-anchor-normal .rc-anchor-checkbox-label { - max-width: 152px; - width: unset; -} - body.login_noEmail #main { background-image: none; background-color: #F8F8F8; diff --git a/resources/sass/frontend_simple/basic/popravki.scss b/resources/sass/frontend_simple/basic/popravki.scss index 24592d2c3..c089f8390 100644 --- a/resources/sass/frontend_simple/basic/popravki.scss +++ b/resources/sass/frontend_simple/basic/popravki.scss @@ -280,20 +280,6 @@ footer .footer_content .col3 .social_logo_flex a:first-of-type{ } - -//CAPTCHA -iframe { - max-width: 304px; - width: unset; -} - -.rc-anchor-normal .rc-anchor-checkbox-label{ - max-width: 152px; - width: unset; -} - - - //------------- POPRAVKI ( napačno geslo, elektronski naslov etc.)-------------------------- diff --git a/resources/sass/frontend_simple/modules/landing_page.scss b/resources/sass/frontend_simple/modules/landing_page.scss index 86c557c40..cbc469a32 100644 --- a/resources/sass/frontend_simple/modules/landing_page.scss +++ b/resources/sass/frontend_simple/modules/landing_page.scss @@ -155,7 +155,7 @@ body.login_noEmail{ display: flex; align-items: baseline; - margin: 17px 0 5px 0; + margin: 16px 0 0 0; input{ margin-right: 10px; @@ -184,8 +184,7 @@ body.login_noEmail{ } .g-recaptcha{ - width: 304px; - margin-top: 20px; + margin-top: 16px; } } }