Consistent headers and footers in sidebar

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 66b9f3c4854eb28d6fc3f92cafcc8c14277a46c5..c4ac18edc1bc23cf3f3dc3c35ef0c7f4a4d86eb8 100644 (file)
--- 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;
 
     h2, h3, h4 {
       padding: $lineheight;

-      border-bottom: $keyline;

     }
 
     h4 {
     }
 
     h4 {


@@ -957,7 +956,6 @@ a.donate {
 #sidebar_content {
   .browse-section {
     padding: 20px;
 #sidebar_content {
   .browse-section {
     padding: 20px;

-    border-bottom: 1px solid #CCC;

   }
 
   .browse-field {
   }
 
   .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;}
 /* 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 10a64b7f7cdef0cbb2be2b9c88353d31ff824807..60f6c01facc70e3d19f2e4a9a3424b3a334c7bf6 100644 (file)
--- 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 %>
 <% 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 1c0f4c93c004100a1d7a842dfcaa7dc6ae8ffacc..6e12f7f651bb5a046f28335ecb5d542692cedf58 100644 (file)
--- 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 %><
 <% 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 1c7972aa83f18354e8add8c946fb388d535c6982..2ffa6573b33e477a56e312bec6fbf6c9f4d1b71b 100644 (file)
--- 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 %>
 <% 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 1970f568d8dbb3c1874c5a2828f89c9c2cb79f72..e6a4db70789c8f619dd89c9ec94fa325a814588d 100644 (file)
--- 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>
       <% 
   <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 %>
 
   <%= 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 9fc915a126fdd81f81dd4a94e86b288bab5202ba..1936b934367bfc566def492e3afea286fd36d998 100644 (file)
--- a/app/views/browse/node.html.erb
+++ b/app/views/browse/node.html.erb
@@ -3,11 +3,15 @@
 @title = t('browse.node.node') + ' | ' + @name
 %>
 
 @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 %>
 
 
 <%= 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 5727669bfa3c38d40b28d3345347530043bc4d4f..9b3c27a8744442ad74ada073c2ca6f63bf16fe5a 100644 (file)
--- 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
 %>
 
 @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 %>
 
 
 <% @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 2d2560ef2ff51a5e52b584cc07962f0b8b3a034e..dbf384799a0a47b0f3780dadca1edf61081e8aaf 100644 (file)
--- 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'>
 
 <% 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 -%>
 
 </div>
 <% end -%>
 


@@ -31,7 +33,7 @@
 
   <div class='browse-field'>
     <h4><%= t "browse.node_details.coordinates" %></h4>
 
   <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>
 
   </div>
 </div>
 


@@ -42,7 +44,7 @@
       <% @note.comments[1..-1].each do |comment| %>
         <li id="c<%= comment.id %>">
           <%= comment.body.to_html %>
       <% @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>
         </li>
       <% end %>
     </ul>

diff --git a/app/views/browse/relation.html.erb b/app/views/browse/relation.html.erb
index 213e5108f744e7eeaa7bc4019b4c9c8d32d931de..d561cc21f213287f388bf5c37551423128caa9b1 100644 (file)
--- a/app/views/browse/relation.html.erb
+++ b/app/views/browse/relation.html.erb
@@ -3,11 +3,13 @@
 @title = t('browse.relation.relation') + ' | ' + @name
 %>
 
 @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 %>
 
 
 <%= 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 6112d834e5530781f9a6246b851f3ed836ba9a8d..cf100b77eda7d1485bae5eb40b34b26ac300b2a2 100644 (file)
--- 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
 %>
 
 @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 %>
 
 
 <% @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 3d1e2c57750fd67f44a47fee3a832f35673e1870..e1da90c4494c9becfb2ed2bf3a2db65120355282 100644 (file)
--- 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
 %>
 @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 %>
 
 
 <%= 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 a05d0c125d75c22875c0e4b14793aba889cd81f5..0f82c346cd6a1cbd7115d0640f27d66bdb4fd32a 100644 (file)
--- 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
 %>
 
 @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 %>
 
 
 <% @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 fd90b75014d2708d43e0e7710f33368ad8ef7a51..9dc800cff56849107b7e25d7b202fe7f27543279 100644 (file)
--- a/app/views/diary_entry/comments.html.erb
+++ b/app/views/diary_entry/comments.html.erb
@@ -18,7 +18,7 @@
   <% end -%>
 </table>
 
   <% 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>