diff options
| author | Maurício Meneghini Fauth <mauricio@fauth.dev> | 2021-09-14 23:21:09 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-14 23:21:09 +0300 |
| commit | 03b9016b7d1b26114eb3c02649609e29fed1a51d (patch) | |
| tree | 6b4184dd41b4b39b8cb9d8127a475f2625eccc9a | |
| parent | 9721b19dbf918d8047fa58ad013f17adffa193bc (diff) | |
| parent | 8f04e1a26d7a801da57ca2294015866871140679 (diff) | |
Merge pull request #17103 from shucontech/nav_modal
Replace hidden navigation items dialog with modal
| -rw-r--r-- | js/src/navigation.js | 19 | ||||
| -rw-r--r-- | libraries/classes/Controllers/JavaScriptMessagesController.php | 1 | ||||
| -rw-r--r-- | templates/modals/unhide_nav_item.twig | 14 | ||||
| -rw-r--r-- | templates/navigation/main.twig | 1 |
4 files changed, 17 insertions, 18 deletions
diff --git a/js/src/navigation.js b/js/src/navigation.js index adf2cd6761..cb02a440ea 100644 --- a/js/src/navigation.js +++ b/js/src/navigation.js @@ -500,23 +500,8 @@ $(function () { $.post($(this).attr('href'), params, function (data) { if (typeof data !== 'undefined' && data.success === true) { Functions.ajaxRemoveMessage($msg); - var buttonOptions = {}; - buttonOptions[Messages.strClose] = function () { - $(this).dialog('close'); - }; - $('<div></div>') - .attr('id', 'unhideNavItemDialog') - .append(data.message) - .dialog({ - width: 400, - minWidth: 200, - modal: true, - buttons: buttonOptions, - title: Messages.strUnhideNavItem, - close: function () { - $(this).remove(); - } - }); + $('#unhideNavItemModal').modal('show'); + $('#unhideNavItemModal').find('.modal-body').first().html(data.message); } else { Functions.ajaxShowMessage(data.error); } diff --git a/libraries/classes/Controllers/JavaScriptMessagesController.php b/libraries/classes/Controllers/JavaScriptMessagesController.php index 4ef36fde92..8049aaf875 100644 --- a/libraries/classes/Controllers/JavaScriptMessagesController.php +++ b/libraries/classes/Controllers/JavaScriptMessagesController.php @@ -620,7 +620,6 @@ final class JavaScriptMessagesController /* navigation panel */ 'strShowPanel' => __('Show panel'), 'strHidePanel' => __('Hide panel'), - 'strUnhideNavItem' => __('Show hidden navigation tree items.'), 'linkWithMain' => __('Link with main panel'), 'unlinkWithMain' => __('Unlink from main panel'), diff --git a/templates/modals/unhide_nav_item.twig b/templates/modals/unhide_nav_item.twig new file mode 100644 index 0000000000..a7eb0f0647 --- /dev/null +++ b/templates/modals/unhide_nav_item.twig @@ -0,0 +1,14 @@ +<div class="modal fade" id="unhideNavItemModal" tabindex="-1" aria-labelledby="unhideNavItemModalLabel" aria-hidden="true"> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <h5 class="modal-title" id="unhideNavItemModalLabel">{% trans 'Show hidden navigation tree items.' %}</h5> + <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% trans 'Close' %}"></button> + </div> + <div class="modal-body"></div> + <div class="modal-footer"> + <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{% trans 'Close' %}</button> + </div> + </div> + </div> +</div> diff --git a/templates/navigation/main.twig b/templates/navigation/main.twig index cb001d5cad..3b5d8a5833 100644 --- a/templates/navigation/main.twig +++ b/templates/navigation/main.twig @@ -94,4 +94,5 @@ </div> {% endif %} </div> + {{ include('modals/unhide_nav_item.twig') }} {% endif %} |