blacklight-spotlight 2.13.0 → 3.0.0.alpha.1

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

@@ -12,17 +12,19 @@
       <%= f.fields_for :translations, translation do |translation_fields| %>
         <%= translation_fields.hidden_field :key %>
         <%= translation_fields.hidden_field :locale %>
-        <div data-translation-progress-item='true' class='form-group translation-form translation-basic-settings-title'>
-          <%= translation_fields.label :value, t('spotlight.exhibits.translations.general.basic_settings.title'), class: 'control-label col-xs-12 col-sm-2' %>
-          <div class='col-xs-11 col-sm-9 panel panel-body panel-translation'>
+        <div data-translation-progress-item='true' class='row form-group translation-form translation-basic-settings-title'>
+          <%= translation_fields.label :value, t('spotlight.exhibits.translations.general.basic_settings.title'), class: 'col-form-label col-12 col-sm-2' %>
+          <div class='col-11 col-sm-9 card card-body panel-translation'>
             <%= translation_fields.text_field_without_bootstrap :value, class: 'form-control' %>
-            <p class="help-block">
+            <small class="form-text text-muted">
               <%= current_exhibit[:title] %>
-            </p>
+            </small>
           </div>
-          <div class='col-xs-1'>
+          <div class='col-1'>
             <% if 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>
@@ -31,17 +33,19 @@
       <%= f.fields_for :translations, translation do |translation_fields| %>
         <%= translation_fields.hidden_field :key %>
         <%= translation_fields.hidden_field :locale %>
-        <div data-translation-progress-item='true' class='form-group translation-form translation-basic-settings-subtitle'>
-          <%= translation_fields.label :value, t('spotlight.exhibits.translations.general.basic_settings.subtitle'), class: 'control-label col-xs-12 col-sm-2' %>
-          <div class='col-xs-11 col-sm-9 panel panel-body panel-translation'>
+        <div data-translation-progress-item='true' class='row form-group translation-form translation-basic-settings-subtitle'>
+          <%= translation_fields.label :value, t('spotlight.exhibits.translations.general.basic_settings.subtitle'), class: 'col-form-label col-12 col-sm-2' %>
+          <div class='col-11 col-sm-9 card card-body panel-translation'>
             <%= translation_fields.text_field_without_bootstrap :value, class: 'form-control' %>
-            <p class="help-block">
+            <small class="form-text text-muted">
               <%= current_exhibit[:subtitle] %>
-            </p>
+            </small>
           </div>
-          <div class='col-xs-1'>
+          <div class='col-1'>
             <% if 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>
@@ -50,17 +54,19 @@
       <%= f.fields_for :translations, translation do |translation_fields| %>
         <%= translation_fields.hidden_field :key %>
         <%= translation_fields.hidden_field :locale %>
-        <div data-translation-progress-item='true' class='form-group translation-form translation-basic-settings-description'>
-          <%= translation_fields.label :value, t('spotlight.exhibits.translations.general.basic_settings.description'), class: 'control-label col-xs-12 col-sm-2' %>
-          <div class='col-xs-11 col-sm-9 panel panel-body panel-translation'>
+        <div data-translation-progress-item='true' class='row form-group translation-form translation-basic-settings-description'>
+          <%= translation_fields.label :value, t('spotlight.exhibits.translations.general.basic_settings.description'), class: 'col-form-label col-12 col-sm-2' %>
+          <div class='col-11 col-sm-9 card card-body panel-translation'>
             <%= translation_fields.text_area_without_bootstrap :value, class: 'form-control' %>
-            <p class="help-block">
+            <small class="form-text text-muted">
               <%= current_exhibit.description %>
-            </p>
+            </small>
           </div>
-          <div class='col-xs-1'>
+          <div class='col-1'>
             <% if 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>
@@ -75,93 +81,65 @@
       <%= f.fields_for :translations, translation do |translation_fields| %>
         <%= translation_fields.hidden_field :key %>
         <%= translation_fields.hidden_field :locale %>
-        <div data-translation-progress-item='true' class='form-group translation-form translation-main-menu-home'>
-          <%= translation_fields.label :value, t('spotlight.exhibits.translations.general.main_menu.home'), class: 'control-label col-xs-12 col-sm-2' %>
-          <div class='col-xs-11 col-sm-9 panel panel-body panel-translation'>
+        <div data-translation-progress-item='true' class='row form-group translation-form translation-main-menu-home'>
+          <%= translation_fields.label :value, t('spotlight.exhibits.translations.general.main_menu.home'), class: 'col-form-label col-12 col-sm-2' %>
+          <div class='col-11 col-sm-9 card card-body panel-translation'>
             <%= translation_fields.text_field_without_bootstrap :value, class: 'form-control' %>
-            <p class="help-block">
+            <small class="form-text text-muted">
               <%= t(:'spotlight.curation.nav.home', locale: I18n.default_locale) %>
-            </p>
+            </small>
           </div>
-          <div class='col-xs-1'>
+          <div class='col-1'>
             <% if 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 %>
-      <% translation = Translation.find_or_initialize_by(exhibit: current_exhibit, key: "main_navigation.browse.label", locale: @language) %>
-      <%= f.fields_for :translations, translation do |translation_fields| %>
-        <%= translation_fields.hidden_field :key %>
-        <%= translation_fields.hidden_field :locale %>
-        <div data-translation-progress-item='true' class='form-group translation-form translation-main-menu-browse'>
-          <%= translation_fields.label :value, t('spotlight.exhibits.translations.general.main_menu.browse'), class: 'control-label col-xs-12 col-sm-2' %>
-          <div class='col-xs-11 col-sm-9 panel panel-body panel-translation'>
-            <%= translation_fields.text_field_without_bootstrap :value, class: 'form-control' %>
-            <p class="help-block">
-              <%= current_exhibit.main_navigations.browse[:label].presence || current_exhibit.main_navigations.browse.default_label %>
-            </p>
-          </div>
-          <div class='col-xs-1'>
-            <% if translation.value.present? %>
-              <span data-translation-present="true" class='glyphicon glyphicon-ok'></span>
-            <% end %>
-          </div>
-        </div>
-      <% end %>
-      <% translation = Translation.find_or_initialize_by(exhibit: current_exhibit, key: "main_navigation.curated_features.label", locale: @language) %>
-      <%= f.fields_for :translations, translation do |translation_fields| %>
-        <%= translation_fields.hidden_field :key %>
-        <%= translation_fields.hidden_field :locale %>
-        <div data-translation-progress-item='true' class='form-group translation-form translation-main-menu-curated-features'>
-          <%= translation_fields.label :value, t('spotlight.exhibits.translations.general.main_menu.curated_features'), class: 'control-label col-xs-12 col-sm-2' %>
-          <div class='col-xs-11 col-sm-9 panel panel-body panel-translation'>
-            <%= translation_fields.text_field_without_bootstrap :value, class: 'form-control' %>
-            <p class="help-block">
-              <%= current_exhibit.main_navigations.curated_features[:label].presence || current_exhibit.main_navigations.curated_features.default_label %>
-            </p>
-          </div>
-          <div class='col-xs-1'>
-            <% if translation.value.present? %>
-              <span data-translation-present="true" class='glyphicon glyphicon-ok'></span>
-            <% end %>
-          </div>
-        </div>
-      <% end %>
-      <% translation = Translation.find_or_initialize_by(exhibit: current_exhibit, key: "main_navigation.about.label", locale: @language) %>
-      <%= f.fields_for :translations, translation do |translation_fields| %>
-        <%= translation_fields.hidden_field :key %>
-        <%= translation_fields.hidden_field :locale %>
-        <div data-translation-progress-item='true' class='form-group translation-form translation-main-menu-about'>
-          <%= translation_fields.label :value, t('spotlight.exhibits.translations.general.main_menu.about'), class: 'control-label col-xs-12 col-sm-2' %>
-          <div class='col-xs-11 col-sm-9 panel panel-body panel-translation'>
-            <%= translation_fields.text_field_without_bootstrap :value, class: 'form-control' %>
-            <p class="help-block">
-              <%= current_exhibit.main_navigations.about[:label].presence || current_exhibit.main_navigations.about.default_label %>
-            </p>
-          </div>
-          <div class='col-xs-1'>
-            <% if translation.value.present? %>
-              <span data-translation-present="true" class='glyphicon glyphicon-ok'></span>
-            <% end %>
-          </div>
-        </div>
+
+      <% current_exhibit.main_navigations.each do |navigation| %>
+        <% translation = Translation.find_or_initialize_by(exhibit: current_exhibit, key: "main_navigation.#{navigation.nav_type}.label", locale: @language) %>
+        <%= f.fields_for :translations, translation do |translation_fields| %>
+          <%= translation_fields.hidden_field :key %>
+          <%= translation_fields.hidden_field :locale %>
+          <div data-translation-progress-item='true' class='row form-group translation-form translation-main-menu-<%= navigation.nav_type %>'>
+            <%= translation_fields.label :value, t("spotlight.exhibits.translations.general.main_menu.#{navigation.nav_type}", default: navigation.default_label), class: 'col-form-label col-12 col-sm-2' %>
+            <div class='col-11 col-sm-9 card card-body panel-translation'>
+              <%= translation_fields.text_field_without_bootstrap :value, class: 'form-control' %>
+              <small class="form-text text-muted">
+                <%= navigation[:label].presence || navigation.default_label %>
+              </small>
+            </div>
+            <div class='col-1'>
+              <% if translation.value.present? %>
+                <span data-translation-present="true">
+                  <%= blacklight_icon('check', classes: 'translation-complete') %>
+                </span>
+              <% end %>
+            </div>
+          </div>
+        <% end %>
       <% end %>
+
       <% translation = Translation.find_or_initialize_by(exhibit: current_exhibit, key: 'spotlight.catalog.breadcrumb.index', locale: @language) %>
       <%= f.fields_for :translations, translation do |translation_fields| %>
         <%= translation_fields.hidden_field :key %>
         <%= translation_fields.hidden_field :locale %>
-        <div data-translation-progress-item='true' class='form-group translation-form translation-main-menu-search-results'>
-          <%= translation_fields.label :value, t('spotlight.catalog.breadcrumb.index'), class: 'control-label col-xs-12 col-sm-2' %>
-          <div class='col-xs-11 col-sm-9 panel panel-body panel-translation'>
+        <div data-translation-progress-item='true' class='row form-group translation-form translation-main-menu-search-results'>
+          <%= translation_fields.label :value, t('spotlight.catalog.breadcrumb.index'), class: 'col-form-label col-12 col-sm-2' %>
+          <div class='col-11 col-sm-9 card card-body panel-translation'>
             <%= translation_fields.text_field_without_bootstrap :value, class: 'form-control' %>
-            <p class="help-block">
+            <small class="form-text text-muted">
               <%= t(:'spotlight.catalog.breadcrumb.index', locale: I18n.default_locale) %>
-            </p>
+            </small>
           </div>
-          <div class='col-xs-1'>
+          <div class='col-1'>
             <% if 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>

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

@@ -10,17 +10,19 @@
         <%= translation_fields.hidden_field :key %>
         <%= translation_fields.hidden_field :locale %>
 
-        <div data-translation-progress-item='true' class='form-group translation-form'>
-          <%= translation_fields.label :value, t("spotlight.search.fields.#{key}", default: field_config.label, locale: I18n.default_locale), class: 'control-label col-xs-12 col-sm-2' %>
-          <div class='col-xs-11 col-sm-9 panel panel-body panel-translation'>
+        <div data-translation-progress-item='true' class='row form-group translation-form'>
+          <%= translation_fields.label :value, t("spotlight.search.fields.#{key}", default: field_config.label, locale: I18n.default_locale), class: 'col-form-label col-12 col-sm-2' %>
+          <div class='col-11 col-sm-9 card card-body panel-translation'>
             <%= translation_fields.text_field_without_bootstrap :value, class: 'form-control' %>
-            <p class="help-block">
+            <small class="form-text text-muted">
               <%= field_config.label %>
-            </p>
+            </small>
           </div>
-          <div class='col-xs-1'>
+          <div class='col-1'>
             <% if 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>
@@ -39,17 +41,19 @@
             <%= translation_fields.hidden_field :key %>
             <%= translation_fields.hidden_field :locale %>
 
-            <div data-translation-progress-item='true' class='form-group translation-form'>
-              <%= translation_fields.label :value, t("spotlight.search.fields.#{custom_field.field}", default: custom_field.configuration['label'], locale: I18n.default_locale), class: 'control-label col-xs-12 col-sm-2' %>
-              <div class='col-xs-11 col-sm-9 panel panel-body panel-translation'>
+            <div data-translation-progress-item='true' class='row form-group translation-form'>
+              <%= translation_fields.label :value, t("spotlight.search.fields.#{custom_field.field}", default: custom_field.configuration['label'], locale: I18n.default_locale), class: 'col-form-label col-12 col-sm-2' %>
+              <div class='col-11 col-sm-9 card card-body panel-translation'>
                 <%= translation_fields.text_field_without_bootstrap :value, class: 'form-control' %>
-                <p class="help-block">
+                <small class="form-text text-muted">
                   <%= custom_field.configuration['label'] %>
-                </p>
+                </small>
               </div>
-              <div class='col-xs-1'>
+              <div class='col-1'>
                 <% if 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>

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

@@ -8,7 +8,7 @@
   </td>
   <td class="text-center">
     <% if page.published? %>
-      <span class="glyphicon glyphicon-ok"></span>
+      <%= blacklight_icon('check', classes: 'translation-complete') %>
     <% end %>
   </td>
   <td>
@@ -17,7 +17,7 @@
       <p>
         <%= l(translated_page.updated_at, format: :long) %>
         <% if page.updated_after? translated_page %>
-          <span class="glyphicon glyphicon-alert"></span>
+          <%= blacklight_icon('warning', classes: 'translation-warning') %>
         <% end %>
       </p>
     <% else %>

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

@@ -14,17 +14,19 @@
         <%= f.fields_for :translations, translation do |translation_fields| %>
           <%= translation_fields.hidden_field :key %>
           <%= translation_fields.hidden_field :locale %>
-          <div data-translation-progress-item='true' class='form-group translation-form'>
-            <%= translation_fields.label :value, t("spotlight.search.fields.search.#{key}", locale: I18n.default_locale), class: 'control-label col-xs-12 col-sm-2' %>
-            <div class='col-xs-11 col-sm-9 panel panel-body panel-translation'>
+          <div data-translation-progress-item='true' class='row form-group translation-form'>
+            <%= translation_fields.label :value, t("spotlight.search.fields.search.#{key}", locale: I18n.default_locale), class: 'col-form-label col-12 col-sm-2' %>
+            <div class='col-11 col-sm-9 card card-body panel-translation'>
               <%= translation_fields.text_field_without_bootstrap :value, class: 'form-control' %>
-              <p class="help-block">
+              <small class="form-text text-muted">
                 <%= search_config.label %>
-              </p>
+              </small>
             </div>
-            <div class='col-xs-1'>
+            <div class='col-1'>
               <% if 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>
@@ -42,17 +44,19 @@
         <%= f.fields_for :translations, translation do |translation_fields| %>
           <%= translation_fields.hidden_field :key %>
           <%= translation_fields.hidden_field :locale %>
-          <div data-translation-progress-item='true' class='form-group translation-form'>
-            <%= translation_fields.label :value, t("spotlight.search.fields.facet.#{key}", locale: I18n.default_locale), class: 'control-label col-xs-12 col-sm-2' %>
-            <div class='col-xs-11 col-sm-9 panel panel-body panel-translation'>
+          <div data-translation-progress-item='true' class='row form-group translation-form'>
+            <%= translation_fields.label :value, t("spotlight.search.fields.facet.#{key}", locale: I18n.default_locale), class: 'col-form-label col-12 col-sm-2' %>
+            <div class='col-11 col-sm-9 card card-body panel-translation'>
               <%= translation_fields.text_field_without_bootstrap :value, class: 'form-control' %>
-              <p class="help-block">
+              <small class="form-text text-muted">
                 <%= facet_config.label %>
-              </p>
+              </small>
             </div>
-            <div class='col-xs-1'>
+            <div class='col-1'>
               <% if 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>
@@ -71,16 +75,18 @@
           <%= translation_fields.hidden_field :key %>
           <%= translation_fields.hidden_field :locale %>
           <div data-translation-progress-item='true' class='form-group translation-form'>
-            <%= translation_fields.label :value, t("spotlight.search.fields.sort.#{key}", locale: I18n.default_locale), class: 'control-label col-xs-12 col-sm-2' %>
-            <div class='col-xs-11 col-sm-9 panel panel-body panel-translation'>
+            <%= translation_fields.label :value, t("spotlight.search.fields.sort.#{key}", locale: I18n.default_locale), class: 'col-form-label col-12 col-sm-2' %>
+            <div class='col-11 col-sm-9 card card-body panel-translation'>
               <%= translation_fields.text_field_without_bootstrap :value, class: 'form-control' %>
-              <p class="help-block">
+              <small class="form-text text-muted">
                 <%= sort_config.label %>
-              </p>
+              </small>
             </div>
-            <div class='col-xs-1'>
+            <div class='col-1'>
               <% if 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>

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

@@ -1,13 +1,15 @@
-<%= render 'spotlight/shared/exhibit_sidebar' %>
+<% content_for(:sidebar) do %>
+  <%= render 'spotlight/shared/exhibit_sidebar' %>
+<% end %>
 
-<div class='col-md-9 translation-edit-form'>
+<div class='translation-edit-form'>
   <%= curation_page_title t('spotlight.exhibits.translations.title') %>
 
   <div class='text-center'>
     <ul class='nav nav-pills inline-block'>
       <% current_exhibit.available_locales.each do |language| %>
-        <li role="presentation" class="<%= 'active' if @language == language %>">
-          <%= link_to spotlight.edit_exhibit_translations_path(current_exhibit, language: language) do %>
+        <li role="presentation" class="nav-item">
+          <%= link_to spotlight.edit_exhibit_translations_path(current_exhibit, language: language), class: "nav-link #{'active' if @language == language}" do %>
             <%= t("locales.#{language}") %>
           <% end %>
         </li>
@@ -17,28 +19,28 @@
 
   <div role="tabpanel">
     <ul class='nav nav-tabs' role="tablist">
-      <li role="presentation" class="<%= 'active' if @tab.blank? %>">
-        <a href='#general' aria-controls="general" role="tab" data-toggle="tab" data-behavior="translation-progress">
+      <li role="presentation" class="nav-item">
+        <a href='#general' class="nav-link <%= 'active' if @tab.blank? %>" aria-controls="general" role="tab" data-toggle="tab" data-behavior="translation-progress">
           <%= t('spotlight.exhibits.translations.general.label') %> <span class="badge"></span>
         </a>
       </li>
-      <li class="<%= 'active' if @tab == 'metadata' %>">
-        <a href="#metadata" aria-controls="metadata" role="tab" data-toggle="tab" data-behavior="translation-progress">
+      <li class="nav-item">
+        <a href="#metadata" class="nav-link <%= 'active' if @tab == 'metadata' %>" aria-controls="metadata" role="tab" data-toggle="tab" data-behavior="translation-progress">
           <%= t('spotlight.exhibits.translations.metadata.label') %> <span class="badge"></span>
         </a>
       </li>
-      <li class="<%= 'active' if @tab == 'search_fields' %>">
-        <a href="#search_fields" aria-controls="search_fields" role="tab" data-toggle="tab" data-behavior="translation-progress">
+      <li class="nav-item" >
+        <a href="#search_fields" class="nav-link <%= 'active' if @tab == 'search_fields' %>" aria-controls="search_fields" role="tab" data-toggle="tab" data-behavior="translation-progress">
           <%= t('spotlight.exhibits.translations.search_fields.label') %> <span class="badge"></span>
         </a>
       </li>
-      <li class="<%= 'active' if @tab == 'browse' %>">
-        <a href="#browse" aria-controls="browse" role="tab" data-toggle="tab" data-behavior="translation-progress">
+      <li class="nav-item">
+        <a href="#browse" class="nav-link <%= 'active' if @tab == 'browse' %>" aria-controls="browse" role="tab" data-toggle="tab" data-behavior="translation-progress">
           <%= t('spotlight.exhibits.translations.browse_categories.label') %> <span class="badge"></span>
         </a>
       </li>
-      <li class="<%= 'active' if @tab == 'pages' %>">
-        <a href="#pages" aria-controls="pages" role="tab" data-toggle="tab" data-behavior="translation-progress">
+      <li class="nav-item">
+        <a href="#pages" class="nav-link <%= 'active' if @tab == 'pages' %>" aria-controls="pages" role="tab" data-toggle="tab" data-behavior="translation-progress">
           <%= t('spotlight.exhibits.translations.pages.label') %> <span class="badge"></span>
         </a>
       </li>

data/config/locales/spotlight.en.yml

@@ -140,6 +140,7 @@ en:
       submit: Save changes
       update: Save changes
   locales:
+    ar: Arabic
     de: German
     en: English
     es: Spanish
@@ -274,6 +275,8 @@ en:
         confirm: Confirm my account
         instructions: 'You can confirm your account email through the link below:'
         welcome: Welcome %{email}!
+    contact_form:
+      subject: "%{application_name} exhibit feedback"
     contacts:
       edit:
         header: Edit Contact

data/config/routes.rb

@@ -57,7 +57,7 @@ Spotlight::Engine.routes.draw do
               except: [:index],
               path: '/catalog',
               controller: 'catalog',
-              id: Blacklight::Engine.config.routes.identifier_constraint do
+              **Spotlight::Engine.config.routes.solr_documents do
       concerns :exportable
 
       member do