[Redizajn 1KA] - GDPR nastavitve --> Seznam anket - v1

admin/survey/classes/class.GDPR.php

@@ -59,9 +59,10 @@ class GDPR{
 		$survey_list = $this->getUserSurveys();
 
 
-		echo '<div style="margin-top:-10px;">';
+		echo '<fieldset>';
+		echo '<legend>'.$lang['srv_anketalist'].'</legend>';
 
-		echo '<p>'.$lang['srv_gdpr_survey_list_text'].'</p>';
+		echo '<p class="bottom16">'.$lang['srv_gdpr_survey_list_text'].'</p>';
 
 		echo $lang['srv_gdpr_survey_list_text2'].'<ul style="margin-top:2px;">';
 		echo '	<li>'.$lang['srv_gdpr_survey_list_li_1'].'</li>';
@@ -70,10 +71,7 @@ class GDPR{
 		echo '	<li>'.$lang['srv_gdpr_survey_list_li_4'].'</li>';
 		echo '</ul>';
 
-		echo '<p>'.$lang['srv_gdpr_survey_list_text3'].'</p>';
+		echo '<p class="top16 bottom16">'.$lang['srv_gdpr_survey_list_text3'].'</p>';
-
-		echo '</div>';
-
 
 		echo '<table class="gdpr_surveys">';
 
@@ -96,17 +94,30 @@ class GDPR{
 
 			echo '<tr '.$color.'>';
 
-			echo '<td><a href="'.$site_url.'admin/survey/index.php?anketa='.$anketa['id'].'&a=gdpr_settings">'.$anketa['naslov'].'</a></td>';
+			if($anketa['active']==1)
-			echo '<td>'.$anketa['active'].'</td>';
+				$anketa_active = $lang['yes'];
-			echo '<td>'.$anketa['potential_gdpr'].'</td>';
+			else
+				$anketa_active = $lang['no'];
+
+			if($anketa['potential_gdpr']==1)
+				$anketa_potential_gdpr = $lang['yes'];
+			else
+				$anketa_potential_gdpr = $lang['no'];
+
+
+			echo '<td><a href="'.$site_url.'admin/survey/index.php?anketa='.$anketa['id'].'&a=gdpr_settings">'.$anketa['naslov'].'</a></td>';
+			echo '<td>'.$anketa_active.'</td>';
+			echo '<td>'.$anketa_potential_gdpr.'</td>';
 
-			//echo '<td>'.$anketa['gdpr'].'</td>';
 			echo '<td><input type="checkbox" value="1" class="pointer" onClick="setGDPRSurvey(\''.$anketa['id'].'\', this.checked); return false;" '.($anketa['gdpr'] == '1' ? ' checked="checked"' : '').'</td>';
 
 			echo '</tr>';
 		}
 
 		echo '</table>';
+
+		echo '</fieldset>';
+
 	}
 
 	// Prikazemo vsebino zavihka gdpr - nastavitve uporabnika

lang/1.php

@@ -1046,6 +1046,8 @@ $lang = array (
 	"send_email2admins"		=>	"Pošlji e-mail administratorjem",
 	"sendmailnotice"		=>	"Pozor: vnesite vaš pravi e-mail naslov, da vam bo naslovnik lahko odgovoril!",
 	"subject"			=>	"Zadeva",
+	"message"		=>	"Sporočilo",
+	"message_content"			=>	"Vsebina sporočila",
 	"email_show"			=>	"Prikaži e-mail",
 //	"email_send"			=>	"Možno poslati e-mail",
 	"email_send"			=>	"Omogoči pošiljanje, a skrij naslov",
@@ -2246,9 +2248,11 @@ $lang = array (
     "srv_alert_respondent_cms_note"	=>	  "&nbsp;<span class=\"red\">(V nastavitah mora biti ozna&#269;eno, da prepozna uporabnika iz CMS!)</span>",
 	"srv_alert_respondent_cms_note_ok"	=>	  "&nbsp;<span class=\"gray\">(Uporabnik bo prepoznan iz sisplet CMS)</span>",
 	"srv_alert_respondent_cms_note_link"	=>	"Dodaj nastavitev!",
-    "srv_alert_author"		=>	"Avtor ankete oziroma druge osebe, katerim je omogo&#269;en dostop:",
+    "srv_alert_author"		=>	"Avtor ankete oziroma souredniki",
     "srv_alert_msg"         =>	 "je izpolnil formo/anketo",
     "srv_alert_prejemnik"	=>	 "Obvestilo dobijo naslednji prejemniki:",
+    "srv_alert_surveydelete"	=>	 "Obveščanje o izbrisu ankete",
+    "srv_alert_surveydelete_text"	=>	 "Obvestilo o izbrisu ankete prejmejo naslednji prejemniki:",
     "srv_alert_oblika"		=>	 "Oblika e-mail sporočila:",
     "srv_alert_oblika_deactivate_note"	=>	 "Sporo&#269;ilo ob deaktivaciji ankete",
     "srv_alert_oblika_activate_note"	=>	 "Sporo&#269;ilo ob aktivaciji ankete",
@@ -7739,13 +7743,13 @@ $lang = array (
 	'srv_gdpr_user_settings_country_select' => "Izberi državo",
 	'srv_gdpr_user_settings_authority' => "Informacijski pooblaščenec",
 	'srv_gdpr_survey_list' 			=> "Seznam anket",
-	'srv_gdpr_survey_list_text' 	=> "Spodaj je seznam vseh vaših anket. Z rožnato barvo in vrednostjo 1 (v stolpcu Potencialno GDPR) so označene vse ankete, pri katerih je orodje 1KA zaznalo prisotnost vprašanj, ki bi lahko vsebovala GDPR občutljive podatke.",
+	'srv_gdpr_survey_list_text' 	=> "Spodaj je seznam vseh vaših anket. Z ozadjem svetlo rdeče barve in vrednostjo “Da” (v stolpcu Potencialno GDPR) so označene vse ankete, pri katerih je orodje 1KA zaznalo prisotnost vprašanj, ki bi lahko vsebovala GDPR občutljive podatke.",
 	'srv_gdpr_survey_list_text2' 	=> "Za GDPR se preverja:",
 	'srv_gdpr_survey_list_li_1' 	=> "email vabila",
 	'srv_gdpr_survey_list_li_2' 	=> "vklopljen modul telefonska anketa",
 	'srv_gdpr_survey_list_li_3' 	=> "spremenljivke 'ime', 'priimek', 'email', 'firstname', 'lastname'",
 	'srv_gdpr_survey_list_li_4' 	=> "vprašanje tipa lokacija",
-	'srv_gdpr_survey_list_text3' 	=> "V primeru, da gre za h GDPR zavezujočo anketo, označite to v zadnjem stolpcu. V tem primeru imate pri anketi na voljo dodatne možnosti urejanja v skladu z GDPR zahtevanega soglasja respondentov.",
+	'srv_gdpr_survey_list_text3' 	=> "V primeru, da gre za anketo, ki zahteva zavezanost h GDPR, slednje označite v zadnjem stolpcu. V tem primeru imate pri vsaki anketi (v zavihku ‘Urejanje’ - ‘Nastavitve’ - ‘GDPR’) na voljo dodatne možnosti urejanja soglasja respondentov, ki ga zahteva GDPR.",
 	'srv_gdpr_survey_list_survey' 	=> "Anketa",
 	'srv_gdpr_survey_list_activity' => "Aktivnost",
 	'srv_gdpr_survey_list_pot_gdpr' => "Potencialno GDPR",

lang/2.php

@@ -1030,6 +1030,8 @@ $lang = array (
 	"send_email2admins"		=>	"Send email to administrators",
 	"sendmailnotice"	=>	"Alert: insert your real e-mail, so that recipient can reply!",
 	"subject"		=>	"Subject",
+	"message"		=>	"Message",
+	"message_content"			=>	"Message content",
 	"email_show"		=>	"Display email",
 	"email_send"		=>	"Can send email",
 	"default_options"	=>	"Default options",
@@ -2232,9 +2234,11 @@ $lang = array (
     "srv_alert_respondent_cms_note"	=>	"&nbsp;<span class=\"red\">(The seting should be marked to identify the user of CMS!)</span>",
 	"srv_alert_respondent_cms_note_ok"	=>	"&nbsp;<span class=\"gray\">(The user will be identify from CMS)</span>",
 	"srv_alert_respondent_cms_note_link"	=>	"Add setting!", 
-    "srv_alert_author"		=>	"The author of the survey and additional editors",
+    "srv_alert_author"		=>	"Author of the survey or other uses with editing acccess",
     "srv_alert_msg"         =>  "has completed the survey",
     "srv_alert_prejemnik"	=>  "The following recipients will receive notifications for valid responses:",
+    "srv_alert_surveydelete"	=>	 "Survey deletion notifications",
+    "srv_alert_surveydelete_text"	=>	 "Survey deletion notifications will be sent to the following recipients:",
     "srv_alert_oblika"		=>  "Design:",
     "srv_alert_oblika_deactivate_note"	=>  "Message on the deactivation of the survey",
     "srv_alert_oblika_activate_note"	=>  "Message on the activation of the survey",
@@ -7626,13 +7630,13 @@ $lang = array (
 	'srv_gdpr_user_settings_country_select' => "Select country",
 	'srv_gdpr_user_settings_authority' => "Data Protection Supervisory Authority in the country",
 	'srv_gdpr_survey_list' 			=> "Survey list",
-	'srv_gdpr_survey_list_text' 	=> "Below is a list of all your surveys. In the Potentially GDPR column all surveys where 1KA tool detected the presence of questions that could contain GDPR sensitive data, are marked with pink colour and value 1.",
+	'srv_gdpr_survey_list_text' 	=> "Below is a list of all your surveys. The light red background and the value "Yes" (in the Potentially GDPR column) indicate all surveys where the 1KA tool has detected the presence of questions that could contain GDPR-sensitive data.",
 	'srv_gdpr_survey_list_text2' 	=> "For GDPR is checked:",
 	'srv_gdpr_survey_list_li_1' 	=> "email invitations",
 	'srv_gdpr_survey_list_li_2' 	=> "activated module Telephone survey",
 	'srv_gdpr_survey_list_li_3' 	=> "questions with name 'name', 'surname', 'email', 'firstname', 'lastname'",
 	'srv_gdpr_survey_list_li_4' 	=> "location questions",
-	'srv_gdpr_survey_list_text3' 	=> "In case of a GDPR binding survey, mark this in the last column. In this case, you have additional options for editing the survey in accordance with the GDPR required consent for the respondents.",
+	'srv_gdpr_survey_list_text3' 	=> "If the survey requires a commitment to the GDPR, please mark this in the last column. In this case, for each survey (in the 'Edit' - 'Settings' - 'GDPR' tab) you have additional options to edit the consent of respondents required by the GDPR.",
 	'srv_gdpr_survey_list_survey' 	=> "Survey",
 	'srv_gdpr_survey_list_activity' => "Activity",
 	'srv_gdpr_survey_list_pot_gdpr' => "Potentially GDPR",

public/css/admin_new.css

@@ -5066,6 +5066,9 @@ p.italic, span.italic {
 p.bold, span.bold {
   font-weight: 800;
 }
+p.caps, span.caps {
+  text-transform: uppercase;
+}
 
 /* 
     Only layout styles - position, display, max-width...
@@ -7160,6 +7163,9 @@ input[type=text]#anketa_akronim {
 input[type=text].w200 {
   width: 200px;
 }
+input[type=text].wauto {
+  width: auto;
+}
 input[type=text].large {
   height: 40px;
   font-size: 16px;
@@ -7312,6 +7318,11 @@ fieldset .setting_holder.red label {
 fieldset .setting_holder.red input[type=text] {
   border: 1px solid red;
 }
+fieldset .message_instructions {
+  background-color: #F8F8F8;
+  border: 1px solid #E5E5E5;
+  box-sizing: border-box;
+}
 fieldset ul {
   margin-block-start: 0;
   margin-block-end: 0;
@@ -7433,6 +7444,12 @@ table tr {
 table tr:last-of-type td, table tr:last-of-type th {
   border-bottom: 1px solid #E5E5E5;
 }
+table.gdpr_surveys tr.red_row td {
+  background-color: #FFEFEF !important;
+}
+table.gdpr_surveys tr.green_row td {
+  background-color: #a8eea8 !important;
+}
 
 /* 
     Specific pages scss

resources/sass/admin_new/basic/colors.scss

@@ -18,4 +18,6 @@ $light-gray: #F8F8F8;
 
 $yellow: #FFC700;
 $red: #FF0000;
+$light-red: #FFEFEF;
+$light-green: #a8eea8;
 

resources/sass/admin_new/basic/typography.scss

@@ -16,4 +16,8 @@ p,span {
 	&.bold {
 		font-weight: $extra-bold;
 	}
+
+	&.caps {
+        text-transform: uppercase;
+	}
 }

resources/sass/admin_new/components/form/fieldset.scss

@@ -105,6 +105,12 @@ fieldset{
         }
     }
 
+    .message_instructions {
+        background-color: $light-gray;
+        border: 1px solid $gray;
+        box-sizing: border-box;
+    }
+    
     ul {
         margin-block-start: 0;
         margin-block-end: 0;

resources/sass/admin_new/components/form/input.scss

@@ -17,6 +17,10 @@ input {
         box-sizing: border-box;
         border-radius: 2px;
         width: 245px;
+        margin-top: 4px;
+
+        font-family: $font_family;
+
         &#anketa_polnoIme{
             width: 400px;
         }
@@ -26,10 +30,9 @@ input {
         &.w200 {
         width: 200px;
         }
-
+        &.wauto {
-        margin-top: 4px;
+            width: auto;
-
+        }
-        font-family: $font_family;
 
         &.large {
             height: 40px;

resources/sass/admin_new/components/table/table.scss

@@ -38,4 +38,18 @@ table {
             }
         }
     }
+
+    &.gdpr_surveys {
+        tr.red_row {
+            td {
+                background-color: $light-red !important;
+            }
+        }
+        tr.green_row {
+            td {
+                background-color: $light-green !important;
+            }
+        }
+    }
+
 }