Merge pull request #15600 from aarohiprasad/sent-emails-formatting

Sent email formatting fixes

app/bundles/CoreBundle/Assets/js/11.editor.js

@@ -261,10 +261,10 @@ Mautic.ConvertFieldToCkeditor  = function(textarea, ckEditorToolbarOptions) {
         ckEditors.delete( textarea[0] )
     }
     const tokenCallback = textarea.attr('data-token-callback');
-    Mautic.InitCkEditor(textarea, Mautic.GetCkEditorConfigOptions(ckEditorToolbarOptions, tokenCallback));
+    Mautic.InitCkEditor(textarea, Mautic.GetCkEditorConfigOptions(ckEditorToolbarOptions, tokenCallback, textarea));
 }
 
-Mautic.GetCkEditorConfigOptions  = function(ckEditorToolbarOptions, tokenCallback) {
+Mautic.GetCkEditorConfigOptions  = function(ckEditorToolbarOptions, tokenCallback, textarea = null) {
     const defaultOptions = ['undo', 'redo', '|', 'bold', 'italic', 'underline', 'heading', 'fontfamily', 'fontsize', 'fontColor', 'fontBackgroundColor', 'alignment', 'numberedList', 'bulletedList', 'blockQuote', 'removeFormat', 'link', 'ckfinder', 'mediaEmbed', 'insertTable', 'sourceEditing'];
     const ckEditorToolbar = typeof ckEditorToolbarOptions != "undefined" && ckEditorToolbarOptions.length > 0 ? ckEditorToolbarOptions : defaultOptions;
     const ckEditorColors = [
@@ -284,6 +284,7 @@ Mautic.GetCkEditorConfigOptions  = function(ckEditorToolbarOptions, tokenCallbac
         { color: '#4c4ce6', label: 'Blue' },
         { color: '#994ce6', label: 'Purple' }
     ];
+    const allowFullHtml = textarea && typeof textarea.attr('allow-full-html') !== 'undefined';
     const ckEditorOption = {
         toolbar: {
             items: ckEditorToolbar,
@@ -328,7 +329,18 @@ Mautic.GetCkEditorConfigOptions  = function(ckEditorToolbarOptions, tokenCallbac
             allowedProtocols: [ 'https?', 'tel', 'sms', 'sftp', 'smb', 'slack' ]
         },
         htmlSupport: {
-            allow: [
+            fullPage: {
+                allowRenderStylesFromHead: allowFullHtml
+            },
+            allow: allowFullHtml ? [
+                {
+                    // Allow all HTML elements
+                    name: /.*/,
+                    attributes: true,
+                    classes: true,
+                    styles: true
+                }
+            ] : [
                 {
                     name: /^(a|span)$/,
                     attributes: true,

app/bundles/FormBundle/Form/Type/SubmitActionEmailType.php

@@ -63,7 +63,7 @@ class SubmitActionEmailType extends AbstractType
             [
                 'label'      => 'mautic.form.action.sendemail.message',
                 'label_attr' => ['class' => 'control-label'],
-                'attr'       => ['class' => 'form-control editor editor-basic'],
+                'attr'       => ['class' => 'form-control editor editor-basic', 'allow-full-html' => true],
                 'required'   => false,
                 'data'       => $message,
             ]

app/bundles/LeadBundle/Form/Type/EmailType.php

@@ -109,6 +109,7 @@ class EmailType extends AbstractType
                     'class'                => 'form-control editor editor-basic-fullpage editor-builder-tokens editor-email',
                     'data-token-callback'  => 'email:getBuilderTokens',
                     'data-token-activator' => '{',
+                    'allow-full-html'      => true,
                 ],
             ]
         );