X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4557654ba63392f0db4aa5c002be692395eb8cee..d66b4b3d2f379ed61ef2b33bb2b0507267827f98:/app/views/browse/changeset.html.erb?ds=inline diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index 6c60349dd..85b9515df 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -1,67 +1,143 @@ -<% content_for :head do %> - <%= stylesheet_link_tag 'browse' %> -<% end %> +<% set_title(t('.title', :id => @changeset.id)) %> -

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

+

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

-
-
-

<%= t 'browse.changeset_details.created_at' %>

-

<%= l @changeset.created_at %>

-
+
+

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

+
<%= changeset_details(@changeset) %>
-
-

<%= t 'browse.changeset_details.closed_at' %>

-

<%= l @changeset.closed_at %>

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

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

- <% if @changeset.user.data_public? %> -
-

<%= t 'browse.changeset_details.belongs_to' %>

-

<%= link_to h(@changeset.user.display_name), :controller => "user", :action => "view", :display_name => @changeset.user.display_name %>

+ <% 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 => 'user', :action => 'login', :referer => request.fullpath) %>
<% end %> -
-<%= render :partial => "tag_details", :object => @changeset %> + <% if current_user %> + <% unless @changeset.is_open? %> +
+ +
+ +
+
+ <% else %> +
+ <%= t('.still_open') %> +
+ <% end %> + <% end %> -<% unless @nodes.empty? %> -
-

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

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

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

    - <% @nodes.each do |node| %> -
  • <%= link_to h(printable_name(node, true)), { :action => "node", :id => node.node_id.to_s }, :class => link_class('node', node), :title => link_title(node) %>
    • + <% @ways.each do |way| %> +
  • <%= link_to printable_name(way, true), { :action => "way", :id => way.way_id.to_s }, :class => link_class('way', way), :title => link_title(way) %>
    • <% end %>
-
- <%= 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 @relations.empty? %> +

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

    - <% @ways.each do |way| %> -
  • <%= link_to h(printable_name(way, true)), { :action => "way", :id => way.way_id.to_s }, :class => link_class('way', way), :title => link_title(way) %>
    • + <% @relations.each do |relation| %> +
  • <%= link_to printable_name(relation, true), { :action => "relation", :id => relation.relation_id.to_s }, :class => link_class('relation', relation), :title => link_title(relation) %>
    • <% end %>
-
- <%= 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 %>

-
    - <% @relations.each do |relation| %> -
  • <%= link_to h(printable_name(relation, true)), { :action => "relation", :id => relation.relation_id.to_s }, :class => link_class('relation', relation), :title => link_title(relation) %>
    • - <% end %> -
+ <% unless @nodes.empty? %> +

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

+
    + <% @nodes.each do |node| %> +
  • <%= link_to printable_name(node, true), { :action => "node", :id => node.node_id.to_s }, :class => link_class('node', node), :title => link_title(node), :rel => link_follow(node) %>
    • + <% end %> +
+ <% 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 %>
- <%= 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") %> +