From d1a1f6ca95d9d403af042fdc5460a2d1c799788d Mon Sep 17 00:00:00 2001
From: MAEDA Go <maeda@farend.jp>
Date: Thu, 1 May 2025 17:46:12 +0900
Subject: [PATCH 2/2] Reorder "Also available in" links to place Atom at the
 end

---
 app/views/issues/index.html.erb    | 2 +-
 app/views/issues/show.html.erb     | 2 +-
 app/views/projects/index.html.erb  | 2 +-
 app/views/timelog/index.html.erb   | 2 +-
 app/views/wiki/date_index.html.erb | 2 +-
 app/views/wiki/index.html.erb      | 8 ++++----
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index af2510827..70f0b740a 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -35,9 +35,9 @@
 <% end %>
 
 <% other_formats_links do |f| %>
-  <%= f.link_to_with_query_parameters 'Atom', :key => User.current.atom_key %>
   <%= f.link_to_with_query_parameters 'CSV', {}, :onclick => "showModal('csv-export-options', '350px'); return false;" %>
   <%= f.link_to_with_query_parameters 'PDF' %>
+  <%= f.link_to_with_query_parameters 'Atom', :key => User.current.atom_key %>
 <% end %>
 
 <div id="csv-export-options" style="display:none;">
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 8f732032a..36111efa4 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -132,8 +132,8 @@ end %>
 <%= render partial: 'action_menu_edit' unless User.current.wants_comments_in_reverse_order? %>
 
 <% other_formats_links do |f| %>
-  <%= f.link_to 'Atom', :url => {:key => User.current.atom_key} %>
   <%= f.link_to 'PDF' %>
+  <%= f.link_to 'Atom', :url => {:key => User.current.atom_key} %>
 <% end %>
 
 <% html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb
index 3a1c047c9..875e736b1 100644
--- a/app/views/projects/index.html.erb
+++ b/app/views/projects/index.html.erb
@@ -31,10 +31,10 @@
 <% end %>
 
 <% other_formats_links do |f| %>
-  <%= f.link_to 'Atom', :url => {:key => User.current.atom_key} %>
   <% if @query.display_type == 'list' %>
     <%= f.link_to_with_query_parameters 'CSV', {}, :onclick => "showModal('csv-export-options', '350px'); return false;" %>
   <% end %>
+  <%= f.link_to 'Atom', :url => {:key => User.current.atom_key} %>
 <% end %>
 
 <% html_title(l(:label_project_plural)) -%>
diff --git a/app/views/timelog/index.html.erb b/app/views/timelog/index.html.erb
index 55e2312b3..d9985e922 100644
--- a/app/views/timelog/index.html.erb
+++ b/app/views/timelog/index.html.erb
@@ -29,8 +29,8 @@
 <span class="pagination"><%= pagination_links_full @entry_pages, @entry_count %></span>
 
 <% other_formats_links do |f| %>
-  <%= f.link_to_with_query_parameters 'Atom', :key => User.current.atom_key %>
   <%= f.link_to_with_query_parameters 'CSV', {}, :onclick => "showModal('csv-export-options', '330px'); return false;" %>
+  <%= f.link_to_with_query_parameters 'Atom', :key => User.current.atom_key %>
 <% end %>
 
 <div id="csv-export-options" style="display:none;">
diff --git a/app/views/wiki/date_index.html.erb b/app/views/wiki/date_index.html.erb
index 7ee5b467d..c8acf933c 100644
--- a/app/views/wiki/date_index.html.erb
+++ b/app/views/wiki/date_index.html.erb
@@ -29,11 +29,11 @@
 
 <% unless @pages.empty? %>
 <% other_formats_links do |f| %>
-  <%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :key => User.current.atom_key} %>
   <% if User.current.allowed_to?(:export_wiki_pages, @project) %>
   <%= f.link_to('PDF', :url => {:action => 'export', :format => 'pdf'}) %>
   <%= f.link_to('HTML', :url => {:action => 'export'}) %>
   <% end %>
+  <%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :key => User.current.atom_key} %>
 <% end %>
 <% end %>
 
diff --git a/app/views/wiki/index.html.erb b/app/views/wiki/index.html.erb
index 3f6d05fc2..a4afcb28e 100644
--- a/app/views/wiki/index.html.erb
+++ b/app/views/wiki/index.html.erb
@@ -22,14 +22,14 @@
 
 <% unless @pages.empty? %>
 <% other_formats_links do |f| %>
-  <%= f.link_to 'Atom',
-                :url => {:controller => 'activities', :action => 'index',
-                         :id => @project, :show_wiki_edits => 1,
-                         :key => User.current.atom_key} %>
   <% if User.current.allowed_to?(:export_wiki_pages, @project) %>
   <%= f.link_to('PDF', :url => {:action => 'export', :format => 'pdf'}) %>
   <%= f.link_to('HTML', :url => {:action => 'export'}) %>
   <% end %>
+  <%= f.link_to 'Atom',
+                :url => {:controller => 'activities', :action => 'index',
+                         :id => @project, :show_wiki_edits => 1,
+                         :key => User.current.atom_key} %>
 <% end %>
 <% end %>
 
-- 
2.49.0