From 544a4881ce15b7902152d19c8018231134066be5 Mon Sep 17 00:00:00 2001
From: Marius Balteanu <marius.balteanu@zitec.com>
Date: Thu, 18 Sep 2025 18:36:16 +0000
Subject: [PATCH] Replace ajax-indicator loading icon with SVG (#34709).

Patch by Mizuki ISHIKAWA (user:ishikawa999).

git-svn-id: https://svn.redmine.org/redmine/trunk@23985 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/assets/stylesheets/application.css | 13 ++++++-------
 app/views/layouts/base.html.erb        |  6 +++++-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 51332d53e..45a062e1e 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -1352,14 +1352,13 @@ opacity: 0.5;
 
 html>body #ajax-indicator { position: fixed; }
 
-#ajax-indicator span {
-background-position: 0% 40%;
-background-repeat: no-repeat;
-background-image: url(/loading.gif);
-padding-left: 26px;
-vertical-align: bottom;
+#ajax-indicator:not(:has(svg)) span {
+  background-position: 0% 40%;
+  background-repeat: no-repeat;
+  background-image: url(/loading.gif);
+  padding-left: 26px;
+  vertical-align: bottom;
 }
-
 /***** Calendar *****/
 ul.cal {
   list-style: none;
diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
index 9e2ef51b5..4b7b401c1 100644
--- a/app/views/layouts/base.html.erb
+++ b/app/views/layouts/base.html.erb
@@ -127,7 +127,11 @@
     Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url, :target => '_blank', :rel => 'noopener' %> &copy; 2006-2025 Jean-Philippe Lang
 </div>
 
-<div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
+<div id="ajax-indicator" style="display:none;">
+  <span class="icon">
+    <%= sprite_icon 'loader', l(:label_loading), css_class: 'svg-loader' %>
+  </span>
+</div>
 <div id="ajax-modal" style="display:none;"></div>
 <div id="icon-copy-source" style="display: none;"><%= sprite_icon('') %></div>