Merge pull request #166 from yv-101/yv-101/bugfix-42

Fix action and style cancel button modal confirm delete api
EC-CUBE · May 16, 2024 · b00580e · b00580e
2 parents 0cf6173 + c9b36a6
commit b00580e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/Resource/template/admin/OAuth/index.twig b/Resource/template/admin/OAuth/index.twig
@@ -145,15 +145,13 @@ file that was distributed with this source code.
                                                                 <h5 class="modal-title fw-bold">
                                                                     {{ 'api.admin.oauth.delete__confirm_title'|trans }}
                                                                 </h5>
-                                                                <button class="close" type="button" data-dismiss="modal" aria-label="Close">
-                                                                    <span aria-hidden="true">×</span>
-                                                                </button>
+                                                                <button class="btn-close" type="button" data-bs-dismiss="modal" aria-label="Close"></button>
                                                             </div>
                                                             <div class="modal-body text-start">
                                                                 <p class="text-start">{{ 'api.admin.oauth.delete__confirm_message'|trans }}</p>
                                                             </div>
                                                             <div class="modal-footer">
-                                                                <button class="btn btn-ec-sub" type="button" data-dismiss="modal">
+                                                                <button class="btn btn-ec-sub" type="button" data-bs-dismiss="modal">
                                                                     {{ 'admin.common.cancel'|trans }}
                                                                 </button>
                                                                 <a class="btn btn-ec-delete" href="{{ url('admin_api_oauth_delete', {identifier: client.identifier}) }}"

diff --git a/Resource/template/admin/WebHook/index.twig b/Resource/template/admin/WebHook/index.twig
@@ -79,15 +79,13 @@ file that was distributed with this source code.
                                                             <h5 class="modal-title fw-bold">
                                                                 {{ 'api.admin.webhook.delete__confirm_title'|trans }}
                                                             </h5>
-                                                            <button class="close" type="button" data-dismiss="modal" aria-label="Close">
-                                                                <span aria-hidden="true">×</span>
-                                                            </button>
+                                                            <button class="btn-close" type="button" data-bs-dismiss="modal" aria-label="Close"></button>
                                                         </div>
                                                         <div class="modal-body text-start">
                                                             <p class="text-start">{{ 'api.admin.webhook.delete__confirm_message'|trans }}</p>
                                                         </div>
                                                         <div class="modal-footer">
-                                                            <button class="btn btn-ec-sub" type="button" data-dismiss="modal">
+                                                            <button class="btn btn-ec-sub" type="button" data-bs-dismiss="modal">
                                                                 {{ 'admin.common.cancel'|trans }}
                                                             </button>
                                                             <a class="btn btn-ec-delete" href="{{ url('admin_api_webhook_delete', {id: webhook.id}) }}"