X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4cc2b63d5c38158e6beb114147be723425ec412e..44c3e1d66a983a41d4cdc4d3472a1d99d5bf6ef7:/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 05e3d4391..31799f0e9 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -1,71 +1,72 @@ -<% content_for :head do %> - <%= stylesheet_link_tag 'browse' %> -<% end %> - -<% content_for :sidebar do %> -

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

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

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

-

<%= l @changeset.created_at %>

-
+

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

-
-

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

-

<%= l @changeset.closed_at %>

-
+
+

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

+
<%= changeset_details(@changeset) %>
- <% 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 %>

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

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

- -
- <%= render :partial => 'paging_nav', :locals => { :pages => @node_pages, :page_param => "node_page"} %> - <% end %> + <%= render :partial => "tag_details", :object => @changeset.tags.except('comment') %> <% unless @ways.empty? %> -
-

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

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

+ <%= type_and_paginated_count('way', @way_pages) %> + <%= render :partial => 'paging_nav', :locals => { :pages => @way_pages, :page_param => "way_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" } %> +

+ <%= 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 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 %> -<%= render :template => 'layouts/map' %> +
+ <%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %> + · + <%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %> +