-<% content_for :heading_class, 'pb-0' %>
+<% content_for :heading_class, "pb-0" %>
<% content_for :heading do %>
<h1><%= @title %></h1>
- <p>
- <%= 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 %>
- </p>
- <ul class="nav nav-tabs">
- <li class="nav-item">
- <% if @target_user.blank? %>
- <!-- public traces -->
- <% if current_user %>
+ <nav class="secondary-actions mb-3">
+ <ul>
+ <li>
+ <%= t(".description") %>
+ </li>
+ <% if params[:tag] %>
+ <li>
+ <%= link_to t(".remove_tag_filter", :tag => params[:tag]), { :controller => "traces", :action => "index", :tag => nil } %>
+ </li>
+ <% end %>
+ </ul>
+ </nav>
+
+ <div class="d-flex flex-column flex-md-row-reverse align-items-md-end">
+ <div class="pb-1 ps-1 d-flex flex-wrap flex-shrink-0 gap-1 justify-content-end">
+ <%= link_to({ :action => :georss, :display_name => @target_user&.display_name, :tag => params[:tag] },
+ { :class => "btn btn-secondary btn-sm" }) do %>
+ <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" class="align-text-bottom">
+ <circle cx="2" cy="14" r="2" fill="white" />
+ <path d="M 8 14 a 6 6 0 0 0 -6 -6 M 14 14 a 12 12 0 0 0 -12 -12" fill="none" stroke="white" stroke-width="3" stroke-linecap="round" />
+ </svg><% end -%>
+ <%= link_to t(".upload_trace"), new_trace_path, :class => "btn btn-secondary btn-sm" %>
+ </div>
+
+ <div class="flex-grow-1">
+ <ul class="nav nav-tabs">
+ <% if @target_user.blank? %>
+ <!-- public traces -->
<li class="nav-item">
- <%= link_to t(".see_my_traces"), {:action => "mine", :page => nil}, {:class => "nav-link"} %>
+ <%= link_to t(".all_traces"), { :controller => "traces", :action => "index", :display_name => nil }, { :class => "nav-link active" } %>
</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 %>
- <!-- 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"} %>
- </li>
- <% if current_user && current_user != @target_user %>
+ <% if current_user %>
+ <li class="nav-item">
+ <%= link_to t(".my_traces"), { :action => "mine" }, { :class => "nav-link" } %>
+ </li>
+ <% end %>
+ <% elsif current_user && current_user == @target_user %>
+ <li class="nav-item">
+ <%= link_to t(".all_traces"), { :controller => "traces", :action => "index", :display_name => nil }, { :class => "nav-link" } %>
+ </li>
+ <!-- my traces -->
+ <li class="nav-item">
+ <%= link_to t(".my_traces"), { :action => "mine" }, { :class => "nav-link active" } %>
+ </li>
+ <% else %>
+ <!-- traces_from @target_user -->
+ <li class="nav-item">
+ <%= link_to t(".all_traces"), { :controller => "traces", :action => "index", :display_name => nil }, { :class => "nav-link" } %>
+ </li>
+ <% if current_user && current_user != @target_user %>
+ <li class="nav-item">
+ <%= link_to t(".my_traces"), { :action => "mine" }, { :class => "nav-link" } %>
+ </li>
+ <% end %>
<li class="nav-item">
- <%= link_to t(".see_my_traces"), {:action => "mine", :page => nil}, {:class => "nav-link"} %>
+ <%= link_to t(".traces_from_html", :user => tag.span(@target_user.display_name, :class => "username text-truncate d-inline-block align-bottom", :dir => "auto")),
+ { :controller => "traces", :action => "index", :display_name => @target_user.display_name }, { :class => "nav-link active" } %>
</li>
<% end %>
- <li class="nav-item">
- <%= link_to t(".see_all_traces"), {:controller => "traces", :action => "index", :display_name => nil, :page => nil}, {:class => "nav-link"} %>
- </li>
- <% end %>
- </li>
-
- <li class="nav-item ml-auto pt-1">
- <%= link_to({:action => :georss, :display_name => @target_user&.display_name, :tag => params[:tag]}, {:class => "btn btn-secondary btn-sm px-1 py-0"}) do %>
- <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="white" viewBox="0 0 16 16">
- <path d="M5.5 12a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0zm-3-8.5a1 1 0 0 1 1-1c5.523 0 10 4.477 10 10a1 1 0 1 1-2 0 8 8 0 0 0-8-8 1 1 0 0 1-1-1zm0 4a1 1 0 0 1 1-1 6 6 0 0 1 6 6 1 1 0 1 1-2 0 4 4 0 0 0-4-4 1 1 0 0 1-1-1z"/>
- </svg>
- <% end -%>
- <%= link_to t(".upload_trace"), new_trace_path, :class => "btn btn-secondary btn-sm px-1 py-0" %>
- </li>
- </ul>
+ </ul>
+ </div>
+ </div>
<% end %>
<% content_for :auto_discovery_link_tag do %>
<% end %>
<% if @traces.size > 0 %>
- <%= render "trace_paging_nav", :page => @page, :page_size => @page_size, :traces => @traces, :params => @params %>
-
- <table id="trace_list" class="table table-borderless table-striped">
- <tbody>
- <%= render @traces %>
- </tbody>
- </table>
-
- <%= render "trace_paging_nav", :page => @page, :page_size => @page_size, :traces => @traces, :params => @params %>
+ <%= render :partial => "page" %>
<% else %>
- <h4><%= t ".empty_html", :upload_link => new_trace_path %></h4>
+ <h2><%= t ".empty_title" %></h2>
+ <p><%= t ".empty_upload_html", :upload_link => link_to(t(".upload_new"), new_trace_path),
+ :wiki_link => link_to(t(".wiki_page"), t(".wiki_page_url")) %></p>
<% end %>
projects / rails.git / blobdiff