Merge branch 'drop-oauth1'

[rails.git] / app / views / changesets / show.html.erb

diff --git a/app/views/changesets/show.html.erb b/app/views/changesets/show.html.erb
index 1d37e302a9004d8a6587506bab29531b8dd0eaf6..13f40ce500d016dee39537330586f908b8287828 100644 (file)
--- a/app/views/changesets/show.html.erb
+++ b/app/views/changesets/show.html.erb
@@ -3,7 +3,7 @@
 <%= render "sidebar_header", :title => t(".title", :id => @changeset.id) %>
 
 <div class="browse-section">
 <%= render "sidebar_header", :title => t(".title", :id => @changeset.id) %>
 
 <div class="browse-section">

-  <p class="fst-italic">
+  <p class="fs-6 overflow-x-auto">

     <%= linkify(@changeset.tags["comment"].to_s.presence || t("browse.no_comment")) %>
   </p>
   <p class="details"><%= changeset_details(@changeset) %></p>
     <%= linkify(@changeset.tags["comment"].to_s.presence || t("browse.no_comment")) %>
   </p>
   <p class="details"><%= changeset_details(@changeset) %></p>


@@ -18,13 +18,13 @@
     <% if current_user %>
       <div class="col-auto">
         <% if @changeset.subscribers.exists?(current_user.id) %>
     <% if current_user %>
       <div class="col-auto">
         <% if @changeset.subscribers.exists?(current_user.id) %>

-          <%= tag.button t("javascripts.changesets.show.unsubscribe"),
+          <%= tag.button t(".unsubscribe"),

                          :class => "btn btn-sm btn-primary",
                          :name => "unsubscribe",
                          :data => { :method => "POST",
                                     :url => api_changeset_unsubscribe_url(@changeset) } %>
         <% else %>
                          :class => "btn btn-sm btn-primary",
                          :name => "unsubscribe",
                          :data => { :method => "POST",
                                     :url => api_changeset_unsubscribe_url(@changeset) } %>
         <% else %>

-          <%= tag.button t("javascripts.changesets.show.subscribe"),
+          <%= tag.button t(".subscribe"),

                          :class => "btn btn-sm btn-primary",
                          :name => "subscribe",
                          :data => { :method => "POST",
                          :class => "btn btn-sm btn-primary",
                          :name => "subscribe",
                          :data => { :method => "POST",


@@ -90,42 +90,15 @@
   <% end %>
 
   <% unless @ways.empty? %>
   <% end %>
 
   <% unless @ways.empty? %>

-    <%= render :partial => "paging_nav", :locals => { :type => "way", :pages => @way_pages } %>
-    <ul class="list-unstyled">
-      <% @ways.each do |way| %>
-        <%= element_list_item "way", way do
-              t "printable_name.current_and_old_links_html",
-                :current_link => link_to(printable_element_name(way), way_path(way.way_id)),
-                :old_link => link_to(printable_element_version(way), old_way_path(way.way_id, way.version))
-            end %>
-      <% end %>
-    </ul>
+    <%= render :partial => "elements", :locals => { :type => "way", :elements => @ways, :pages => @way_pages } %>

   <% end %>
 
   <% unless @relations.empty? %>
   <% end %>
 
   <% unless @relations.empty? %>

-    <%= render :partial => "paging_nav", :locals => { :type => "relation", :pages => @relation_pages } %>
-    <ul class="list-unstyled">
-      <% @relations.each do |relation| %>
-        <%= element_list_item "relation", relation do
-              t "printable_name.current_and_old_links_html",
-                :current_link => link_to(printable_element_name(relation), relation_path(relation.relation_id)),
-                :old_link => link_to(printable_element_version(relation), old_relation_path(relation.relation_id, relation.version))
-            end %>
-      <% end %>
-    </ul>
+    <%= render :partial => "elements", :locals => { :type => "relation", :elements => @relations, :pages => @relation_pages } %>

   <% end %>
 
   <% unless @nodes.empty? %>
   <% end %>
 
   <% unless @nodes.empty? %>

-    <%= render :partial => "paging_nav", :locals => { :type => "node", :pages => @node_pages } %>
-    <ul class="list-unstyled">
-      <% @nodes.each do |node| %>
-        <%= element_list_item "node", node do
-              t "printable_name.current_and_old_links_html",
-                :current_link => link_to(printable_element_name(node), node_path(node.node_id), { :rel => link_follow(node) }),
-                :old_link => link_to(printable_element_version(node), old_node_path(node.node_id, node.version), { :rel => link_follow(node) })
-            end %>
-      <% end %>
-    </ul>
+    <%= render :partial => "elements", :locals => { :type => "node", :elements => @nodes, :pages => @node_pages } %>

   <% end %>
 </div>
 
   <% end %>
 </div>