XWIKI-21600: Various close button modals do not use icons

* Updated close buttons on the export modal * Removed incorrect escaping from the location picker modal
xwiki · Jan 25, 2024 · d83f7af · d83f7af
1 parent b8cf28d
commit d83f7af
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 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
@@ -224,7 +224,7 @@
       <div class="modal-content">
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal" title="Close">
-            $escapetool.javascript($services.icon.renderHTML('cross'))
+            $services.icon.renderHTML('cross')
           </button>
           <div class="modal-title">$services.localization.render('core.documentPicker.title')</div>
         </div>