X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ba9456066f74814fe4e8929a4467caa2c5c6ba9f..77d495ccdc4c6d07cb7795177c73ba541afc44e0:/app/views/browse/changeset.html.erb?ds=sidebyside diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index 1227c0dd6..9acbd05ae 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -1,65 +1,145 @@ -
-

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

-

- <% - created_at = distance_of_time_in_words_to_now(@changeset.created_at) - closed_at = distance_of_time_in_words_to_now(@changeset.closed_at) - if created_at == closed_at %> - <%= t 'browse.changeset_details.closed_at' %> - - <%= created_at %> ago - <% else %> - <%= t 'browse.changeset_details.created_at' %> <%= created_at %> ago, - <%= t 'browse.changeset_details.closed_at' %> <%= closed_at %> ago - <% end %> - <% if @changeset.user.data_public? %> - by <%= link_to h(@changeset.user.display_name), :controller => "user", :action => "view", :display_name => @changeset.user.display_name %> - <% end %> +<% set_title(t(".title", :id => @changeset.id)) %> + +<%= render "sidebar_header", :title => t(".title", :id => @changeset.id) %> + +

+

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

+

<%= changeset_details(@changeset) %>

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

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

+
+ + <% if current_user %> +
+ +
+ <% end %> +
+ + <% if @comments.length > 0 %> +
+
+
    + <% @comments.each do |comment| %> + <% if comment.visible %> +
  • + + <%= t(".comment_by_html", + :time_ago => tag.abbr(friendly_date_ago(comment.created_at), + :title => 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_comment_by_html", + :time_ago => tag.abbr(friendly_date_ago(comment.created_at), + :title => 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)) %>

-
- -<%= render :partial => "tag_details", :object => @changeset %> + <% end %> -<% unless @nodes.empty? %> -
-

<%= t 'browse.changeset_details.has_nodes', :count => @node_pages.item_count %>

-
-<% end %> + <% end %> -<% unless @ways.empty? %> -
-

<%= t 'browse.changeset_details.has_ways', :count => @way_pages.item_count %>

-
-<% end %> + <% end %> + + <% unless @nodes.empty? %> + <%= render :partial => "paging_nav", :locals => { :heading => type_and_paginated_count("node", @node_pages), :pages => @node_pages, :page_param => "node_page" } %> + + <% end %> +
-<% unless @relations.empty? %> -
-

<%= t 'browse.changeset_details.has_relations', :count => @relation_pages.item_count %>

- - <%= render :partial => 'paging_nav', :locals => { :pages => @relation_pages, :page_param => "relation_page" } %> +<% if @next_by_user || @prev_by_user %> +
+ <% if @prev_by_user %> + <%= link_to "<< #{@prev_by_user.id}", :id => @prev_by_user.id %> + · + <% end %> + <%= user = (@prev_by_user || @next_by_user).user.display_name + link_to tag.bdi(user), :controller => "changesets", :action => "index", :display_name => user %> + <% if @next_by_user %> + · + <%= link_to "#{@next_by_user.id} >>", :id => @next_by_user.id %> + <% end %>
<% end %> -
- <%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %> +
+ <%= link_to(t(".changesetxml"), :controller => "api/changesets", :action => "show") %> · - <%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %> + <%= link_to(t(".osmchangexml"), :controller => "api/changesets", :action => "download") %>