Fix common details

[rails.git] / app / views / browse / changeset.html.erb

diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 97f57e41c56f6c15eba8cdab23c1961305103475..e6a4db70789c8f619dd89c9ec94fa325a814588d 100644 (file)
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -1,12 +1,63 @@
-<% content_for :head do %>
-<%= stylesheet_link_tag 'browse' %>
+<div class='browse-section header'>
+  <h2><%= t 'browse.changeset.changeset', :id => @changeset.id %></h2>
+    <p>
+      <% 
+      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' %> 
+        <abbr title="<%= t 'browse.changeset_details.created_at' %>: <%= @changeset.created_at %> &#10;<%= t 'browse.changeset_details.closed_at' %>: <%= @changeset.closed_at %>">
+        <%= created_at %> ago</abbr> 
+      <% else %>
+        <%= t 'browse.changeset_details.created_at' %> <abbr title="<%= l @changeset.created_at %>"><%= created_at %> ago</abbr>, 
+        <%= t 'browse.changeset_details.closed_at' %> <abbr title="<%= l @changeset.closed_at %>"><%= closed_at %> ago<abbr> 
+      <% end %>
+      <% if @changeset.user.data_public? %>
+        by <%= link_to h(@changeset.user.display_name), :controller => "user", :action => "view", :display_name => @changeset.user.display_name %>
+      <% end %>
+    </p>
+</div>
+  
+<%= render :partial => "tag_details", :object => @changeset %>
+
+<% unless @nodes.empty? %>
+  <div class='browse-section clearfix'>
+    <h4><%= t 'browse.changeset_details.has_nodes', :count => @node_pages.item_count %></h4>
+    <ul>
+      <% @nodes.each do |node| %>
+        <li><%= link_to h(printable_name(node, true)), { :action => "node", :id => node.node_id.to_s }, :class => link_class('node', node), :title => link_title(node) %></li>
+      <% end %>
+    </ul>
+  </div>
+  <%= render :partial => 'paging_nav', :locals => { :pages => @node_pages, :page_param => "node_page"} %>

 <% end %>
 <% end %>

-<%= render :partial => "navigation" %>
-<h2><%= t 'browse.changeset.changeset', :id => @changeset.id %></h2>
-<% if @changeset.has_valid_bbox? %>
-<%= render :partial => "map", :object => @changeset %>
+
+<% unless @ways.empty? %>
+  <div class='browse-section clearfix'>
+    <h4><%= t 'browse.changeset_details.has_ways', :count => @way_pages.item_count %></h4>
+    <ul>
+      <% @ways.each do |way| %>
+        <li><%= link_to h(printable_name(way, true)), { :action => "way", :id => way.way_id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li>
+      <% end %>
+    </ul>
+  </div>
+  <%= render :partial => 'paging_nav', :locals => { :pages => @way_pages, :page_param => "way_page" } %>

 <% end %>
 <% end %>

-<%= render :partial => "changeset_details", :object => @changeset %>
-<hr />
-<%= t 'browse.changeset.download', :changeset_xml_link => link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read"), 
-                                   :osmchange_xml_link => link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %>
+
+<% unless @relations.empty? %>
+  <div class='browse-section clearfix'>
+    <h4><%= t 'browse.changeset_details.has_relations', :count => @relation_pages.item_count %></h4>
+      <ul>
+        <% @relations.each do |relation| %>
+          <li><%= link_to h(printable_name(relation, true)), { :action => "relation", :id => relation.relation_id.to_s }, :class => link_class('relation', relation), :title => link_title(relation) %></li>
+        <% end %>
+      </ul>
+  </div>
+  <%= render :partial => 'paging_nav', :locals => { :pages => @relation_pages, :page_param => "relation_page" } %>
+<% end %>
+
+<div class='browse-section secondary-actions clearfix'> 
+  <span><%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %>
+  &middot;
+  <%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %></span>
+</div>