Merge branch 'pull/4985'

[rails.git] / app / views / traces / index.html.erb

diff --git a/app/views/traces/index.html.erb b/app/views/traces/index.html.erb
index b696ef3fd91e475e34b2fc91d078c945a7cdb819..4311ba082e39de12dd945f3a66bf011c9edfabc3 100644 (file)
--- a/app/views/traces/index.html.erb
+++ b/app/views/traces/index.html.erb
@@ -14,7 +14,17 @@
     </ul>
   </nav>
 
     </ul>
   </nav>
 

-  <div class="d-flex align-items-end">
+  <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? %>
     <div class="flex-grow-1">
       <ul class="nav nav-tabs">
         <% if @target_user.blank? %>


@@ -46,21 +56,12 @@
             </li>
           <% end %>
           <li class="nav-item">
             </li>
           <% end %>
           <li class="nav-item">

-            <%= link_to t(".traces_from", :user => @target_user&.display_name), { :controller => "traces", :action => "index", :display_name => @target_user&.display_name }, { :class => "nav-link active" } %>
+            <%= 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 %>
       </ul>
     </div>
           </li>
         <% end %>
       </ul>
     </div>

-
-    <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>
 <% end %>
 
   </div>
 <% end %>
 


@@ -69,23 +70,7 @@
 <% end %>
 
 <% if @traces.size > 0 %>
 <% end %>
 
 <% if @traces.size > 0 %>

-  <%= render "shared/pagination",
-             :newer_key => "traces.trace_paging_nav.newer",
-             :older_key => "traces.trace_paging_nav.older",
-             :newer_id => @newer_traces_id,
-             :older_id => @older_traces_id %>
-
-  <table id="trace_list" class="table table-borderless table-striped">
-    <tbody>
-      <%= render @traces %>
-    </tbody>
-  </table>
-
-  <%= render "shared/pagination",
-             :newer_key => "traces.trace_paging_nav.newer",
-             :older_key => "traces.trace_paging_nav.older",
-             :newer_id => @newer_traces_id,
-             :older_id => @older_traces_id %>
+  <%= render :partial => "page" %>

 <% else %>
   <h2><%= t ".empty_title" %></h2>
   <p><%= t ".empty_upload_html", :upload_link => link_to(t(".upload_new"), new_trace_path),
 <% else %>
   <h2><%= t ".empty_title" %></h2>
   <p><%= t ".empty_upload_html", :upload_link => link_to(t(".upload_new"), new_trace_path),