Summernote basic toolbar

* Add a toolbar variation to HTML Editor
* Use HTML editor's basic toolbar on dynamic fields

refs #1774

diff --git a/galette/templates/default/components/dynamic_fields.html.twig b/galette/templates/default/components/dynamic_fields.html.twig
index 2b0909b1c6041c66e5b7dc9144240358252c3c1b..d2fdb573234002d9d2fdfd3db3e4c2cfc2fa87fb 100644 (file)
--- a/galette/templates/default/components/dynamic_fields.html.twig
+++ b/galette/templates/default/components/dynamic_fields.html.twig
@@ -170,7 +170,7 @@
                                 <div class="field{% if field.isRequired() %} required{% endif %}{% if get_class(field) == 'Galette\\DynamicFields\\File' %} wide{% endif %}">
                                     {{ _self.draw_field(field, field_data, disabled, loop.index, object, masschange) }}
                                     {% if field.getInformation() %}
-                                        <p class="exemple">{{ field.getInformation()|raw }}</p>
+                                        <div class="exemple">{{ field.getInformation()|raw }}</div>
                                     {% endif %}
                                 </div>
                             {% endfor %}

diff --git a/galette/templates/default/elements/scripts.html.twig b/galette/templates/default/elements/scripts.html.twig
index 9b0d732a28ac70c9fe96b207d45239e5380c09e2..d43ad238aff610145c77435c19a25b92f3205bff 100644 (file)
--- a/galette/templates/default/elements/scripts.html.twig
+++ b/galette/templates/default/elements/scripts.html.twig
@@ -229,18 +229,28 @@
         <script type="text/javascript" src="{{ base_path() }}/assets/js/summernote.min.js"></script>
         <script type="text/javascript" src="{{ base_path() }}/assets/js/lang/summernote-{{ i18n.getID()|replace({'_': '-'}) }}.min.js"></script>
         <script type="text/javascript">
-            function activateHtmlEditor(elt) {
-                elt.summernote({
-                    lang: '{{ i18n.getID()|replace({'_': '-'}) }}',
-                    disableDragAndDrop: true,
-                    height: 240,
-                    toolbar: [
+            function activateHtmlEditor(elt, basic) {
+                if (basic === true) {
+                    var _toolbar = [
+                        ['font', ['bold', 'italic', 'strikethrough', 'clear']],
+                        ['para', ['ul', 'ol']],
+                        ['insert', ['link']],
+                        ['view', ['codeview']]
+                    ];
+                } else {
+                    var _toolbar = [
                         ['style', ['style']],
                         ['font', ['bold', 'italic', 'strikethrough', 'clear']],
                         ['para', ['ul', 'ol', 'paragraph']],
                         ['insert', ['link', 'picture']],
-                        ['view', ['codeview', 'help']]
-                    ],
+                        ['view', ['codeview']]
+                    ];
+                }
+                elt.summernote({
+                    lang: '{{ i18n.getID()|replace({'_': '-'}) }}',
+                    disableDragAndDrop: true,
+                    height: 240,
+                    toolbar: _toolbar,
                     styleTags: [
                         'p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6'
                     ],

diff --git a/galette/templates/default/pages/configuration_dynamic_field_form.html.twig b/galette/templates/default/pages/configuration_dynamic_field_form.html.twig
index e06da06cfcb29ac9413135ec6ce18ab2da35ecbf..38c8e088b8eb6a81b74f4d9ae6719d0257c79b1c 100644 (file)
--- a/galette/templates/default/pages/configuration_dynamic_field_form.html.twig
+++ b/galette/templates/default/pages/configuration_dynamic_field_form.html.twig
@@ -175,7 +175,7 @@
 {% block javascripts %}
     <script>
         $(function() {
-            activateHtmlEditor($('#field_information'));
+            activateHtmlEditor($('#field_information'), true);
         });
     </script>
 {% endblock %}

diff --git a/galette/templates/default/pages/configuration_dynamic_fields.html.twig b/galette/templates/default/pages/configuration_dynamic_fields.html.twig
index 93831ab2516703d763b8f4a9c4bca4ed80cb7175..2364e2cb9974f8c9021f9457d62d9bf530f5804a 100644 (file)
--- a/galette/templates/default/pages/configuration_dynamic_fields.html.twig
+++ b/galette/templates/default/pages/configuration_dynamic_fields.html.twig
@@ -117,7 +117,7 @@
                     modal_class: "tiny",
                     modal_content_class: "scrolling",
                     modal_onapprove: modal_onapprove,
-                    modal_action_onshow: "activateHtmlEditor($('#field_information'));"
+                    modal_action_onshow: "activateHtmlEditor($('#field_information'), true);"
                 } %}
             }
             _editDynField();