blacklight-spotlight 2.13.0 → 3.0.0.alpha.1

data/app/views/spotlight/sir_trevor/blocks/_oembed_block.html.erb

@@ -1,5 +1,5 @@
-<div class="content-block item-text row">
-  <div class="<%= 'col-md-6' if oembed_block.text? %> col-xs-12 oembed-block pull-<%= oembed_block.content_align %>">
+<div class="content-block item-text row <%= 'flex-row-reverse' if oembed_block.content_align == 'right' %>">
+  <div class="<%= 'col-md-6' if oembed_block.text? %> col-12 oembed-block">
     <%= render_oembed_tag oembed_block.url %>
   </div>
 

data/app/views/spotlight/sir_trevor/blocks/_search_results_block.html.erb

@@ -11,7 +11,7 @@
       <% views = blacklight_view_config_for_search_block(search_results_block) %>
       <% if views.length > 1 -%>
       <div id="sortAndPerPage" class="clearfix">
-        <div class="search-widgets pull-right">
+        <div class="search-widgets float-right">
           <%= render partial: 'view_type_group', locals: { block: search_results_block } %>
         </div>
       </div>
@@ -22,4 +22,4 @@
     </div>
   <%- end %>
 </div>
-<% end %>
+<% end %>

data/app/views/spotlight/sir_trevor/blocks/_solr_documents_block.html.erb

@@ -1,32 +1,32 @@
 <% solr_documents_block.with_solr_helper(self) %>
 
-<div class="content-block items-block row">
+<div class="content-block items-block row <%= 'flex-row-reverse' if solr_documents_block.content_align == 'right' %>">
   <% if solr_documents_block.documents? %>
 
-    <div class="items-col spotlight-flexbox pull-<%= solr_documents_block.content_align %> <%= solr_documents_block.text? ? "col-md-6" : "col-md-12" %> ">
+    <div class="items-col spotlight-flexbox <%= solr_documents_block.text? ? "col-md-6" : "col-md-12" %> ">
       <% solr_documents_block.each_document do |block_options, document| %>
         <% doc_presenter = index_presenter(document) %>
         <div class="box" data-id="<%= document.id %>">
           <div class="contents">
             <% if block_options[:thumbnail_image_url].present? %>
-              <div class="thumbnail"><%= link_to_document(document, image_tag(block_options[:thumbnail_image_url]), counter: -1) %></div>
+              <%= link_to_document(document, image_tag(block_options[:thumbnail_image_url], class: 'img-thumbnail'), counter: -1) %>
             <% elsif block_options[:iiif_tilesource_base].present?  %>
-              <div class="thumbnail"><%= link_to_document(document, image_tag(block_options[:iiif_tilesource_base] + '/full/!400,400/0/default.jpg'), counter: -1) %></div>
+              <%= link_to_document(document, image_tag(block_options[:iiif_tilesource_base] + '/full/!400,400/0/default.jpg', class: 'img-thumbnail'), counter: -1) %>
             <% elsif has_thumbnail? document %>
-              <div class="thumbnail"><%= render_thumbnail_tag(document, {}, document_counter: -1) %></div>
+              <%= render_thumbnail_tag(document, { class: 'img-thumbnail' }, document_counter: -1) %>
             <% end %>
             <% if solr_documents_block.primary_caption? %>
               <div class="caption primary-caption">
-                <%= doc_presenter.field_value solr_documents_block.primary_caption_field %>
+                <%= doc_presenter.field_value(blacklight_config.index_fields[solr_documents_block.primary_caption_field] || Blacklight::Configuration::NullField.new(solr_documents_block.primary_caption_field)) %>
               </div>
             <% end %>
             <% if solr_documents_block.secondary_caption? %>
               <div class="caption secondary-caption">
-                <%= doc_presenter.field_value solr_documents_block.secondary_caption_field %>
+                <%= doc_presenter.field_value(blacklight_config.index_fields[solr_documents_block.secondary_caption_field] || Blacklight::Configuration::NullField.new(solr_documents_block.secondary_caption_field)) %>
               </div>
             <% end %>
             <% if solr_documents_block.zpr_link? && block_options[:iiif_tilesource].present? %>
-              <button class="btn btn-default zpr-link" data-iiif-tilesource="<%= block_options[:iiif_tilesource] %>">Show in ZPR viewer</button>
+              <button class="btn btn-secondary zpr-link" data-iiif-tilesource="<%= block_options[:iiif_tilesource] %>">Show in ZPR viewer</button>
             <% end %>
           </div>
         </div>

data/app/views/spotlight/sir_trevor/blocks/_solr_documents_carousel_block.html.erb

@@ -4,10 +4,10 @@
 <div class="content-block carousel-block carousel-height-<%= solr_documents_carousel_block.max_height %>">
 <% if solr_documents_carousel_block.documents? %>
   <div id="<%= html_id %>" class="carousel slide" data-ride="carousel"  data-interval="<%= solr_documents_carousel_block.interval %>">
-    <div class="carousel-inner">
+    <div class="carousel-inner text-center">
     <% solr_documents_carousel_block.each_document.each_with_index do |(block_options, document), index| %>
       <% doc_presenter = index_presenter(document) %>
-      <div class="item <%= 'active' if index == 0 %>" data-id="<%= document.id %>">
+      <div class="carousel-item <%= 'active' if index == 0 %>" data-id="<%= document.id %>">
         <% if block_options[:full_image_url].present? %>
           <%= link_to_document(document, image_tag(block_options[:full_image_url]), counter: -1) %>
         <% elsif block_options[:iiif_tilesource_base].present?  %>
@@ -18,12 +18,12 @@
         <div class="carousel-caption">
           <% if solr_documents_carousel_block.primary_caption? %>
             <h3 class="primary">
-              <%= doc_presenter.field_value solr_documents_carousel_block.primary_caption_field %>
+              <%= doc_presenter.field_value(blacklight_config.index_fields[solr_documents_carousel_block.primary_caption_field] || Blacklight::Configuration::NullField.new(solr_documents_carousel_block.primary_caption_field)) %>
             </h3>
           <% end %>
           <% if solr_documents_carousel_block.secondary_caption? %>
             <div class="secondary">
-              <%= doc_presenter.field_value solr_documents_carousel_block.secondary_caption_field %>
+              <%= doc_presenter.field_value(blacklight_config.index_fields[solr_documents_carousel_block.secondary_caption_field] || Blacklight::Configuration::NullField.new(solr_documents_carousel_block.secondary_caption_field)) %>
             </div>
           <% end %>
         </div>
@@ -40,11 +40,11 @@
     </ol>
 
     <!-- Controls -->
-    <a class="left carousel-control prev" href="#<%= html_id %>" data-slide="prev">
-      <span class="glyphicon glyphicon-chevron-left"></span>
+    <a class="left carousel-control-prev" href="#<%= html_id %>" data-slide="prev">
+      <%= blacklight_icon('arrow_back_ios') %>
     </a>
-    <a class="right carousel-control next" href="#<%= html_id %>" data-slide="next">
-      <span class="glyphicon glyphicon-chevron-right"></span>
+    <a class="right carousel-control-next" href="#<%= html_id %>" data-slide="next">
+      <%= blacklight_icon('arrow_forward_ios') %>
     </a>
   </div>
 <% end %>

data/app/views/spotlight/sir_trevor/blocks/_solr_documents_embed_block.html.erb

@@ -1,10 +1,9 @@
 <% solr_documents_embed_block.with_solr_helper(self) %>
 
-<div class="content-block items-block row">
+<div class="content-block items-block row <%= 'flex-row-reverse' if solr_documents_embed_block.content_align == 'right' %>">
 
   <% if solr_documents_embed_block.documents? %>
-
-    <div class="items-col spotlight-flexbox pull-<%= solr_documents_embed_block.content_align %> <%= solr_documents_embed_block.text? ? "col-md-6" : "col-md-12" %> ">
+    <div class="items-col spotlight-flexbox <%= solr_documents_embed_block.text? ? "col-md-6" : "col-md-12" %> ">
       <% solr_documents_embed_block.each_document do |block_options, document| %>
         <div class="box" data-id="<%= document.id %>">
           <%= render_document_partials document, blacklight_config.view.embed.partials, (blacklight_config.view.embed.locals || {}).reverse_merge(block: solr_documents_embed_block) %>
@@ -21,4 +20,4 @@
       <%= sir_trevor_markdown solr_documents_embed_block.text %>
     </div>
   <% end %>
-</div>
+</div>

data/app/views/spotlight/sir_trevor/blocks/_solr_documents_features_block.html.erb

@@ -2,42 +2,43 @@
 <% indicators = [] %>
 <% html_id = "carousel-#{solr_documents_features_block.object_id}" %>
 
-<div class="content-block item-features">
+<div class="content-block carousel-block item-features">
   <% if solr_documents_features_block.documents? %>
-  <div id="<%= html_id %>" class="row carousel" data-ride="carousel"  data-interval="false">
-      <div class="col-sm-6">
-        <div class="carousel-inner">
-          <% solr_documents_features_block.each_document.each_with_index do |(block_options, document), index| %>
-            <% doc_presenter = index_presenter(document) %>
-            <div class="item <%= 'active' if index == 0 %>" data-id="<%= document.id %>">
-              <% if block_options[:full_image_url].present? %>
-                <%= link_to_document(document, image_tag(block_options[:full_image_url]), counter: -1) %>
-              <% elsif block_options[:iiif_tilesource_base].present?  %>
-                <%= link_to_document(document, image_tag(block_options[:iiif_tilesource_base] + '/full/!800,800/0/default.jpg'), counter: -1) %>
-              <% elsif has_thumbnail? document %>
-                <%= render_thumbnail_tag(document, {}, document_counter: -1) %>
-              <% end %>
-            </div>
-
-            <% indicators << capture do %>
-              <li data-target="#<%= html_id %>" data-slide-to="<%= index %>" class="list-group-item <%= 'active' if index == 0 %>">
-                <a href="#" title="<%= (caption_text = doc_presenter.field_value(solr_documents_features_block.primary_caption? ? solr_documents_features_block.primary_caption_field : document_show_link_field(document))) %>">
-                  <%= truncate(caption_text, length: 95) %>
-                </a>
-                <% if solr_documents_features_block.secondary_caption? %>
-                  <p><%= doc_presenter.field_value solr_documents_features_block.secondary_caption_field %></p>
+    <div id="<%= html_id %>" class="carousel" data-ride="carousel"  data-interval="false">
+      <div class="row">
+        <div class="col-sm-6">
+          <div class="carousel-inner">
+            <% solr_documents_features_block.each_document.each_with_index do |(block_options, document), index| %>
+              <% doc_presenter = index_presenter(document) %>
+              <div class="carousel-item <%= 'active' if index == 0 %>" data-id="<%= document.id %>">
+                <% if block_options[:full_image_url].present? %>
+                  <%= link_to_document(document, image_tag(block_options[:full_image_url]), counter: -1) %>
+                <% elsif block_options[:iiif_tilesource_base].present?  %>
+                  <%= link_to_document(document, image_tag(block_options[:iiif_tilesource_base] + '/full/!800,800/0/default.jpg'), counter: -1) %>
+                <% elsif has_thumbnail? document %>
+                  <%= render_thumbnail_tag(document, {}, document_counter: -1) %>
                 <% end %>
-              </li>
-            <% end %>
+              </div>
 
-          <% end %>
+              <% indicators << capture do %>
+                <li data-target="#<%= html_id %>" data-slide-to="<%= index %>" class="list-group-item <%= 'active' if index == 0 %>">
+                  <a href="#" title="<%= (caption_text = doc_presenter.field_value(blacklight_config.index_fields[solr_documents_features_block.primary_caption? ? solr_documents_features_block.primary_caption_field : document_show_link_field(document)] || Blacklight::Configuration::NullField.new(solr_documents_features_block.primary_caption? ? solr_documents_features_block.primary_caption_field : document_show_link_field(document)))) %>">
+                    <%= truncate(caption_text, length: 95) %>
+                  </a>
+                  <% if solr_documents_features_block.secondary_caption? %>
+                    <p><%= doc_presenter.field_value(blacklight_config.index_fields[solr_documents_features_block.secondary_caption_field] || Blacklight::Configuration::NullField.new(solr_documents_features_block.secondary_caption_field)) %></p>
+                  <% end %>
+                </li>
+              <% end %>
+            <% end %>
+          </div>
         </div>
-      </div>
 
-      <!-- Indicators -->
-      <ol class="carousel-indicators col-sm-6 list-group list-striped">
-        <%= safe_join(indicators, "\n") %>
-      </ol>
+        <!-- Indicators -->
+        <ol class="carousel-indicators justify-content-start col-sm-6 list-group list-striped">
+          <%= safe_join(indicators, "\n") %>
+        </ol>
+      </div>
     </div>
   <% end %>
 </div>

data/app/views/spotlight/sir_trevor/blocks/_solr_documents_grid_block.html.erb

@@ -1,15 +1,15 @@
 <% solr_documents_grid_block.with_solr_helper(self) %>
-<div class="content-block item-grid-block row">
-  <div class="items-col <%= solr_documents_grid_block.text? ? 'col-md-9' : 'col-md-12' %> pull-<%= solr_documents_grid_block.content_align %>">
+<div class="content-block item-grid-block row <%= 'flex-row-reverse' if solr_documents_grid_block.content_align == 'right' %>">
+  <div class="items-col <%= solr_documents_grid_block.text? ? 'col-md-9' : 'col-md-12' %>">
     <% if solr_documents_grid_block.documents? %>
         <% solr_documents_grid_block.each_document.each_with_index do |(block_options, document), index| %>
           <div class="box item-<%= index %>" data-id="<%= document.id %>">
             <% if block_options[:thumbnail_image_url].present? %>
-              <div class="thumbnail"><%= link_to_document(document, image_tag(block_options[:thumbnail_image_url]), counter: -1) %></div>
+              <%= link_to_document(document, image_tag(block_options[:thumbnail_image_url], class: 'img-thumbnail'), counter: -1) %>
             <% elsif block_options[:iiif_tilesource_base].present?  %>
-              <div class="thumbnail"><%= link_to_document(document, image_tag(block_options[:iiif_tilesource_base] + '/full/!400,400/0/default.jpg'), counter: -1) %></div>
+              <%= link_to_document(document, image_tag(block_options[:iiif_tilesource_base] + '/full/!400,400/0/default.jpg', class: 'img-thumbnail'), counter: -1) %>
             <% elsif has_thumbnail? document %>
-              <div class="thumbnail"><%= render_thumbnail_tag(document, {}, document_counter: -1) %></div>
+              <%= render_thumbnail_tag(document, { class: 'img-thumbnail'}, document_counter: -1) %>
             <% end %>
           </div>
         <% end %>

data/app/views/spotlight/sir_trevor/blocks/_uploaded_items_block.html.erb

@@ -1,17 +1,15 @@
-<div class="content-block item-text row">
-  <div class="items-col spotlight-flexbox <%= 'col-md-6' if uploaded_items_block.text? %> col-xs-12 uploaded-items-block pull-<%= uploaded_items_block.content_align %>">
+<div class="content-block item-text row <%= 'flex-row-reverse' if uploaded_items_block.content_align == 'right' %>">
+  <div class="items-col spotlight-flexbox <%= 'col-md-6' if uploaded_items_block.text? %> col-12 uploaded-items-block">
     <% if uploaded_items_block.files.present? %>
       <% uploaded_items_block.files.each do |file| %>
         <div class="box" data-id="<%= file[:id] %>">
           <div class="contents">
-            <div class="thumbnail">
-              <img src='<%= file[:url] %>' alt='<%= file[:title] %>' />
-              <% if file[:caption].present? %>
-                <div class="caption">
-                  <%= file[:caption] %>
-                </div>
-              <% end %>
-            </div>
+            <img class="img-thumbnail" src='<%= file[:url] %>' alt='<%= file[:title] %>' />
+            <% if file[:caption].present? %>
+              <div class="caption">
+                <%= file[:caption] %>
+              </div>
+            <% end %>
           </div>
         </div>
       <% end %>

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

@@ -1,40 +1,37 @@
-<div id="content" class="col-md-9 exhibit-admin">
-  <%= page_title(t('.section'), t('.page_title')) %>
-  <div role="tabpanel">
-    <%= bootstrap_form_for @site, url: spotlight.site_path, layout: :horizontal, label_col: 'col-md-2', control_col: 'col-md-10' do |f| %>
-      <ul class="nav nav-tabs" role="tablist">
-        <li role="presentation" class="active">
-          <a href="#basic" aria-controls="basic" role="tab" data-toggle="tab"><%= t(:'.basic_settings.heading') %></a>
-        </li>
-        <li role="presentation">
-          <a href="#site-masthead" aria-controls="site-masthead" role="tab" data-toggle="tab"><%= t(:'.site_masthead.heading') %></a>
-        </li>
-      </ul>
-      <div class="tab-content">
-        <div role="tabpanel" class="tab-pane active" id="basic">
-          <div class="row col-md-12">
-            <%= f.text_field :title %>
-            <%= f.text_field :subtitle %>
-          </div>
-        </div>
+<%= page_title(t('.section'), t('.page_title')) %>
+<div role="tabpanel">
+  <%= bootstrap_form_for @site, url: spotlight.site_path, layout: :horizontal, label_col: 'col-md-2', control_col: 'col-md-10' do |f| %>
+    <ul class="nav nav-tabs" role="tablist">
+      <li role="presentation" class="nav-item">
+        <a href="#basic" class="active nav-link" aria-controls="basic" role="tab" data-toggle="tab"><%= t(:'.basic_settings.heading') %></a>
+      </li>
+      <li role="presentation" class="nav-item">
+        <a href="#site-masthead" class="nav-link" aria-controls="site-masthead" role="tab" data-toggle="tab"><%= t(:'.site_masthead.heading') %></a>
+      </li>
+    </ul>
+    <div class="tab-content">
+      <div role="tabpanel" class="tab-pane active" id="basic">
+        <%= f.text_field :title %>
+        <%= f.text_field :subtitle %>
+      </div>
 
-        <div role="tabpanel" class="tab-pane" id="site-masthead">
-          <p class="instructions"><%= t(:'.site_masthead.help') %></p>
-          <%= f.fields_for(:masthead, @site.masthead || @site.build_masthead) do |m| %>
-            <%= render '/spotlight/featured_images/upload_form', f: m, initial_crop_selection: Spotlight::Engine.config.masthead_initial_crop_selection, crop_type: :masthead %>
-          <% end %>
-        </div>
+      <div role="tabpanel" class="tab-pane" id="site-masthead">
+        <p class="instructions"><%= t(:'.site_masthead.help') %></p>
+        <%= f.fields_for(:masthead, @site.masthead || @site.build_masthead) do |m| %>
+          <%= render '/spotlight/featured_images/upload_form', f: m, initial_crop_selection: Spotlight::Engine.config.masthead_initial_crop_selection, crop_type: :masthead %>
+        <% end %>
       </div>
+    </div>
 
-      <div class="form-actions">
-        <div class="primary-actions">
-          <%= f.submit nil, class: 'btn btn-primary' %>
-        </div>
+    <div class="form-actions">
+      <div class="primary-actions">
+        <%= f.submit nil, class: 'btn btn-primary' %>
       </div>
     </div>
-  <% end %>
-</div>
+  </div>
+<% end %>
 
-<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/sites/edit_exhibits.html.erb

@@ -1,32 +1,31 @@
-<div id="content" class="col-md-9 exhibit-admin">
-  <%= page_title(t('.section'), t('.page_title')) %>
-  <%= bootstrap_form_for @site, url: spotlight.site_path, layout: :horizontal, label_col: 'col-md-2', control_col: 'col-md-10' do |f| %>
-    <p class="instructions"><%= t :'.instructions' %></p>
-    <table class="table table-striped dd-table">
-      <thead>
-        <tr>
-          <th><%= Spotlight::Exhibit.human_attribute_name(:title) %></th>
-          <th class="text-right"><%= Spotlight::Exhibit.human_attribute_name(:published)  %></th>
-          <th class="text-right"><%= Spotlight::Exhibit.human_attribute_name(:requested_by) %></th>
-          <th class="text-right"><%= Spotlight::Exhibit.human_attribute_name(:created_at)  %></th>
-          <th class="text-right"><%= Spotlight::Exhibit.human_attribute_name(:updated_at)  %></th>
-        </tr>
-      </thead>
-      <tbody class="table metadata_fields dd dd-list" data-behavior="nestable" data-max-depth="1" data-list-node-name="tbody" data-item-node-name="tr" data-expand-btn-HTML=" " data-collapse-btn-HTML=" ">
-        <%= f.fields_for :exhibits do |exhibit_form| %>
-          <%= render partial: 'exhibit', locals: { f: exhibit_form } %>
-        <% end %>
-      </tbody>
-    </table>
+<%= page_title(t('.section'), t('.page_title')) %>
+<%= bootstrap_form_for @site, url: spotlight.site_path, layout: :horizontal, label_col: 'col-md-2', control_col: 'col-md-10' do |f| %>
+  <p class="instructions"><%= t :'.instructions' %></p>
+  <table class="table table-striped dd-table">
+    <thead>
+      <tr>
+        <th><%= Spotlight::Exhibit.human_attribute_name(:title) %></th>
+        <th class="text-right"><%= Spotlight::Exhibit.human_attribute_name(:published)  %></th>
+        <th class="text-right"><%= Spotlight::Exhibit.human_attribute_name(:requested_by) %></th>
+        <th class="text-right"><%= Spotlight::Exhibit.human_attribute_name(:created_at)  %></th>
+        <th class="text-right"><%= Spotlight::Exhibit.human_attribute_name(:updated_at)  %></th>
+      </tr>
+    </thead>
+    <tbody class="table metadata_fields dd dd-list" data-behavior="nestable" data-max-depth="1" data-list-node-name="tbody" data-item-node-name="tr" data-expand-btn-HTML=" " data-collapse-btn-HTML=" ">
+      <%= f.fields_for :exhibits do |exhibit_form| %>
+        <%= render partial: 'exhibit', locals: { f: exhibit_form } %>
+      <% end %>
+    </tbody>
+  </table>
 
-    <div class="form-actions">
-      <div class="primary-actions">
-        <%= f.submit nil, class: 'btn btn-primary' %>
-      </div>
+  <div class="form-actions">
+    <div class="primary-actions">
+      <%= f.submit nil, class: 'btn btn-primary' %>
     </div>
-  <% end %>
-</div>
+  </div>
+<% end %>
 
-<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/tags/index.html.erb

@@ -1,26 +1,27 @@
-<%= render 'spotlight/shared/exhibit_sidebar' %>
-<div id="content" class="col-md-9">
-  <%= curation_page_title t(:".header") %>
+<% content_for(:sidebar) do %>
+  <%= render 'spotlight/shared/exhibit_sidebar' %>
+<% end %>
 
-  <% if @tags.empty? %>
-    <p><%= t :'.no_tags' %></p>
-  <% else %>
-  <table class="table table-striped tags">
-    <thead>
-      <th><%= t '.name' %></th>
-      <th><%= t '.taggings.count' %></th>
-      <%# TODO last used? %>
-      <th><%= t '.actions' %></th>
-    </thead>
-    <tbody>
-    <% @tags.each do |tag| %>
-      <tr>
-        <td><%= link_to tag.name, url_to_tag_facet(tag.name) %></td>
-        <td><%= tag.taggings.count %></td>
-        <td><%= delete_link(tag, exhibit_tag_path(current_exhibit, tag), class: 'btn btn-danger btn-xs') %></td>
-      </tr>
-    <% end %>
-    </tbody>
-  </table>
+<%= curation_page_title t(:".header") %>
+
+<% if @tags.empty? %>
+  <p><%= t :'.no_tags' %></p>
+<% else %>
+<table class="table table-striped tags">
+  <thead>
+    <th><%= t '.name' %></th>
+    <th><%= t '.taggings.count' %></th>
+    <%# TODO last used? %>
+    <th><%= t '.actions' %></th>
+  </thead>
+  <tbody>
+  <% @tags.each do |tag| %>
+    <tr>
+      <td><%= link_to tag.name, url_to_tag_facet(tag.name) %></td>
+      <td><%= tag.taggings.count %></td>
+      <td><%= delete_link(tag, exhibit_tag_path(current_exhibit, tag), class: 'btn btn-danger btn-sm') %></td>
+    </tr>
   <% end %>
-</div>
+  </tbody>
+</table>
+<% end %>

data/app/views/spotlight/translations/_browse_categories.html.erb

@@ -4,12 +4,12 @@
     <%= hidden_field_tag :language, @language %>
     <%= hidden_field_tag :tab, 'browse' %>
     <div class="row">
-      <div class="col-xs-4 text-right">
+      <div class="col-4 text-right">
         <span class="browse-translations-header">
           <%= t :'spotlight.exhibits.translations.browse_categories.default_language_column_label' %>
         </span>
       </div>
-      <div class="col-xs-7">
+      <div class="col-7">
         <span class="browse-translations-header">
           <%= t :'spotlight.exhibits.translations.browse_categories.translation_column_label', language: t("locales.#{@language}")  %>
         </span>
@@ -21,38 +21,43 @@
       <%= f.fields_for :translations, title_translation do |translation_fields| %>
         <%= translation_fields.hidden_field :key %>
         <%= translation_fields.hidden_field :locale %>
-        <div data-translation-progress-item="true" class="form-group browse-category-title">
-          <%= translation_fields.label :value, search[:title], class: 'control-label col-xs-4' %>
-          <div class="col-xs-7">
+        <div data-translation-progress-item="true" class="row form-group browse-category-title">
+          <%= translation_fields.label :value, search[:title], class: 'col-form-label col-4' %>
+          <div class="col-7">
             <%= translation_fields.text_field_without_bootstrap :value, class: 'form-control' %>
           </div>
-          <div class="col-xs-1">
+          <div class="col-1">
             <% if title_translation.value.present? %>
-              <span data-translation-present="true" class='glyphicon glyphicon-ok'></span>
+              <span data-translation-present="true">
+                <%= blacklight_icon('check', classes: 'translation-complete') %>
+              </span>
             <% end %>
           </div>
         </div>
       <% end %>
 
       <% description_translation = Translation.find_or_initialize_by(exhibit: current_exhibit, key: "#{search.slug}.long_description", locale: @language) %>
-      <div data-translation-progress-item="true" class="form-group browse-category-description">
-        <div class="col-xs-7 col-xs-offset-4">
+      <div data-translation-progress-item="true" class="row form-group browse-category-description">
+        <div class="col-7 offset-4">
           <%= f.fields_for :translations, description_translation do |translation_fields| %>
-            <%= button_tag 'type' => 'button', class: 'btn btn-text collapsed tanslation-description-toggle', 'data-toggle': 'collapse', 'data-target': "#browse_category_description_#{search.id}", 'aria-expanded': 'false', 'aria-controls': "#browse_category_description_#{search.id}" do %>
+            <%= button_tag 'type' => 'button', class: 'btn btn-text collapse-toggle collapsed translation-description-toggle', 'data-toggle': 'collapse', 'data-target': "#browse_category_description_#{search.id}", 'aria-expanded': 'false', 'aria-controls': "#browse_category_description_#{search.id}" do %>
               <%= translation_fields.label :value, t(:'spotlight.exhibits.translations.browse_categories.description_label') %>
-              <span class="caret"></span>
             <% end %>
+            <span class="collapse-chevron">❯</span>
+
             <%= translation_fields.hidden_field :key %>
             <%= translation_fields.hidden_field :locale %>
-            <div id="browse_category_description_<%= search.id %>" class="panel panel-body collapse panel-translation">
+            <div id="browse_category_description_<%= search.id %>" class="card card-body collapse panel-translation">
               <%= translation_fields.text_area_without_bootstrap :value, class: 'form-control' %>
-              <p class="help-block"><%= search[:long_description] %></p>
+              <small class="form-text text-muted"><%= search[:long_description] %></small>
             </div>
           <% end %>
         </div>
-        <div class="col-xs-1">
+        <div class="col-1">
           <% if description_translation.value.present? %>
-            <span data-translation-present="true" class='glyphicon glyphicon-ok'></span>
+            <span data-translation-present="true">
+              <%= blacklight_icon('check', classes: 'translation-complete') %>
+            </span>
           <% end %>
         </div>
       </div>