Refactor search form for visual design changes

Why these changes are being introduced:

GeoData and USE UI currently share search form input and submit fields.
These fields should be isolated for UXWS to easily make tweaks to the
form for USE UI that won't affect GeoData.

Relevant ticket(s):

* [USE-127](https://mitlibraries.atlassian.net/browse/USE-127)

How this addresses that need:

This conditionally renders a submit button with class
`geo-search-submit` if GeoData is enabled. If not, the button div has
the class `basic-search-submit`.

This also adds a conditional `inline` class to the input field if
GeoData is not enabled. This class does not actually do anything yet,
but it will make it easier for UXWS update the CSS such that the
button renders inline with the input.

Side effects of this change:

The ID and classes associated with the form element have been renamed
from `basic-search-form` to `search-form`. This more accurately captures
the element they target, since the form is used both for USE UI (basic
search) and GeoData (advanced search).

Author: jazairi

app/assets/stylesheets/partials/_search.scss

@@ -3,7 +3,7 @@
 // ------------------------
 
 /* basic search bar */
-.basic-search {
+.search-form {
   background-color: #989898;
   margin-bottom: 0rem;
   padding: 2.4rem 2rem 1.6rem 2rem;
@@ -114,7 +114,7 @@
     }
   }
 
-  .basic-search-submit {
+  .geo-search-submit {
     width: 150px;
     margin-top: 0.8rem;
     .btn {

app/views/search/_form.html.erb

@@ -22,10 +22,10 @@ end
 keyword_placeholder = search_required ? "Enter your search" : "Keyword anywhere"
 %>
 
-<form id="basic-search" class="form-horizontal basic-search" action="<%= results_path %>" method="get" role="search">
+<form id="search-form" class="form-horizontal search-form" action="<%= results_path %>" method="get" role="search">
   <div class="form-group">
     <input id="basic-search-main" type="search"
-           class="field field-text basic-search-input <%= "required" if search_required %>" name="q"
+           class="field field-text basic-search-input <%= "required" if search_required %> <%= "inline" unless Flipflop.enabled?(:gdt) %>" name="q"
            title="Keyword anywhere" placeholder="<%= keyword_placeholder %>"
            value="<%= params[:q] %>" <%= 'required' if search_required %>
            <%= 'aria-describedby=site-desc' if Flipflop.enabled?(:gdt) %>>
@@ -175,11 +175,15 @@ keyword_placeholder = search_required ? "Enter your search" : "Keyword anywhere"
         </div>
       </div>
     </details>
-    <% end %>
-  </div>
 
-  <div class="basic-search-submit">
-    <button type="submit" class="btn button-primary">Search</button>
+    <div class="geo-search-submit">
+      <button type="submit" class="btn button-primary">Search</button>
+    </div>
+    <% else %>
+    <div class="basic-search-submit">
+      <button type="submit" class="btn button-primary">Search</button>
+    </div>
+    <% end %>
   </div>
 </form>
 

test/controllers/search_controller_test.rb

@@ -75,7 +75,7 @@ def mock_timdex_search_success
     get '/'
     assert_response :success
 
-    assert_select 'form#basic-search', { count: 1 }
+    assert_select 'form#search-form', { count: 1 }
     assert_select 'details#advanced-search-panel', count: 0
   end
 
@@ -183,15 +183,15 @@ def mock_timdex_search_success
     get '/results?q=hallo'
     assert_response :success
 
-    assert_select 'form#basic-search', { count: 1 }
+    assert_select 'form#search-form', { count: 1 }
   end
 
   test 'timdex results with valid query shows search form' do
     mock_timdex_search_success
     get '/results?q=hallo&tab=timdex'
     assert_response :success
 
-    assert_select 'form#basic-search', { count: 1 }
+    assert_select 'form#search-form', { count: 1 }
   end
 
   test 'primo results with valid query populates search form with query' do