X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e9e4b10473fa536cdb840303ee4afccf71c69329..549a46c867002c974224bc86cc5933edd8acef94:/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 71b25afe0..998dd248d 100644
--- a/app/views/traces/index.html.erb
+++ b/app/views/traces/index.html.erb
@@ -8,57 +8,60 @@
       </li>
       <% if params[:tag] %>
         <li>
-          <%= link_to t(".remove_tag_filter", :tag => params[:tag]), { :controller => "traces", :action => "index", :display_name => nil, :tag => nil, :page => nil } %>
+          <%= link_to t(".remove_tag_filter", :tag => params[:tag]), { :controller => "traces", :action => "index", :tag => nil } %>
         </li>
       <% end %>
     </ul>
   </nav>
-  <ul class="nav nav-tabs flex-column flex-sm-row">
-    <% if @target_user.blank? %>
-      <!-- public traces -->
-      <li class="nav-item">
-        <%= link_to t(".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(".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(".all_traces"), { :controller => "traces", :action => "index", :display_name => nil, :page => nil }, { :class => "nav-link" } %>
-      </li>
-      <!-- my traces -->
-      <li class="nav-item">
-        <%= link_to t(".my_traces"), { :action => "mine", :page => nil }, { :class => "nav-link active" } %>
-      </li>
-    <% else %>
-      <!-- public_traces_from @target_user -->
-      <li class="nav-item">
-        <%= link_to t(".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">
-          <%= link_to t(".my_traces"), { :action => "mine", :page => nil }, { :class => "nav-link" } %>
-        </li>
-      <% end %>
-      <li class="nav-item">
-        <%= link_to t(".public_traces_from", :user => @target_user&.display_name), { :action => "mine", :page => nil }, { :class => "nav-link active" } %>
-      </li>
-    <% end %>
 
-    <li class="nav-item flex-sm-grow-1"></li>
-    <li class="nav-item">
-      <div class="px-3 py-2 py-sm-0">
-        <%= 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="18" height="18" 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" %>
-      </div>
-    </li>
-  </ul>
+  <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(".all_traces"), { :controller => "traces", :action => "index", :display_name => nil }, { :class => "nav-link active" } %>
+          </li>
+          <% 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(".traces_from", :user => @target_user&.display_name), { :controller => "traces", :action => "index", :display_name => @target_user&.display_name }, { :class => "nav-link active" } %>
+          </li>
+        <% end %>
+      </ul>
+    </div>
+  </div>
 <% end %>
 
 <% content_for :auto_discovery_link_tag do %>
@@ -66,15 +69,7 @@
 <% 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 %>
   <h2><%= t ".empty_title" %></h2>
   <p><%= t ".empty_upload_html", :upload_link => link_to(t(".upload_new"), new_trace_path),