X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/11cc4a5e601dd288d601e6e35a72d159062f18b5..1a65c279aab2b99d13dbf5909a1a05ad52648b25:/app/views/traces/index.html.erb?ds=sidebyside
diff --git a/app/views/traces/index.html.erb b/app/views/traces/index.html.erb
index da40f5a4d..693de7e1a 100644
--- a/app/views/traces/index.html.erb
+++ b/app/views/traces/index.html.erb
@@ -1,45 +1,74 @@
+<% content_for :heading_class, "pb-0" %>
<% content_for :heading do %>
-
<%= h(@title) %>
-
- - <%= t(".description") %>
- - <%= rss_link_to :action => "georss", :display_name => @display_name, :tag => @tag %>
- - <%= link_to t(".upload_trace"), new_trace_path %>
- <% if @tag %>
- - <%= link_to t(".see_all_traces"), :controller => "traces", :action => "index", :display_name => nil, :tag => nil, :page => nil %>
- - <%= link_to t(".see_my_traces"), :action => "mine", :tag => nil, :page => nil %>
- <% else %>
- <% if @display_name %>
- - <%= link_to t(".see_all_traces"), :controller => "traces", :action => "index", :display_name => nil, :tag => nil, :page => nil %>
+ <%= @title %>
+
+ <%= t(".description") %>
+ <% if params[:tag] %>
+ <%= link_to t(".remove_tag_filter", :tag => params[:tag]), { :controller => "traces", :action => "index", :display_name => nil, :tag => nil, :page => nil }, { :class => "border-left ml-2 pl-2" } %>
+ <% end %>
+
+
+ <% if @target_user.blank? %>
+
+ -
+ <%= link_to t(".all_traces"), { :controller => "traces", :action => "index", :display_name => nil, :page => nil }, { :class => "nav-link active" } %>
+
+ <% if current_user %>
+ -
+ <%= link_to t(".my_traces"), { :action => "mine", :page => nil }, { :class => "nav-link" } %>
+
<% end %>
+ <% elsif current_user && current_user == @target_user %>
+ -
+ <%= link_to t(".all_traces"), { :controller => "traces", :action => "index", :display_name => nil, :page => nil }, { :class => "nav-link" } %>
+
+
+ -
+ <%= link_to t(".my_traces"), { :action => "mine", :page => nil }, { :class => "nav-link active" } %>
+
+ <% else %>
+
+ -
+ <%= link_to t(".all_traces"), { :controller => "traces", :action => "index", :display_name => nil, :page => nil }, { :class => "nav-link" } %>
+
<% if current_user && current_user != @target_user %>
- - <%= link_to t(".see_my_traces"), :action => "mine", :tag => nil, :page => nil %>
+ -
+ <%= link_to t(".my_traces"), { :action => "mine", :page => nil }, { :class => "nav-link" } %>
+
<% end %>
+ -
+ <%= link_to t(".public_traces_from", :user => @target_user&.display_name), { :action => "mine", :page => nil }, { :class => "nav-link active" } %>
+
<% end %>
+
+
+ -
+
+ <%= link_to({ :action => :georss, :display_name => @target_user&.display_name, :tag => params[:tag] }, { :class => "btn btn-secondary btn-sm" }) do %>
+
+ <% end -%>
+ <%= link_to t(".upload_trace"), new_trace_path, :class => "btn btn-secondary btn-sm" %>
+
+
<% end %>
<% content_for :auto_discovery_link_tag do %>
-<%= auto_discovery_link_tag :rss, :action => "georss", :display_name => @display_name, :tag => @tag %>
+ <%= auto_discovery_link_tag :rss, :action => "georss", :display_name => @target_user&.display_name, :tag => params[:tag] %>
<% end %>
<% if @traces.size > 0 %>
- <%= render :partial => "trace_paging_nav" %>
+ <%= render "trace_paging_nav", :page => @page, :page_size => @page_size, :traces => @traces, :params => @params %>
-
-
-
- |
- |
-
-
+
- <%= render @traces unless @traces.nil? %>
+ <%= render @traces %>
- <%= render :partial => "trace_paging_nav" %>
+ <%= render "trace_paging_nav", :page => @page, :page_size => @page_size, :traces => @traces, :params => @params %>
<% else %>
<%= t ".empty_html", :upload_link => new_trace_path %>
<% end %>
-
-<%= render :partial => "trace_optionals" %>