X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d8cf49f0d7f0006bb8b5ccb16d3d236069e6821a..9126653ffd07e38800986a6410ae1fe0955989fc:/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 fb08987bb..31799f0e9 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -1,31 +1,17 @@ +<% set_title(t('browse.changeset.title', :id => @changeset.id)) %> +

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

-

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

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

<%= 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"} %> -

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

<%= type_and_paginated_count('way', @way_pages) %> <%= render :partial => 'paging_nav', :locals => { :pages => @way_pages, :page_param => "way_page" } %> @@ -35,11 +21,9 @@
  • <%= link_to h(printable_name(way, true)), { :action => "way", :id => way.way_id.to_s }, :class => link_class('way', way), :title => link_title(way) %>
  • <% end %> -

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

    <%= type_and_paginated_count('relation', @relation_pages) %> <%= render :partial => 'paging_nav', :locals => { :pages => @relation_pages, :page_param => "relation_page" } %> @@ -49,11 +33,40 @@
  • <%= 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 %> + <% 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 %> -
    -

    <%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %> +
    + <%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %> · - <%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %>

    + <%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %>