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

[Redizajn 1KA] - GDPR nastavitve --> Splošne nastavitve - v1

Browse Source
This commit is contained in:
tejagerjovic 2021-12-09 14:29:42 +01:00
parent feac952619
commit c24d6f9eab
9 changed files with 202 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,41 +122,55 @@ class GDPR{
echo ' <fieldset><legend>'.$lang['srv_gdpr_user_settings_title'].'</legend>'; echo ' <fieldset><legend>'.$lang['srv_gdpr_user_settings_title'].'</legend>';
echo '<p class="italic">'.$lang['srv_gdpr_user_settings_desc1'].'<br />'; echo '<p class="setting_text">'.$lang['srv_gdpr_user_settings_desc1'].'</p>';
echo $lang['srv_gdpr_user_settings_desc2'].'<br /><br />'; echo '<p class="setting_text">'.$lang['srv_gdpr_user_settings_desc2'].'</p>';
echo $lang['srv_gdpr_user_settings_desc3'].'</p>'; echo '<p class="setting_text">'.$lang['srv_gdpr_user_settings_desc3'].'</p>';
// PODATKI AVTORJA // PODATKI AVTORJA
// Opozorilo za obvezna polja // Opozorilo za obvezna polja
if($user_settings['firstname'] == '' || $user_settings['lastname'] == '' || $user_settings['email'] == '') if($user_settings['firstname'] == '' || $user_settings['lastname'] == '' || $user_settings['email'] == '')
echo '<p><span class="red bold">'.$lang['srv_gdpr_user_settings_err'].'</span></p>'; echo '<p class="red setting_text">'.$lang['srv_gdpr_user_settings_err'].'</p>';
else
echo '<br />';
echo ' <div class="setting '.($user_settings['firstname'] == '' ? ' red' : '').'"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_firstname'].':</label></span> '; echo '<div class="setting_horizontal_wrapper">';
echo ' <input class="text" name="firstname" value="'.$user_settings['firstname'].'" type="text"></div>';
echo ' <div class="setting '.($user_settings['lastname'] == '' ? ' red' : '').'"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_lastname'].':</label></span> '; echo '<div class="setting_holder '.($user_settings['firstname'] == '' ? ' red' : '').'">';
echo ' <input class="text" name="lastname" value="'.$user_settings['lastname'].'" type="text"></div>'; echo '<label for="firstname">'.$lang['srv_gdpr_user_settings_firstname'].'*:</label>';
echo '<input class="large w200" id="firstname" name="firstname" value="'.$user_settings['firstname'].'" type="text">';
echo '</div>';
echo '<div class="setting_holder '.($user_settings['lastname'] == '' ? ' red' : '').'">';
echo '<label for="lastname">'.$lang['srv_gdpr_user_settings_lastname'].'*:</label>';
echo '<input class="large w200" id="lastname" name="lastname" value="'.$user_settings['lastname'].'" type="text">';
echo '</div>';
echo '</div>';
echo '<div class="setting_horizontal_wrapper">';
$email = ($user_settings['email'] == '') ? User::getInstance()->primaryEmail() : $user_settings['email']; $email = ($user_settings['email'] == '') ? User::getInstance()->primaryEmail() : $user_settings['email'];
echo ' <div class="setting '.($user_settings['email'] == '' ? ' red' : '').'"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_email'].':</label></span> '; echo '<div class="setting_holder '.($user_settings['email'] == '' ? ' red' : '').'">';
echo ' <input class="text '.(isset($error['email']) ? ' red' : '').'" name="email" value="'.$email.'" type="text"> '.(isset($error['email']) ? '<span class="red italic">'.$lang['srv_remind_email_hard'].'</span>' : '').'</div>'; echo '<label for="email">'.$lang['srv_gdpr_user_settings_email'].'*:</label>';
echo '<input class="large w200 '.(isset($error['email']) ? ' red' : '').'" id="email" name="email" value="'.$email.'" type="text"> '.(isset($error['email']) ? '<span class="red italic">'.$lang['srv_remind_email_hard'].'</span>' : '');
echo '</div>';
echo ' <div class="setting"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_phone'].':</label></span> '; echo '<div class="setting_holder">';
echo ' <input class="text" name="phone" value="'.$user_settings['phone'].'" type="text"></div>'; echo '<label>'.$lang['srv_gdpr_user_settings_phone'].':</label>';
echo '<input class="large w200" name="phone" value="'.$user_settings['phone'].'" type="text">';
echo '</div>';
echo ' <br />'; echo '</div>';
echo '<div class="setting_horizontal_wrapper">';
// Naslov in drzava // Naslov in drzava
echo ' <div class="setting"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_address'].':</label></span> '; echo '<div class="setting_holder">';
echo ' <input class="text" name="address" value="'.$user_settings['address'].'" type="text"></div>'; echo '<label for="address">'.$lang['srv_gdpr_user_settings_address'].':</label>';
echo '<input class="large w200" name="address" value="'.$user_settings['address'].'" type="text">';
echo '</div>';
echo ' <div class="setting"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_country'].':</label></span> '; echo '<div class="setting_holder">';
echo '<label for="country">'.$lang['srv_gdpr_user_settings_country'].':</label>';
echo ' <select name="country" onChange="editGDPRAuthority(this.value); return false;">'; echo '<select class="dropdown large w200" id="country" name="country" onChange="editGDPRAuthority(this.value); return false;">';
//echo ' <option value="" '.($user_settings['country'] == '' ? ' selected="selected"' : '').'>'.$lang['srv_gdpr_user_settings_country_select'].'</option>';
$country_filter = array(); $country_filter = array();
foreach(self::$authorities as $authority){ foreach(self::$authorities as $authority){
@ -171,88 +185,124 @@ class GDPR{
$country_filter[] = $authority['country']; $country_filter[] = $authority['country'];
} }
echo ' </select>'; echo '</select>';
echo ' </div>'; echo '</div>';
echo ' <br />';
echo '</div>';
// ORGANIZACIJA ALI ZASEBNIK // ORGANIZACIJA ALI ZASEBNIK
echo ' <div class="setting"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_type'].':</label></span> ';
echo ' <label for="type_0"><input class="radio" name="type" id="type_0" value="0" type="radio" '.($user_settings['type'] != '1' ? ' checked="checked"' : '').' onClick="toggleGDPRDPO();"> '.$lang['srv_gdpr_user_settings_type_0'].'</label>';
echo ' <label for="type_1"><input class="radio" name="type" id="type_1" value="1" type="radio" '.($user_settings['type'] == '1' ? ' checked="checked"' : '').' onClick="toggleGDPRDPO();"> '.$lang['srv_gdpr_user_settings_type_1'].'</label>';
echo ' </div>';
echo '<div class="setting_holder">';
echo '<span class="setting_title">'.$lang['srv_gdpr_user_settings_type'].':</span> ';
echo '<div class="setting_item">';
echo '<input class="radio" name="type" id="type_0" value="0" type="radio" '.($user_settings['type'] != '1' ? ' checked="checked"' : '').' onClick="toggleGDPRDPO();">';
echo '<label for="type_0"> '.$lang['srv_gdpr_user_settings_type_0'].'</label>';
echo '</div>';
echo '<div class="setting_item">';
echo '<input class="radio" name="type" id="type_1" value="1" type="radio" '.($user_settings['type'] == '1' ? ' checked="checked"' : '').' onClick="toggleGDPRDPO();">';
echo '<label for="type_1"> '.$lang['srv_gdpr_user_settings_type_1'].'</label>';
echo '</div>';
echo '</div>';
// PODATKI PODJETJA // PODATKI PODJETJA
echo ' <div id="gdpr_organization" '.($user_settings['type'] != '1' ? ' style="display:none;"' : '').'>'; echo ' <div id="gdpr_organization" '.($user_settings['type'] != '1' ? ' class="displayNone"' : '').'>';
// Opozorilo za obvezna polja // Opozorilo za obvezna polja
if($user_settings['organization'] == '' || $user_settings['organization_maticna'] == '') if($user_settings['organization'] == '' || $user_settings['organization_maticna'] == '')
echo '<p><span class="red bold">'.$lang['srv_gdpr_user_settings_err2'].'</span></p>'; echo '<p class="red setting_text">'.$lang['srv_gdpr_user_settings_err'].'</p>';
echo ' <div class="setting '.($user_settings['organization'] == '' ? ' red' : '').'"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_organization'].':</label></span> '; echo '<div class="setting_horizontal_wrapper">';
echo ' <input class="text" name="organization" value="'.$user_settings['organization'].'" type="text"></div>';
echo ' <div class="setting '.($user_settings['organization_maticna'] == '' ? ' red' : '').'"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_organization_maticna'].':</label></span> '; echo '<div class="setting_holder '.($user_settings['organization'] == '' ? 'red' : '').'">';
echo ' <input class="text" name="organization_maticna" value="'.$user_settings['organization_maticna'].'" type="text"></div>'; echo '<label for="organization">'.$lang['srv_gdpr_user_settings_organization'].'*:</label>';
echo '<input class="large w200" id="organization" name="organization" value="'.$user_settings['organization'].'" type="text">';
echo '</div>';
/*echo ' <div class="setting"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_organization_davcna'].':</label></span> '; echo '<div class="setting_holder '.($user_settings['organization_maticna'] == '' ? 'red' : '').'">';
echo ' <input class="text" name="organization_davcna" value="'.$user_settings['organization_davcna'].'" type="text"></div>';*/ echo '<label for="organization_maticna">'.$lang['srv_gdpr_user_settings_organization_maticna'].'*:</label>';
echo '<input class="large w200" id="organization_maticna" name="organization_maticna" value="'.$user_settings['organization_maticna'].'" type="text">';
echo '</div>';
echo ' </div>'; echo '</div>';
echo '</div>';
// IMA DPO // IMA DPO
echo ' <div id="gdpr_has_dpo" '.($user_settings['type'] != '0' ? ' style="display:none;"' : '').'>'; echo '<div id="gdpr_has_dpo" '.($user_settings['type'] != '0' ? ' class="displayNone"' : '').'>';
echo ' <div class="setting"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_has_dpo'].':</label></span> '; echo '<div class="setting_holder">';
echo ' <label for="has_dpo_0"><input class="radio" name="has_dpo" id="has_dpo_0" value="0" type="radio" '.($user_settings['has_dpo'] != '1' ? ' checked="checked"' : '').' onClick="toggleGDPRHasDPO();"> '.$lang['no'].'</label>'; echo '<span class="setting_title">'.$lang['srv_gdpr_user_settings_has_dpo'].':</span>';
echo ' <label for="has_dpo_1"><input class="radio" name="has_dpo" id="has_dpo_1" value="1" type="radio" '.($user_settings['has_dpo'] == '1' ? ' checked="checked"' : '').' onClick="toggleGDPRHasDPO();"> '.$lang['yes'].'</label>';
echo ' </div>';
echo '<br /><br />'; echo '<div class="setting_item">';
echo '<input class="radio" name="has_dpo" id="has_dpo_0" value="0" type="radio" '.($user_settings['has_dpo'] != '1' ? ' checked="checked"' : '').' onClick="toggleGDPRHasDPO();">';
echo '<label for="has_dpo_0"> '.$lang['no'].'</label>';
echo '</div>';
echo ' </div>'; echo '<div class="setting_item">';
echo '<input class="radio" name="has_dpo" id="has_dpo_1" value="1" type="radio" '.($user_settings['has_dpo'] == '1' ? ' checked="checked"' : '').' onClick="toggleGDPRHasDPO();">';
echo '<label for="has_dpo_1"> '.$lang['yes'].'</label>';
echo '</div>';
echo '</div>';
echo '</div>';
// DPO // DPO
echo ' <div id="gdpr_dpo" '.($user_settings['type'] != '1' && $user_settings['has_dpo'] != '1' ? ' style="display:none;"' : '').'>';
echo ' <p class="bold">'.$lang['srv_gdpr_user_settings_dpo'].':</p>'; echo '<div id="gdpr_dpo" '.($user_settings['type'] != '1' && $user_settings['has_dpo'] != '1' ? ' class="displayNone"' : '').'>';
echo '<p class="setting_text">'.$lang['srv_gdpr_user_settings_dpo'].':</p>';
// Opozorilo za obvezna polja // Opozorilo za obvezna polja
if($user_settings['dpo_firstname'] == '' || $user_settings['dpo_lastname'] == '' || $user_settings['dpo_email'] == '') if($user_settings['dpo_firstname'] == '' || $user_settings['dpo_lastname'] == '' || $user_settings['dpo_email'] == '')
echo '<p><span class="red bold">'.$lang['srv_gdpr_user_settings_err'].'</span></p>'; echo '<p class="red setting_text">'.$lang['srv_gdpr_user_settings_err'].'</p>';
else
echo '<br />';
echo ' <div class="setting '.($user_settings['dpo_firstname'] == '' ? ' red' : '').'"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_dpo_firstname'].':</label></span> '; echo '<div class="setting_horizontal_wrapper">';
echo ' <input class="text" name="dpo_firstname" value="'.$user_settings['dpo_firstname'].'" type="text"></div>';
echo ' <div class="setting '.($user_settings['dpo_lastname'] == '' ? ' red' : '').'"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_dpo_lastname'].':</label></span> '; echo '<div class="setting_holder '.($user_settings['dpo_firstname'] == '' ? ' red' : '').'">';
echo ' <input class="text" name="dpo_lastname" value="'.$user_settings['dpo_lastname'].'" type="text"></div>'; echo '<label for="dpo_firstname">'.$lang['srv_gdpr_user_settings_dpo_firstname'].':</label>';
echo '<input class="large w200" id="dpo_firstname" name="dpo_firstname" value="'.$user_settings['dpo_firstname'].'" type="text">';
echo '</div>';
echo ' <div class="setting '.($user_settings['dpo_email'] == '' ? ' red' : '').'"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_dpo_email'].':</label></span> '; echo '<div class="setting_holder '.($user_settings['dpo_lastname'] == '' ? ' red' : '').'">';
echo ' <input class="text '.(isset($error['dpo_email']) ? ' red' : '').'" name="dpo_email" value="'.$user_settings['dpo_email'].'" type="text"> '.(isset($error['dpo_email']) ? '<span class="red italic">'.$lang['srv_remind_email_hard'].'</span>' : '').'</div>'; echo '<label for="dpo_lastname">'.$lang['srv_gdpr_user_settings_dpo_lastname'].':</label>';
echo '<input class="large w200" id="dpo_lastname" name="dpo_lastname" value="'.$user_settings['dpo_lastname'].'" type="text">';
echo '</div>';
echo ' <div class="setting"><span class="nastavitveSpan2"><label>'.$lang['srv_gdpr_user_settings_dpo_phone'].':</label></span> '; echo '</div>';
echo ' <input class="text" name="dpo_phone" value="'.$user_settings['dpo_phone'].'" type="text"></div>';
echo ' </div>'; echo '<div class="setting_horizontal_wrapper">';
echo '<div class="setting_holder '.($user_settings['dpo_email'] == '' ? ' red' : '').'">';
echo '<label for="dpo_email">'.$lang['srv_gdpr_user_settings_dpo_email'].':</label>';
echo '<input class="large w200 '.(isset($error['dpo_email']) ? ' red' : '').'" id="dpo_email" name="dpo_email" value="'.$user_settings['dpo_email'].'" type="text"> '.(isset($error['dpo_email']) ? '<span class="red italic">'.$lang['srv_remind_email_hard'].'</span>' : '');
echo '</div>';
echo '<div class="setting_holder ">';
echo '<label>'.$lang['srv_gdpr_user_settings_dpo_phone'].':</label>';
echo '<input class="large w200" name="dpo_phone" value="'.$user_settings['dpo_phone'].'" type="text">';
echo '</div>';
echo '</div>';
echo '</div>';
// Podatki trenutne avtoritete // Podatki trenutne avtoritete
echo '<div id="gdpr_authority_info">'; echo '<div class="setting_holder" id="gdpr_authority_info">';
self::displayGDPRAuthority($user_settings['country']); self::displayGDPRAuthority($user_settings['country']);
echo '</div>'; echo '</div>';
echo ' </fieldset>'; echo '</fieldset>';
// Gumb shrani // Gumb shrani
echo '<div class="buttonwrapper floatLeft spaceLeft"><a class="ovalbutton ovalbutton_orange btn_savesettings" href="#" onclick="editGDPRProfile(); return false;"><span>'.$lang['edit1337'].'</span></a></div>'; echo '<div class="button_holder">';
echo '<button class="medium white-blue" onClick="window.location='.$preklici_url.';return false;">'.$lang['edit1338'].'</button>';
echo '<button class="medium blue" onclick="editGDPRProfile(); return false;">'.$lang['edit1337'].'</button>';
echo '</div>';
// div za prikaz uspešnosti shranjevanja // div za prikaz uspešnosti shranjevanja
if ($_GET['s'] == '1') { if ($_GET['s'] == '1') {
@ -280,7 +330,7 @@ class GDPR{
$current_authorities[] = $authority; $current_authorities[] = $authority;
} }
echo '<p class="bold">'.$lang['srv_gdpr_user_settings_authority'].':</p>'; echo '<p class="setting_text">'.$lang['srv_gdpr_user_settings_authority'].':</p>';
// Prikazemo podatke za vse avtoritete (lahko jih je vec na drzavo) // Prikazemo podatke za vse avtoritete (lahko jih je vec na drzavo)
foreach ($current_authorities as $authority) { foreach ($current_authorities as $authority) {

16
admin/survey/script/GDPR.js
View File

@ -145,17 +145,17 @@ function toggleGDPRDPO(){
var has_dpo = $('input[name=has_dpo]:checked').val(); var has_dpo = $('input[name=has_dpo]:checked').val();
if(organization == '1' || has_dpo == '1') if(organization == '1' || has_dpo == '1')
$("#gdpr_dpo").show(); $("#gdpr_dpo").removeClass('displayNone');
else else
$("#gdpr_dpo").hide(); $("#gdpr_dpo").addClass('displayNone');
if(organization == '1'){ if(organization == '1'){
$("#gdpr_organization").show(); $("#gdpr_organization").removeClass('displayNone');
$("#gdpr_has_dpo").hide(); $("#gdpr_has_dpo").addClass('displayNone');
} }
else{ else{
$("#gdpr_organization").hide(); $("#gdpr_organization").addClass('displayNone');
$("#gdpr_has_dpo").show(); $("#gdpr_has_dpo").removeClass('displayNone');
} }
} }
// Prikazemo/skrijemo nastavitve organizacije in dpo-ja (ce je zasebnik) // 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(); var has_dpo = $('input[name=has_dpo]:checked').val();
if(has_dpo == '1') if(has_dpo == '1')
$("#gdpr_dpo").show(); $("#gdpr_dpo").removeClass('displayNone');
else else
$("#gdpr_dpo").hide(); $("#gdpr_dpo").addClass('displayNone');
} }
// Nastavimo zahtevo za izbris da je opravljena // Nastavimo zahtevo za izbris da je opravljena

4
lang/1.php
View File

@ -7708,11 +7708,11 @@ $lang = array (
'srv_gdpr_general_settings' => "Splošne GDPR nastavitve", 'srv_gdpr_general_settings' => "Splošne GDPR nastavitve",
'srv_gdpr_general_settings_warning' => "Prosimo izpolnite osebne podatke GDPR profila!", 'srv_gdpr_general_settings_warning' => "Prosimo izpolnite osebne podatke GDPR profila!",
'srv_gdpr_user_settings' => "Splošne nastavitve", '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 (<a href=\"http://www.eugdpr.org/\" target=\"_blank\"><span class=\"bold\">GDPR</span></a>), 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_desc1' => "S 25. majem 2018 je v veljavi nova Splošna uredba o varstvu podatkov (<a href=\"http://www.eugdpr.org/\" target=\"_blank\"><span class=\"bold\">GDPR</span></a>), 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, <a href=\"https://www.1ka.si/d/sl/pomoc/prirocniki/pravice-respondentov-odgovornosti-urednikov-anket-okviru-gdpr\" target=\"_blank\"><span class=\"bold\">odgovornost</span></a>, 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_desc2' => "V skladu s tem je na vaši strani, kot izvajalcu ankete in s tem upravljalcu osebnih podatkov, <a href=\"https://www.1ka.si/d/sl/pomoc/prirocniki/pravice-respondentov-odgovornosti-urednikov-anket-okviru-gdpr\" target=\"_blank\"><span class=\"bold\">odgovornost</span></a>, 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 (<a href=\"https://www.uradni-list.si/e-bilten/novica/pooblascena-oseba-za-varstvo-podatkov\" target=\"_blank\"><span class=\"bold\">DPO</span></a>). Vnesene podatke bomo uporabili zgolj za namene procesiranja zahtevkov.", '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 (<a href=\"https://www.uradni-list.si/e-bilten/novica/pooblascena-oseba-za-varstvo-podatkov\" target=\"_blank\"><span class=\"bold\">DPO</span></a>). 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_err2' => "Polji \"Ime organizacije\" in \"Matična številka\" sta obvezni!",
'srv_gdpr_user_settings_type' => "Organizacija ali zasebnik", 'srv_gdpr_user_settings_type' => "Organizacija ali zasebnik",
'srv_gdpr_user_settings_type_0' => "Zasebnik", 'srv_gdpr_user_settings_type_0' => "Zasebnik",

4
lang/2.php
View File

@ -7595,11 +7595,11 @@ $lang = array (
'srv_gdpr_general_settings' => "General GDPR settings", 'srv_gdpr_general_settings' => "General GDPR settings",
'srv_gdpr_general_settings_warning' => "Please fill in your personal data in your GDPR profile!", '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' => "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 (<a href=\"http://www.eugdpr.org/\" target=\"_blank\"><span class=\"bold\">GDPR</span></a>) 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_desc1' => "Since May 25th, 2018, a new regulation on the protection of personal data (<a href=\"http://www.eugdpr.org/\" target=\"_blank\"><span class=\"bold\">GDPR</span></a>) 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 <a href=\"https://www.1ka.si/d/sl/pomoc/prirocniki/pravice-respondentov-odgovornosti-urednikov-anket-okviru-gdpr\" target=\"_blank\"><span class=\"bold\">responsibility</span></a> 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_desc2' => "Accordingly, it is your <a href=\"https://www.1ka.si/d/sl/pomoc/prirocniki/pravice-respondentov-odgovornosti-urednikov-anket-okviru-gdpr\" target=\"_blank\"><span class=\"bold\">responsibility</span></a> 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 (<a href=\"https://edps.europa.eu/data-protection/data-protection/reference-library/data-protection-officer-dpo_en\" target=\"_blank\"><span class=\"bold\">DPO</span></a>), 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_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 (<a href=\"https://edps.europa.eu/data-protection/data-protection/reference-library/data-protection-officer-dpo_en\" target=\"_blank\"><span class=\"bold\">DPO</span></a>), 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_err2' => "Fields \"Organization name\" \"Surname\" and \"Email\" are mandatory!",
'srv_gdpr_user_settings_type' => "Organization or individual", 'srv_gdpr_user_settings_type' => "Organization or individual",
'srv_gdpr_user_settings_type_0' => "Individual", 'srv_gdpr_user_settings_type_0' => "Individual",

25
public/css/admin_new.css
View File

@ -5063,6 +5063,9 @@ p.warning, p.red, span.warning, span.red {
p.italic, span.italic { p.italic, span.italic {
font-style: italic; font-style: italic;
} }
p.bold, span.bold {
font-weight: 800;
}
/* /*
Only layout styles - position, display, max-width... Only layout styles - position, display, max-width...
@ -7116,6 +7119,9 @@ input[type=text]#anketa_polnoIme {
input[type=text]#anketa_akronim { input[type=text]#anketa_akronim {
width: 800px; width: 800px;
} }
input[type=text].w200 {
width: 200px;
}
input[type=text].large { input[type=text].large {
height: 40px; height: 40px;
font-size: 16px; font-size: 16px;
@ -7205,6 +7211,16 @@ fieldset legend {
color: #1E88E5; color: #1E88E5;
text-transform: uppercase; 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 { fieldset .setting_holder {
margin-bottom: 16px; margin-bottom: 16px;
display: flex; display: flex;
@ -7234,6 +7250,12 @@ fieldset .setting_holder span.charalimit#anketa_akronim_chars, fieldset .setting
fieldset .setting_holder.indent { fieldset .setting_holder.indent {
margin-left: 27px; margin-left: 27px;
} }
fieldset .setting_holder.red label {
color: red;
}
fieldset .setting_holder.red input[type=text] {
border: 1px solid red;
}
div#gdpr_nastavitve { div#gdpr_nastavitve {
display: flex; display: flex;
@ -7286,6 +7308,9 @@ select.dropdown.small option {
line-height: 18px; line-height: 18px;
color: #333333; color: #333333;
} }
select.dropdown.w200 {
width: 200px;
}
select.dropdown:focus { select.dropdown:focus {
outline-style: none; outline-style: none;
box-shadow: none; box-shadow: none;

4
resources/sass/admin_new/basic/typography.scss
View File

@ -12,4 +12,8 @@ p,span {
&.italic { &.italic {
font-style: italic; font-style: italic;
} }
&.bold {
font-weight: $extra-bold;
}
} }

4
resources/sass/admin_new/components/form/dropdown.scss
View File

@ -48,6 +48,10 @@ select.dropdown {
} }
} }
&.w200 {
width: 200px;
}
&:focus { &:focus {
outline-style: none; outline-style: none;
box-shadow: none; box-shadow: none;

24
resources/sass/admin_new/components/form/fieldset.scss
View File

@ -17,6 +17,19 @@ fieldset{
text-transform: uppercase; text-transform: uppercase;
} }
p.setting_text {
margin-bottom: 16px;
}
.setting_horizontal_wrapper {
display: flex;
flex-direction: row;
.setting_holder {
margin-right: 17px;
}
}
.setting_holder { .setting_holder {
margin-bottom: 16px; margin-bottom: 16px;
display: flex; display: flex;
@ -53,6 +66,17 @@ fieldset{
&.indent { &.indent {
margin-left: 27px; margin-left: 27px;
} }
&.red {
label {
color: red;
}
input {
&[type="text"] {
border: 1px solid red;
}
}
}
} }
} }

3
resources/sass/admin_new/components/form/input.scss
View File

@ -23,6 +23,9 @@ input {
&#anketa_akronim{ &#anketa_akronim{
width: 800px; width: 800px;
} }
&.w200 {
width: 200px;
}
margin-top: 4px; margin-top: 4px;