Merge branch 'pull/5196'

[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 7c04ee2840287ed7bf63f81ca232bf8e5491ec41..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="fs-6">
+  <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,9 +18,17 @@
     <% 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) %>

-          <button class="btn btn-sm btn-primary" name="unsubscribe" data-method="POST" data-url="<%= api_changeset_unsubscribe_url(@changeset) %>"><%= t("javascripts.changesets.show.unsubscribe") %></button>
+          <%= tag.button t(".unsubscribe"),
+                         :class => "btn btn-sm btn-primary",
+                         :name => "unsubscribe",
+                         :data => { :method => "POST",
+                                    :url => api_changeset_unsubscribe_url(@changeset) } %>

         <% else %>
         <% else %>

-          <button class="btn btn-sm btn-primary" name="subscribe" data-method="POST" data-url="<%= api_changeset_subscribe_url(@changeset) %>"><%= t("javascripts.changesets.show.subscribe") %></button>
+          <%= tag.button t(".subscribe"),
+                         :class => "btn btn-sm btn-primary",
+                         :name => "subscribe",
+                         :data => { :method => "POST",
+                                    :url => api_changeset_subscribe_url(@changeset) } %>

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


@@ -31,13 +39,13 @@
       <% @comments.each do |comment| %>
         <% next unless comment.visible || current_user&.moderator? %>
         <li id="c<%= comment.id %>">
       <% @comments.each do |comment| %>
         <% next unless comment.visible || current_user&.moderator? %>
         <li id="c<%= comment.id %>">

-          <small class='text-muted'>
+          <small class='text-body-secondary'>

             <%= t comment.visible ? ".comment_by_html" : ".hidden_comment_by_html",
                   :time_ago => friendly_date_ago(comment.created_at),
                   :user => link_to(comment.author.display_name, comment.author) %>
             <% if current_user&.moderator? %>
               —
             <%= t comment.visible ? ".comment_by_html" : ".hidden_comment_by_html",
                   :time_ago => friendly_date_ago(comment.created_at),
                   :user => link_to(comment.author.display_name, comment.author) %>
             <% if current_user&.moderator? %>
               —

-              <%= tag.button t("javascripts.changesets.show.#{comment.visible ? 'hide' : 'unhide'}_comment"),
+              <%= tag.button t(".#{comment.visible ? 'hide' : 'unhide'}_comment"),

                              :class => "btn btn-sm small btn-link link-secondary p-0 align-baseline",
                              :data => { :method => "POST",
                                         :url => comment.visible ? changeset_comment_hide_url(comment) : changeset_comment_unhide_url(comment) } %>
                              :class => "btn btn-sm small btn-link link-secondary p-0 align-baseline",
                              :data => { :method => "POST",
                                         :url => comment.visible ? changeset_comment_hide_url(comment) : changeset_comment_unhide_url(comment) } %>


@@ -66,7 +74,12 @@
         <div id="comment-error" class="alert alert-danger p-2 mb-3" hidden>
         </div>
         <div>
         <div id="comment-error" class="alert alert-danger p-2 mb-3" hidden>
         </div>
         <div>

-          <button name="comment" data-method="POST" data-url="<%= changeset_comment_url(@changeset) %>" disabled class="btn btn-sm btn-primary"><%= t("javascripts.changesets.show.comment") %></button>
+          <%= tag.button t(".comment"),
+                         :class => "btn btn-primary",
+                         :name => "comment",
+                         :disabled => true,
+                         :data => { :method => "POST",
+                                    :url => changeset_comment_url(@changeset) } %>

         </div>
       </form>
     <% else %>
         </div>
       </form>
     <% else %>


@@ -77,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>