From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 16 Jun 2021 15:26:25 +0000 (+0100)
Subject: Rearrange tabs for inter-page consistency
X-Git-Tag: live~1532^2~3
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7996b843807aa08ab5f79fc718212109f72f0faa

Rearrange tabs for inter-page consistency

The all traces tab comes first, since it's shown on every page as you click around. Otherwise the tabs appear to be constantly rearranging themselves.
---

diff --git a/app/views/traces/index.html.erb b/app/views/traces/index.html.erb
index 2e5c44a5e..7668532aa 100644
--- a/app/views/traces/index.html.erb
+++ b/app/views/traces/index.html.erb
@@ -11,26 +11,26 @@
     <li class="nav-item">
       <% if @target_user.blank? %>
         <!-- public traces -->
+        <li class="nav-item">
+          <%= link_to t(".see_all_traces"), { :controller => "traces", :action => "index", :display_name => nil, :page => nil }, { :class => "nav-link active" } %>
+        </li>
         <% if current_user %>
           <li class="nav-item">
             <%= link_to t(".see_my_traces"), { :action => "mine", :page => nil }, { :class => "nav-link" } %>
           </li>
         <% end %>
+      <% elsif current_user && current_user == @target_user %>
         <li class="nav-item">
-          <%= link_to t(".see_all_traces"), { :controller => "traces", :action => "index", :display_name => nil, :page => nil }, { :class => "nav-link active" } %>
+          <%= link_to t(".see_all_traces"), { :controller => "traces", :action => "index", :display_name => nil, :page => nil }, { :class => "nav-link" } %>
         </li>
-      <% elsif current_user && current_user == @target_user %>
         <!-- my traces -->
         <li class="nav-item">
           <%= link_to t(".see_my_traces"), { :action => "mine", :page => nil }, { :class => "nav-link active" } %>
         </li>
-        <li class="nav-item">
-          <%= link_to t(".see_all_traces"), { :controller => "traces", :action => "index", :display_name => nil, :page => nil }, { :class => "nav-link" } %>
-        </li>
       <% else %>
         <!-- public_traces_from @target_user -->
         <li class="nav-item">
-          <%= link_to t(".see_public_traces_from", :user => @target_user&.display_name), { :action => "mine", :page => nil }, { :class => "nav-link active" } %>
+          <%= link_to t(".see_all_traces"), { :controller => "traces", :action => "index", :display_name => nil, :page => nil }, { :class => "nav-link" } %>
         </li>
         <% if current_user && current_user != @target_user %>
           <li class="nav-item">
@@ -38,7 +38,7 @@
           </li>
         <% end %>
         <li class="nav-item">
-          <%= link_to t(".see_all_traces"), { :controller => "traces", :action => "index", :display_name => nil, :page => nil }, { :class => "nav-link" } %>
+          <%= link_to t(".see_public_traces_from", :user => @target_user&.display_name), { :action => "mine", :page => nil }, { :class => "nav-link active" } %>
         </li>
       <% end %>
     </li>