blacklight 6.25.0 → 7.0.0.rc1

data/app/views/catalog/facet.html.erb

@@ -1,25 +1,24 @@
-<div class="facet_pagination top">
+<div class="facet-pagination top">
   <%= render :partial=>'facet_pagination' %>
 </div>
 
 <div class="modal-header">
-  <button type="button" class="ajax-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
+  <h3 class="modal-title"><%= facet_field_label(@facet.key) %></h3>
+  <button type="button" class="blacklight-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
     <span aria-hidden="true">&times;</span>
   </button>
-
-  <h3 class="modal-title"><%= facet_field_label(@facet.key) %></h3>
   <%= render partial: 'facet_index_navigation' if @facet.index_range && @display_facet.index? %>
 
 </div>
 <div class="modal-body">
-  <div class="facet_extended_list">
+  <div class="facet-extended-list">
   <%= render_facet_limit(@display_facet, layout: false) %>
   </div>
 </div>
   
 <div class="modal-footer">
 
-  <div class="facet_pagination bottom">
+  <div class="facet-pagination bottom">
     <%= render :partial=>'facet_pagination' %>
   </div>
 </div>

data/app/views/catalog/index.atom.builder

@@ -1,56 +1,51 @@
 require 'base64'
 
-xml.instruct!(:xml, :encoding => "UTF-8")
+xml.instruct!(:xml, encoding: "UTF-8")
 
 xml.feed("xmlns" => "http://www.w3.org/2005/Atom",
          "xmlns:opensearch"=>"http://a9.com/-/spec/opensearch/1.1/") do
 
-  xml.title   t('blacklight.search.title', :application_name => application_name)
+  xml.title   t('blacklight.search.page_title.title', constraints: render_search_to_page_title(params), application_name: application_name)
   # an author is required, so we'll just use the app name
   xml.author { xml.name application_name }
   
   xml.link    "rel" => "self", "href" => url_for(search_state.to_h.merge(only_path: false))
-  xml.link    "rel" => "alternate", "href" => url_for(search_state.to_h.merge(:only_path => false, :format => "html")), "type" => "text/html"
+  xml.link    "rel" => "alternate", "href" => url_for(search_state.to_h.merge(only_path: false, format: "html")), "type" => "text/html"
   xml.id      url_for(search_state.to_h.merge(:only_path => false, :format => "html", :content_format => nil, "type" => "text/html"))
 
   # Navigational and context links
   
   xml.link( "rel" => "next", 
-            "href" => url_for(search_state.to_h.merge(:only_path => false, :page => @response.next_page.to_s))
+            "href" => url_for(search_state.to_h.merge(only_path: false, page: @response.next_page.to_s))
            ) if @response.next_page
   
   xml.link( "rel" => "previous", 
-            "href" => url_for(search_state.to_h.merge(:only_path => false, :page => @response.prev_page.to_s))
+            "href" => url_for(search_state.to_h.merge(only_path: false, page: @response.prev_page.to_s))
            ) if @response.prev_page
            
   xml.link( "rel" => "first", 
-            "href" => url_for(search_state.to_h.merge(:only_path => false, :page => "1")))
+            "href" => url_for(search_state.to_h.merge(only_path: false, page: "1")))
   
   xml.link( "rel" => "last",
-            "href" => url_for(search_state.to_h.merge(:only_path => false, :page => @response.total_pages.to_s)))
+            "href" => url_for(search_state.to_h.merge(only_path: false, page: @response.total_pages.to_s)))
   
   # "search" doesn't seem to actually be legal, but is very common, and
   # used as an example in opensearch docs
   xml.link( "rel" => "search",
             "type" => "application/opensearchdescription+xml",
-            "href" =>  url_for(:controller=>'catalog',:action => 'opensearch', :format => 'xml', :only_path => false))
+            "href" =>  url_for(controller: 'catalog',action: 'opensearch', format: 'xml', only_path: false))
 
   # opensearch response elements
   xml.opensearch :totalResults, @response.total.to_s
   xml.opensearch :startIndex, @response.start.to_s
   xml.opensearch :itemsPerPage, @response.limit_value
-  xml.opensearch :Query, :role => "request", :searchTerms => params[:q], :startPage => @response.current_page
+  xml.opensearch :Query, role: "request", searchTerms: params[:q], startPage: @response.current_page
   
   
   # updated is required, for now we'll just set it to now, sorry
   xml.updated Time.current.iso8601
   
-  @document_list.each_with_index do |document, document_counter|
+  @response.documents.each_with_index do |document, document_counter|
     xml << Nokogiri::XML.fragment(render_document_partials(document, blacklight_config.view_config(:atom).partials, document_counter: document_counter))
   end
 end
-
-
-
-
-

data/app/views/catalog/index.html.erb

@@ -1,13 +1,11 @@
-<div id="sidebar" class="<%= sidebar_classes %>">
+<% content_for(:sidebar) do %>
   <%= render 'search_sidebar' %>
-</div>
+<% end %>
 
-<div id="content" class="<%= main_content_classes %>">
-  <% unless has_search_parameters? %>
-    <%# if there are no input/search related params, display the "home" partial -%>
-    <%= render 'home' %>
-    <%= render 'shared/sitelinks_search_box' %>
-  <% else %>
-    <%= render 'search_results' %>
-  <% end %>
-</div>
+<% unless has_search_parameters? %>
+  <%# if there are no input/search related params, display the "home" partial -%>
+  <%= render 'home' %>
+  <%= render 'shared/sitelinks_search_box' %>
+<% else %>
+  <%= render 'search_results' %>
+<% end %>

data/app/views/catalog/index.json.jbuilder

@@ -1,5 +1,67 @@
-json.response do
-  json.docs @presenter.documents
-  json.facets @presenter.search_facets_as_json
+json.links do
+  json.self url_for(search_state.to_h.merge(only_path: false))
+  json.prev url_for(search_state.to_h.merge(only_path: false, page: @response.prev_page.to_s)) if @response.prev_page
+  json.next url_for(search_state.to_h.merge(only_path: false, page: @response.next_page.to_s)) if @response.next_page
+  json.last url_for(search_state.to_h.merge(only_path: false, page: @response.total_pages.to_s))
+end
+
+json.meta do
   json.pages @presenter.pagination_info
 end
+
+json.data do
+  json.array! @presenter.documents do |document|
+    json.id document.id
+    json.attributes document
+    json.links do
+      json.self polymorphic_url(url_for_document(document))
+    end
+  end
+end
+
+json.included do
+  json.array! @presenter.search_facets_as_json do |facet|
+    json.type 'facet'
+    json.id facet['name']
+    json.attributes do
+      json.items do
+        json.array! facet['items'] do |item|
+          json.id
+          json.attributes do
+            json.label item['label']
+            json.value item['value']
+            json.hits item['hits']
+          end
+          json.links do
+            json.self path_for_facet(facet['name'], item['value'], only_path: false)
+          end
+        end
+      end
+    end
+    json.links do
+      json.self search_facet_path(id: facet['name'], only_path: false)
+    end
+  end
+
+  json.array! search_fields do |(label, key)|
+    json.type 'search_field'
+    json.id key
+    json.attributes do
+      json.label label
+    end
+    json.links do
+      json.self url_for(search_state.to_h.merge(search_field: key, only_path: false))
+    end
+  end
+
+  json.array! active_sort_fields do |key, field|
+    json.type 'sort'
+    json.id key
+    json.attributes do
+      json.label field.label
+    end
+    json.links do
+      json.self url_for(search_state.to_h.merge(sort: key, only_path: false))
+    end
+  end
+end

data/app/views/catalog/index.rss.builder

@@ -1,11 +1,11 @@
-xml.instruct! :xml, :version=>"1.0"
-xml.rss(:version=>"2.0") {
+xml.instruct! :xml, version: "1.0"
+xml.rss(version: "2.0") {
   xml.channel {
-    xml.title(t('blacklight.search.title', :application_name => application_name))
+    xml.title(t('blacklight.search.page_title.title', constraints: render_search_to_page_title(params), application_name: application_name))
     xml.link(search_action_url(params.to_unsafe_h))
-    xml.description(t('blacklight.search.title', :application_name => application_name))
+    xml.description(t('blacklight.search.page_title.title', constraints: render_search_to_page_title(params), application_name: application_name))
     xml.language('en-us')
-    @document_list.each_with_index do |document, document_counter|
+    @response.documents.each_with_index do |document, document_counter|
       xml << Nokogiri::XML.fragment(render_document_partials(document, blacklight_config.view_config(:rss).partials, document_counter: document_counter))
     end
   }

data/app/views/catalog/opensearch.xml.builder

@@ -1,10 +1,10 @@
-xml.instruct! :xml, :version=>'1.0'
-xml.OpenSearchDescription(:xmlns=>'http://a9.com/-/spec/opensearch/1.1/') {
-  xml.ShortName application_name
-  xml.Description "#{application_name} Search"
-  xml.Image "#{asset_url('favicon.ico')}", :height=>16, :width=>16, :type=>'image/x-icon'
-  xml.Contact
-  xml.Url :type=>'text/html', :method=>'get', :template=>"#{url_for :controller=>'catalog', :only_path => false}?q={searchTerms}&page={startPage?}"
-  xml.Url :type=>'application/rss+xml', :method=>'get', :template=>"#{url_for :controller=>'catalog', :only_path => false}.rss?q={searchTerms}&page={startPage?}"
-  xml.Url :type=>'application/x-suggestions+json', :method=>'get', :template=>"#{url_for :controller=>'catalog',:action => 'opensearch', :format=> 'json', :only_path => false}?q={searchTerms}"
-}
+xml.instruct! :xml, version: '1.0'
+xml.OpenSearchDescription(xmlns: 'http://a9.com/-/spec/opensearch/1.1/') {
+  xml.ShortName application_name
+  xml.Description "#{application_name} Search"
+  xml.Image "#{asset_url('favicon.ico')}", height: 16, width: 16, type: 'image/x-icon'
+  xml.Contact
+  xml.Url type: 'text/html', method: 'get', template: "#{url_for controller: 'catalog', only_path: false}?q={searchTerms}&page={startPage?}"
+  xml.Url type: 'application/rss+xml', method: 'get', template: "#{url_for controller: 'catalog', only_path: false}.rss?q={searchTerms}&page={startPage?}"
+  xml.Url type: 'application/x-suggestions+json', method: 'get', template: "#{url_for controller: 'catalog',action: 'opensearch', format: 'json', only_path: false}?q={searchTerms}"
+}

data/app/views/catalog/show.html.erb

@@ -1,7 +1,12 @@
-<div id="content" class="<%= show_content_classes %>">
-  <%= render_document_main_content_partial %>
-</div>
+<% if current_search_session %>
+  <div id="appliedParams" class="clearfix constraints-container">
+    <%= link_to t('blacklight.search.start_over'), start_over_path, class: "catalog_startOverLink btn btn-primary" %>
+    <%= link_back_to_catalog class: 'btn btn-outline-secondary' %>
+  </div>
+<% end %>
 
-<div id="sidebar" class="<%= show_sidebar_classes %>">
-   <%= render_document_sidebar_partial %>
-</div>
+<%= render_document_main_content_partial %>
+
+<% content_for(:sidebar) do %>
+  <%= render_document_sidebar_partial %>
+<% end %>

data/app/views/catalog/sms.html.erb

@@ -1,8 +1,7 @@
 <div class="modal-header">
-  <button type="button" class="ajax-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
+	<h1 class="modal-title"><%= t('blacklight.sms.form.title') %></h1>
+	<button type="button" class="blacklight-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
     <span aria-hidden="true">&times;</span>
   </button>
-
-	<h1 class="modal-title"><%= t('blacklight.sms.form.title') %></h1>
 </div>
 <%= render :partial => 'sms_form' %>

data/app/views/catalog/sms_success.html.erb

@@ -1,12 +1,13 @@
-<div class="modal-header">
-  <button type="button" class="ajax-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
-    <span aria-hidden="true">&times;</span>
-  </button>
+<div data-blacklight-modal="container">
+  <div class="modal-header">
+    <h1 class="modal-title"><%= t('blacklight.sms.form.title') %></h1>
+    <button type="button" class="blacklight-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
 
-  <h1 class="modal-title"><%= t('blacklight.sms.form.title') %></h1>
-</div>
-
-<div class="modal-body">
-  <%= render :partial=>'/flash_msg' %>
-  <span class="ajax-close-modal"></span>
+  <div class="modal-body">
+    <%= render partial: '/shared/flash_msg' %>
+    <span data-blacklight-modal="close"></span>
+  </div>
 </div>

data/app/views/kaminari/blacklight/_first_page.html.erb

@@ -6,6 +6,6 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<li class="<%= 'disabled' if current_page.first? %>">
-  <%= link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote %>
+<li class="page-item <%= 'disabled' if current_page.first? %>">
+  <%= link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote, class: 'page-link' %>
 </li>

data/app/views/kaminari/blacklight/_gap.html.erb

@@ -5,7 +5,7 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<li class="disabled">
-  <span><%= raw(t 'views.pagination.truncate') %></span>
+<li class="page-item disabled">
+  <span class="page-link"><%= raw(t 'views.pagination.truncate') %></span>
 </li>
 

data/app/views/kaminari/blacklight/_last_page.html.erb

@@ -6,6 +6,6 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<li class="<%= 'disabled' if current_page.last? %>">
-  <%= link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {:remote => remote} %>
+<li class="page-item <%= 'disabled' if current_page.last? %>">
+  <%= link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, :remote => remote, class: 'page-link' %>
 </li>

data/app/views/kaminari/blacklight/_next_page.html.erb

@@ -7,11 +7,11 @@
     remote:        data-remote
 -%>
 <% if current_page.last? %>
-    <li class="disabled">
-      <%= link_to raw(t 'views.pagination.next'), '#', :rel => 'next', :onclick=>'return false;' %>
+    <li class="page-item disabled">
+      <%= link_to raw(t 'views.pagination.next'), '#', :rel => 'next', :onclick=>'return false;', class: 'page-link' %>
     </li>
 <% else %>
-    <li>
-      <%= link_to raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote %>
+    <li class="page-item">
+      <%= link_to raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote, class: 'page-link' %>
     </li>
 <% end %>

data/app/views/kaminari/blacklight/_page.html.erb

@@ -7,11 +7,11 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<li class="<%= 'active' if page.current? %>">
+<li class="page-item <%= 'active' if page.current? %>">
   <% if page.current? %>
-    <span><%= number_with_delimiter(page.to_s) %></span>
+    <span class="page-link"><%= number_with_delimiter(page.to_s) %></span>
   <% else %>
-    <%= link_to number_with_delimiter(page.to_s), url, opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
+    <%= link_to number_with_delimiter(page.to_s), url, :remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil, class: 'page-link' %>
   <% end %>
 </li>
 

data/app/views/kaminari/blacklight/_prev_page.html.erb

@@ -7,12 +7,12 @@
     remote:        data-remote
 -%>
 <% if current_page.first? %>
-    <li class="disabled">
-      <%= link_to raw(t 'views.pagination.previous'), '#', :rel => 'prev', :onclick=>'return false;' %>
+    <li class="page-item disabled">
+      <%= link_to raw(t 'views.pagination.previous'), '#', :rel => 'prev', :onclick=>'return false;', class: 'page-link' %>
     </li>
 <% else %>
-    <li>
-      <%= link_to raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote %>
+    <li class="page-item">
+      <%= link_to raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote, class: 'page-link' %>
     </li>
 <% end %>
 

data/app/views/kaminari/blacklight_compact/_paginator.html.erb

@@ -18,17 +18,17 @@
   <%# #render checks if total_pages > 1, so we can't put our fallback 
   in here .. -%>
   <%= paginator.render do -%>
-    <div class="page_links">
+    <div class="page-links">
       <%= prev_page_tag %> | 
-      <span class="page_entries">
+      <span class="page-entries">
         <%= page_entries_info %>
       </span> | 
       <%= next_page_tag %>
     </div>
   <% end -%>
 <% else -%>
-    <div class="page_links">
-      <span class="page_entries">
+    <div class="page-links">
+      <span class="page-entries">
         <%= page_entries_info %>
       </span>
     </div> 

data/app/views/layouts/blacklight/base.html.erb

@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="en" class="no-js">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+
+    <!-- Mobile viewport optimization h5bp.com/ad -->
+    <meta name="HandheldFriendly" content="True">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+
+    <!-- Internet Explorer use the highest version available -->
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+    <!-- Mobile IE allows us to activate ClearType technology for smoothing fonts for easy reading -->
+    <!--[if IEMobile]>
+      <meta http-equiv="cleartype" content="on">
+    <![endif]-->
+
+    <title><%= render_page_title %></title>
+    <%= opensearch_description_tag application_name, opensearch_catalog_url(format: 'xml') %>
+    <%= favicon_link_tag %>
+    <%= stylesheet_link_tag "application", media: "all" %>
+    <%= javascript_include_tag "application" %>
+    <%= csrf_meta_tags %>
+    <%= content_for(:head) %>
+  </head>
+  <body class="<%= render_body_class %>">
+  <%= render partial: 'shared/header_navbar' %>
+
+  <div id="main-container" class="<%= container_classes %>">
+    <%= content_for(:container_header) %>
+
+    <%= render partial: 'shared/flash_msg', layout: 'shared/flash_messages' %>
+
+    <div class="row">
+      <%= content_for?(:content) ? yield(:content) : yield %>
+    </div>
+  </div>
+
+  <%= render partial: 'shared/footer' %>
+  <%= render partial: 'shared/modal' %>
+  </body>
+</html>

data/app/views/layouts/blacklight.html.erb

@@ -1,44 +1,17 @@
-<!DOCTYPE html>
-<%= content_tag :html, class: 'no-js', **html_tag_attributes do %>
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<% content_for(:content) do %>
+  <% if content_for? :sidebar %>
+    <section id="sidebar" class="<%= sidebar_classes %>">
+      <%= content_for(:sidebar) %>
+    </section>
 
-    <!-- Mobile viewport optimization h5bp.com/ad -->
-    <meta name="HandheldFriendly" content="True">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    
-    <!-- Internet Explorer use the highest version available -->
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-    <!-- Mobile IE allows us to activate ClearType technology for smoothing fonts for easy reading -->
-    <!--[if IEMobile]>
-      <meta http-equiv="cleartype" content="on">
-    <![endif]-->
-
-    <title><%= render_page_title %></title>
-    <%= opensearch_description_tag application_name, opensearch_catalog_url(:format => 'xml') %>
-    <%= favicon_link_tag %>
-    <%= stylesheet_link_tag "application", media: "all" %>
-    <%= javascript_include_tag "application" %>
-    <%= csrf_meta_tags %>
-    <%= content_for(:head) %>
-  </head>
-  <body class="<%= render_body_class %>">
-  <%= render :partial => 'shared/header_navbar' %>
-
-  <%= render partial: 'shared/ajax_modal' %>
-
-  <div id="main-container" class="<%= container_classes %>">
-    <%= content_tag :h1, application_name, class: 'sr-only application-heading' %>
-
-    <%= render :partial=>'/flash_msg', layout: 'shared/flash_messages' %>
-
-    <div class="row">
+    <section id="content" class="<%= main_content_classes %>">
       <%= yield %>
-    </div>
-  </div>
-
-  <%= render :partial => 'shared/footer' %>
-  </body>
+    </section>
+  <% else %>
+    <section class="col-md-12">
+      <%= yield %>
+    </section>
+  <% end %>
 <% end %>
+
+<%= render template: "layouts/blacklight/base" %>

data/app/views/layouts/catalog_result.html.erb

@@ -0,0 +1,11 @@
+<% content_for(:content) do %>
+  <section class="<%= show_content_classes %>">
+    <%= yield %>
+  </section>
+
+  <section class="<%= show_sidebar_classes %>">
+    <%= content_for(:sidebar) %>
+  </section>
+<% end %>
+
+<%= render template: "layouts/blacklight/base" %>

data/app/views/search_history/index.html.erb

@@ -1,27 +1,22 @@
 <% @page_title = t('blacklight.search_history.page_title', :application_name => application_name) %>
 
 <div id="content" class="col-md-12">
-<h2 class='page-heading'><%=t('blacklight.search_history.title')%></h2>
-<%- if @searches.blank? -%>
-  <h3 class='section-heading'><%=t('blacklight.search_history.no_history')%></h3>
-<%- else -%>
-    <%= link_to t('blacklight.search_history.clear.action_title'), blacklight.clear_search_history_path, :method => :delete, :data => { :confirm => t('blacklight.search_history.clear.action_confirm') }, :class => 'btn btn-danger pull-right' %>
-  <h3 class='section-heading'><%=t('blacklight.search_history.recent')%></h3>
-  <table class="table table-striped search_history">
-    <%-  @searches.each_with_index do |search,index| -%>
-    <%= content_tag :tr, :id => "document_#{index + 1}" do %>
+<h2 class='page-heading'><%= t('blacklight.search_history.title') %></h2>
+<% if @searches.blank? %>
+  <h3 class='section-heading'><%= t('blacklight.search_history.no_history') %></h3>
+<% else %>
+  <%= link_to t('blacklight.search_history.clear.action_title'),
+              blacklight.clear_search_history_path,
+              method: :delete,
+              data: { confirm: t('blacklight.search_history.clear.action_confirm') },
+              class: 'btn btn-danger float-md-right' %>
+  <h3 class='section-heading'><%= t('blacklight.search_history.recent') %></h3>
+  <table class="table table-striped search-history">
+    <% @searches.each_with_index do |search,index| %>
+    <tr id="document_<%= index + 1 %>">
       <td class="query"><%= link_to_previous_search(search_state.reset(search.query_params).to_hash) %></td>
-      <%- if has_user_authentication_provider? -%>
-        <td class="actions">
-          <%- if current_or_guest_user && search.saved? -%>
-            <%= button_to t('blacklight.search_history.forget'), blacklight.forget_search_path(search.id), :class => 'btn btn-default' %>
-          <%- else -%>
-            <%= button_to t('blacklight.search_history.save'), blacklight.save_search_path(search.id), :method => :put, :class => 'btn btn-default' %>
-          <%- end -%>
-        </td>
-      <%- end -%>
-    <% end #content_tag %>
-  <%- end -%>
+    </tr>
+  <% end %>
   </table>
-<%- end -%>
+<% end %>
 </div>

data/app/views/shared/_header_navbar.html.erb

@@ -1,22 +1,17 @@
-<div id="header-navbar" class="navbar navbar-inverse navbar-static-top" role="navigation">
+<nav class="navbar navbar-expand-md navbar-dark bg-dark topbar" role="navigation">
   <div class="<%= container_classes %>">
-    <div class="navbar-header">
-    <button type="button" class="navbar-toggle btn collapsed" data-toggle="collapse" data-target="#user-util-collapse">
-      <span class="sr-only">Toggle navigation</span>
-      <span class="icon-bar"></span>
-      <span class="icon-bar"></span>
-      <span class="icon-bar"></span>
+    <h1 class="mb-0 navbar-brand"><%= link_to application_name, root_path %></h1>
+    <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#user-util-collapse" aria-controls="user-util-collapse" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
     </button>
-    <%= link_to application_name, root_path, class: "navbar-brand" %>
-    </div>
 
-    <div class="collapse navbar-collapse" id="user-util-collapse">
-      <%= render :partial=>'/user_util_links' %>
+    <div class="collapse navbar-collapse justify-content-md-end" id="user-util-collapse">
+      <%= render 'shared/user_util_links' %>
     </div>
   </div>
-</div>
+</nav>
 
-<div id="search-navbar" class="navbar navbar-default navbar-static-top" role="navigation">
+<div class="navbar-search navbar navbar-light bg-faded" role="navigation">
   <div class="<%= container_classes %>">
     <%= render_search_bar  %>
   </div>

data/app/views/shared/_modal.html.erb

@@ -0,0 +1,6 @@
+<div id="blacklight-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="modal menu" aria-hidden="true">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+    </div>
+  </div>
+</div>

data/app/views/shared/_user_util_links.html.erb

@@ -0,0 +1,22 @@
+<ul class="navbar-nav">
+  <%= render_nav_actions do |config, action|%>
+    <li class="nav-item"><%= action %></li>
+  <% end %>
+
+  <% if has_user_authentication_provider? %>
+    <% if current_user %>
+    <li class="nav-item">
+      <%= link_to t('blacklight.header_links.logout'), destroy_user_session_path, class: 'nav-link' %>
+    </li>
+    <% unless current_user.to_s.blank? -%>
+    <li class="nav-item">
+      <%= link_to current_user, edit_user_registration_path, class: 'nav-link' %>
+    </li>
+    <% end %>
+    <% else %>
+    <li class="nav-item">
+      <%= link_to t('blacklight.header_links.login'), new_user_session_path, class: 'nav-link' %>
+    </li>
+    <% end %>
+  <% end %>
+</ul>