X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/39ffcbc6a25e1ff4565fff3132be59612073276a..7377cb63939f8743ca31e67ea3965c2b15d20057:/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 ac8a47069..85b9515df 100644
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -1,77 +1,143 @@
-
<%= t 'browse.changeset.changeset', :id => @changeset.id %>
-
+<% set_title(t('.title', :id => @changeset.id)) %>
+
+
+
+ <%= t('.title', :id => @changeset.id) %>
+
-
- <%=
- if @changeset.tags['comment'].to_s != ''
- @changeset.tags['comment'].to_s
- else
- t ('browse.changeset_details.no_comment')
- end
- %>
-
-
- <%
- created_at = distance_of_time_in_words_to_now(@changeset.created_at)
- closed_at = distance_of_time_in_words_to_now(@changeset.closed_at)
- if created_at == closed_at
- %>
- <%= t 'browse.changeset_details.closed_at' %>
-
- <%= t('browse.changeset_details.ago', :ago => created_at) %>
+ <%= linkify(h(@changeset.tags['comment'].to_s.presence || t('browse.no_comment'))) %>
+ <%= changeset_details(@changeset) %>
+
+ <%= render :partial => "tag_details", :object => @changeset.tags.except('comment') %>
+
+
+
+ <% if current_user %>
+
+
+
+ <% end %>
+
+
+
+ <% if @comments.length > 0 %>
+
+ <% 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 'browse.changeset_details.created_at' %> <%= t('browse.changeset_details.ago', :ago => created_at) %>,
- <%= t 'browse.changeset_details.closed_at' %> <%= t('browse.changeset_details.ago', :ago => closed_at) %>
- <% end %>
- <% if @changeset.user.data_public? %>
- by <%= link_to h(@changeset.user.display_name), :controller => "user", :action => "view", :display_name => @changeset.user.display_name %>
+
+ <%= t('.still_open') %>
+
<% end %>
-
-
-
-<%=
- render :partial => "tag_details", :object => @changeset.tags.except('comment')
-%>
+ <% 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 %>
-
- <%= render :partial => 'paging_nav', :locals => { :pages => @relation_pages, :page_param => "relation_page" } %>
+ <% 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 %>
<% 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") %>