X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5c53bb78ab8a7292b489d7f8d1f38ba17a0287e6..fd283efa51c0fee16b710efd97bf72da5a461288:/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 31799f0e9..4045c0b48 100644
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -1,48 +1,117 @@
-<% set_title(t('browse.changeset.title', :id => @changeset.id)) %>
+<% set_title(t(".title", :id => @changeset.id)) %>
-
-
<%= linkify(h(@changeset.tags['comment'].to_s.presence || t('browse.no_comment'))) %>
-
<%= changeset_details(@changeset) %>
+
+ <%= linkify(@changeset.tags["comment"].to_s.presence || t("browse.no_comment")) %>
+
+
<%= changeset_details(@changeset) %>
- <%= render :partial => "tag_details", :object => @changeset.tags.except('comment') %>
+ <%= render :partial => "tag_details", :object => @changeset.tags.except("comment") %>
+
+
+
+
<%= t(".discussion") %>
+
+
+ <% if current_user %>
+
+ <% end %>
+
+
+ <% if @comments.length > 0 %>
+
+ <% end %>
+
+ <% unless current_user %>
+
+ <%= link_to(t(".join_discussion"), login_path(:referer => request.fullpath)) %>
+
+ <% end %>
+
+ <% if current_user %>
+ <% unless @changeset.open? %>
+
+ <% else %>
+
+ <%= t(".still_open") %>
+
+ <% end %>
+ <% end %>
<% unless @ways.empty? %>
-
- <%= type_and_paginated_count('way', @way_pages) %>
- <%= render :partial => 'paging_nav', :locals => { :pages => @way_pages, :page_param => "way_page" } %>
-
-
+ <%= render :partial => "paging_nav", :locals => { :heading => type_and_paginated_count("way", @way_pages), :pages => @way_pages, :page_param => "way_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) %>
+ - <%= link_to printable_name(way, :version => true), { :action => "way", :id => way.way_id.to_s }, { :class => link_class("way", way), :title => link_title(way) } %>
<% end %>
<% end %>
<% unless @relations.empty? %>
-
- <%= type_and_paginated_count('relation', @relation_pages) %>
- <%= render :partial => 'paging_nav', :locals => { :pages => @relation_pages, :page_param => "relation_page" } %>
-
-
+ <%= render :partial => "paging_nav", :locals => { :heading => type_and_paginated_count("relation", @relation_pages), :pages => @relation_pages, :page_param => "relation_page" } %>
+
<% @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) %>
+ - <%= link_to printable_name(relation, :version => 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"} %>
-
-
+ <%= render :partial => "paging_nav", :locals => { :heading => type_and_paginated_count("node", @node_pages), :pages => @node_pages, :page_param => "node_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) %>
+ - <%= link_to printable_name(node, :version => true), { :action => "node", :id => node.node_id.to_s }, { :class => link_class("node", node), :title => link_title(node), :rel => link_follow(node) } %>
<% end %>
<% end %>
@@ -54,10 +123,8 @@
<%= 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
- %>
+ <%= user = (@prev_by_user || @next_by_user).user.display_name
+ link_to tag.bdi(user), :controller => "changesets", :action => "index", :display_name => user %>
<% if @next_by_user %>
·
<%= link_to "#{@next_by_user.id} >>", :id => @next_by_user.id %>
@@ -66,7 +133,7 @@
<% end %>
- <%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %>
+ <%= link_to(t(".changesetxml"), :controller => "api/changesets", :action => "show") %>
·
- <%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %>
+ <%= link_to(t(".osmchangexml"), :controller => "api/changesets", :action => "download") %>