XWIKI-21600: Various close button modals do not use icons (#2821)

* Updated close buttons on the export modal * Removed incorrect escaping from the location picker modal (cherry picked from commit 7758661)
xwiki · Feb 6, 2024 · 21f8553 · 21f8553
1 parent 206148b
commit 21f8553
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/...o-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/export_modal.vm b/...o-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/export_modal.vm
@@ -28,7 +28,9 @@
     <div class="modal-dialog">
       <div class="modal-content">
         <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+            $services.icon.renderHTML('cross')
+          </button>
           <div class="modal-title" id="exportModalLabel">
             $services.icon.renderHTML('download')
             $escapetool.xml($services.localization.render('core.menu.export'))

diff --git a/...rm-web/xwiki-platform-web-templates/src/main/resources/templates/locationPicker_macros.vm b/...rm-web/xwiki-platform-web-templates/src/main/resources/templates/locationPicker_macros.vm
@@ -223,8 +223,8 @@
     <div class="modal-dialog" role="document">
       <div class="modal-content">
         <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-            <span aria-hidden="true">&times;</span>
+          <button type="button" class="close" data-dismiss="modal" title="Close">
+            $services.icon.renderHTML('cross')
           </button>
           <div class="modal-title">$services.localization.render('core.documentPicker.title')</div>
         </div>