Added support for linebreaks in confimation modal messages

dpgmediamagazines · May 15, 2018 · 734db64 · 734db64
1 parent 8fb1c3a
commit 734db64
Show file tree

Hide file tree

Showing 5 changed files with 15,324 additions and 7 deletions.
diff --git a/arctic/static/arctic/dist/assets/css/arctic.css b/arctic/static/arctic/dist/assets/css/arctic.css
diff --git a/arctic/static/arctic/dist/assets/img/arctic_logo.svg b/arctic/static/arctic/dist/assets/img/arctic_logo.svg
diff --git a/arctic/static/arctic/dist/assets/js/app.js b/arctic/static/arctic/dist/assets/js/app.js
diff --git a/arctic/static/arctic/src/assets/js/components/confirm_dialog.js b/arctic/static/arctic/src/assets/js/components/confirm_dialog.js
@@ -4,7 +4,7 @@ $(document).ready(function() {
         var button = $(event.relatedTarget) // Button that triggered the modal
         modal.addClass(button.data('confirm-class'));
         modal.find('.modal-title').text(button.data('confirm-title'));
-        modal.find('.modal-body').text(button.data('confirm-message'));
+        modal.find('.modal-body').html(button.data('confirm-message'));
         modal.find('.modal-footer .confirm-cancel').text(button.data('confirm-cancel'))
         modal.find('.modal-footer .confirm-ok').text(button.data('confirm-ok'))
         modal.find('.modal-footer .confirm-ok').prop('href', button.prop('href'));

diff --git a/arctic/templates/arctic/partials/base_data_table.html b/arctic/templates/arctic/partials/base_data_table.html
@@ -112,7 +112,7 @@ <h4 class="arctic-card__title">
                                                         data-toggle="modal" 
                                                         data-target="#confirm-dialog"
                                                         data-confirm-title="{{ column.confirm.title }}"
-                                                        data-confirm-message="{{ column.confirm.message }}"
+                                                        data-confirm-message="{{ column.confirm.message|linebreaks }}"
                                                         data-confirm-ok="{{ column.confirm.ok }}"
                                                         data-confirm-cancel="{{ column.confirm.cancel }}"
                                                         data-confirm-class="{{ column.confirm.class }}"
@@ -140,7 +140,7 @@ <h4 class="arctic-card__title">
                                                         data-toggle="modal" 
                                                         data-target="#confirm-dialog"
                                                         data-confirm-title="{{ link.confirm.title }}"
-                                                        data-confirm-message="{{ link.confirm.message }}"
+                                                        data-confirm-message="{{ link.confirm.message|linebreaks }}"
                                                         data-confirm-ok="{{ link.confirm.ok }}"
                                                         data-confirm-cancel="{{ link.confirm.cancel }}"
                                                         data-confirm-class="{{ link.confirm.class }}"