Merge branch 'develop'

melisplatform · Dec 14, 2020 · 27b565a · 27b565a
2 parents 0191dba + ccf407d
commit 27b565a
Show file tree

Hide file tree

Showing 31 changed files with 3,422 additions and 3,122 deletions.
diff --git a/config/app.tools.php b/config/app.tools.php
@@ -483,14 +483,14 @@
                                                 'message' => 'tr_meliscore_tool_user_invalid_email',
                                             ],
                                         ],
-                                        [
-                                            'name' => 'regex', false,
-                                            'options' => [
-                                                'pattern' => '/^[a-zA-Z0-9]+([._@]?[a-zA-Z0-9])*$/',
-                                                'messages' => [\Laminas\Validator\Regex::NOT_MATCH => 'tr_melis_core_gdpr_autodelete_invalid_email'],
-                                                'encoding' => 'UTF-8',
-                                            ],
-                                        ],
+//                                        [
+//                                            'name' => 'regex', false,
+//                                            'options' => [
+//                                                'pattern' => '/^[a-zA-Z0-9]+([._@]?[a-zA-Z0-9])*$/',
+//                                                'messages' => [\Laminas\Validator\Regex::NOT_MATCH => 'tr_melis_core_gdpr_autodelete_invalid_email'],
+//                                                'encoding' => 'UTF-8',
+//                                            ],
+//                                        ],
                                     ],
                                     'filters' => [
                                         ['name' => 'StripTags'],

diff --git a/config/gdpr-autodelete/app.forms.php b/config/gdpr-autodelete/app.forms.php
@@ -259,12 +259,12 @@
                                         'name' => 'mgdprc_email_conf_tags',
                                         'type' => "text",
                                         'options' => [
+                                            'label' => 'tr_melis_core_gdpr_autodelete_label_email_setup_tags',
                                             'tooltip' => "tr_melis_core_gdpr_autodelete_label_alert_email_tags tooltip",
                                             'not_editable' => true,
                                             'no_tags_text' => 'No tags available'
                                         ],
                                         'attributes' => [
-                                            'data-label-text' => 'tr_melis_core_gdpr_autodelete_label_email_setup_tags',
                                             'class' => 'melis-multi-val-input',
                                             'style' => 'width:0;',
                                             'disabled' => 'disabled'
@@ -455,13 +455,13 @@
                                         'name' => 'mgdpre_email_tags',
                                         'type' => "text",
                                         'options' => [
+                                            'label' => 'tr_melis_core_gdpr_autodelete_label_alert_email_tags',
                                             'tooltip' => "tr_melis_core_gdpr_autodelete_label_alert_email_tags tooltip",
                                             'not_editable' => true,
                                             'no_tags_text' => 'No tags available'
                                         ],
                                         'attributes' => [
                                             'class' => 'melis-multi-val-input',
-                                            'data-label-text' => 'tr_melis_core_gdpr_autodelete_label_alert_email_tags',
                                             'style' => 'width:0;',
                                             'disabled' => 'disabled'
                                         ]
@@ -527,13 +527,13 @@
                                         'name' => 'mgdpre_email_tags',
                                         'type' => "text",
                                         'options' => [
+                                            'label' => 'tr_melis_core_gdpr_autodelete_label_alert_email_tags',
                                             'tooltip' => "tr_meliscore_emails_mngt_tool_boe_tag_accepted_list tooltip",
                                             'not_editable' => true,
                                             'no_tags_text' => 'No tags available'
                                         ],
                                         'attributes' => [
                                             'class' => 'melis-multi-val-input',
-                                            'data-label-text' => 'tr_melis_core_gdpr_autodelete_label_alert_email_tags',
                                             'style' => 'width:0;',
                                             'disabled' => 'disabled'
                                         ]

diff --git a/language/en_EN.interface.php b/language/en_EN.interface.php
@@ -342,6 +342,8 @@
     'tr_meliscore_tool_platform_update_marketplace' => 'Allow updates from the marketplace',
     'tr_meliscore_tool_platform_update_marketplace tooltip' => 'Check to allow updates from the marketplace or uncheck to disallow them',
     'tr_meliscore_common_allow' => 'Allow',
+    'tr_meliscore_tool_platform_invalid_platform_name' => 'The name of the platform can only contain letters and numbers, no spaces or special characters',
+
 
     // Language Tool Translations
     'tr_meliscore_tool_language' => 'Back-Office languages',
@@ -771,6 +773,9 @@
     'tr_melis_core_composer_scrpts_executed' => 'Composer scripts executed',
     'tr_meliscore_logs_tool_modal_container' => 'Modal container',
     'tr_meliscore_logs_tool_log_type_form' => 'Form',
-    'tr_meliscore_logs_tool_export_modal_content' => 'Export modal content'
+    'tr_meliscore_logs_tool_export_modal_content' => 'Export modal content',
+
+    // cms page iframe loader
+    'tr_meliscore_page_edition_loader_text' => 'Building the page',
     ];
 ?>
diff --git a/language/fr_FR.interface.php b/language/fr_FR.interface.php
@@ -785,5 +785,8 @@
     'tr_melis_core_composer_scrpts_executed' => 'Scripts de composer éxécutés',
     'tr_meliscore_logs_tool_modal_container' => 'Modal container',
     'tr_meliscore_logs_tool_log_type_form' => 'Formulaire',
-    'tr_meliscore_logs_tool_export_modal_content' => 'Modal contenu de l\'export'
+    'tr_meliscore_logs_tool_export_modal_content' => 'Modal contenu de l\'export',
+
+    // cms page iframe loader
+    'tr_meliscore_page_edition_loader_text' => 'Construction de la page',
 ];
diff --git a/public/assets/images/page-loader.gif b/public/assets/images/page-loader.gif
diff --git a/public/build/css/bundle.css b/public/build/css/bundle.css
diff --git a/public/build/js/bundle.js b/public/build/js/bundle.js
diff --git a/public/css/custom-style.css b/public/css/custom-style.css
@@ -569,9 +569,6 @@ ul.row {
 .sites-language .checkbox {
 	padding-left: 6px;
 }
-.melis-radio-box input:checked + .melis-radio-box-circle:after {
-	left: 51%;
-}
 /* utility classes */
 .hidden {
 	display: none !important;