From 8f63ae9c7d6e55dce1b614fa00134a1f687fd6c0 Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Fri, 17 Dec 2021 02:19:35 +0100 Subject: [PATCH] [Redizajn 1KA] - GDPR nastavitve --> Seznam anket - v1 --- admin/survey/classes/class.GDPR.php | 31 +++++++++++++------ lang/1.php | 10 ++++-- lang/2.php | 10 ++++-- public/css/admin_new.css | 17 ++++++++++ resources/sass/admin_new/basic/colors.scss | 2 ++ .../sass/admin_new/basic/typography.scss | 4 +++ .../admin_new/components/form/fieldset.scss | 6 ++++ .../sass/admin_new/components/form/input.scss | 11 ++++--- .../admin_new/components/table/table.scss | 14 +++++++++ 9 files changed, 85 insertions(+), 20 deletions(-) diff --git a/admin/survey/classes/class.GDPR.php b/admin/survey/classes/class.GDPR.php index 0d6de5307..b8153cb5d 100644 --- a/admin/survey/classes/class.GDPR.php +++ b/admin/survey/classes/class.GDPR.php @@ -59,9 +59,10 @@ class GDPR{ $survey_list = $this->getUserSurveys(); - echo '
'; + echo '
'; + echo ''.$lang['srv_anketalist'].''; - echo '

'.$lang['srv_gdpr_survey_list_text'].'

'; + echo '

'.$lang['srv_gdpr_survey_list_text'].'

'; echo $lang['srv_gdpr_survey_list_text2'].'
    '; echo '
  • '.$lang['srv_gdpr_survey_list_li_1'].'
    • '; @@ -70,10 +71,7 @@ class GDPR{ echo '
  • '.$lang['srv_gdpr_survey_list_li_4'].'
    • '; echo '
'; - echo '

'.$lang['srv_gdpr_survey_list_text3'].'

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

'.$lang['srv_gdpr_survey_list_text3'].'

'; echo ''; @@ -96,17 +94,30 @@ class GDPR{ echo ''; - echo ''; - echo ''; - echo ''; + if($anketa['active']==1) + $anketa_active = $lang['yes']; + else + $anketa_active = $lang['no']; + + if($anketa['potential_gdpr']==1) + $anketa_potential_gdpr = $lang['yes']; + else + $anketa_potential_gdpr = $lang['no']; + + + echo ''; + echo ''; + echo ''; - //echo ''; echo ''; } echo '
'.$anketa['naslov'].''.$anketa['active'].''.$anketa['potential_gdpr'].''.$anketa['naslov'].''.$anketa_active.''.$anketa_potential_gdpr.''.$anketa['gdpr'].''; echo '
'; + + echo ''; + } // Prikazemo vsebino zavihka gdpr - nastavitve uporabnika diff --git a/lang/1.php b/lang/1.php index f2973a866..8673cb682 100644 --- a/lang/1.php +++ b/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" => " (V nastavitah mora biti označeno, da prepozna uporabnika iz CMS!)", "srv_alert_respondent_cms_note_ok" => " (Uporabnik bo prepoznan iz sisplet CMS)", "srv_alert_respondent_cms_note_link" => "Dodaj nastavitev!", - "srv_alert_author" => "Avtor ankete oziroma druge osebe, katerim je omogoč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čilo ob deaktivaciji ankete", "srv_alert_oblika_activate_note" => "Sporoč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", diff --git a/lang/2.php b/lang/2.php index 2cf375818..c6bf034f6 100644 --- a/lang/2.php +++ b/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" => " (The seting should be marked to identify the user of CMS!)", "srv_alert_respondent_cms_note_ok" => " (The user will be identify from CMS)", "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", diff --git a/public/css/admin_new.css b/public/css/admin_new.css index ea6bbb78f..44f51746a 100644 --- a/public/css/admin_new.css +++ b/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 diff --git a/resources/sass/admin_new/basic/colors.scss b/resources/sass/admin_new/basic/colors.scss index 5e6b68ea0..4277a97e1 100644 --- a/resources/sass/admin_new/basic/colors.scss +++ b/resources/sass/admin_new/basic/colors.scss @@ -18,4 +18,6 @@ $light-gray: #F8F8F8; $yellow: #FFC700; $red: #FF0000; +$light-red: #FFEFEF; +$light-green: #a8eea8; diff --git a/resources/sass/admin_new/basic/typography.scss b/resources/sass/admin_new/basic/typography.scss index aa0152264..aa12e7eec 100644 --- a/resources/sass/admin_new/basic/typography.scss +++ b/resources/sass/admin_new/basic/typography.scss @@ -16,4 +16,8 @@ p,span { &.bold { font-weight: $extra-bold; } + + &.caps { + text-transform: uppercase; + } } \ No newline at end of file diff --git a/resources/sass/admin_new/components/form/fieldset.scss b/resources/sass/admin_new/components/form/fieldset.scss index e88573cba..dfe47003a 100644 --- a/resources/sass/admin_new/components/form/fieldset.scss +++ b/resources/sass/admin_new/components/form/fieldset.scss @@ -104,6 +104,12 @@ fieldset{ } } } + + .message_instructions { + background-color: $light-gray; + border: 1px solid $gray; + box-sizing: border-box; + } ul { margin-block-start: 0; diff --git a/resources/sass/admin_new/components/form/input.scss b/resources/sass/admin_new/components/form/input.scss index 1f938809a..81b987a11 100644 --- a/resources/sass/admin_new/components/form/input.scss +++ b/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; } - - margin-top: 4px; - - font-family: $font_family; + &.wauto { + width: auto; + } &.large { height: 40px; diff --git a/resources/sass/admin_new/components/table/table.scss b/resources/sass/admin_new/components/table/table.scss index 7228302b3..115e81275 100644 --- a/resources/sass/admin_new/components/table/table.scss +++ b/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; + } + } + } + } \ No newline at end of file