From 08116990201d92acebab4c43cf8d8abdb4eb16fa Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sat, 25 May 2019 19:15:27 +1200
Subject: [PATCH] USe search bar partial

---
 app/views/crops/_search_bar.haml    | 13 ++++++-------
 app/views/layouts/_header.html.haml |  8 +-------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/app/views/crops/_search_bar.haml b/app/views/crops/_search_bar.haml
index 6d0d412f7..bea22af51 100644
--- a/app/views/crops/_search_bar.haml
+++ b/app/views/crops/_search_bar.haml
@@ -1,7 +1,6 @@
-= form_tag search_crops_path, method: :get, class: 'navbar-form navbar-left', id: 'navbar-search' do
-  .input-group.navbar-search
-    = label_tag :term, "Search crop database:", class: 'sr-only'
-    = text_field_tag 'term', nil, class: 'search-query input-medium form-control text-white', placeholder: t('crops.search')
-    .input-group-btn
-      %button.btn.btn-default{ style: "height: 34px;" }
-        %span.glyphicon.glyphicon-search
+= form_tag search_crops_path, method: :get, class: 'form-inline my-2 my-lg-0', id: 'navbar-search' do
+  .input-group
+    %input.form-control.mr-sm-2{name: 'term', "aria-label" => "Search", placeholder: "Search", type: "search"}/
+    %button.btn.btn-default.text-white{type: "submit"}
+      = icon 'fas', 'search'
+      Search
\ No newline at end of file
diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
index 30ba563e1..42e1f7245 100644
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -66,10 +66,4 @@
       - else
         %li.nav-item= link_to t('.sign_in'), new_member_session_path, id: 'navbar-signin', class: 'btn nav-link'
         %li.nav-item= link_to t('.sign_up'), new_member_registration_path, id: 'navbar-signup', class: 'btn nav-link'
-
-
-    = form_tag search_crops_path, method: :get, class: 'form-inline my-2 my-lg-0' do
-      .input-group
-        %input.form-control.mr-sm-2{name: 'term', "aria-label" => "Search", placeholder: "Search", type: "search"}/
-        %button.btn.btn-default.text-white{type: "submit"}
-          = icon 'fas', 'search'
+    = render 'crops/search_bar'