From ae906398b02d8d79fab252c1645a18a4b31eb535 Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Wed, 15 Dec 2021 15:53:59 +0100
Subject: [PATCH] =?UTF-8?q?[Redizajn=201KA]=20-=20GDPR=20nastavitve=20-->?=
 =?UTF-8?q?=20Splo=C5=A1ne=20nastavitve=20-=20v2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Popravljeni margini med odstavki in nastavitvami
---
 admin/survey/classes/class.GDPR.php           | 18 ++++++------
 admin/survey/script/GDPR.js                   |  6 ++++
 public/css/admin_new.css                      | 28 +++++++++++++------
 resources/sass/admin_new/basic/layout.scss    |  8 ++++++
 .../admin_new/components/form/fieldset.scss   | 25 +++++++++++------
 5 files changed, 58 insertions(+), 27 deletions(-)

diff --git a/admin/survey/classes/class.GDPR.php b/admin/survey/classes/class.GDPR.php
index ab7e45de8..b7b2dfd9e 100644
--- a/admin/survey/classes/class.GDPR.php
+++ b/admin/survey/classes/class.GDPR.php
@@ -122,15 +122,15 @@ class GDPR{
 
 		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="setting_text">'.$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_desc1'].'</p>';
+		echo '<p class="bottom16">'.$lang['srv_gdpr_user_settings_desc2'].'</p>';
+        echo '<p class="bottom16">'.$lang['srv_gdpr_user_settings_desc3'].'</p>';
         
 
         // PODATKI AVTORJA
         // Opozorilo za obvezna polja
         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">';
 
@@ -211,7 +211,7 @@ class GDPR{
         
         // Opozorilo za obvezna polja
         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">';
 
@@ -232,7 +232,7 @@ class GDPR{
         // IMA DPO
         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 '<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 '<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
         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">';
 
@@ -330,7 +330,7 @@ class GDPR{
 					$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)
 			foreach ($current_authorities as $authority) {
diff --git a/admin/survey/script/GDPR.js b/admin/survey/script/GDPR.js
index 49a5053c8..6701f2481 100644
--- a/admin/survey/script/GDPR.js
+++ b/admin/survey/script/GDPR.js
@@ -146,16 +146,21 @@ function toggleGDPRDPO(){
 
 	if(organization == '1' || has_dpo == '1')
         $("#gdpr_dpo").removeClass('displayNone');
+
 	else
         $("#gdpr_dpo").addClass('displayNone');
+
         
     if(organization == '1'){
         $("#gdpr_organization").removeClass('displayNone');
         $("#gdpr_has_dpo").addClass('displayNone');
+        $("#gdpr_has_dpo").find('.setting_holder').removeClass('bottom16');
+
     }
 	else{
         $("#gdpr_organization").addClass('displayNone');
         $("#gdpr_has_dpo").removeClass('displayNone');
+        $("#gdpr_has_dpo").find('.setting_holder').addClass('bottom16');
     }
 }
 // Prikazemo/skrijemo nastavitve organizacije in dpo-ja (ce je zasebnik)
@@ -165,6 +170,7 @@ function toggleGDPRHasDPO(){
 
 	if(has_dpo == '1')
 		$("#gdpr_dpo").removeClass('displayNone');
+
 	else
 		$("#gdpr_dpo").addClass('displayNone');
 }
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index c265af73b..1ecb9b71c 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -5105,6 +5105,12 @@ body #main_holder #main .menu_left .layout_left_item {
 body #main_holder #main .menu_left .layout_right_item {
   flex-grow: 1;
 }
+body #main_holder #main #moje_ankete_edit {
+  display: flex;
+  flex-direction: column;
+  margin: 0 auto;
+  max-width: 1060px;
+}
 span.faicon,
 a.faicon {
   font-family: "Font Awesome 5 Free";
@@ -7236,6 +7242,12 @@ fieldset p.bottom16 {
 fieldset p.top16 {
   margin-top: 16px;
 }
+fieldset p.bottom8 {
+  margin-bottom: 8px;
+}
+fieldset p.top8 {
+  margin-top: 8px;
+}
 fieldset .setting_horizontal_wrapper {
   display: flex;
   flex-direction: row;
@@ -7251,9 +7263,15 @@ fieldset .setting_holder {
 fieldset .setting_holder:first-of-type, fieldset .setting_holder.top0 {
   margin-top: 0;
 }
-fieldset .setting_holder:last-of-type, fieldset .setting_holder.bottom0 {
+fieldset .setting_holder.bottom0 {
   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 {
   margin-top: 8px;
 }
@@ -7279,14 +7297,6 @@ fieldset .setting_holder.red input[type=text] {
   border: 1px solid red;
 }
 
-div#gdpr_nastavitve {
-  display: flex;
-  justify-content: center;
-}
-div#gdpr_nastavitve fieldset {
-  width: 1060px;
-}
-
 select.dropdown {
   border: 1px solid #C4C4C4;
   box-sizing: border-box;
diff --git a/resources/sass/admin_new/basic/layout.scss b/resources/sass/admin_new/basic/layout.scss
index c0a1341b6..88b745290 100644
--- a/resources/sass/admin_new/basic/layout.scss
+++ b/resources/sass/admin_new/basic/layout.scss
@@ -54,6 +54,14 @@ body{
                     flex-grow: 1;
                 }
             }
+
+            #moje_ankete_edit {
+                display: flex;
+                flex-direction: column;
+                margin: 0 auto;
+                max-width: 1060px;
+
+            }
         }
 
         footer{
diff --git a/resources/sass/admin_new/components/form/fieldset.scss b/resources/sass/admin_new/components/form/fieldset.scss
index 81fa9fb45..ef1ec0944 100644
--- a/resources/sass/admin_new/components/form/fieldset.scss
+++ b/resources/sass/admin_new/components/form/fieldset.scss
@@ -25,6 +25,14 @@ fieldset{
         &.top16 {
 		margin-top: 16px;
         }
+
+        &.bottom8 {
+            margin-bottom: 8px;
+            }
+    
+            &.top8 {
+            margin-top: 8px;
+            }
 	}
 
     .setting_horizontal_wrapper {
@@ -46,11 +54,18 @@ fieldset{
             margin-top: 0;
         }
 
-        &:last-of-type,
         &.bottom0{
             margin-bottom: 0;
         }
 
+        &:last-of-type {
+            margin-bottom: 0;
+
+            &.bottom16 {
+		        margin-bottom: 16px !important;
+            }
+        }
+
         .setting_item {
             margin-top: 8px;
         }
@@ -86,12 +101,4 @@ fieldset{
             }
         }
     }    
-}
-
-div#gdpr_nastavitve {
-    display:flex;
-    justify-content: center;    
-    fieldset {
-        width: 1060px;
-    }
 }
\ No newline at end of file