From 2dbef54d77b289e2430d932cb6a27e1b27d9509f Mon Sep 17 00:00:00 2001
From: "C. Lucas" <lucas.charpentier@imt-atlantique.net>
Date: Tue, 6 Feb 2024 17:17:10 +0100
Subject: [PATCH] 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 775866172d5c09a99e3614ccf3b9660ac2fb9b13)
---
 .../src/main/resources/flamingo/export_modal.vm               | 4 +++-
 .../src/main/resources/templates/locationPicker_macros.vm     | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/export_modal.vm b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/export_modal.vm
index dbc11ac74cab..8bfef24a1f00 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/export_modal.vm
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-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/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/locationPicker_macros.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/locationPicker_macros.vm
index 4895cb54cd15..8373306f5a04 100644
--- a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/locationPicker_macros.vm
+++ b/xwiki-platform-core/xwiki-platform-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>