From 51a21e6738c5fe524472971e8171bf2442bea415 Mon Sep 17 00:00:00 2001
From: Aaron Lidman <aaronlidman@gmail.com>
Date: Tue, 5 Nov 2013 10:04:45 -0800
Subject: [PATCH] Consistent headers and footers in sidebar

---
 app/assets/stylesheets/common.css.scss      |  8 ++++++--
 app/views/browse/_node_details.html.erb     |  2 +-
 app/views/browse/_relation_details.html.erb |  2 +-
 app/views/browse/_way_details.html.erb      |  2 +-
 app/views/browse/changeset.html.erb         | 11 ++++++-----
 app/views/browse/node.html.erb              | 14 +++++++++-----
 app/views/browse/node_history.html.erb      | 13 ++++++++-----
 app/views/browse/note.html.erb              | 10 ++++++----
 app/views/browse/relation.html.erb          | 12 +++++++-----
 app/views/browse/relation_history.html.erb  | 12 +++++++-----
 app/views/browse/way.html.erb               | 15 +++++++++------
 app/views/browse/way_history.html.erb       | 12 +++++++-----
 app/views/diary_entry/comments.html.erb     |  8 ++++----
 13 files changed, 72 insertions(+), 49 deletions(-)

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 66b9f3c48..c4ac18edc 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -563,7 +563,6 @@ nav.secondary {
 
     h2, h3, h4 {
       padding: $lineheight;
-      border-bottom: $keyline;
     }
 
     h4 {
@@ -957,7 +956,6 @@ a.donate {
 #sidebar_content {
   .browse-section {
     padding: 20px;
-    border-bottom: 1px solid #CCC;
   }
 
   .browse-field {
@@ -1783,6 +1781,12 @@ ul.secondary-actions {
   }
 }
 
+div.secondary-actions {
+  padding: 10px;
+  border-top: 1px solid #ccc;
+  text-align: center;
+}
+
 /* Utility for managing inner content areas */
 
 .inner22 { padding: $lineheight;}
diff --git a/app/views/browse/_node_details.html.erb b/app/views/browse/_node_details.html.erb
index 10a64b7f7..60f6c01fa 100644
--- a/app/views/browse/_node_details.html.erb
+++ b/app/views/browse/_node_details.html.erb
@@ -1,4 +1,4 @@
-<div class="browse_details" id="<%= node_details.version %>">
+<div class='browse_details' id="<%= node_details.version %>">
 <% if node_details.redacted? %>
   <div class='browse-section'>
     <%= 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 %>
diff --git a/app/views/browse/_relation_details.html.erb b/app/views/browse/_relation_details.html.erb
index 1c0f4c93c..6e12f7f65 100644
--- a/app/views/browse/_relation_details.html.erb
+++ b/app/views/browse/_relation_details.html.erb
@@ -1,4 +1,4 @@
-<div class="browse_details" id="<%= relation_details.version %>">
+<div class='browse_details' id="<%= relation_details.version %>">
 <% if relation_details.redacted? %>
   <div class='browse-section'>
     <%= 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 %><
diff --git a/app/views/browse/_way_details.html.erb b/app/views/browse/_way_details.html.erb
index 1c7972aa8..2ffa6573b 100644
--- a/app/views/browse/_way_details.html.erb
+++ b/app/views/browse/_way_details.html.erb
@@ -1,4 +1,4 @@
-<div class="browse_details" id="<%= way_details.version %>">
+<div class='browse_details' id="<%= way_details.version %>">
 <% if way_details.redacted? %>
   <div class='browse-section'>
     <%= 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 %>
diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 1970f568d..e6a4db707 100644
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -1,4 +1,4 @@
-<div class="browse-section header">
+<div class='browse-section header'>
   <h2><%= t 'browse.changeset.changeset', :id => @changeset.id %></h2>
     <p>
       <% 
@@ -56,7 +56,8 @@
   <%= render :partial => 'paging_nav', :locals => { :pages => @relation_pages, :page_param => "relation_page" } %>
 <% end %>
 
-<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>
+<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>
diff --git a/app/views/browse/node.html.erb b/app/views/browse/node.html.erb
index 9fc915a12..1936b9343 100644
--- a/app/views/browse/node.html.erb
+++ b/app/views/browse/node.html.erb
@@ -3,11 +3,15 @@
 @title = t('browse.node.node') + ' | ' + @name
 %>
 
-<h2><%= t'browse.node.node_title', :node_name => @name %></h2>
+<div class='browse-section header'>
+    <h2><%= t'browse.node.node_title', :node_name => @name %></h2>
+</div>
 
 <%= render :partial => "node_details", :object => @node %>
 
-<ul class='secondary-actions clearfix'>
-  <li><%= link_to(t('browse.node.download_xml'), :controller => "node", :action => "read") %></li>
-  <li><%= link_to(t('browse.node.view_history'), :action => "node_history") %></li>
-</ul>
+<div class='browse-section secondary-actions clearfix'> 
+  <span><%= link_to(t('browse.node.download_xml'), :controller => "node", :action => "read") %>
+    &middot;
+  <%= link_to(t('browse.node.view_history'), :action => "node_history") %>
+    </span>
+</div>
diff --git a/app/views/browse/node_history.html.erb b/app/views/browse/node_history.html.erb
index 5727669bf..9b3c27a87 100644
--- a/app/views/browse/node_history.html.erb
+++ b/app/views/browse/node_history.html.erb
@@ -3,13 +3,16 @@
 @title = t('browse.node_history.node_history') + ' | ' + @name
 %>
 
-<h2><%= raw t'browse.node_history.node_history_title', :node_name => link_to(h(@name), :action => "node", :id => @node.id) %></h2>
+<div class='browse-section header'>
+    <h2><%= raw t'browse.node_history.node_history_title', :node_name => link_to(h(@name), :action => "node", :id => @node.id) %></h2>
+</div>
 
 <% @node.old_nodes.reverse.each do |node| %>
   <%= render :partial => "node_details", :object => node %>
 <% end %>
 
-<ul class='secondary-actions clearfix'>
-  <li><%= link_to(t('browse.node_history.download_xml'), :controller => "old_node", :action => "history") %></li>
-  <li><%= link_to(t('browse.node_history.view_details'), :action => "node") %></li>
-</ul>
+<div class='browse-section secondary-actions clearfix'> 
+  <span><%= link_to(t('browse.node_history.download_xml'), :controller => "old_node", :action => "history") %>
+    &middot;
+  <%= link_to(t('browse.node_history.view_details'), :action => "node") %></span>
+</div>
diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index 2d2560ef2..dbf384799 100644
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -1,8 +1,10 @@
-<h2><%= t "browse.note.#{@note.status}_title", :note_name => @note.id %></h2>
+<div class='browse-section header'>
+  <h2><%= t "browse.note.#{@note.status}_title", :note_name => @note.id %></h2>
+</div>
 
 <% if @note.comments.find { |comment| comment.author.nil? } -%>
 <div class='browse-section common'>
-  <p class="warning"><%= t "javascripts.notes.show.anonymous_warning" %></p>
+  <p class='warning'><%= t "javascripts.notes.show.anonymous_warning" %></p>
 </div>
 <% end -%>
 
@@ -31,7 +33,7 @@
 
   <div class='browse-field'>
     <h4><%= t "browse.node_details.coordinates" %></h4>
-    <p class="geo"><%= link_to ("<span class='latitude'>#{number_with_delimiter(@note.lat)}</span>, <span class='longitude'>#{number_with_delimiter(@note.lon)}</span>".html_safe), {:controller => 'site', :action => 'index', :lat => h(@note.lat), :lon => h(@note.lon), :zoom => "18"} %></p>
+    <p class='geo'><%= link_to ("<span class='latitude'>#{number_with_delimiter(@note.lat)}</span>, <span class='longitude'>#{number_with_delimiter(@note.lon)}</span>".html_safe), {:controller => 'site', :action => 'index', :lat => h(@note.lat), :lon => h(@note.lon), :zoom => "18"} %></p>
   </div>
 </div>
 
@@ -42,7 +44,7 @@
       <% @note.comments[1..-1].each do |comment| %>
         <li id="c<%= comment.id %>">
           <%= comment.body.to_html %>
-          <small class="deemphasize"><%= note_event(comment.created_at, comment.author) %></small>
+          <small class='deemphasize'><%= note_event(comment.created_at, comment.author) %></small>
         </li>
       <% end %>
     </ul>
diff --git a/app/views/browse/relation.html.erb b/app/views/browse/relation.html.erb
index 213e5108f..d561cc21f 100644
--- a/app/views/browse/relation.html.erb
+++ b/app/views/browse/relation.html.erb
@@ -3,11 +3,13 @@
 @title = t('browse.relation.relation') + ' | ' + @name
 %>
 
-<h2><%= t'browse.relation.relation_title', :relation_name => @name %></h2>
+<div class="browse-section header">
+    <h2><%= t'browse.relation.relation_title', :relation_name => @name %></h2>
+</div>
 
 <%= render :partial => "relation_details", :object => @relation %>
 
-<ul class='secondary-actions clearfix'>
-  <li><%= link_to(t('browse.relation.download_xml'), :controller => "relation", :action => "read") %></li>
-  <li><%= link_to(t('browse.relation.view_history'), :action => "relation_history") %></li>
-</ul>
+<div class='secondary-actions clearfix'>
+  <span><%= link_to(t('browse.relation.download_xml'), :controller => "relation", :action => "read") %>
+  <%= link_to(t('browse.relation.view_history'), :action => "relation_history") %></span>
+</div>
diff --git a/app/views/browse/relation_history.html.erb b/app/views/browse/relation_history.html.erb
index 6112d834e..cf100b77e 100644
--- a/app/views/browse/relation_history.html.erb
+++ b/app/views/browse/relation_history.html.erb
@@ -3,13 +3,15 @@
 @title = t('browse.relation_history.relation_history') + ' | ' + @name
 %>
 
-<h2><%= raw t'browse.relation_history.relation_history_title', :relation_name => link_to(h(@name), :action => "relation", :id => @relation.id) %></h2>
+<div class='browse-section header'>
+    <h2><%= raw t'browse.relation_history.relation_history_title', :relation_name => link_to(h(@name), :action => "relation", :id => @relation.id) %></h2>
+</div>
 
 <% @relation.old_relations.reverse.each do |relation| %>
   <%= render :partial => "relation_details", :object => relation %>
 <% end %>
 
-<ul class='secondary-actions clearfix'>
-  <li><%= link_to(t('browse.relation_history.download_xml'), :controller => "old_relation", :action => "history") %></li>
-  <li><%= link_to(t('browse.relation_history.view_details'), :action => "relation") %></li>
-</ul>
+<div class='secondary-actions clearfix'>
+  <span><%= link_to(t('browse.relation_history.download_xml'), :controller => "old_relation", :action => "history") %>
+  <%= link_to(t('browse.relation_history.view_details'), :action => "relation") %></span>
+</div>
diff --git a/app/views/browse/way.html.erb b/app/views/browse/way.html.erb
index 3d1e2c577..e1da90c44 100644
--- a/app/views/browse/way.html.erb
+++ b/app/views/browse/way.html.erb
@@ -2,12 +2,15 @@
 @name = printable_name @way
 @title = t('browse.way.way') + ' | ' + @name
 %>
-
-<h2><%= t'browse.way.way_title', :way_name => @name %></h2>
+<div class='browse-section header'>
+    <h2><%= t'browse.way.way_title', :way_name => @name %></h2>
+</div>
 
 <%= render :partial => "way_details", :object => @way %>
 
-<ul class='secondary-actions clearfix'>
-  <li><%= link_to(t('browse.way.download_xml'), :controller => "way", :action => "read") %></li>
-  <li><%= link_to(t('browse.way.view_history'), :action => "way_history") %></li>
-</ul>
+<div class='browse-section secondary-actions clearfix'> 
+  <span><%= link_to(t('browse.way.download_xml'), :controller => "way", :action => "read") %>
+    &middot;
+    <%= link_to(t('browse.way.view_history'), :action => "way_history") %>
+    </span>
+</div>
diff --git a/app/views/browse/way_history.html.erb b/app/views/browse/way_history.html.erb
index a05d0c125..0f82c346c 100644
--- a/app/views/browse/way_history.html.erb
+++ b/app/views/browse/way_history.html.erb
@@ -3,13 +3,15 @@
 @title = t('browse.way_history.way_history') + ' | ' + @name
 %>
 
-<h2><%= raw t'browse.way_history.way_history_title', :way_name => link_to(h(@name), :action => "way", :id => @way.id) %></h2>
+<div class='browse-section header'>
+    <h2><%= raw t'browse.way_history.way_history_title', :way_name => link_to(h(@name), :action => "way", :id => @way.id) %></h2>
+</div>
 
 <% @way.old_ways.reverse.each do |way| %>
   <%= render :partial => "way_details", :object => way %>
 <% end %>
 
-<ul class='secondary-actions clearfix'>
-  <li><%= link_to(t('browse.way_history.download_xml'), :controller => "old_way", :action => "history") %></li>
-  <li><%= link_to(t('browse.way_history.view_details'), :action => "way") %></li>
-</ul>
+<div class='secondary-actions clearfix'>
+  <span><%= link_to(t('browse.way_history.download_xml'), :controller => "old_way", :action => "history") %>
+  <%= link_to(t('browse.way_history.view_details'), :action => "way") %></span>
+</div>
diff --git a/app/views/diary_entry/comments.html.erb b/app/views/diary_entry/comments.html.erb
index fd90b7501..9dc800cff 100644
--- a/app/views/diary_entry/comments.html.erb
+++ b/app/views/diary_entry/comments.html.erb
@@ -18,7 +18,7 @@
   <% end -%>
 </table>
 
-<ul class='secondary-actions clearfix'>
-  <li><%= link_to t('diary_entry.comments.older_comments') , { :page => @comment_pages.current.next} if @comment_pages.current.next %></li>
-  <li><%= link_to t('diary_entry.comments.newer_comments'), { :page => @comment_pages.current.previous } if @comment_pages.current.previous %></li>
-</ul>
+<div class='secondary-actions clearfix'>
+  <span><%= link_to t('diary_entry.comments.older_comments') , { :page => @comment_pages.current.next} if @comment_pages.current.next %>
+  <%= link_to t('diary_entry.comments.newer_comments'), { :page => @comment_pages.current.previous } if @comment_pages.current.previous %></span>
+</div>
-- 
2.43.2