blacklight-spotlight 2.13.0 → 3.0.0.alpha.1

data/app/views/spotlight/dashboards/show.html.erb

@@ -1,17 +1,17 @@
-<%= render 'spotlight/shared/exhibit_sidebar' %>
+<% content_for(:sidebar) do %>
+  <%= render 'spotlight/shared/exhibit_sidebar' %>
+<% end %>
 
-<div id="content" class="col-md-9">
-  <%= curation_page_title %>
+<%= curation_page_title %>
 
-  <div class="reindexingHistory clearfix">
-    <%= render 'reindexing_activity' %>
-  </div>
+<div class="reindexingHistory clearfix mb-4">
+  <%= render 'reindexing_activity' %>
+</div>
+
+<div class="pageHistory clearfix mb-4">
+  <%= render 'page_activity' %>
+</div>
 
-  <div class="pageHistory clearfix">
-    <%= render 'page_activity' %>
-  </div>
-  
-  <div class="updatedItems clearfix">
-    <%= render 'solr_document_activity' %>
-  </div>
+<div class="updatedItems clearfix mb-4">
+  <%= render 'solr_document_activity' %>
 </div>

data/app/views/spotlight/exhibits/_confirmation_status.html.erb

@@ -1,10 +1,9 @@
             <div class="confirmation-status <%= 'not-validated' unless contact_email.confirmed? or contact_email.recently_sent? %>">
               <% if contact_email.confirmed? %>
-                <span class="confirmed"><span class="glyphicon glyphicon-ok-sign"></span> <%= t('.confirmed') %></span>
+                <span class="confirmed"><%= blacklight_icon('check_circle') %> <%= t('.confirmed') %></span>
               <% elsif contact_email.recently_sent? %>
-                <span class="confirmed"><span class="glyphicon glyphicon-ok-sign"></span> <%= t('.confirmation_sent') %></span>
+                <span class="confirmed"><%= blacklight_icon('check_circle') %> <%= t('.confirmation_sent') %></span>
               <% else %>
-                <span class="unconfirmed"><span class="glyphicon glyphicon-exclamation-sign"></span> <%= t('.not_validated') %></span> <%= link_to t('.resend'), contact_email_confirmation_path(contact_email: {email: contact_email.email}),  method: :post %>
+                <span class="unconfirmed"><%= blacklight_icon('error') %> <%= t('.not_validated') %></span> <%= link_to t('.resend'), contact_email_confirmation_path(contact_email: {email: contact_email.email}),  method: :post %>
               <% end %>
             </div>
-

data/app/views/spotlight/exhibits/_contact.html.erb

@@ -3,16 +3,16 @@
           <div class="col-md-8<%= ' has-error' if contact.object.errors[:email].present? %>">
             <%= text_field_tag "#{contact.object_name}[email]", contact.object.email, class: 'exhibit-contact form-control' %>
             <% if contact.object.errors[:email].present? %>
-              <span class="help-block"><%=contact.object.errors[:email].join(", ".html_safe) %></span>
+              <small class="form-text text-muted"><%=contact.object.errors[:email].join(", ".html_safe) %></small>
             <% end %>
             <p>
-              <span class="contact-email-delete-error text-danger callout-danger" style="display: none;"><%= t('.email_delete_error') %> <span class="error-msg"></span></span>
+              <span class="contact-email-delete-error text-danger bg-danger" style="display: none;"><%= t('.email_delete_error') %> <span class="error-msg"></span></span>
             </p>
           </div>
           <div class="col-md-4">
             <% if contact.object.id %>
               <span class="contact-email-delete-wrapper">
-                <%= link_to exhibit_contact_email_path(exhibit_id: exhibit.id, id: contact.object.id), class: 'contact-email-delete btn btn-xs btn-danger', method: :delete, data: { confirm: t('.email_delete_confirmation'), remote: true } do %>
+                <%= link_to exhibit_contact_email_path(exhibit_id: exhibit.id, id: contact.object.id), class: 'contact-email-delete btn btn-sm btn-danger', method: :delete, data: { confirm: t('.email_delete_confirmation'), remote: true } do %>
                   <%= t('.email_delete_button') %>
                 <% end %>
               </span>

data/app/views/spotlight/exhibits/_delete.html.erb

@@ -1,9 +1,11 @@
 <div role="tabpanel" class="tab-pane" id="delete">
-  <div class="callout callout-danger row">
-    <h4><%= t(:".heading") %></h4>
-    <p class='col-md-9'><%= t(:".warning_html", export_link: link_to(t(:'spotlight.exhibits.export.download'), spotlight.import_exhibit_path(current_exhibit))) %></p>
-    <div class='col-md-3'>
-      <%= delete_link current_exhibit, class: 'btn btn-default' %>
+  <div class="alert alert-danger">
+    <h4 class="alert-heading"><%= t(:".heading") %></h4>
+    <div class="row">
+      <p class='col-9'><%= t(:".warning_html", export_link: link_to(t(:'spotlight.exhibits.export.download'), spotlight.import_exhibit_path(current_exhibit))) %></p>
+      <div class='col-3'>
+        <%= delete_link current_exhibit, class: 'btn btn-secondary' %>
+      </div>
     </div>
   </div>
 </div>

data/app/views/spotlight/exhibits/_exhibit_card.html.erb

@@ -1,4 +1,4 @@
-<div class="col-xs-12 col-sm-4 exhibit-card">
+<div class="col-12 col-sm-6 col-md-4 exhibit-card">
   <div class="flipper">
     <div class="card-front card-face">
       <%= render 'exhibit_card_front', exhibit: exhibit %>
@@ -7,4 +7,4 @@
       <%= render 'exhibit_card_back', exhibit: exhibit %>
     </div>
   </div>
-</div>
+</div>

data/app/views/spotlight/exhibits/_exhibit_card_front.html.erb

@@ -5,7 +5,7 @@
 <% end %>
 
 <% unless exhibit.published? %>
-  <div class="label label-warning unpublished"><%= t('.unpublished') %></div>
+  <div class="badge badge-warning unpublished"><%= t('.unpublished') %></div>
 <% end %>
 
-<h2 class="card-title"><%= exhibit.title %></h2>
+<h2 class="exhibit-card-title"><%= exhibit.title %></h2>

data/app/views/spotlight/exhibits/_form.html.erb

@@ -1,5 +1,5 @@
 <%= bootstrap_form_for @exhibit, url: ((spotlight.exhibit_path(@exhibit) if @exhibit.persisted?) || spotlight.exhibits_path), layout: :horizontal, label_col: 'col-md-2', control_col: 'col-md-10', html: {class: "row"} do |f| %>
-<div class="row col-md-12">
+<div class="col-md-12">
   <%= f.text_field :title, disabled: !default_language?, help: !default_language? ? t('.uneditable_non_default_language') : '' %>
   <%= f.text_field :subtitle %>
   <%= f.text_area :description %>
@@ -9,15 +9,15 @@
       <%= render partial: 'contact', locals: {exhibit: @exhibit, contact: contact} %>
     <% end %>
     <span id='another-email' class="btn btn-sm btn-info"><%= t('.add_contact_email_button') %></span>
-    <p class="help-block"><%= t(:'.fields.contact_emails.help_block') %></p>
+    <small class="form-text text-muted"><%= t(:'.fields.contact_emails.help_block') %></small>
   <% end %>
   <%= f.form_group :published, label: { text: nil, class: nil }, help: nil do %>
     <%= f.check_box :published, label: "" %>
-    <p class="help-block"><%= t(:'.fields.published.help_block') %></p>
+    <small class="form-text text-muted"><%= t(:'.fields.published.help_block') %></small>
   <% end %>
-  
+
   <div class="form-actions">
-    
+
     <div class="primary-actions">
       <%= f.submit nil, class: 'btn btn-primary' %>
     </div>

data/app/views/spotlight/exhibits/_languages.html.erb

@@ -9,7 +9,7 @@
     <%= f.submit nil, class: 'btn btn-primary' %>
   <% end %>
 
-  <h3><%= t :'spotlight.exhibits.languages.current_header' %></h3>
+  <h3 class="mt-4"><%= t :'spotlight.exhibits.languages.current_header' %></h3>
 
   <% if current_exhibit.languages.any? && current_exhibit.languages.last.persisted? %>
     <p class="instructions"><%= t :'spotlight.exhibits.languages.current_instructions' %></p>
@@ -36,7 +36,7 @@
                         <%= languages.check_box_without_bootstrap :public %>
                       </div>
                       </td>
-                    <td class='text-center'><%= link_to t('.remove'), exhibit_language_path(current_exhibit, language), method: :delete, data: { confirm: t('.modal.confirm') }, class: 'btn btn-sm btn-primary' %></td>
+                    <td class='text-center'><%= link_to t('.remove'), exhibit_language_path(current_exhibit, language), method: :delete, data: { confirm: t('.modal.confirm') }, class: 'btn btn-sm btn-danger' %></td>
                   </tr>
                 <% end %>
               <% end %>

data/app/views/spotlight/exhibits/_new_exhibit_form.html.erb

@@ -1,5 +1,4 @@
 <%= bootstrap_form_for @exhibit, url: ((spotlight.exhibit_path(@exhibit) if @exhibit.persisted?) || spotlight.exhibits_path), layout: :horizontal, label_col: 'col-md-2', control_col: 'col-md-10' do |f| %>
-<div class="row col-md-12">
   <%= f.text_field :title, label: t(:'.fields.title.label'), help: t(:'.fields.title.help_block') %>
   <%= f.text_field :slug, label: t(:'.fields.slug.label'), help: t(:'.fields.slug.help_block') %>
   <%= f.text_field :tag_list %>
@@ -11,5 +10,4 @@
       <%= f.submit nil, class: 'btn btn-primary' %>
     </div>
   </div>
-</div>
 <% end %>

data/app/views/spotlight/exhibits/edit.html.erb

@@ -1,46 +1,47 @@
-<%= render 'spotlight/shared/exhibit_sidebar' %>
-<div id="content" class="col-md-9 exhibit-admin">
-  <%= configuration_page_title %>
-  <div role="tabpanel">
-    <ul class="nav nav-tabs" role="tablist">
-      <li role="presentation" class="<%= 'active' if @tab.blank? %>">
-        <a href="#basic" aria-controls="basic" role="tab" data-toggle="tab"><%= t(:'.basic_settings.heading') %></a>
+<% content_for(:sidebar) do %>
+  <%= render 'spotlight/shared/exhibit_sidebar' %>
+<% end %>
+
+<%= configuration_page_title %>
+<div role="tabpanel">
+  <ul class="nav nav-tabs" role="tablist">
+    <li role="presentation" class="nav-item">
+      <a href="#basic" aria-controls="basic" role="tab" data-toggle="tab" class="nav-link <%= 'active' if @tab.blank? %>"><%= t(:'.basic_settings.heading') %></a>
+    </li>
+    <% if can? :manage, current_exhibit.languages.first_or_initialize %>
+      <li role="presentation" class="nav-item">
+        <a href="#language" aria-controls="language" role="tab" data-toggle="tab" class="nav-link <%= 'active' if @tab == 'language' %>"><%= t(:'spotlight.exhibits.languages.heading') %></a>
       </li>
-      <% if can? :manage, current_exhibit.languages.first_or_initialize %>
-        <li role="presentation" class="<%= 'active' if @tab == 'language' %>">
-          <a href="#language" aria-controls="language" role="tab" data-toggle="tab"><%= t(:'spotlight.exhibits.languages.heading') %></a>
-        </li>
-      <% end %>
-      <% if can? :edit, current_exhibit.filters.first_or_initialize %>
-        <li role="presentation" class="<%= 'active' if @tab == 'filter' %>">
-          <a href="#filter" aria-controls="filter" role="tab" data-toggle="tab"><%= t(:'spotlight.exhibits.filter.heading') %></a>
-        </li>
-      <% end %>
-      <% if can? :import, current_exhibit %>
-        <li role="presentation" class="<%= 'active' if @tab == 'import' %>">
-          <a href="#import" aria-controls="import" role="tab" data-toggle="tab"><%= t(:'spotlight.exhibits.import.heading') %></a>
-        </li>
-      <% end %>
-      <% if can? :export, current_exhibit %>
-        <li role="presentation" class="<%= 'active' if @tab == 'export' %>">
-          <a href="#export" aria-controls="export" role="tab" data-toggle="tab"><%= t(:'spotlight.exhibits.export.heading') %></a>
-        </li>
-      <% end %>
-      <% if can? :destroy, current_exhibit %>
-        <li role="presentation">
-          <a href="#delete" aria-controls="delete" role="tab" data-toggle="tab"><%= t(:'spotlight.exhibits.delete.heading') %></a>
-        </li>
-      <% end %>
-    </ul>
-    <div class="tab-content">
-      <div role="tabpanel" class="tab-pane <%= 'active' if @tab.blank? %>" id="basic">
-        <%= render 'form' %>
-      </div>
-      <%= render 'languages' if can? :manage, current_exhibit.languages.first_or_initialize %>
-      <%= render 'spotlight/filters/form' if can? :edit, current_exhibit.filters.first_or_initialize %>
-      <%= render 'import' if can? :import, current_exhibit %>
-      <%= render 'export' if can? :export, current_exhibit %>
-      <%= render 'delete' if can? :destroy, current_exhibit %>
+    <% end %>
+    <% if can? :edit, current_exhibit.filters.first_or_initialize %>
+      <li role="presentation" class="nav-item">
+        <a href="#filter" aria-controls="filter" role="tab" data-toggle="tab" class="nav-link <%= 'active' if @tab == 'filter' %>"><%= t(:'spotlight.exhibits.filter.heading') %></a>
+      </li>
+    <% end %>
+    <% if can? :import, current_exhibit %>
+      <li role="presentation" class="nav-item">
+        <a href="#import" aria-controls="import" role="tab" data-toggle="tab" class="nav-link <%= 'active' if @tab == 'import' %>"><%= t(:'spotlight.exhibits.import.heading') %></a>
+      </li>
+    <% end %>
+    <% if can? :export, current_exhibit %>
+      <li role="presentation" class="nav-item">
+        <a href="#export" aria-controls="export" role="tab" data-toggle="tab" class="nav-link <%= 'active' if @tab == 'import' %>"><%= t(:'spotlight.exhibits.export.heading') %></a>
+      </li>
+    <% end %>
+    <% if can? :destroy, current_exhibit %>
+      <li role="presentation" class="nav-item">
+        <a href="#delete" aria-controls="delete" role="tab" data-toggle="tab" class="nav-link"><%= t(:'spotlight.exhibits.delete.heading') %></a>
+      </li>
+    <% end %>
+  </ul>
+  <div class="tab-content">
+    <div role="tabpanel" class="tab-pane <%= 'active' if @tab.blank? %>" id="basic">
+      <%= render 'form' %>
     </div>
+    <%= render 'languages' if can? :manage, current_exhibit.languages.first_or_initialize %>
+    <%= render 'spotlight/filters/form' if can? :edit, current_exhibit.filters.first_or_initialize %>
+    <%= render 'import' if can? :import, current_exhibit %>
+    <%= render 'export' if can? :export, current_exhibit %>
+    <%= render 'delete' if can? :destroy, current_exhibit %>
   </div>
 </div>

data/app/views/spotlight/exhibits/index.html.erb

@@ -1,50 +1,49 @@
-<div class="col-md-9">
-  <% if (current_user && current_user.exhibits.any?) || can?(:manage, Spotlight::Exhibit) %>
-    <ul class="nav nav-tabs" role="tablist">
-      <li role="presentation" class="active"><a href="#published" aria-controls="published" role="tab" data-toggle="tab"><%= t('.published') %></a></li>
-      <% if can?(:manage, Spotlight::Exhibit) && @exhibits.unpublished.accessible_by(current_ability).any? %>
-        <li role="presentation"><a href="#unpublished" aria-controls="unpublished" role="tab" data-toggle="tab"><%= t('.unpublished') %></a></li>
-      <% end %>
-      <% if current_user && current_user.exhibits.any? %>
-        <li role="presentation"><a href="#user" aria-controls="user" role="tab" data-toggle="tab"><%= t('.user') %></a></li>
-      <% end %>
-    </ul>
-  <% end %>
+<% if (current_user && current_user.exhibits.any?) || can?(:manage, Spotlight::Exhibit) %>
+  <ul class="nav nav-tabs" role="tablist">
+    <li role="presentation" class="nav-item"><a href="#published" aria-controls="published" role="tab" data-toggle="tab" class="nav-link active"><%= t('.published') %></a></li>
+    <% if can?(:manage, Spotlight::Exhibit) && @exhibits.unpublished.accessible_by(current_ability).any? %>
+      <li role="presentation" class="nav-item"><a href="#unpublished" aria-controls="unpublished" role="tab" data-toggle="tab" class="nav-link"><%= t('.unpublished') %></a></li>
+    <% end %>
+    <% if current_user && current_user.exhibits.any? %>
+      <li role="presentation" class="nav-item"><a href="#user" aria-controls="user" role="tab" data-toggle="tab" class="nav-link"><%= t('.user') %></a></li>
+    <% end %>
+  </ul>
+<% end %>
 
-  <div class="tab-content">
-    <div role="tabpanel" class="tab-pane active" id="published">
-      <% if @exhibits.published.none? %>
-        <%= render 'missing_exhibits' %>
-      <% else %>
-        <%= render 'tags', tags: @exhibits.published.all_tags %>
-        <%= render 'exhibits', exhibits: @published_exhibits %>
+<div class="tab-content">
+  <div role="tabpanel" class="tab-pane active" id="published">
+    <% if @exhibits.published.none? %>
+      <%= render 'missing_exhibits' %>
+    <% else %>
+      <%= render 'tags', tags: @exhibits.published.all_tags %>
+      <%= render 'exhibits', exhibits: @published_exhibits %>
 
-        <% if @published_exhibits.total_count > @published_exhibits.size %>
-          <nav>
-            <ul class="pager">
-              <li><%= link_to_previous_page @published_exhibits, t('views.pagination.previous').html_safe %></li>
-              <li><%= link_to_next_page @published_exhibits, t('views.pagination.next').html_safe %></li>
-            </ul>
-          </nav>
-        <% end %>
+      <% if @published_exhibits.total_count > @published_exhibits.size %>
+        <nav>
+          <ul class="pager">
+            <li><%= link_to_previous_page @published_exhibits, t('views.pagination.previous').html_safe %></li>
+            <li><%= link_to_next_page @published_exhibits, t('views.pagination.next').html_safe %></li>
+          </ul>
+        </nav>
       <% end %>
-
-    </div>
-
-    <% if @exhibits.unpublished.accessible_by(current_ability).any? %>
-      <div role="tabpanel" class="tab-pane" id="unpublished">
-        <%= render 'exhibits', exhibits: @exhibits.unpublished.ordered_by_weight.accessible_by(current_ability) %>
-      </div>
     <% end %>
 
-    <% if current_user && current_user.exhibits.any? %>
-      <div role="tabpanel" class="tab-pane" id="user">
-        <%= render 'exhibits', exhibits: current_user.exhibits %>
-      </div>
-    <% end %>
   </div>
+
+  <% if @exhibits.unpublished.accessible_by(current_ability).any? %>
+    <div role="tabpanel" class="tab-pane" id="unpublished">
+      <%= render 'exhibits', exhibits: @exhibits.unpublished.ordered_by_weight.accessible_by(current_ability) %>
+    </div>
+  <% end %>
+
+  <% if current_user && current_user.exhibits.any? %>
+    <div role="tabpanel" class="tab-pane" id="user">
+      <%= render 'exhibits', exhibits: current_user.exhibits %>
+    </div>
+  <% end %>
 </div>
 
-<aside class="col-md-3">
+<% content_for(:sidebar_position) { 'order-last' } %>
+<% content_for(:sidebar) do %>
   <%= render "shared/site_sidebar" %>
-</aside>
+<% end %>

data/app/views/spotlight/exhibits/new.html.erb

@@ -1,8 +1,7 @@
-<div id="content" class="col-md-9 exhibit-admin">
 <%= page_title t(:'spotlight.sites.new.section') %>
 <%= render 'new_exhibit_form' %>
-</div>
 
-<aside class="col-md-3">
-  <%= render "shared/site_sidebar" %>
-</aside>
+<% content_for(:sidebar_position) { 'order-last' } %>
+<% content_for(:sidebar) do %>
+  <%= render 'shared/site_sidebar' %>
+<% end %>

data/app/views/spotlight/feature_pages/_header.html.erb

@@ -2,20 +2,18 @@
   <% page = p.object %>
   <div class="home_page">
     <h3><%= t('spotlight.pages.index.feature_pages.home_pages_header') %></h3>
-    <div class="panel panel-default">
-      <div class="panel-heading page">
-        <div class="main row">
-          <div class="col-sm-8">
-            <%= p.hidden_field :id, value: page.id , class: 'form-control input-sm' %>
-            <h3 class="panel-title" data-in-place-edit-target=".edit-in-place" data-in-place-edit-field-target="[data-edit-field-target='true']">
-              <a href="#edit-in-place" class="field-label edit-in-place"><%= page.title %></a>
-              <%= p.hidden_field :title, value: page.title , class: 'form-control input-sm', data: {:"edit-field-target" => 'true'} %>
-            </h3>
-          </div>
-          <div class="col-sm-4 page-links">
-            <%= exhibit_view_link page, exhibit_root_path(page.exhibit), class: 'btn btn-link' %> &middot;
-            <%= exhibit_edit_link page, edit_exhibit_home_page_path(page.exhibit), class: 'btn btn-link', data: { turbolinks: false } %>
-          </div>
+    <div class="card container">
+      <div class="card-body bg-light page main row">
+        <div class="col-sm-8">
+          <%= p.hidden_field :id, value: page.id , class: 'form-control form-control-sm' %>
+          <h3 class="h6 card-title" data-in-place-edit-target=".edit-in-place" data-in-place-edit-field-target="[data-edit-field-target='true']">
+            <a href="#edit-in-place" class="field-label edit-in-place"><%= page.title %></a>
+            <%= p.hidden_field :title, value: page.title , class: 'form-control form-control-sm title-field', data: {:"edit-field-target" => 'true'} %>
+          </h3>
+        </div>
+        <div class="col-sm-4 page-links">
+          <%= exhibit_view_link page, exhibit_root_path(page.exhibit), class: 'btn btn-link' %> &middot;
+          <%= exhibit_edit_link page, edit_exhibit_home_page_path(page.exhibit), class: 'btn btn-link', data: { turbolinks: false } %>
         </div>
       </div>
     </div>

data/app/views/spotlight/feature_pages/_sidebar.html.erb

@@ -1,9 +1,8 @@
 <% cache_unless current_user, [current_exhibit, @page] do %>
-<div id="sidebar" class="col-md-3" role="complementary">
-  <ol class="nav sidenav">
+  <ol class="nav sidenav flex-column">
     <% @exhibit.feature_pages.for_locale.published.at_top_level.each do |feature_section| %>
       <li class="<%= 'active' if current_page? [spotlight, @exhibit, feature_section] %>">
-        <h4><%= link_to_unless_current feature_section.title, [spotlight, @exhibit, feature_section] %></h4>
+        <%= link_to_unless_current feature_section.title, [spotlight, @exhibit, feature_section] %>
         <ol class="subsection">
           <% feature_section.child_pages.published.each do |page| %>
             <li class="<%= 'active' if current_page? [spotlight, @exhibit, page] %>"><%= link_to_unless_current page.title, [spotlight, @exhibit, page] %></li>
@@ -12,5 +11,4 @@
       </li>
     <% end %>
   </ol>
-</div>
 <% end %>

data/app/views/spotlight/featured_images/_form.html.erb

@@ -8,17 +8,17 @@
     <div>
       <%= f.hidden_field(:document_global_id) %>
       <div class="alert alert-danger" data-behavior="non-iiif-alert" role="alert" style="display:none;">
-        <span class="glyphicon glyphicon-alert"></span>
+        <%= blacklight_icon('warning') %>
         <%= t(:'.non_iiif_alert_html') %>
       </div>
-      <%= text_field_tag(:document_title, (presenter(f.object.document).document_show_html_title if f.object.document), class: "form-control", data: { input_select_target: "##{form_prefix(f)}_source_exhibit", 'behavior': 'autocomplete', featured_image_typeahead: true, target_panel: "##{form_prefix(f)}-target-panel", :'id-field' => "##{form_prefix(f)}_document_global_id" }) %>
+      <%= text_field_tag(:document_title, (presenter(f.object.document).heading if f.object.document), class: "form-control", data: { input_select_target: "##{form_prefix(f)}_source_exhibit", 'behavior': 'autocomplete', featured_image_typeahead: true, target_panel: "##{form_prefix(f)}-target-panel", :'id-field' => "##{form_prefix(f)}_document_global_id" }) %>
       <div id="<%= form_prefix(f) %>-target-panel" style="display:none">
-        <div class="panel-heading">
+        <div class="card-header">
           <div data-item-title="true"></div>
           <div data-panel-image-pagination="true"></div>
         </div>
       </div>
-      <p class="help-block"><%= t(:'.source.exhibit.help') %></p>
+      <small class="form-text text-muted"><%= t(:'.source.exhibit.help') %></small>
     </div>
   </div>
   <div>

data/app/views/spotlight/filters/_form.html.erb

@@ -1,5 +1,5 @@
 <div role="tabpanel" class="tab-pane <%= 'active' if @tab == 'filter' %>" id="filter">
-  <%= bootstrap_form_for [@exhibit, @exhibit.filters.first_or_initialize], layout: :horizontal, label_col: 'col-md-2', control_col: 'col-md-10', html: {class: "row"} do |f| %>
+  <%= bootstrap_form_for [@exhibit, @exhibit.filters.first_or_initialize], layout: :horizontal, label_col: 'col-md-2', control_col: 'col-md-10' do |f| %>
     <p class="instructions"><%= t :'spotlight.exhibits.filter.instructions' %></p>
 
     <%= f.text_field :field %>

data/app/views/spotlight/home_pages/_edit_page_link.html.erb

@@ -1 +1 @@
-<%= exhibit_edit_link @page, edit_exhibit_home_page_path(@page.exhibit), class: 'edit-button pull-right btn btn-primary', data: { turbolinks: false } %>
+<%= exhibit_edit_link @page, edit_exhibit_home_page_path(@page.exhibit), class: 'edit-button float-right btn btn-primary', data: { turbolinks: false } %>

data/app/views/spotlight/home_pages/_sidebar.html.erb

@@ -1,3 +1 @@
-<div id="sidebar" class="col-md-3">
- <%= render 'catalog/search_sidebar' %>
- </div>
+<%= render 'catalog/search_sidebar' %>