From a175bc5aac6754e9a0919940061eb2921f2d1c52 Mon Sep 17 00:00:00 2001
From: Go MAEDA <maeda@farend.jp>
Date: Fri, 22 Aug 2025 09:03:07 +0000
Subject: [PATCH] Submit button incorrectly displayed in the middle of the form
 on mobile view (#38795).

Patch by Kenta Kumojima (user:kumojima).


git-svn-id: https://svn.redmine.org/redmine/trunk@23932 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/custom_fields/_form.html.erb | 11 ++++++++++-
 app/views/trackers/_form.html.erb      |  3 ++-
 app/views/users/_form.html.erb         |  8 ++++++++
 app/views/users/_general.html.erb      |  2 +-
 app/views/users/new.html.erb           |  2 +-
 5 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/app/views/custom_fields/_form.html.erb b/app/views/custom_fields/_form.html.erb
index a7af54a07..9e544339f 100644
--- a/app/views/custom_fields/_form.html.erb
+++ b/app/views/custom_fields/_form.html.erb
@@ -20,7 +20,7 @@
 
 <%= call_hook(:view_custom_fields_form_upper_box, :custom_field => @custom_field, :form => f) %>
 </div>
-<p>
+<p class="mobile-hide">
   <% if @custom_field.new_record? %>
     <%= submit_tag l(:button_create) %>
     <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
@@ -65,4 +65,13 @@
 </div>
 </div>
 
+<p class="mobile-show">
+  <% if @custom_field.new_record? %>
+    <%= submit_tag l(:button_create) %>
+    <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
+  <% else %>
+    <%= submit_tag l(:button_save) %>
+  <% end %>
+</p>
+
 <% include_calendar_headers_tags %>
diff --git a/app/views/trackers/_form.html.erb b/app/views/trackers/_form.html.erb
index 7e3929d3f..9131ae538 100644
--- a/app/views/trackers/_form.html.erb
+++ b/app/views/trackers/_form.html.erb
@@ -43,7 +43,7 @@
 <% end %>
 <!--[eoform:tracker]-->
 </div>
-<%= submit_tag l(@tracker.new_record? ? :button_create : :button_save) %>
+<%= submit_tag l(@tracker.new_record? ? :button_create : :button_save), class: "mobile-hide" %>
 </div>
 
 <div class="splitcontentright">
@@ -58,3 +58,4 @@ end %>
 <% end %>
 </div>
 </div>
+<%= submit_tag l(@tracker.new_record? ? :button_create : :button_save), class: "mobile-show" %>
diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
index 6d6058c49..2f7c73484 100644
--- a/app/views/users/_form.html.erb
+++ b/app/views/users/_form.html.erb
@@ -55,6 +55,14 @@
   </p>
   <% end -%>
 </fieldset>
+<p class="mobile-hide">
+  <% if @user.new_record? %>
+    <%= submit_tag l(:button_create) %>
+    <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
+  <% else %>
+    <%= submit_tag l(:button_save) %>
+  <% end %>
+</p>
 </div>
 
 <div class="splitcontentright">
diff --git a/app/views/users/_general.html.erb b/app/views/users/_general.html.erb
index c9398577c..9bb72ce97 100644
--- a/app/views/users/_general.html.erb
+++ b/app/views/users/_general.html.erb
@@ -3,5 +3,5 @@
   <% if @user.active? && email_delivery_enabled? && @user != User.current -%>
     <p><label><%= check_box_tag 'send_information', 1, params[:send_information] %> <%= l(:label_send_information) %></label></p>
   <% end -%>
-  <p><%= submit_tag l(:button_save) %></p>
+  <p class="mobile-show"><%= submit_tag l(:button_save) %></p>
 <% end %>
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index f65bea1f2..ce246fd51 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -5,7 +5,7 @@
   <% if email_delivery_enabled? %>
   <p><label><%= check_box_tag 'send_information', 1, params[:send_information] %> <%= l(:label_send_information) %></label></p>
   <% end %>
-  <p>
+  <p class="mobile-show">
     <%= submit_tag l(:button_create) %>
     <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
   </p>