adds default search bar back in

pulibrary · Sep 24, 2021 · 8b400ca · 8b400ca
1 parent e3ef20e
commit 8b400ca
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 36 deletions.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -5,11 +5,11 @@ module ApplicationHelper
   include Spotlight::ApplicationHelper
   delegate :url, to: :universal_viewer, prefix: true
 
-  def render_search_bar
-    super
-  rescue StandardError
-    render partial: 'catalog/default_search_form'
-  end
+  # def render_search_bar
+  #   super
+  # rescue StandardError
+  #   render partial: 'catalog/default_search_form'
+  # end
 
   def site_sidebar?
     can?(:manage, Spotlight::Site.instance) || can?(:create, Spotlight::Exhibit)

diff --git a/app/views/catalog/_search_form.html.erb b/app/views/catalog/_search_form.html.erb
diff --git a/app/views/shared/_exhibit_navbar.html.erb b/app/views/shared/_exhibit_navbar.html.erb
@@ -1,20 +1,20 @@
-<div id="exhibit-navbar" class="exhibit-navbar navbar navbar-default" role="navigation">
-  <div class="container">
+<div id="exhibit-navbar" class="exhibit-navbar navbar navbar-light navbar-expand-md" role="navigation" aria-label="<%= t('spotlight.exhibitnavbar.label') %>">
+  <div class="container flex-column flex-md-row">
     <% if current_exhibit && resource_masthead? %>
       <%= link_to(current_exhibit.title, spotlight.exhibit_path(current_exhibit), class: 'navbar-brand') %>
     <% end %>
 
-    <ul class="nav navbar-nav">
+    <ul class="navbar-nav <%= resource_masthead? ? 'justify-content-md-end' : 'mr-auto' %>">
       <% if current_exhibit %>
-        <li class="<%= "active" if current_page?(current_exhibit) %>"><%= link_to t(:'spotlight.curation.nav.home'), current_exhibit %></li>
+        <li class="nav-item <%= "active" if current_page?([spotlight, current_exhibit]) %>"><%= link_to t(:'spotlight.curation.nav.home'), [spotlight, current_exhibit], class: 'nav-link' %></li>
         <% current_exhibit.main_navigations.displayable.each do |navigation| %>
           <%= render partial: "shared/#{navigation.nav_type}_navbar", locals: { navigation: navigation } %>
         <% end %>
       <% end %>
     </ul>
     <% if !current_exhibit || should_render_spotlight_search_bar? %>
-      <div class="navbar-right navbar-nav nav">
-        <%= render_search_bar  %>
+      <div class="navbar-right navbar-nav exhibit-search-form mt-3 mt-md-0">
+        <%= render_search_bar %>
       </div>
     <% end %>
   </div>