Merge branch 'fix/gdpr-messages'

helsingborg-stad · Mar 31, 2020 · 6fc35b5 · 6fc35b5
2 parents 713023c + 55b1563
commit 6fc35b5
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 24 deletions.
diff --git a/acf-fields/json/form.json b/acf-fields/json/form.json
@@ -1922,7 +1922,7 @@
                         "class": "",
                         "id": ""
                     },
-                    "message": "<div style=\"margin: 5px 0 15px;\r\n                background: #f1f1f157;\r\n                border-left: 4px solid #b2b500;\r\n                box-shadow: 0 1px 1px 0 rgba(0,0,0,.1);\r\n                padding: 10px;\">Conditional fields must be a multi-choise field that is required to fill in and lacks conditional arguments. Note that you may not get email notfications if the requirements aren't fulfilled.<\/div>",
+                    "message": "<div style=\"margin: 5px 0 15px;\r\n                                background: #f1f1f157;\r\n                                border-left: 4px solid #b2b500;\r\n                                box-shadow: 0 1px 1px 0 rgba(0,0,0,.1);\r\n                                padding: 10px;\">Conditional fields must be a multi-choise field that is required to fill in and lacks conditional arguments. Note that you may not get email notfications if the requirements aren't fulfilled.<\/div>",
                     "new_lines": "",
                     "esc_html": 0
                 },
@@ -2460,7 +2460,7 @@
         },
         {
             "key": "field_5b3c8d3f4e20a",
-            "label": "GDPR komplience    meddelande",
+            "label": "GDPR \u00f6verensst\u00e4mmelsemeddelande",
             "name": "gdpr_complience_notice",
             "type": "true_false",
             "instructions": "Inneh\u00e5ller information om hur personlig data hanteras.",
@@ -2481,7 +2481,7 @@
             "key": "field_5b3c8e0a6e7f2",
             "label": "Inneh\u00e5ll f\u00f6r GDPR meddelande",
             "name": "gdpr_complience_notice_content",
-            "type": "textarea",
+            "type": "wysiwyg",
             "instructions": "",
             "required": 0,
             "conditional_logic": [
@@ -2498,11 +2498,11 @@
                 "class": "",
                 "id": ""
             },
-            "default_value": "I det h\u00e4r formul\u00e4ret samlar vi in personuppgifter om dig f\u00f6r att [det formul\u00e4ret ska anv\u00e4ndas till]. Uppgifterna kommer inte att hanteras f\u00f6r n\u00e5got annat syfte, och kommer att raderas n\u00e4r [\u00e4rendet \u00e4r avslutat]. L\u00e4s om hur Helsingborgs stad hanterar personuppgifter.",
-            "placeholder": "",
-            "maxlength": "",
-            "rows": "",
-            "new_lines": ""
+            "default_value": "I det h\u00e4r formul\u00e4ret samlar vi in personuppgifter om dig f\u00f6r att [det formul\u00e4ret ska anv\u00e4ndas till]. Uppgifterna kommer inte att hanteras f\u00f6r n\u00e5got annat syfte, och kommer att raderas n\u00e4r [\u00e4rendet \u00e4r avslutat]. <a href=\"https:\/\/helsingborg.se\/toppmeny\/om-webbplatsen\/sa-har-behandlar-vi-dina-personuppgifter\/\">L\u00e4s om hur Helsingborgs stad hanterar personuppgifter<\/a>.",
+            "tabs": "all",
+            "toolbar": "full",
+            "media_upload": 0,
+            "delay": 0
         },
         {
             "key": "field_5b2a3840ff029",
@@ -2597,7 +2597,7 @@
     "label_placement": "top",
     "instruction_placement": "label",
     "hide_on_screen": "",
-    "active": true,
+    "active": 1,
     "description": ""
 }]
 
diff --git a/acf-fields/php/form.php b/acf-fields/php/form.php
@@ -1945,10 +1945,10 @@
                         'id' => '',
                     ),
                     'message' => __('<div style="margin: 5px 0 15px;
-                                background: #f1f1f157;
-                                border-left: 4px solid #b2b500;
-                                box-shadow: 0 1px 1px 0 rgba(0,0,0,.1);
-                                padding: 10px;">Conditional fields must be a multi-choise field that is required to fill in and lacks conditional arguments. Note that you may not get email notfications if the requirements aren\'t fulfilled.</div>', 'modularity-form-builder'),
+                                                                background: #f1f1f157;
+                                                                border-left: 4px solid #b2b500;
+                                                                box-shadow: 0 1px 1px 0 rgba(0,0,0,.1);
+                                                                padding: 10px;">Conditional fields must be a multi-choise field that is required to fill in and lacks conditional arguments. Note that you may not get email notfications if the requirements aren\'t fulfilled.</div>', 'modularity-form-builder'),
                     'new_lines' => '',
                     'esc_html' => 0,
                 ),
@@ -2490,7 +2490,7 @@
         ),
         29 => array(
             'key' => 'field_5b3c8d3f4e20a',
-            'label' => __('GDPR komplience        meddelande', 'modularity-form-builder'),
+            'label' => __('GDPR överensstämmelsemeddelande', 'modularity-form-builder'),
             'name' => 'gdpr_complience_notice',
             'type' => 'true_false',
             'instructions' => __('Innehåller information om hur personlig data hanteras.', 'modularity-form-builder'),
@@ -2511,7 +2511,7 @@
             'key' => 'field_5b3c8e0a6e7f2',
             'label' => __('Innehåll för GDPR meddelande', 'modularity-form-builder'),
             'name' => 'gdpr_complience_notice_content',
-            'type' => 'textarea',
+            'type' => 'wysiwyg',
             'instructions' => '',
             'required' => 0,
             'conditional_logic' => array(
@@ -2528,11 +2528,11 @@
                 'class' => '',
                 'id' => '',
             ),
-            'default_value' => 'I det här formuläret samlar vi in personuppgifter om dig för att [det formuläret ska användas till]. Uppgifterna kommer inte att hanteras för något annat syfte, och kommer att raderas när [ärendet är avslutat]. Läs om hur Helsingborgs stad hanterar personuppgifter.',
-            'placeholder' => '',
-            'maxlength' => '',
-            'rows' => '',
-            'new_lines' => '',
+            'default_value' => 'I det här formuläret samlar vi in personuppgifter om dig för att [det formuläret ska användas till]. Uppgifterna kommer inte att hanteras för något annat syfte, och kommer att raderas när [ärendet är avslutat]. <a href="https://helsingborg.se/toppmeny/om-webbplatsen/sa-har-behandlar-vi-dina-personuppgifter/">Läs om hur Helsingborgs stad hanterar personuppgifter</a>.',
+            'tabs' => 'all',
+            'toolbar' => 'full',
+            'media_upload' => 0,
+            'delay' => 0,
         ),
         31 => array(
             'key' => 'field_5b2a3840ff029',
@@ -2627,7 +2627,7 @@
     'label_placement' => 'top',
     'instruction_placement' => 'label',
     'hide_on_screen' => '',
-    'active' => true,
+    'active' => 1,
     'description' => '',
 ));
 }

diff --git a/source/php/Module/views/form.blade.php b/source/php/Module/views/form.blade.php
@@ -56,9 +56,9 @@ class="pricon pricon-notice-warning pull-left"></i> <?php _e('Something went wro
                             </p>
                         @endif
                         @if($gdpr_complience_notice && !empty($gdpr_complience_notice_content))
-                            <p class="text-sm gutter gutter-sm gutter-bottom">
-                                {{$gdpr_complience_notice_content}}
-                            </p>
+                            <div class="text-sm gutter gutter-sm gutter-bottom">
+                                {!! $gdpr_complience_notice_content !!}
+                            </div>
                         @endif
                     @endif
                     <button type="submit" class="btn btn-primary u-mt-2">{{ $submit_button_text ? $submit_button_text : 'Send' }}</button>