Mild rejig of the browse pages

app/assets/stylesheets/common.css.scss

@@ -1230,6 +1230,10 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   }
 }
 
+.edit_summary_chunk {
+  display: inline-block;
+}
+
 /* Rules for small maps in content areas */
 
 .content_map {
@@ -1301,8 +1305,11 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   border-top: 1px solid #ccc;
   margin-top: $lineheight/2;
   padding-top: $lineheight/2;
+  clear: left;
   &:first-child {
     margin-top: 0;
+    border-top: 0;
+    padding-top: 0;
   }
   .warning {
     background-color: #ffe0cc;
@@ -1324,9 +1331,10 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   }
   h4 {
     float: left;
-    width: 33.3333%;
+    width: 18%;
     display: inline-block;
     vertical-align: top;
+    clear: left;
   }
 }
 
@@ -1941,7 +1949,8 @@ ul.secondary-actions {
   margin-left: 0;
   &.pager {
     display: inline-block;
-    margin-right: 60px;
+    margin-right: 20px;
+    float: right;
   }
   > li {
     display: block;

app/assets/stylesheets/small.css.scss

@@ -87,6 +87,8 @@ h2, h3, h4 {
 #browse_map ul.secondary-actions {
   float: right;
   font-size: 10px;
+  margin-left: 5px;
+  margin-right: 5px;
 }
 
 #map {
@@ -216,6 +218,7 @@ p.search_results_entry {
 
 /* Rules for the browse pages */
 
+.browse_details.common div,
 .browse-section.common div{
   clear: both;
 }

app/helpers/browse_helper.rb

@@ -3,24 +3,41 @@ def link_to_page(page, page_param)
     return link_to(page, page_param => page)
   end
 
-  def printable_name(object, version=false)
+  def printable_name(object, options={})
+    options = {
+      :type => false,  # :type can be set to a string indicating object type, such as t('browse.way.way')
+       :version => false
+    }.merge(options)
     if object.id.is_a?(Array)
       id = object.id[0]
     else
       id = object.id
     end
-    name = t 'printable_name.with_id', :id => id.to_s
-    if version
-      name = t 'printable_name.with_version', :id => name, :version => object.version.to_s
+    name = t 'printable_name.with_id', :id => id.to_s, :type => options[:type]
+    if options[:version]
+      name = t 'printable_name.with_version', :id => name, :type => options[:type], :version => object.version.to_s
     end
 
     # don't look at object tags if redacted, so as to avoid giving
     # away redacted version tag information.
     unless object.redacted?
+      nametag = false
       if object.tags.include? "name:#{I18n.locale}"
-        name = t 'printable_name.with_name',  :name => object.tags["name:#{I18n.locale}"].to_s, :id => name
+        nametag = object.tags["name:#{I18n.locale}"].to_s
       elsif object.tags.include? 'name'
-        name = t 'printable_name.with_name',  :name => object.tags['name'].to_s, :id => name
+        nametag = object.tags['name'].to_s
+      end
+
+      if nametag
+        if options[:type]
+          name = t 'printable_name.with_name_type',  :name => nametag, :type => options[:type], :id => name
+        else
+          name = t 'printable_name.with_name',  :name => nametag, :id => name
+        end
+      else
+        if options[:type]
+          name = t 'printable_name.with_type',  :type => options[:type], :id => name
+        end
       end
     end
 

app/views/browse/_changeset_details.html.erb

@@ -1,24 +1,5 @@
 <div class='column-1'>
 
-  <div class='browse-section common'>
-    <div>
-      <h4><%= t 'browse.changeset_details.created_at' %></h4>
-      <p><%= l changeset_details.created_at %></p>
-    </div>
-
-    <div>
-      <h4><%= t 'browse.changeset_details.closed_at' %></h4>
-      <p><%= l changeset_details.closed_at %></p>
-    </div>
-
-    <% if changeset_details.user.data_public? %>
-      <div>
-        <h4><%= t 'browse.changeset_details.belongs_to' %></h4>
-        <p><%= link_to h(changeset_details.user.display_name), :controller => "user", :action => "view", :display_name => changeset_details.user.display_name %></p>
-      </div>
-    <% end %>
-  </div>
-
   <%= render :partial => "tag_details", :object => changeset_details %>
 
   <div class='browse-section clearfix'>
@@ -41,7 +22,7 @@
       <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>
+            <li><%= link_to h(printable_name(node, {:version => true})), { :action => "node", :id => node.node_id.to_s }, :class => link_class('node', node), :title => link_title(node) %></li>
           <% end %>
       </ul>
     </div>
@@ -53,7 +34,7 @@
       <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>
+          <li><%= link_to h(printable_name(way, {:version => true})), { :action => "way", :id => way.way_id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li>
           <% end %>
           <%=
           #render :partial => "containing_relation", :collection => changeset_details.containing_relation_members
@@ -68,11 +49,11 @@
       <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>
+          <li><%= link_to h(printable_name(relation, {:version => 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>
+</div>

app/views/browse/_common_details.html.erb

@@ -1,39 +1,13 @@
-<div class='browse-section common'>
-  <div>
-    <% if common_details.visible? %>
-      <h4><%= t 'browse.common_details.edited_at' %></h4>
-    <% else %>
-      <h4><%= t 'browse.common_details.deleted_at' %></h4>
-    <% end %>
-    <p><%= l common_details.timestamp %></p>
-  </div>
-
-  <% if common_details.changeset.user.data_public? %>
+<% if common_details.changeset.tags['comment'].present? or (not common_details.tags.empty?) %>
+  <div class='browse-section common'>
     <div>
-      <% if common_details.visible? %>
-        <h4><%= t 'browse.common_details.edited_by' %></h4>
-      <% else %>
-        <h4><%= t 'browse.common_details.deleted_by' %></h4>
+      <%= render :partial => "tag_details", :object => common_details %>
+      <% if common_details.changeset.tags['comment'].present? %>
+      <div class='browse-section'>
+        <h4><%= t 'browse.common_details.changeset_comment' %></h4>
+        <p><%= linkify(h(common_details.changeset.tags['comment'])) %></p>
+      </div>
       <% end %>
-      <p><%= link_to h(common_details.changeset.user.display_name), :controller => "user", :action => "view", :display_name => common_details.changeset.user.display_name %></p>
     </div>
-  <% end %>
-
-  <div>
-    <h4><%= t 'browse.common_details.version' %></h4>
-    <p><%= h(common_details.version) %></p>
-  </div>
-
-  <div>
-    <h4><%= t 'browse.common_details.in_changeset' %></h4>
-    <p><%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %></p>
   </div>
-
-  <% if common_details.changeset.tags['comment'].present? %>
-    <div>
-      <h4><%= t 'browse.common_details.changeset_comment' %></h4>
-      <p><%= linkify(h(common_details.changeset.tags['comment'])) %></p>
-    </div>
-  <% end %>
-</div>
-<%= render :partial => "tag_details", :object => common_details %>
+<% end %>

app/views/browse/_common_editsummary.html.erb

@@ -0,0 +1,34 @@
+<% if !common_editsummary.redacted? %>
+<div class="edit_summary_chunk">
+<%
+@agohtml = "<abbr title='%s'>%s</abbr>" % [l(common_editsummary.timestamp), t('browse.common_details.ago', :time_in_words_ago => time_ago_in_words(common_editsummary.timestamp))]
+
+if common_editsummary.changeset.user.data_public?
+  @userhtml = link_to h(common_editsummary.changeset.user.display_name), :controller => "user", :action => "view", :display_name => common_editsummary.changeset.user.display_name
+  if common_editsummary.visible? %>
+      <%= raw t 'browse.common_details.edited_ago_by', :time_in_words_ago => @agohtml, :user => @userhtml %>
+  <% else %>
+      <%= raw t 'browse.common_details.deleted_ago_by', :time_in_words_ago => @agohtml, :user => @userhtml %>
+  <% end %>
+<% else %>
+  <% if common_editsummary.visible? %>
+      <%= raw t 'browse.common_details.edited_ago', :time_in_words_ago => @agohtml %>
+  <% else %>
+      <%= raw t 'browse.common_details.deleted_ago', :time_in_words_ago => @agohtml %>
+  <% end %>
+<% end %>
+</div>
+
+  &middot;
+
+  <% if defined? historyaction %>
+    <div class="edit_summary_chunk"><%= link_to(t('browse.common_details.version', :version => common_editsummary.version), url_for(:action => historyaction), :title => t('browse.common_details.view_history')) %></div>
+  <% else %>
+    <div class="edit_summary_chunk"><%= t 'browse.common_details.version', :version => common_editsummary.version %></div>
+  <% end %>
+
+  &middot;
+
+    <div class="edit_summary_chunk"><%= raw t 'browse.common_details.in_changeset', :changeset => link_to(common_editsummary.changeset_id, :action => :changeset, :id => common_editsummary.changeset_id) %></div>
+
+<% end %>

app/views/browse/_containing_relation.html.erb

@@ -5,4 +5,4 @@
   else
     raw t 'browse.containing_relation.entry_role', :relation_name => linked_name, :relation_role => h(containing_relation.member_role)
   end
-%></li>
+%></li>

app/views/browse/_map.html.erb

@@ -72,6 +72,41 @@
   </ul>
   <% end %>
 
+  <%
+     if map.instance_of? Changeset
+	%>
+        <ul class='secondary-actions clearfix'>
+          <li><%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %></li>
+          <li><%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %></li>
+        </ul>
+        <%
+     elsif map.instance_of? OldNode
+	%>
+        <ul class='secondary-actions clearfix'>
+          <li><%= link_to(t('browse.node.history.download_xml'), :controller => "old_node", :action => "history") %></li>
+        </ul>
+        <%
+     elsif map.instance_of? OldWay
+	%>
+        <ul class='secondary-actions clearfix'>
+          <li><%= link_to(t('browse.way_history.download_xml'), :controller => "old_way", :action => "history") %></li>
+        </ul>
+        <%
+     elsif map.instance_of? OldRelation
+	%>
+        <ul class='secondary-actions clearfix'>
+          <li><%= link_to(t('browse.relation_history.download_xml'), :controller => "old_relation", :action => "history") %></li>
+        </ul>
+        <%
+     elsif !(map.instance_of? Note)
+	%>
+        <ul class='secondary-actions clearfix'>
+          <li><%= link_to(t('browse.' + map.class.to_s.downcase + '.download_xml'), :controller => map.class.to_s.downcase, :action => "read") %></li>
+        </ul>
+        <%
+     end
+  %>
+
   <% else %>
     <%= t 'browse.map.deleted' %>
   <% end %>

app/views/browse/_node_details.html.erb

@@ -1,6 +1,6 @@
-<div class="browse_details" id="<%= node_details.version %>">
+<div class="browse_details common" id="<%= node_details.version %>">
 <% if node_details.redacted? %>
-  <div class='browse-section'>
+  <div class='browse-section redacted'>
     <%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.node'), :redaction_link => link_to(t('browse.redacted.redaction', :id => node_details.redaction.id), node_details.redaction), :version => node_details.version %>
   </div>
 <% else %>
@@ -18,7 +18,7 @@
       <h4><%= t 'browse.node_details.part_of' %></h4>
       <ul>
           <% node_details.ways.each do |way| %>
-            <li><%= link_to h(printable_name(way)), { :action => "way", :id => way.id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li>
+            <li><%= link_to h(printable_name(way, {:type => t('browse.way.way')})), { :action => "way", :id => way.id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li>
           <% end %>
           <%= render :partial => "containing_relation", :collection => node_details.containing_relation_members %>
       </ul>

app/views/browse/_relation_details.html.erb

@@ -1,6 +1,6 @@
 <div class="browse_details" id="<%= relation_details.version %>">
 <% if relation_details.redacted? %>
-  <div class='browse-section'>
+  <div class='browse-section redacted'>
     <%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.relation'), :redaction_link => link_to(t('browse.redacted.redaction', :id => relation_details.redaction.id), relation_details.redaction), :version => relation_details.version %><
   </div>
 <% else %>

app/views/browse/_relation_member.html.erb

@@ -9,4 +9,4 @@
     else
       raw t'browse.relation_member.entry_role', :type => type_str, :name => linked_name, :role => h(relation_member.member_role)
     end
-  %></li>
+  %></li>

app/views/browse/_way_details.html.erb

@@ -1,6 +1,6 @@
 <div class="browse_details" id="<%= way_details.version %>">
 <% if way_details.redacted? %>
-  <div class='browse-section'>
+  <div class='browse-section redacted'>
     <%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.way'), :redaction_link => link_to(t('browse.redacted.redaction', :id => way_details.redaction.id), way_details.redaction), :version => way_details.version %>
   </div>
 <% else %>

app/views/browse/changeset.html.erb

@@ -4,15 +4,25 @@
 
 <% content_for :heading do %>
   <h2><%= t 'browse.changeset.changeset', :id => @changeset.id %></h2>
-  <ul class='secondary-actions clearfix'>
-    <li><%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %></li>
-    <li><%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %></li>
-  </ul>
+  <%= render :partial => "navigation" %>
+
+  <div class="edit_summary_chunk"><%
+  # this div is analogous to _common_editsummary.html.erb
+@createdagohtml = "<abbr title='%s'>%s</abbr>" % [l(@changeset.created_at), t('browse.common_details.ago', :time_in_words_ago => time_ago_in_words(@changeset.created_at))]
+@closedagohtml  = "<abbr title='%s'>%s</abbr>" % [l(@changeset.closed_at),  t('browse.common_details.ago', :time_in_words_ago => time_ago_in_words(@changeset.closed_at ))]
+
+if @changeset.user.data_public?
+  @userhtml = link_to h(@changeset.user.display_name), :controller => "user", :action => "view", :display_name => @changeset.user.display_name  %>
+  <%= raw t 'browse.changeset.created_closed_ago_by', :created_in_words_ago => @createdagohtml, :closed_in_words_ago => @closedagohtml, :user => @userhtml %>
+<% else %>
+  <%= raw t 'browse.changeset.created_closed_ago',    :created_in_words_ago => @createdagohtml, :closed_in_words_ago => @closedagohtml %>
 <% end %>
+</div>
+  <!-- end equiv to common_editsummary -->
 
-<%= render :partial => "navigation" %>
+<% end %>
 
 <% if @changeset.has_valid_bbox? %>
 <%= render :partial => "map", :object => @changeset %>
 <% end %>
-<%= render :partial => "changeset_details", :object => @changeset %>
+<%= render :partial => "changeset_details", :object => @changeset %>