X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9f3dace353d08417d23624781f059bd61dd56c52..6c22bf4b9afb26af56430ec9f9e191502fb0ee60:/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 d8a60a66c..9ad35b2a7 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -1,63 +1,143 @@ -
- <%
- 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' %>
-
- <%= created_at %> ago
- <% else %>
- <%= t 'browse.changeset_details.created_at' %> <%= created_at %> ago,
- <%= t 'browse.changeset_details.closed_at' %> <%= closed_at %> ago
- <% end %>
- <% if @changeset.user.data_public? %>
- by <%= link_to h(@changeset.user.display_name), :controller => "user", :action => "view", :display_name => @changeset.user.display_name %>
+<% set_title(t(".title", :id => @changeset.id)) %>
+
+
+
+ <%= t(".title", :id => @changeset.id) %>
+
+
+<%= linkify(h(@changeset.tags["comment"].to_s.presence || t("browse.no_comment"))) %>
+ <%= t(".discussion") %>
+
+ <% if current_user %>
+
+ <% end %>
+
+
+
+ <% if @comments.length > 0 %>
+
+ <%= type_and_paginated_count("way", @way_pages) %>
+ <%= render :partial => "paging_nav", :locals => { :pages => @way_pages, :page_param => "way_page" } %>
+
+
+ <% @ways.each do |way| %>
+
<%= t 'browse.changeset_details.has_nodes', :count => @node_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" } %>
+
- <% @nodes.each do |node| %>
-
- <%= render :partial => 'paging_nav', :locals => { :pages => @node_pages, :page_param => "node_page"} %>
- <%= t 'browse.changeset_details.has_ways', :count => @way_pages.item_count %>
+ <% unless @nodes.empty? %>
+
+ <%= type_and_paginated_count("node", @node_pages) %>
+ <%= render :partial => "paging_nav", :locals => { :pages => @node_pages, :page_param => "node_page" } %>
+
- <% @ways.each do |way| %>
-
- <%= render :partial => 'paging_nav', :locals => { :pages => @way_pages, :page_param => "way_page" } %>
-