X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c4090bb150e0eb866151ba0477e50b0421d60527..08f0621d6f9342ab473cd1fdc262a5b6e9a368c3:/app/views/browse/changeset.html.erb diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index eaa02af58..85b9515df 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -1,26 +1,85 @@ -<% set_title("#{t('browse.changeset.title')} | #{@changeset.id}") %> +<% set_title(t('.title', :id => @changeset.id)) %>

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

-

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

+

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

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

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

- +

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

+ + <% if current_user %> +
+
+ <% if @changeset.subscribers.exists?(current_user.id) %> + + <% else %> + + <% end %> +
+
+ <% 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 => 'user', :action => 'login', :referer => request.fullpath) %> +
+ <% end %> + + <% if current_user %> + <% unless @changeset.is_open? %> +
+ +
+ +
+
+ <% else %> +
+ <%= t('.still_open') %> +
+ <% end %> <% end %> <% unless @ways.empty? %> @@ -30,7 +89,7 @@ <% end %> @@ -42,14 +101,43 @@ + <% 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('.changesetxml'), :controller => "changeset", :action => "read") %> · - <%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %> + <%= link_to(t('.osmchangexml'), :controller => "changeset", :action => "download") %>