diff --git a/admin/survey/classes/class.GDPR.php b/admin/survey/classes/class.GDPR.php index 3bf102369..ab7e45de8 100644 --- a/admin/survey/classes/class.GDPR.php +++ b/admin/survey/classes/class.GDPR.php @@ -122,42 +122,56 @@ class GDPR{ echo '
'.$lang['srv_gdpr_user_settings_title'].''; - echo '

'.$lang['srv_gdpr_user_settings_desc1'].'
'; - echo $lang['srv_gdpr_user_settings_desc2'].'

'; - echo $lang['srv_gdpr_user_settings_desc3'].'

'; + echo '

'.$lang['srv_gdpr_user_settings_desc1'].'

'; + echo '

'.$lang['srv_gdpr_user_settings_desc2'].'

'; + echo '

'.$lang['srv_gdpr_user_settings_desc3'].'

'; // PODATKI AVTORJA // Opozorilo za obvezna polja if($user_settings['firstname'] == '' || $user_settings['lastname'] == '' || $user_settings['email'] == '') - echo '

'.$lang['srv_gdpr_user_settings_err'].'

'; - else - echo '
'; - - echo '
'; - echo '
'; + echo '

'.$lang['srv_gdpr_user_settings_err'].'

'; - echo '
'; - echo '
'; + echo '
'; - $email = ($user_settings['email'] == '') ? User::getInstance()->primaryEmail() : $user_settings['email']; - echo '
'; - echo ' '.(isset($error['email']) ? ''.$lang['srv_remind_email_hard'].'' : '').'
'; + echo '
'; + echo ''; + echo ''; + echo '
'; - echo '
'; - echo '
'; + echo '
'; + echo ''; + echo ''; + echo '
'; - echo '
'; - + echo '
'; + + echo '
'; + + $email = ($user_settings['email'] == '') ? User::getInstance()->primaryEmail() : $user_settings['email']; + echo '
'; + echo ''; + echo ' '.(isset($error['email']) ? ''.$lang['srv_remind_email_hard'].'' : ''); + echo '
'; + + echo '
'; + echo ''; + echo ''; + echo '
'; + + echo '
'; + + echo '
'; // Naslov in drzava - echo '
'; - echo '
'; + echo '
'; + echo ''; + echo ''; + echo '
'; - echo '
'; - - echo ' '; + $country_filter = array(); foreach(self::$authorities as $authority){ if (in_array($authority['country'], $country_filter)) { @@ -171,89 +185,125 @@ class GDPR{ $country_filter[] = $authority['country']; } - echo ' '; - echo '
'; - - - echo '
'; - + echo ''; + echo '
'; + + echo ''; // ORGANIZACIJA ALI ZASEBNIK - echo '
'; - echo ' '; - echo ' '; - echo '
'; + echo '
'; + echo ''.$lang['srv_gdpr_user_settings_type'].': '; + + echo '
'; + echo ''; + echo ''; + echo '
'; + echo '
'; + echo ''; + echo ''; + echo '
'; + + echo '
'; // PODATKI PODJETJA - echo ' '; // IMA DPO - echo ' '; // DPO - echo ' '; // Podatki trenutne avtoritete - echo '
'; + echo '
'; self::displayGDPRAuthority($user_settings['country']); echo '
'; - echo '
'; + echo ''; // Gumb shrani - echo '
'.$lang['edit1337'].'
'; - + echo '
'; + echo ''; + echo ''; + echo '
'; + // div za prikaz uspešnosti shranjevanja if ($_GET['s'] == '1') { echo ''; @@ -280,7 +330,7 @@ class GDPR{ $current_authorities[] = $authority; } - echo '

'.$lang['srv_gdpr_user_settings_authority'].':

'; + echo '

'.$lang['srv_gdpr_user_settings_authority'].':

'; // Prikazemo podatke za vse avtoritete (lahko jih je vec na drzavo) foreach ($current_authorities as $authority) { diff --git a/admin/survey/script/GDPR.js b/admin/survey/script/GDPR.js index 1945c4f35..49a5053c8 100644 --- a/admin/survey/script/GDPR.js +++ b/admin/survey/script/GDPR.js @@ -145,17 +145,17 @@ function toggleGDPRDPO(){ var has_dpo = $('input[name=has_dpo]:checked').val(); if(organization == '1' || has_dpo == '1') - $("#gdpr_dpo").show(); + $("#gdpr_dpo").removeClass('displayNone'); else - $("#gdpr_dpo").hide(); + $("#gdpr_dpo").addClass('displayNone'); if(organization == '1'){ - $("#gdpr_organization").show(); - $("#gdpr_has_dpo").hide(); + $("#gdpr_organization").removeClass('displayNone'); + $("#gdpr_has_dpo").addClass('displayNone'); } else{ - $("#gdpr_organization").hide(); - $("#gdpr_has_dpo").show(); + $("#gdpr_organization").addClass('displayNone'); + $("#gdpr_has_dpo").removeClass('displayNone'); } } // Prikazemo/skrijemo nastavitve organizacije in dpo-ja (ce je zasebnik) @@ -164,9 +164,9 @@ function toggleGDPRHasDPO(){ var has_dpo = $('input[name=has_dpo]:checked').val(); if(has_dpo == '1') - $("#gdpr_dpo").show(); + $("#gdpr_dpo").removeClass('displayNone'); else - $("#gdpr_dpo").hide(); + $("#gdpr_dpo").addClass('displayNone'); } // Nastavimo zahtevo za izbris da je opravljena diff --git a/lang/1.php b/lang/1.php index f23f10558..1a4cb7f59 100644 --- a/lang/1.php +++ b/lang/1.php @@ -7708,11 +7708,11 @@ $lang = array ( 'srv_gdpr_general_settings' => "Splošne GDPR nastavitve", 'srv_gdpr_general_settings_warning' => "Prosimo izpolnite osebne podatke GDPR profila!", 'srv_gdpr_user_settings' => "Splošne nastavitve", - 'srv_gdpr_user_settings_title' => "GDPR nastavitve profila", + 'srv_gdpr_user_settings_title' => "Splošne GDPR nastavitve", 'srv_gdpr_user_settings_desc1' => "S 25. majem 2018 je v veljavi nova Splošna uredba o varstvu podatkov (GDPR), ki opredeljuje tudi način zbiranja podatkov in respondentom zagotavlja možnost izbrisa, vpogleda, prenosa, omejitve obdelave ali spremembe zbranih osebnih in/ali anketnih podatkov.", 'srv_gdpr_user_settings_desc2' => "V skladu s tem je na vaši strani, kot izvajalcu ankete in s tem upravljalcu osebnih podatkov, odgovornost, da izvršite omenjene zahteve, ki jih na vaših anketah podajo respondenti (zahteva za izbris, vpogled ali spremembo osebnih in/ali anketnih podatkov).", 'srv_gdpr_user_settings_desc3' => "Prosimo vas, da izpolnite spodnji obrazec s svojimi podatki. Podatke potrebujemo za pripravo informacij, ki morajo biti v skladu z GDPR na voljo posamezniku (respondentu). Če gre za organizacijo, vnesite tudi podatke o pooblaščeni osebi za varstvo osebnih podatkov (DPO). Vnesene podatke bomo uporabili zgolj za namene procesiranja zahtevkov.", - 'srv_gdpr_user_settings_err' => "Polja \"Ime\", \"Priimek\" in \"E-pošta\" so obvezna!", + 'srv_gdpr_user_settings_err' => "Polja označena z * so obvezna.", 'srv_gdpr_user_settings_err2' => "Polji \"Ime organizacije\" in \"Matična številka\" sta obvezni!", 'srv_gdpr_user_settings_type' => "Organizacija ali zasebnik", 'srv_gdpr_user_settings_type_0' => "Zasebnik", diff --git a/lang/2.php b/lang/2.php index 283ec72b0..2ca2fd195 100644 --- a/lang/2.php +++ b/lang/2.php @@ -7595,11 +7595,11 @@ $lang = array ( 'srv_gdpr_general_settings' => "General GDPR settings", 'srv_gdpr_general_settings_warning' => "Please fill in your personal data in your GDPR profile!", 'srv_gdpr_user_settings' => "General settings", - 'srv_gdpr_user_settings_title' => "GDPR profile settings", + 'srv_gdpr_user_settings_title' => "General GDPR settings", 'srv_gdpr_user_settings_desc1' => "Since May 25th, 2018, a new regulation on the protection of personal data (GDPR) is in force. New regulation also defines the method of collecting data and provides options for respondents, such as deletion, insight and modifying collected personal and/or survey data.", 'srv_gdpr_user_settings_desc2' => "Accordingly, it is your responsibility to comply with these requirements, which respondents provide in your surveys (request for the deletion, insight or modification of personal and/or survey data).", 'srv_gdpr_user_settings_desc3' => "Please fill in the form below with your details. We need the data to produce the information that must be made available to the individual (respondent) in accordance with the GDPR. In case you are an organization, enter also the data about the data protection officer (DPO), authorized person for the protection of personal data. We will only use the data entered for the purpose of processing requests.", - 'srv_gdpr_user_settings_err' => "Fields \"Name\" and \"Registration numbe\" are mandatory!", + 'srv_gdpr_user_settings_err' => "Fields marked with * are mandatory.", 'srv_gdpr_user_settings_err2' => "Fields \"Organization name\" \"Surname\" and \"Email\" are mandatory!", 'srv_gdpr_user_settings_type' => "Organization or individual", 'srv_gdpr_user_settings_type_0' => "Individual", diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 9cf7c15c7..db91e3f0b 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -5063,6 +5063,9 @@ p.warning, p.red, span.warning, span.red { p.italic, span.italic { font-style: italic; } +p.bold, span.bold { + font-weight: 800; +} /* Only layout styles - position, display, max-width... @@ -7116,6 +7119,9 @@ input[type=text]#anketa_polnoIme { input[type=text]#anketa_akronim { width: 800px; } +input[type=text].w200 { + width: 200px; +} input[type=text].large { height: 40px; font-size: 16px; @@ -7205,6 +7211,16 @@ fieldset legend { color: #1E88E5; text-transform: uppercase; } +fieldset p.setting_text { + margin-bottom: 16px; +} +fieldset .setting_horizontal_wrapper { + display: flex; + flex-direction: row; +} +fieldset .setting_horizontal_wrapper .setting_holder { + margin-right: 17px; +} fieldset .setting_holder { margin-bottom: 16px; display: flex; @@ -7234,6 +7250,12 @@ fieldset .setting_holder span.charalimit#anketa_akronim_chars, fieldset .setting fieldset .setting_holder.indent { margin-left: 27px; } +fieldset .setting_holder.red label { + color: red; +} +fieldset .setting_holder.red input[type=text] { + border: 1px solid red; +} div#gdpr_nastavitve { display: flex; @@ -7286,6 +7308,9 @@ select.dropdown.small option { line-height: 18px; color: #333333; } +select.dropdown.w200 { + width: 200px; +} select.dropdown:focus { outline-style: none; box-shadow: none; diff --git a/resources/sass/admin_new/basic/typography.scss b/resources/sass/admin_new/basic/typography.scss index a9b940aee..aa0152264 100644 --- a/resources/sass/admin_new/basic/typography.scss +++ b/resources/sass/admin_new/basic/typography.scss @@ -12,4 +12,8 @@ p,span { &.italic { font-style: italic; } + + &.bold { + font-weight: $extra-bold; + } } \ No newline at end of file diff --git a/resources/sass/admin_new/components/form/dropdown.scss b/resources/sass/admin_new/components/form/dropdown.scss index a20445c19..d90660fc4 100644 --- a/resources/sass/admin_new/components/form/dropdown.scss +++ b/resources/sass/admin_new/components/form/dropdown.scss @@ -48,6 +48,10 @@ select.dropdown { } } + &.w200 { + width: 200px; + } + &:focus { outline-style: none; box-shadow: none; diff --git a/resources/sass/admin_new/components/form/fieldset.scss b/resources/sass/admin_new/components/form/fieldset.scss index 1c2b6e10b..cf555ef70 100644 --- a/resources/sass/admin_new/components/form/fieldset.scss +++ b/resources/sass/admin_new/components/form/fieldset.scss @@ -17,6 +17,19 @@ fieldset{ text-transform: uppercase; } + p.setting_text { + margin-bottom: 16px; + } + + .setting_horizontal_wrapper { + display: flex; + flex-direction: row; + + .setting_holder { + margin-right: 17px; + } + } + .setting_holder { margin-bottom: 16px; display: flex; @@ -53,6 +66,17 @@ fieldset{ &.indent { margin-left: 27px; } + + &.red { + label { + color: red; + } + input { + &[type="text"] { + border: 1px solid red; + } + } + } } } diff --git a/resources/sass/admin_new/components/form/input.scss b/resources/sass/admin_new/components/form/input.scss index 4b7955b58..1f938809a 100644 --- a/resources/sass/admin_new/components/form/input.scss +++ b/resources/sass/admin_new/components/form/input.scss @@ -23,6 +23,9 @@ input { &#anketa_akronim{ width: 800px; } + &.w200 { + width: 200px; + } margin-top: 4px;