cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rearrange tabs for inter-page consistency

Browse source 
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.
This commit is contained in:
Andy Allan 2021-06-16 16:26:25 +01:00
parent 33f9b7c55f
commit 7996b84380
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/views/traces/index.html.erb
View file

@ -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 %>
<li class="nav-item">
<%= link_to t(".see_all_traces"), { :controller => "traces", :action => "index", :display_name => nil, :page => nil }, { :class => "nav-link active" } %>
</li>
<% 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" } %>
</li>
<!-- 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>