From b312bf387a96f1949e450562cc34ffde4e87d17a Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Fri, 9 Dec 2011 14:15:03 -0800
Subject: [PATCH] [#692] Cleanup layout structure from rebase

---
 app/views/layouts/base.rhtml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index 5841d3e4..15318605 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -40,7 +40,7 @@
           <%= hidden_field_tag(controller.default_search_scope, 1, :id => nil) if controller.default_search_scope %>
           <%= text_field_tag 'q', @question, :size => 20, :class => 'search_field', :placeholder => l(:search_input_placeholder), :accesskey => accesskey(:quick_search) %>
         <% end %>
-      </ul>
+      </div>
 
       <% if User.current.logged? || !Setting.login_required? %>
       <ul id="account-nav">
@@ -70,14 +70,7 @@
           </ul>
         </li>
         <li>
-          <label for='q'>
-            <%= link_to l(:label_search), {:controller => 'search', :action => 'index', :id => @project}, :accesskey => accesskey(:search), :class => 'search' %>
-          </label>
-          <% form_tag({:controller => 'search', :action => 'index', :id => @project}, :method => :get, :id => 'nav-search' ) do %>
-            <%= hidden_field_tag(controller.default_search_scope, 1, :id => nil) if controller.default_search_scope %>
-            <%= text_field_tag 'q', @question, :size => 20, :class => 'small', :accesskey => accesskey(:quick_search) %>
-        <% end %>
-        <%= render_menu_node(help_menu_item) %>
+          <%= render_menu_node(help_menu_item) %>
           <% unless User.current.logged? %>
             <li>
               <%= link_to l(:label_login), {:controller => 'account', :action => 'login'}, :class => 'login' %>