X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/68a3df4d53c84508bf443058040379c3a18eb1a7..764f808d5a5faebc835ed0f588bae4a306ad687d:/app/views/browse/changeset.html.erb diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index 736abf12f..079915fcf 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -1,48 +1,122 @@ -<% set_title(t('browse.changeset.title', :id => @changeset.id)) %> +<% set_title(t(".title", :id => @changeset.id)) %> -

- - <%= t('browse.changeset.title', :id => @changeset.id) %> -

+<%= render "sidebar_header", :title => t(".title", :id => @changeset.id) %>
-

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

+

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

<%= changeset_details(@changeset) %>
- <%= render :partial => "tag_details", :object => @changeset.tags.except('comment') %> + <%= render :partial => "tag_details", :object => @changeset.tags.except("comment") %> + +

<%= t(".discussion") %>

+ + <% if current_user %> +
+
+ <% if @changeset.subscribers.exists?(current_user.id) %> + " data-method="POST" data-url="<%= changeset_unsubscribe_url(@changeset) %>" /> + <% else %> + " data-method="POST" data-url="<%= changeset_subscribe_url(@changeset) %>" /> + <% end %> +
+
+ <% end %> + +
+ + <% if @comments.length > 0 %> +
+
+
    + <% @comments.each do |comment| %> + <% if comment.visible %> +
  • + + <%= t(".commented_by_html", + :when => friendly_date_ago(comment.created_at), + :exact_time => l(comment.created_at), + :user => link_to(comment.author.display_name, user_path(comment.author))) %> + <% if current_user and current_user.moderator? %> + — <%= t("javascripts.changesets.show.hide_comment") %> + <% end %> + + <%= comment.body.to_html %> +
  • + <% elsif current_user and current_user.moderator? %> +
  • + + <%= t(".hidden_commented_by_html", + :when => friendly_date_ago(comment.created_at), + :exact_time => l(comment.created_at), + :user => link_to(comment.author.display_name, user_path(comment.author))) %> + — <%= t("javascripts.changesets.show.unhide_comment") %> + + <%= comment.body.to_html %> +
  • + <% end %> + <% end %> +
+
+
+ <% end %> + + <% unless current_user %> +
+ <%= link_to(t(".join_discussion"), login_path(:referer => request.fullpath)) %> +
+ <% end %> + + <% if current_user %> + <% unless @changeset.is_open? %> +
+
+ +
+
+ " data-changeset-id="<%= @changeset.id %>" data-method="POST" data-url="<%= changeset_comment_url(@changeset) %>" disabled="1" class="btn btn-sm btn-primary" /> +
+
+ <% else %> +
+ <%= t(".still_open") %> +
+ <% end %> + <% end %> <% unless @ways.empty? %>

- <%= type_and_paginated_count('way', @way_pages) %> - <%= render :partial => 'paging_nav', :locals => { :pages => @way_pages, :page_param => "way_page" } %> + <%= type_and_paginated_count("way", @way_pages) %> + <%= render :partial => "paging_nav", :locals => { :pages => @way_pages, :page_param => "way_page" } %>

-