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

Merge branch 'master' of https://git.1ka.si:/git/1ka

Browse Source
This commit is contained in:
tejagerjovic 2022-07-20 11:54:16 +02:00
commit 220550ef4c
7 changed files with 39 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1540,20 +1540,20 @@ class GDPR{
$naslov = '<h3 style="margin-top: 0;">'.$lang['srv_gdpr_intro_title'].'</h3>'; $naslov = '<h3 style="margin-top: 0;">'.$lang['srv_gdpr_intro_title'].'</h3>';
$naslov .= '<p>'.$lang['srv_gdpr_intro'].':</p>'; $naslov .= '<p>'.$lang['srv_gdpr_intro'].':</p>';
$naslov .= '<ul>'; $naslov .= ' <ul>';
if($user_settings['name']) if($user_settings['name'])
$naslov .= '<li>'.$lang['srv_gdpr_intro_name'].'</li>'; $naslov .= ' <li>'.$lang['srv_gdpr_intro_name'].'</li> ';
if($user_settings['email']) if($user_settings['email'])
$naslov .= '<li>'.$lang['srv_gdpr_intro_email'].'</li>'; $naslov .= ' <li>'.$lang['srv_gdpr_intro_email'].'</li> ';
if($user_settings['location']) if($user_settings['location'])
$naslov .= '<li>'.$lang['srv_gdpr_intro_location'].'</li>'; $naslov .= ' <li>'.$lang['srv_gdpr_intro_location'].'</li> ';
if($user_settings['phone']) if($user_settings['phone'])
$naslov .= '<li>'.$lang['srv_gdpr_intro_phone'].'</li>'; $naslov .= ' <li>'.$lang['srv_gdpr_intro_phone'].'</li> ';
if($user_settings['web']) if($user_settings['web'])
$naslov .= '<li>'.$lang['srv_gdpr_intro_web'].'</li>'; $naslov .= ' <li>'.$lang['srv_gdpr_intro_web'].'</li> ';
if($user_settings['other']) if($user_settings['other'])
$naslov .= '<li>'.$lang['srv_gdpr_intro_other'].' - '.$user_settings['other_text'.$translation].'</li>'; $naslov .= ' <li>'.$lang['srv_gdpr_intro_other'].' - '.$user_settings['other_text'.$translation].'</li> ';
$naslov .= '</ul>'; $naslov .= '</ul> ';
$naslov .= '<p>'.$lang['srv_gdpr_intro2']; $naslov .= '<p>'.$lang['srv_gdpr_intro2'];
$naslov .= ' '.$lang['srv_gdpr_intro3'].'</p>'; $naslov .= ' '.$lang['srv_gdpr_intro3'].'</p>';

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

@ -84,9 +84,10 @@ class SurveyCheck {
// Dobimo stevilo odgovorov na anketo // Dobimo stevilo odgovorov na anketo
$stevilo_odgovorov = SurveyInfo::getInstance()->getSurveyAnswersCount(); $stevilo_odgovorov = SurveyInfo::getInstance()->getSurveyAnswersCount();
$stevilo_odgovorov_limit = AppSettings::getInstance()->getSetting('app_limits-response_count_limit');
// Obvestilo (mail adminu) posljemo pri dosezeni stevilki // 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); $this->sendAlert($alert_type='limit_responses', $stevilo_odgovorov);
// Deaktiviramo anketo, ce je aktivna ? // Deaktiviramo anketo, ce je aktivna ?

3
admin/survey/minify/groupsConfig.php
View File

@ -97,7 +97,8 @@ return [
dirname(__FILE__).'/../script/custom_column_label_respondent.js', dirname(__FILE__).'/../script/custom_column_label_respondent.js',
dirname(__FILE__).'/../script/ImageHotSpot/imagemap_question_editor.js', dirname(__FILE__).'/../script/ImageHotSpot/imagemap_question_editor.js',
dirname(__FILE__).'/../script/ImageHotSpot/imageHotspot.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/Chartjs.js',
dirname(__FILE__).'/../script/jquery/jquery.imagemapster.js', dirname(__FILE__).'/../script/jquery/jquery.imagemapster.js',

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

@ -648,8 +648,6 @@ class DisplayController{
echo '<form name="register" id="register_form" class="register_form register_window" action="'.$site_url.'frontend/api/api.php?action=register" method="post">'; echo '<form name="register" id="register_form" class="register_form register_window" action="'.$site_url.'frontend/api/api.php?action=register" method="post">';
// 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="" type="text">'; echo ' <input class="regfield '.(isset($error['email']) ? 'red' : '').'" id="email" name="email" value="'.$email.'" placeholder="" type="text">';
@ -657,11 +655,7 @@ class DisplayController{
// Ime // Ime
echo ' <label for="ime" '.(isset($error['ime']) ? 'class="red"' : '').'>'.$lang['cms_register_user_nickname'].':</label>'; echo ' <label for="ime" '.(isset($error['ime']) ? 'class="red"' : '').'>'.$lang['cms_register_user_nickname'].':</label>';
echo ' <input class="regfield '.(isset($error['ime']) ? 'red' : '').'" id="ime" name="ime" value="'.$ime.'" placeholder="" type="text">'; echo ' <input class="regfield '.(isset($error['ime']) ? 'red' : '').'" id="ime" name="ime" value="'.$ime.'" placeholder="" type="text">';
// // RECAPTCHA
// if(AppSettings::getInstance()->getSetting('google-secret_captcha') !== false && AppSettings::getInstance()->getSetting('google-recaptcha_sitekey') !== false)
// echo ' <div class="g-recaptcha" data-sitekey="'.AppSettings::getInstance()->getSetting('google-recaptcha_sitekey').'" '.(isset($_GET['invalid_recaptcha']) ? ' style="border:1px red solid"' : '').'></div>';
// Geslo // Geslo
echo ' <label for="p1" '.(isset($error['password']) ? 'class="red"' : '').'>'.$lang['login_password'].':</label>'; echo ' <label for="p1" '.(isset($error['password']) ? 'class="red"' : '').'>'.$lang['login_password'].':</label>';
echo ' <input id="p1" class="text '.(isset($error['password']) ? 'red' : '').'" value="" name="geslo" placeholder="" type="password">'; echo ' <input id="p1" class="text '.(isset($error['password']) ? 'red' : '').'" value="" name="geslo" placeholder="" type="password">';
@ -671,20 +665,16 @@ class DisplayController{
echo ' <input id="p2" class="text '.(isset($error['password']) ? 'red' : '').'" value="" name="geslo2" placeholder="" type="password">'; echo ' <input id="p2" class="text '.(isset($error['password']) ? 'red' : '').'" value="" name="geslo2" placeholder="" type="password">';
// Strinjam se s pogoji // Strinjam se s pogoji
//echo ' <input id="IAgree" type="hidden" name="agree" value="1">';
$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'; $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 ' <div class="form_row agreement '.(isset($_GET['missing_agree']) ? ' red' : '').'">'; echo ' <div class="form_row agreement '.(isset($_GET['missing_agree']) ? ' red' : '').'">';
echo ' <input id="IAgree" type="checkbox" name="agree" value="1"><label for="IAgree">'; echo ' <input id="IAgree" type="checkbox" name="agree" value="1">';
echo '<div class="checkbox_text_holder"> '.str_replace('TERMS_URL', $terms_url, $lang['cms_register_user_terms_of_use2']).'</label>'; echo ' <label for="IAgree"><div class="checkbox_text_holder"> '.str_replace('TERMS_URL', $terms_url, $lang['cms_register_user_terms_of_use2']).'</div></label>';
// echo ' <br /><span class="red italic">*'.$lang['cms_register_mandatory_field'].'</span>'; echo ' </div>';
echo '</div>';
// RECAPTCHA // RECAPTCHA
if(AppSettings::getInstance()->getSetting('google-secret_captcha') !== false && AppSettings::getInstance()->getSetting('google-recaptcha_sitekey') !== false) if(AppSettings::getInstance()->getSetting('google-secret_captcha') !== false && AppSettings::getInstance()->getSetting('google-recaptcha_sitekey') !== false)
echo ' <div class="g-recaptcha" data-sitekey="'.AppSettings::getInstance()->getSetting('google-recaptcha_sitekey').'" '.(isset($_GET['invalid_recaptcha']) ? ' style="border:1px red solid"' : '').'></div>'; echo ' <div class="g-recaptcha" data-sitekey="'.AppSettings::getInstance()->getSetting('google-recaptcha_sitekey').'" '.(isset($_GET['invalid_recaptcha']) ? ' style="border:1px red solid"' : '').'></div>';
echo ' </div>';
// Error text // Error text
if(!empty($error)){ if(!empty($error)){

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

@ -3,7 +3,8 @@
Created on : 28.3.2020 Created on : 28.3.2020
Author : Peter Hrvatin Author : Peter Hrvatin
*/ */
/* BARVE */ /* FONTI */ /* BARVE */
/* FONTI */
@import url("https://fonts.googleapis.com/css?family=Montserrat:300,400,400i,600,700&amp;subset=latin-ext"); @import url("https://fonts.googleapis.com/css?family=Montserrat:300,400,400i,600,700&amp;subset=latin-ext");
@import url("https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;600;700&display=swap"); @import url("https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;600;700&display=swap");
.thin { .thin {
@ -458,7 +459,7 @@ body.login_noEmail #main .landing_page_window .agreement {
cursor: pointer; cursor: pointer;
display: flex; display: flex;
align-items: baseline; align-items: baseline;
margin: 17px 0 5px 0; margin: 16px 0 0 0;
} }
body.landing_page #main .landing_page_window .agreement input, body.landing_page #main .landing_page_window .agreement input,
body.register #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.register #main .landing_page_window .g-recaptcha,
body.login #main .landing_page_window .g-recaptcha, body.login #main .landing_page_window .g-recaptcha,
body.login_noEmail #main .landing_page_window .g-recaptcha { body.login_noEmail #main .landing_page_window .g-recaptcha {
width: 304px; margin-top: 16px;
margin-top: 20px;
} }
/*body.register{ /*body.register{
@ -730,13 +730,16 @@ body.reset_password_activate div.label {
#main .main_content { #main .main_content {
min-height: unset; min-height: unset;
} }
/* --------------HAMBURGER---------------------------------- */ /* --------------HAMBURGER---------------------------------- */
.nav-desktop { .nav-desktop {
display: none; display: none;
} }
.mobile { .mobile {
display: block; display: block;
} }
#nav-icon3 { #nav-icon3 {
width: 38px; width: 38px;
height: 20px; height: 20px;
@ -780,35 +783,42 @@ body.reset_password_activate div.label {
#nav-icon3 span:nth-child(4) { #nav-icon3 span:nth-child(4) {
top: 18px; top: 18px;
} }
#nav-icon3.open span:nth-child(1) { #nav-icon3.open span:nth-child(1) {
top: 9px; top: 9px;
width: 0%; width: 0%;
left: 50%; left: 50%;
} }
#nav-icon3.open span:nth-child(2) { #nav-icon3.open span:nth-child(2) {
-webkit-transform: rotate(45deg); -webkit-transform: rotate(45deg);
-moz-transform: rotate(45deg); -moz-transform: rotate(45deg);
-o-transform: rotate(45deg); -o-transform: rotate(45deg);
transform: rotate(45deg); transform: rotate(45deg);
} }
#nav-icon3.open span:nth-child(3) { #nav-icon3.open span:nth-child(3) {
-webkit-transform: rotate(-45deg); -webkit-transform: rotate(-45deg);
-moz-transform: rotate(-45deg); -moz-transform: rotate(-45deg);
-o-transform: rotate(-45deg); -o-transform: rotate(-45deg);
transform: rotate(-45deg); transform: rotate(-45deg);
} }
#nav-icon3.open span:nth-child(4) { #nav-icon3.open span:nth-child(4) {
top: 9px; top: 9px;
width: 0%; width: 0%;
left: 50%; left: 50%;
} }
#links { #links {
display: none; display: none;
} }
/* */ /* */
.aai a { .aai a {
color: #333333; color: #333333;
} }
#links.open { #links.open {
position: absolute; position: absolute;
top: 72px; top: 72px;
@ -818,8 +828,9 @@ body.reset_password_activate div.label {
align-items: center; align-items: center;
width: 100%; width: 100%;
height: 100vh; height: 100vh;
background-color: rgb(255, 255, 255); background-color: white;
} }
#links .menu_item { #links .menu_item {
font-size: 30px; font-size: 30px;
margin-top: 30px; margin-top: 30px;
@ -831,6 +842,7 @@ body.reset_password_activate div.label {
#links .menu_item a:hover { #links .menu_item a:hover {
color: #1E88E5; color: #1E88E5;
} }
body #main .main_content { body #main .main_content {
padding: 10px 20px 40px 20px; padding: 10px 20px 40px 20px;
} }
@ -872,6 +884,7 @@ body #main .main_content input[type=button] {
margin: 0; margin: 0;
width: 100%; width: 100%;
} }
body.landing_page, body.landing_page,
body.login, body.login,
body.register, body.register,
@ -958,6 +971,7 @@ body.login_noEmail #content.aai #main .main_content .app_subtitle {
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
} }
footer { footer {
padding: 0 20px; padding: 0 20px;
} }
@ -988,6 +1002,7 @@ body.login_noEmail #content.aai #main .main_content .app_subtitle {
footer .footer_content .logo_holder img { footer .footer_content .logo_holder img {
margin: 20px auto 30px auto; margin: 20px auto 30px auto;
} }
.cookie_notice { .cookie_notice {
flex-direction: column; flex-direction: column;
} }
@ -995,6 +1010,7 @@ body.login_noEmail #content.aai #main .main_content .app_subtitle {
margin: 0 0 20px 0; margin: 0 0 20px 0;
text-align: center; text-align: center;
} }
body #main .main_content .register_holder h1 { body #main .main_content .register_holder h1 {
font-size: 50px; font-size: 50px;
font-weight: 300; font-weight: 300;
@ -1249,16 +1265,6 @@ footer .footer_content .col3 .social_logo_flex a:first-of-type {
margin-right: 20px; 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 { body.login_noEmail #main {
background-image: none; background-image: none;
background-color: #F8F8F8; background-color: #F8F8F8;

14
resources/sass/frontend_simple/basic/popravki.scss
View File

@ -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.)-------------------------- //------------- POPRAVKI ( napačno geslo, elektronski naslov etc.)--------------------------

5
resources/sass/frontend_simple/modules/landing_page.scss
View File

@ -155,7 +155,7 @@ body.login_noEmail{
display: flex; display: flex;
align-items: baseline; align-items: baseline;
margin: 17px 0 5px 0; margin: 16px 0 0 0;
input{ input{
margin-right: 10px; margin-right: 10px;
@ -184,8 +184,7 @@ body.login_noEmail{
} }
.g-recaptcha{ .g-recaptcha{
width: 304px; margin-top: 16px;
margin-top: 20px;
} }
} }
} }