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

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

Browse Source 
Popravljeni margini med odstavki in nastavitvami
This commit is contained in:
tejagerjovic 2021-12-15 15:53:59 +01:00
parent 492a6f2292
commit ae906398b0
5 changed files with 58 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,15 +122,15 @@ 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="setting_text">'.$lang['srv_gdpr_user_settings_desc1'].'</p>'; echo '<p class="bottom16">'.$lang['srv_gdpr_user_settings_desc1'].'</p>';
echo '<p class="setting_text">'.$lang['srv_gdpr_user_settings_desc2'].'</p>'; echo '<p class="bottom16">'.$lang['srv_gdpr_user_settings_desc2'].'</p>';
echo '<p class="setting_text">'.$lang['srv_gdpr_user_settings_desc3'].'</p>'; echo '<p class="bottom16">'.$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 class="red setting_text">'.$lang['srv_gdpr_user_settings_err'].'</p>'; echo '<p class="red bottom16">'.$lang['srv_gdpr_user_settings_err'].'</p>';
echo '<div class="setting_horizontal_wrapper">'; echo '<div class="setting_horizontal_wrapper">';
@ -211,7 +211,7 @@ class GDPR{
// 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 class="red setting_text">'.$lang['srv_gdpr_user_settings_err'].'</p>'; echo '<p class="red bottom16">'.$lang['srv_gdpr_user_settings_err'].'</p>';
echo '<div class="setting_horizontal_wrapper">'; echo '<div class="setting_horizontal_wrapper">';
@ -232,7 +232,7 @@ class GDPR{
// IMA DPO // IMA DPO
echo '<div id="gdpr_has_dpo" '.($user_settings['type'] != '0' ? ' class="displayNone"' : '').'>'; echo '<div id="gdpr_has_dpo" '.($user_settings['type'] != '0' ? ' class="displayNone"' : '').'>';
echo '<div class="setting_holder">'; echo '<div class="setting_holder bottom16">';
echo '<span class="setting_title">'.$lang['srv_gdpr_user_settings_has_dpo'].':</span>'; echo '<span class="setting_title">'.$lang['srv_gdpr_user_settings_has_dpo'].':</span>';
echo '<div class="setting_item">'; echo '<div class="setting_item">';
@ -254,11 +254,11 @@ class GDPR{
echo '<div id="gdpr_dpo" '.($user_settings['type'] != '1' && $user_settings['has_dpo'] != '1' ? ' class="displayNone"' : '').'>'; 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>'; echo '<p class="bottom16">'.$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 class="red setting_text">'.$lang['srv_gdpr_user_settings_err'].'</p>'; echo '<p class="red bottom16">'.$lang['srv_gdpr_user_settings_err'].'</p>';
echo '<div class="setting_horizontal_wrapper">'; echo '<div class="setting_horizontal_wrapper">';
@ -330,7 +330,7 @@ class GDPR{
$current_authorities[] = $authority; $current_authorities[] = $authority;
} }
echo '<p class="setting_text">'.$lang['srv_gdpr_user_settings_authority'].':</p>'; echo '<p class="bottom8">'.$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) {

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

@ -146,16 +146,21 @@ function toggleGDPRDPO(){
if(organization == '1' || has_dpo == '1') if(organization == '1' || has_dpo == '1')
$("#gdpr_dpo").removeClass('displayNone'); $("#gdpr_dpo").removeClass('displayNone');
else else
$("#gdpr_dpo").addClass('displayNone'); $("#gdpr_dpo").addClass('displayNone');
if(organization == '1'){ if(organization == '1'){
$("#gdpr_organization").removeClass('displayNone'); $("#gdpr_organization").removeClass('displayNone');
$("#gdpr_has_dpo").addClass('displayNone'); $("#gdpr_has_dpo").addClass('displayNone');
$("#gdpr_has_dpo").find('.setting_holder').removeClass('bottom16');
} }
else{ else{
$("#gdpr_organization").addClass('displayNone'); $("#gdpr_organization").addClass('displayNone');
$("#gdpr_has_dpo").removeClass('displayNone'); $("#gdpr_has_dpo").removeClass('displayNone');
$("#gdpr_has_dpo").find('.setting_holder').addClass('bottom16');
} }
} }
// Prikazemo/skrijemo nastavitve organizacije in dpo-ja (ce je zasebnik) // Prikazemo/skrijemo nastavitve organizacije in dpo-ja (ce je zasebnik)
@ -165,6 +170,7 @@ function toggleGDPRHasDPO(){
if(has_dpo == '1') if(has_dpo == '1')
$("#gdpr_dpo").removeClass('displayNone'); $("#gdpr_dpo").removeClass('displayNone');
else else
$("#gdpr_dpo").addClass('displayNone'); $("#gdpr_dpo").addClass('displayNone');
} }

28
public/css/admin_new.css
View File

@ -5105,6 +5105,12 @@ body #main_holder #main .menu_left .layout_left_item {
body #main_holder #main .menu_left .layout_right_item { body #main_holder #main .menu_left .layout_right_item {
flex-grow: 1; flex-grow: 1;
} }
body #main_holder #main #moje_ankete_edit {
display: flex;
flex-direction: column;
margin: 0 auto;
max-width: 1060px;
}
span.faicon, span.faicon,
a.faicon { a.faicon {
font-family: "Font Awesome 5 Free"; font-family: "Font Awesome 5 Free";
@ -7236,6 +7242,12 @@ fieldset p.bottom16 {
fieldset p.top16 { fieldset p.top16 {
margin-top: 16px; margin-top: 16px;
} }
fieldset p.bottom8 {
margin-bottom: 8px;
}
fieldset p.top8 {
margin-top: 8px;
}
fieldset .setting_horizontal_wrapper { fieldset .setting_horizontal_wrapper {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@ -7251,9 +7263,15 @@ fieldset .setting_holder {
fieldset .setting_holder:first-of-type, fieldset .setting_holder.top0 { fieldset .setting_holder:first-of-type, fieldset .setting_holder.top0 {
margin-top: 0; margin-top: 0;
} }
fieldset .setting_holder:last-of-type, fieldset .setting_holder.bottom0 { fieldset .setting_holder.bottom0 {
margin-bottom: 0; margin-bottom: 0;
} }
fieldset .setting_holder:last-of-type {
margin-bottom: 0;
}
fieldset .setting_holder:last-of-type.bottom16 {
margin-bottom: 16px !important;
}
fieldset .setting_holder .setting_item { fieldset .setting_holder .setting_item {
margin-top: 8px; margin-top: 8px;
} }
@ -7279,14 +7297,6 @@ fieldset .setting_holder.red input[type=text] {
border: 1px solid red; border: 1px solid red;
} }
div#gdpr_nastavitve {
display: flex;
justify-content: center;
}
div#gdpr_nastavitve fieldset {
width: 1060px;
}
select.dropdown { select.dropdown {
border: 1px solid #C4C4C4; border: 1px solid #C4C4C4;
box-sizing: border-box; box-sizing: border-box;

8
resources/sass/admin_new/basic/layout.scss
View File

@ -54,6 +54,14 @@ body{
flex-grow: 1; flex-grow: 1;
} }
} }
#moje_ankete_edit {
display: flex;
flex-direction: column;
margin: 0 auto;
max-width: 1060px;
}
} }
footer{ footer{

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

@ -25,6 +25,14 @@ fieldset{
&.top16 { &.top16 {
margin-top: 16px; margin-top: 16px;
} }
&.bottom8 {
margin-bottom: 8px;
}
&.top8 {
margin-top: 8px;
}
} }
.setting_horizontal_wrapper { .setting_horizontal_wrapper {
@ -46,11 +54,18 @@ fieldset{
margin-top: 0; margin-top: 0;
} }
&:last-of-type,
&.bottom0{ &.bottom0{
margin-bottom: 0; margin-bottom: 0;
} }
&:last-of-type {
margin-bottom: 0;
&.bottom16 {
margin-bottom: 16px !important;
}
}
.setting_item { .setting_item {
margin-top: 8px; margin-top: 8px;
} }
@ -86,12 +101,4 @@ fieldset{
} }
} }
} }
}
div#gdpr_nastavitve {
display:flex;
justify-content: center;
fieldset {
width: 1060px;
}
} }