From b2a82f501dd50603b2d87661c48924e440453fa9 Mon Sep 17 00:00:00 2001
From: Aaron Lidman <aaronlidman@gmail.com>
Date: Fri, 8 Nov 2013 12:01:20 -0800
Subject: [PATCH] Float the close icon, closes #40

---
 app/assets/stylesheets/common.css.scss     | 3 +--
 app/views/browse/changeset.html.erb        | 2 +-
 app/views/browse/node.html.erb             | 3 ++-
 app/views/browse/node_history.html.erb     | 3 ++-
 app/views/browse/note.html.erb             | 3 ++-
 app/views/browse/relation.html.erb         | 3 ++-
 app/views/browse/relation_history.html.erb | 3 ++-
 app/views/browse/way.html.erb              | 3 ++-
 app/views/browse/way_history.html.erb      | 3 ++-
 app/views/changeset/history.html.erb       | 3 ++-
 app/views/geocoder/search.html.erb         | 2 +-
 app/views/site/export.html.erb             | 3 ++-
 12 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 451d45948..458ec0935 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -651,8 +651,7 @@ nav.secondary {
     }
 
     .icon.close {
-      position: absolute;
-      right: $lineheight;
+      float: right;
       cursor: pointer;
     }
 
diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 4e74c5ee0..5063d6e07 100644
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -1,6 +1,6 @@
 <h2>
-  <%= t 'browse.changeset.changeset', :id => @changeset.id %>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+  <%= t 'browse.changeset.changeset', :id => @changeset.id %>
 </h2>
 
 <div class="browse-section">
diff --git a/app/views/browse/node.html.erb b/app/views/browse/node.html.erb
index 8302f472d..0c81b411c 100644
--- a/app/views/browse/node.html.erb
+++ b/app/views/browse/node.html.erb
@@ -3,8 +3,9 @@
 @title = t('browse.node.node') + ' | ' + @name
 %>
 
-<h2><%= t'browse.node.node_title', :node_name => @name %>
+<h2>
     <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+    <%= t'browse.node.node_title', :node_name => @name %>
 </h2>
 
 <%= render :partial => "node_details", :object => @node %>
diff --git a/app/views/browse/node_history.html.erb b/app/views/browse/node_history.html.erb
index cbf7853f2..8bc4ed8ab 100644
--- a/app/views/browse/node_history.html.erb
+++ b/app/views/browse/node_history.html.erb
@@ -3,8 +3,9 @@
 @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>
     <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+    <%= raw t'browse.node_history.node_history_title', :node_name => link_to(h(@name), :action => "node", :id => @node.id) %>
 </h2>
 
 <% @node.old_nodes.reverse.each do |node| %>
diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index 061a86b06..948cd3a06 100644
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -1,5 +1,6 @@
-<h2><%= t "browse.note.#{@note.status}_title", :note_name => @note.id %>
+<h2>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+  <%= t "browse.note.#{@note.status}_title", :note_name => @note.id %>
 </h2>
 <div class="browse-section">
   <span>
diff --git a/app/views/browse/relation.html.erb b/app/views/browse/relation.html.erb
index 2db0d0f44..125efb0d6 100644
--- a/app/views/browse/relation.html.erb
+++ b/app/views/browse/relation.html.erb
@@ -3,8 +3,9 @@
 @title = t('browse.relation.relation') + ' | ' + @name
 %>
 
-<h2><%= t'browse.relation.relation_title', :relation_name => @name %>
+<h2>
     <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+    <%= t'browse.relation.relation_title', :relation_name => @name %>
 </h2>
 
 <%= render :partial => "relation_details", :object => @relation %>
diff --git a/app/views/browse/relation_history.html.erb b/app/views/browse/relation_history.html.erb
index 653991b9d..d059b11b4 100644
--- a/app/views/browse/relation_history.html.erb
+++ b/app/views/browse/relation_history.html.erb
@@ -3,8 +3,9 @@
 @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>
     <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+    <%= raw t'browse.relation_history.relation_history_title', :relation_name => link_to(h(@name), :action => "relation", :id => @relation.id) %>
 </h2>
 
 <% @relation.old_relations.reverse.each do |relation| %>
diff --git a/app/views/browse/way.html.erb b/app/views/browse/way.html.erb
index 5b33bd49e..ce67fb8a9 100644
--- a/app/views/browse/way.html.erb
+++ b/app/views/browse/way.html.erb
@@ -2,8 +2,9 @@
 @name = printable_name @way
 @title = t('browse.way.way') + ' | ' + @name
 %>
-<h2><%= t'browse.way.way_title', :way_name => @name %>
+<h2>
     <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+    <%= t'browse.way.way_title', :way_name => @name %>
 </h2>
 
 <%= render :partial => "way_details", :object => @way %>
diff --git a/app/views/browse/way_history.html.erb b/app/views/browse/way_history.html.erb
index 8959a3fd4..a747572c1 100644
--- a/app/views/browse/way_history.html.erb
+++ b/app/views/browse/way_history.html.erb
@@ -3,8 +3,9 @@
 @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>
     <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+    <%= raw t'browse.way_history.way_history_title', :way_name => link_to(h(@name), :action => "way", :id => @way.id) %>
 </h2>
 
 <% @way.old_ways.reverse.each do |way| %>
diff --git a/app/views/changeset/history.html.erb b/app/views/changeset/history.html.erb
index e5cb104e9..022523efa 100644
--- a/app/views/changeset/history.html.erb
+++ b/app/views/changeset/history.html.erb
@@ -20,8 +20,9 @@
    end
 %>
 
-<h2><%= @heading %>
+<h2>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+  <%= @heading %>
 </h2>
 
 <div class="changesets">
diff --git a/app/views/geocoder/search.html.erb b/app/views/geocoder/search.html.erb
index e3f845939..ac655147a 100644
--- a/app/views/geocoder/search.html.erb
+++ b/app/views/geocoder/search.html.erb
@@ -1,6 +1,6 @@
 <h2>
-	<%= t('site.sidebar.search_results') %>
     <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+	<%= t('site.sidebar.search_results') %>
 </h2>
 <% @sources.each do |source| %>
   <h4 class="inner12"><%= raw(t "geocoder.search.title.#{source}") %></h4>
diff --git a/app/views/site/export.html.erb b/app/views/site/export.html.erb
index 94a9a295d..6a2131e90 100644
--- a/app/views/site/export.html.erb
+++ b/app/views/site/export.html.erb
@@ -1,5 +1,6 @@
-<h2><%= t 'export.start_rjs.export' %>
+<h2>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+  <%= t 'export.start_rjs.export' %>
 </h2>
 
 <%= form_tag :controller => "export", :action => "finish" do %>
-- 
2.39.5