X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2e2f2124728ca755b2db8f83f022eaea24b647f0..0df788d74232330eea5c2d4854ba0d10796053eb:/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 e5963c57f..1fb1e74a4 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -1,21 +1,140 @@ - - - - - - - - <% if @changeset.has_valid_bbox? %> - <%= render :partial => "map", :object => @changeset %> +<% set_title(t('browse.changeset.title', :id => @changeset.id)) %> + +

+ + <%= t('browse.changeset.title', :id => @changeset.id) %> + <% if current_user and current_user.id != @changeset.user.id %> + <%= link_to new_issue_url(reportable_id: @changeset.id, reportable_type: @changeset.class.name, referer: request.fullpath), :title => t('browse.changeset.report') do %> +  ⚐ <% end %> -

-
-

<%= t 'browse.changeset.changeset' %> <%= h(@changeset.id) %>

-
- <%= render :partial => "navigation" %> -
- <%= render :partial => "changeset_details", :object => @changeset %> -
- <%= t 'browse.changeset.download', :changeset_xml_link => link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read"), - :osmchange_xml_link => link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %> -
+ <% end %> + + +
+

<%= 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('browse.changeset.discussion') %>

+ +
+
+ <% if current_user and @changeset.subscribers.exists?(current_user.id) %> + + <% else %> + + <% end %> +
+
+ +
+ + <% if @comments.length > 0 %> +
+
+
    + <% @comments.each do |comment| %> + <% if comment.visible %> +
  • + + <%= t("browse.changeset.commented_by", + :when => friendly_date(comment.created_at), :exact_time => l(comment.created_at), + :user => link_to(h(comment.author.display_name), {:controller => "user", :action => "view", + :display_name => comment.author.display_name})).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("browse.changeset.hidden_commented_by", + :when => friendly_date(comment.created_at), :exact_time => l(comment.created_at), + :user => link_to(h(comment.author.display_name), {:controller => "user", :action => "view", + :display_name => comment.author.display_name})).html_safe %> + — <%= t('javascripts.changesets.show.unhide_comment') %> + + <%= comment.body.to_html %> +
  • + <% end %> + <% end %> +
+
+
+ <% end %> + +
+ <%= link_to(t("browse.changeset.join_discussion"), :controller => 'user', :action => 'login', :referer => request.fullpath) %> +
+ + <% unless @changeset.is_open? %> +
+ +
+ +
+
+ <% end %> + + <% unless @ways.empty? %> +

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

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

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

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

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

+ + <% end %> +
+ +<% 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 => "list", :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('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %> +