X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/161fc8ac47f6a3435f357be9af230a5c44735a9c..bc70cae711fb6947233d6a750cb33f115aa7a01b:/app/views/changesets/show.html.erb?ds=sidebyside diff --git a/app/views/changesets/show.html.erb b/app/views/changesets/show.html.erb index d44ccfc07..a47049e99 100644 --- 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) %>
-

+

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

<%= changeset_details(@changeset) %>

@@ -18,9 +18,17 @@ <% if current_user %>
<% if @changeset.subscribers.exists?(current_user.id) %> - + <%= tag.button t(".unsubscribe"), + :class => "btn btn-sm btn-primary", + :name => "unsubscribe", + :data => { :method => "POST", + :url => api_changeset_unsubscribe_url(@changeset) } %> <% else %> - + <%= tag.button t(".subscribe"), + :class => "btn btn-sm btn-primary", + :name => "subscribe", + :data => { :method => "POST", + :url => api_changeset_subscribe_url(@changeset) } %> <% end %>
<% end %> @@ -32,12 +40,12 @@ <% next unless comment.visible || 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) %> + <%= comment_by_options = { :time_ago => friendly_date_ago(comment.created_at), + :user => link_to(comment.author.display_name, comment.author) } + comment.visible ? t(".comment_by_html", **comment_by_options) : t(".hidden_comment_by_html", **comment_by_options) %> <% 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) } %> @@ -66,7 +74,12 @@
    - + <%= tag.button t(".comment"), + :class => "btn btn-primary", + :name => "comment", + :disabled => true, + :data => { :method => "POST", + :url => changeset_comment_url(@changeset) } %>
    <% else %> @@ -77,42 +90,15 @@ <% end %> <% unless @ways.empty? %> - <%= render :partial => "paging_nav", :locals => { :type => "way", :pages => @way_pages } %> -
      - <% @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 %> -
    + <%= render :partial => "elements", :locals => { :type => "way", :elements => @ways, :pages => @way_pages } %> <% end %> <% unless @relations.empty? %> - <%= render :partial => "paging_nav", :locals => { :type => "relation", :pages => @relation_pages } %> -
      - <% @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 %> -
    + <%= render :partial => "elements", :locals => { :type => "relation", :elements => @relations, :pages => @relation_pages } %> <% end %> <% unless @nodes.empty? %> - <%= render :partial => "paging_nav", :locals => { :type => "node", :pages => @node_pages } %> -
      - <% @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 %> -
    + <%= render :partial => "elements", :locals => { :type => "node", :elements => @nodes, :pages => @node_pages } %> <% end %>