X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1cded7d151f6af733c3760815a00b0a259d9ba17..248f63f728295afcc6052f73f1a1617829a3ba90:/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 1970f568d..81e930812 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -1,62 +1,143 @@ -
-

<%= 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 %> +<% set_title(t('.title', :id => @changeset.id)) %> + +

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

+ +
+

<%= linkify(h(@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(".commented_by", + :when => friendly_date(comment.created_at), :exact_time => l(comment.created_at), + :user => link_to(h(comment.author.display_name), user_path(comment.author))).html_safe %> + <% 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", + :when => friendly_date(comment.created_at), :exact_time => l(comment.created_at), + :user => link_to(h(comment.author.display_name), user_path(comment.author))).html_safe %> + — <%= t('javascripts.changesets.show.unhide_comment') %> + + <%= comment.body.to_html %> +
  • + <% end %> + <% end %> +
+
+
+ <% end %> + + <% unless current_user %> +
+ <%= link_to(t(".join_discussion"), :controller => 'users', :action => 'login', :referer => request.fullpath) %> +
+ <% end %> + + <% if current_user %> + <% unless @changeset.is_open? %> +
+ +
+ +
+
+ <% 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" } %> +

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

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

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

+ <%= type_and_paginated_count('relation', @relation_pages) %> + <%= render :partial => 'paging_nav', :locals => { :pages => @relation_pages, :page_param => "relation_page" } %> +

-
- <%= render :partial => 'paging_nav', :locals => { :pages => @node_pages, :page_param => "node_page"} %> -<% end %> + <% end %> -<% unless @ways.empty? %> -
-

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

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

+ <%= type_and_paginated_count('node', @node_pages) %> + <%= render :partial => 'paging_nav', :locals => { :pages => @node_pages, :page_param => "node_page"} %> +

-
- <%= render :partial => 'paging_nav', :locals => { :pages => @way_pages, :page_param => "way_page" } %> -<% end %> + <% end %> +
-<% unless @relations.empty? %> -
-

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

- +<% 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 content_tag(:bdi, user), :controller => "changeset", :action => "index", :display_name => user + %> + <% if @next_by_user %> + · + <%= link_to "#{@next_by_user.id} >>", :id => @next_by_user.id %> + <% end %>
- <%= render :partial => 'paging_nav', :locals => { :pages => @relation_pages, :page_param => "relation_page" } %> <% end %> - +
+ <%= link_to(t('.changesetxml'), :controller => "changeset", :action => "read") %> + · + <%= link_to(t('.osmchangexml'), :controller => "changeset", :action => "download") %> +