Don't show search in expando header on interior pages

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 334056ee181cfe5cc8d8d9b1c46a554653c45f35..dbb9966b60997c83b57f285c64a2e6e96e592098 100644 (file)
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -7,7 +7,7 @@
   </h1>
   <a href="#" id="menu-icon"></a>
   <nav class='primary'>
-    <%= render :partial => "layouts/search" %>
+    <%= content_for :header %>
     <ul>
       <li id="edit_tab" class="dropdown <%= current_page_class(edit_path) %>">
         <%= link_to t('layouts.edit'), edit_path, :class => "tab geolink editlink",

diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index 420d3933dbbc90dc94ccc68b5b00732122b0aa41..2170705b00b20c7ff6a0186416172d5b39c18c14 100644 (file)
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -16,6 +16,10 @@
   <% end %>
 <% end %>
 
+<% content_for :header do %>
+  <%= render :partial => "layouts/search" %>
+<% end %>
+
 <% content_for :content do %>
   <div id="sidebar">
     <%= render :partial => "layouts/search" %>