From a8b68a751e91342c360962ae137bc6c958104bb5 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Tue, 1 Oct 2013 16:33:43 -0700
Subject: [PATCH] Inline edit menu partial, refine CSS

---
 app/assets/stylesheets/common.css.scss |  8 ++++----
 app/views/layouts/_edit_menu.html.erb  | 19 -------------------
 app/views/layouts/_header.html.erb     | 18 +++++++++++++++---
 3 files changed, 19 insertions(+), 26 deletions(-)
 delete mode 100644 app/views/layouts/_edit_menu.html.erb

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 7395afc99..6bdec2988 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -351,11 +351,11 @@ nav.primary {
   }
 
   .dropdown-toggle {
-    padding: 5px 10px 5px 5px;
+    display: inline-block;
+    padding: 6px 10px 4px 10px;
   }
 
   .caret {
-    margin-top: 15px;
     border-top-color: $green;
   }
 
@@ -2225,7 +2225,7 @@ a.button {
 .dropdown-submenu:focus > a {
   color: #ffffff;
   text-decoration: none;
-  background-color: #0081c2;
+  background-color: $green;
 }
 
 .dropdown-menu > .active > a,
@@ -2233,7 +2233,7 @@ a.button {
 .dropdown-menu > .active > a:focus {
   color: #ffffff;
   text-decoration: none;
-  background-color: #0081c2;
+  background-color: $green;
   outline: 0;
 }
 
diff --git a/app/views/layouts/_edit_menu.html.erb b/app/views/layouts/_edit_menu.html.erb
deleted file mode 100644
index b7d9d7fdf..000000000
--- a/app/views/layouts/_edit_menu.html.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="dropdown edit_menu">
-  <%= link_to link_text, edit_path,
-              :id => 'editanchor',
-              :data => { :editor => preferred_editor },
-              :class => "geolink tab #{link_class}" %>
-  <a class='dropdown-toggle' data-toggle='dropdown' href='#'>
-    <b class="caret"></b>
-  </a>
-  <ul class='dropdown-menu'>
-    <% Editors::RECOMMENDED_EDITORS.each do |editor| %>
-      <li>
-        <%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")),
-                    edit_path(:editor => editor),
-                    :data => { :editor => editor },
-                    :class => "geolink #{link_class}" %>
-      </li>
-    <% end %>
-  </ul>
-</div>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 58185bb5a..1edbf7e5c 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -11,9 +11,21 @@
         <%= link_to t('layouts.history'), browse_changesets_path, :class => 'tab geolink llz' %>
       </li><li id="export_tab">
         <%= link_to t('layouts.export'), export_path, :class => 'tab geolink llz' %>
-      </li><li id="edit_tab">
-        <%= render :partial => 'layouts/edit_menu',
-                   :locals => { :link_text => t('layouts.edit'), :link_class => 'llz object' }%>
+      </li><li id="edit_tab" class="dropdown">
+        <%= link_to t('layouts.edit'), edit_path, :class => "tab geolink llz object",
+                    :id => 'editanchor',
+                    :data => { :editor => preferred_editor }
+        %><a class='dropdown-toggle' data-toggle='dropdown' href='#'><b class="caret"></b></a>
+        <ul class='dropdown-menu'>
+          <% Editors::RECOMMENDED_EDITORS.each do |editor| %>
+            <li>
+              <%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")),
+                          edit_path(:editor => editor),
+                          :data => { :editor => editor },
+                          :class => "geolink llz object" %>
+            </li>
+          <% end %>
+        </ul>
       </li>
     </ul>
   </nav>
-- 
2.39.5