blacklight-spotlight 0.8.2 → 0.9.0

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

@@ -1,6 +1,6 @@
-<%= render 'spotlight/shared/curation_sidebar' %>
+<%= render 'spotlight/shared/exhibit_sidebar' %>
 <div id="content" class="col-md-9">
-  <%= administration_page_title %>
+  <%= configuration_page_title %>
 
 <%= bootstrap_form_for @exhibit, url: spotlight.exhibit_appearance_path(@exhibit), layout: :horizontal, label_col: 'col-md-3', control_col: 'col-sm-5', html: {data: { autocomplete_exhibit_catalog_index_path: spotlight.autocomplete_exhibit_catalog_index_path(current_exhibit, q: "%QUERY", format: "json") } } do |f| %>
   <% if @exhibit.errors.any? %>

data/app/views/spotlight/catalog/_edit_default.html.erb

@@ -26,7 +26,7 @@
           <% unless field.configured_to_display? %>
             <p class="bg-warning help-block">
               <%= t(:'.blank_field_warning_html',
-                    link: link_to(t(:'spotlight.curation.sidebar.metadata'), spotlight.edit_exhibit_metadata_configuration_path(current_exhibit))) %>
+                    link: link_to(t(:'spotlight.configuration.sidebar.metadata'), spotlight.edit_exhibit_metadata_configuration_path(current_exhibit))) %>
             </p>
           <% end %>
         </div>

data/app/views/spotlight/catalog/admin.html.erb

@@ -1,4 +1,4 @@
-<%= render 'spotlight/shared/curation_sidebar' %>
+<%= render 'spotlight/shared/exhibit_sidebar' %>
 <div id="content" class="col-md-9">
 
   <%= curation_page_title %>

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

@@ -1,4 +1,4 @@
-<%= render 'spotlight/shared/curation_sidebar' %>
+<%= render 'spotlight/shared/exhibit_sidebar' %>
 <div id="content" class="col-md-9">
   <%= curation_page_title %>
   <% Spotlight::Engine.config.new_resource_partials.each do |p| %>

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

@@ -1,4 +1,4 @@
-<%= render 'spotlight/shared/curation_sidebar' %>
+<%= render 'spotlight/shared/exhibit_sidebar' %>
 <div id="content" class="col-md-9">
   <%= curation_page_title %>
   <%= render 'form' %>

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

@@ -1,4 +1,4 @@
-<%= render 'spotlight/shared/curation_sidebar' %>
+<%= render 'spotlight/shared/exhibit_sidebar' %>
 <div id="content" class="col-md-9">
   <%= curation_page_title %>
   <%= render 'form' %>

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

@@ -1,5 +1,5 @@
-<%= render 'spotlight/shared/curation_sidebar' %>
+<%= render 'spotlight/shared/exhibit_sidebar' %>
 <div id="content" class="col-md-9">
-  <%= curation_page_title %>
-<%= render 'form' %>
+  <%= configuration_page_title %>
+  <%= render 'form' %>
 </div>

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

@@ -1,6 +1,5 @@
-<%= render 'spotlight/shared/curation_sidebar' %>
+<%= render 'spotlight/shared/exhibit_sidebar' %>
 <div id="content" class="col-md-9">
-  <%= curation_page_title %>
-
-<%= render 'form' %>
+  <%= configuration_page_title %>
+  <%= render 'form' %>
 </div>

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

@@ -1,6 +1,5 @@
 <%= cache current_exhibit, expires_in: 1.hour do %>
-<% if Spotlight::Engine.config.analytics_provider and Spotlight::Engine.config.analytics_provider.enabled? %>
-  <h3><%= t :'.header' %></h3>
+  <h3><%= t :'.monthly_header' %></h3>
   <table class="table analytics">
     <tr>
     <% Spotlight::Engine.config.analytics_provider.metrics.elements.each do |e| %>
@@ -33,5 +32,4 @@
     <% end %>
   </table>
   <% end %>
-<% end %>
 <% end %>

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

@@ -0,0 +1,15 @@
+<%= render 'spotlight/shared/exhibit_sidebar' %>
+
+<div id="content" class="col-md-9">
+  <%= curation_page_title %>
+
+  <% if Spotlight::Engine.config.analytics_provider and Spotlight::Engine.config.analytics_provider.enabled? %>
+    <%= render 'analytics' %>
+  <% else %>
+    <div class="empty-page-block">
+      <% unless current_user %>
+        <p>In order to view exhibit analytics, the site administrator must <a href="https://github.com/sul-dlss/spotlight/wiki/Installation">configure an analytics provider.</a></p>
+      <% end %>
+    </div>
+  <% end %>
+</div>

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

@@ -1,10 +1,8 @@
-<%= render 'spotlight/shared/curation_sidebar' %>
+<%= render 'spotlight/shared/exhibit_sidebar' %>
 
 <div id="content" class="col-md-9">
   <%= curation_page_title %>
 
-  <%= render 'analytics' %>
-
   <div class="pageHistory clearfix">
     <%= render 'page_activity' %>
   </div>

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

@@ -1,6 +1,6 @@
-<%= render 'spotlight/shared/curation_sidebar' %>
+<%= render 'spotlight/shared/exhibit_sidebar' %>
 <div id="content" class="col-md-9 exhibit-admin">
-  <%= administration_page_title %>
+  <%= configuration_page_title %>
   <div role="tabpanel">
     <ul class="nav nav-tabs" role="tablist">
       <li role="presentation" class="active">

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

@@ -1,4 +1,4 @@
 <div id="content" class="col-md-9 exhibit-admin">
-<%= administration_page_title %>
+<%= configuration_page_title %>
 <%= render 'new_exhibit_form' %>
 </div>

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

@@ -10,13 +10,13 @@
 
     <ol>
       <% if can? :update, current_exhibit %>
-        <li>Visit the <%= link_to "Administrative Dashboard Settings", edit_exhibit_path(current_exhibit) %> page to configure the exhibit title and subtitle.</li>
+        <li>Visit the <%= link_to "Configuration > General", edit_exhibit_path(current_exhibit) %> page to configure the exhibit title and subtitle.</li>
 
-        <li>Next, go to the <%= link_to "Administration > Appearance", edit_exhibit_appearance_path(current_exhibit) %> page to add a site masthead image and configure other appearance options.</li>
+        <li>Next, go to the <%= link_to "Configuration > Appearance", edit_exhibit_appearance_path(current_exhibit) %> page to add a site masthead image and configure other appearance options.</li>
       <% end %>
 
       <% if can? :manage, Spotlight::Role.new(exhibit: current_exhibit) %>
-        <li>If you want help building the exhibit, use the <%= link_to "Administration > Users", exhibit_roles_path(current_exhibit) %> page to add other user accounts.</li>
+        <li>If you want help building the exhibit, use the <%= link_to "Configuration > Users", exhibit_roles_path(current_exhibit) %> page to add other user accounts.</li>
       <% end %>
 
       <% unless Spotlight::Engine.config.resource_providers.any? %>

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

@@ -1,6 +1,6 @@
-<%= render 'spotlight/shared/curation_sidebar' %>
+<%= render 'spotlight/shared/exhibit_sidebar' %>
 <div id="content" class="col-md-9">
-<%= curation_page_title %>
+<%= configuration_page_title %>
 <%= bootstrap_form_for @blacklight_configuration, url: spotlight.exhibit_metadata_configuration_path(@exhibit), layout: :horizontal, label_col: 'col-md-3', control_col: 'col-sm-5' do |f| %>
     <h3><%= t(:'.order_header') %></h3>
 

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

@@ -1,4 +1,4 @@
-<%= render 'spotlight/shared/curation_sidebar' %>
+<%= render 'spotlight/shared/exhibit_sidebar' %>
 <div id="content" class="col-md-9">
   <%= render 'order_pages' %>
 </div>

data/app/views/spotlight/resources/upload/new.html.erb

@@ -1,4 +1,4 @@
-<%= render 'spotlight/shared/curation_sidebar' %>
+<%= render 'spotlight/shared/exhibit_sidebar' %>
 <div id="content" class="col-md-9">
   <%= curation_page_title %>
   <div role="tabpanel" class="item-upload-tabs">

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

@@ -1,6 +1,6 @@
-<%= render 'spotlight/shared/curation_sidebar' %>
+<%= render 'spotlight/shared/exhibit_sidebar' %>
 <div id="content" class="col-md-9">
-  <%= administration_page_title %>
+  <%= configuration_page_title %>
   <%= bootstrap_form_for @exhibit, url: spotlight.update_all_exhibit_roles_path(@exhibit) do |f| %>
 
     <table class="table table-striped users">

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

@@ -1,6 +1,6 @@
-<%= render 'spotlight/shared/curation_sidebar' %>
+<%= render 'spotlight/shared/exhibit_sidebar' %>
 <div id="content" class="col-md-9">
-  <%= curation_page_title %>
+  <%= configuration_page_title %>
   <%= bootstrap_form_for @blacklight_configuration, url: spotlight.exhibit_search_configuration_path(@exhibit), layout: :horizontal, label_col: 'col-md-3', control_col: 'col-sm-5' do |f| %>
 
     <div role="tabpanel">

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

@@ -1,4 +1,4 @@
-<%= render 'spotlight/shared/curation_sidebar' %>
+<%= render 'spotlight/shared/exhibit_sidebar' %>
 <div id="content" class="col-md-9">
   <%= curation_page_title %>
   <%= render 'form' %>

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

@@ -1,20 +1,20 @@
-<%= render 'spotlight/shared/curation_sidebar' %>
+<%= render 'spotlight/shared/exhibit_sidebar' %>
 <div id="content" class="col-md-9">
   <%= curation_page_title %>
   <h3><%= header_with_count(t(:'.categories_header'), @searches.count) %></h3>
-  
+
   <% if @searches.empty? %>
     <%= t :'.no_saved_searches' %>
     <% unless @exhibit.searchable? %>
       <p class="instructions alert-warning">
-        <%= t(:'.not_searchable_html', href: link_to(t(:'spotlight.administration.sidebar.appearance'), spotlight.edit_exhibit_appearance_path(@exhibit))) %>
+        <%= t(:'.not_searchable_html', href: link_to(t(:'spotlight.configuration.sidebar.search_configuration'), spotlight.edit_exhibit_search_configuration_path(@exhibit))) %>
       </p>
     <% end %>
   <% else %>
     <p class="instructions"><%= t(:'.instructions') %></p>
     <% unless @exhibit.searchable? %>
       <p class="instructions alert-warning">
-        <%= t(:'.not_searchable_html', href: link_to(t(:'spotlight.administration.sidebar.appearance'), spotlight.edit_exhibit_appearance_path(@exhibit))) %>
+        <%= t(:'.not_searchable_html', href: link_to(t(:'spotlight.configuration.sidebar.search_configuration'), spotlight.edit_exhibit_search_configuration_path(@exhibit))) %>
       </p>
     <% end %>
     <%= bootstrap_form_for @exhibit, url: update_all_exhibit_searches_path(@exhibit), layout: :horizontal, control_col: 'col-sm-10' do |f| %>

data/app/views/spotlight/shared/_configuration_sidebar.html.erb

@@ -0,0 +1,14 @@
+<h4><%=t(:'spotlight.configuration.sidebar.header') %></h4>
+<ul class="nav sidenav">
+  <% if can? :update, current_exhibit %>
+    <li><%= link_to t(:'spotlight.configuration.sidebar.settings'), spotlight.edit_exhibit_path(current_exhibit) %></li>
+    <li><%= link_to t(:'spotlight.configuration.sidebar.appearance'), spotlight.edit_exhibit_appearance_path(current_exhibit) %></li>
+  <% end %>
+  <% if can? :manage, Spotlight::Role.new(exhibit: current_exhibit) %>
+    <li><%= link_to t(:'spotlight.configuration.sidebar.users'), spotlight.exhibit_roles_path(current_exhibit) %></li>
+  <% end %>
+  <% if can? :update, current_exhibit.blacklight_configuration %>
+    <li><%= link_to t(:'spotlight.configuration.sidebar.metadata'), spotlight.edit_exhibit_metadata_configuration_path(current_exhibit) %></li>
+    <li><%= link_to t(:'spotlight.configuration.sidebar.search_configuration'), spotlight.edit_exhibit_search_configuration_path(current_exhibit) %></li>
+  <% end %>
+</ul>

data/app/views/spotlight/shared/_curation_sidebar.html.erb

@@ -1,26 +1,16 @@
-<div id="sidebar" class="col-md-3" role="complementary">
-  <ul class="nav sidenav">
-    <li class="dashboard"><%= link_to t(:'spotlight.curation.sidebar.dashboard'), spotlight.exhibit_dashboard_path(current_exhibit) %></li>
-  </ul>
-  <%= render 'spotlight/shared/admin_sidebar' if can? :update, current_exhibit %>
-  <h4><%=t(:'spotlight.curation.sidebar.header') %></h4>
-  <ul class="nav sidenav">
-    <li><%= link_to t(:'spotlight.curation.sidebar.items'), spotlight.admin_exhibit_catalog_index_path(current_exhibit) %></li>
-    <% if can? :tag, current_exhibit %>
-    <li><%= link_to t(:'spotlight.curation.sidebar.tags'), spotlight.exhibit_tags_path(current_exhibit) %></li>
-    <% end %>
-    <% if can? :update, current_exhibit.blacklight_configuration %>
-    <li><%= link_to t(:'spotlight.curation.sidebar.metadata'), spotlight.edit_exhibit_metadata_configuration_path(current_exhibit) %></li>
-    <li><%= link_to t(:'spotlight.curation.sidebar.search_configuration'), spotlight.edit_exhibit_search_configuration_path(current_exhibit) %></li>
-    <% end %>
-    <% if can? :manage, Spotlight::Search.new(exhibit: current_exhibit) %>
-    <li><%= link_to t(:'spotlight.curation.sidebar.browse'), spotlight.exhibit_searches_path(current_exhibit) %></li>
-    <% end %>
-    <% if can? :manage, Spotlight::FeaturePage.new(exhibit: current_exhibit) or can? :manage, current_exhibit.home_page %>
-    <li><%= link_to t(:'spotlight.curation.sidebar.feature_pages'), spotlight.exhibit_feature_pages_path(current_exhibit), 'data-no-turbolink' => true %></li>
-    <% end %>
-    <% if can? :manage, Spotlight::AboutPage.new(exhibit: current_exhibit) %>
-    <li><%= link_to t(:'spotlight.curation.sidebar.about_pages'), spotlight.exhibit_about_pages_path(current_exhibit), 'data-no-turbolink' => true %></li>
-    <% end %>
-  </ul>
-</div>
+<h4><%=t(:'spotlight.curation.sidebar.header') %></h4>
+<ul class="nav sidenav">
+  <li><%= link_to t(:'spotlight.curation.sidebar.items'), spotlight.admin_exhibit_catalog_index_path(current_exhibit) %></li>
+  <% if can? :tag, current_exhibit %>
+  <li><%= link_to t(:'spotlight.curation.sidebar.tags'), spotlight.exhibit_tags_path(current_exhibit) %></li>
+  <% end %>
+  <% if can? :manage, Spotlight::Search.new(exhibit: current_exhibit) %>
+  <li><%= link_to t(:'spotlight.curation.sidebar.browse'), spotlight.exhibit_searches_path(current_exhibit) %></li>
+  <% end %>
+  <% if can? :manage, Spotlight::FeaturePage.new(exhibit: current_exhibit) or can? :manage, current_exhibit.home_page %>
+  <li><%= link_to t(:'spotlight.curation.sidebar.feature_pages'), spotlight.exhibit_feature_pages_path(current_exhibit), 'data-no-turbolink' => true %></li>
+  <% end %>
+  <% if can? :manage, Spotlight::AboutPage.new(exhibit: current_exhibit) %>
+  <li><%= link_to t(:'spotlight.curation.sidebar.about_pages'), spotlight.exhibit_about_pages_path(current_exhibit), 'data-no-turbolink' => true %></li>
+  <% end %>
+</ul>

data/app/views/spotlight/shared/_exhibit_sidebar.html.erb

@@ -0,0 +1,8 @@
+<div id="sidebar" class="col-md-3" role="complementary">
+  <ul class="nav sidenav top-level">
+    <li><%= link_to t(:'spotlight.curation.sidebar.dashboard'), spotlight.exhibit_dashboard_path(current_exhibit) %></li>
+    <li><%= link_to t(:'spotlight.curation.sidebar.analytics'), spotlight.analytics_exhibit_dashboard_path(current_exhibit) %></li>
+  </ul>
+  <%= render 'spotlight/shared/configuration_sidebar' if can? :update, current_exhibit %>
+  <%= render 'spotlight/shared/curation_sidebar' %>
+</div>

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

@@ -4,7 +4,7 @@
   <div class="spotlight-flexbox browse-categories categories-<%= browse_block.searches.length %>" data-sidebar='<%= @page.display_sidebar? %>'>
     <% browse_block.searches.each_with_index do |search, index| %>
       <div class="box category-<%= (index + 1) %>">
-        <%= link_to [search.exhibit, search] do %>
+        <%= link_to spotlight.exhibit_browse_path(search.exhibit, search) do %>
           <div class="browse-category" style='background-image: linear-gradient(rgba(0, 0, 0, 0.0), rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.5)), url("<%= search.thumbnail.image.cropped if search.thumbnail %>")'>
             <div class="category-caption">
               <p class="category-title">

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

@@ -1,4 +1,4 @@
-<%= render 'spotlight/shared/curation_sidebar' %>
+<%= render 'spotlight/shared/exhibit_sidebar' %>
 <div id="content" class="col-md-9">
   <%= curation_page_title(header_with_count(@tags.length)) %>
 

data/config/locales/spotlight.en.yml

@@ -97,15 +97,15 @@ en:
     application_name: "%{exhibit} - %{application_name}"
     html_title: "%{title} | %{application_name}"
     html_admin_title: "%{section} - %{title}"
-    administration:
+    configuration:
       sidebar:
-        header: Administration
-        dashboard: Dashboard
-        settings: Settings
+        header: Configuration
+        settings: General
         appearance: Appearance
         users: Users
-        import: "Import/Export"
-      header: "Administration"
+        metadata: Metadata
+        search_configuration: Search
+      header: "Configuration"
       page_title: "Page title"
       settings:
         header: "Settings"
@@ -143,15 +143,12 @@ en:
       sidebar:
         header: Curation
         dashboard: Dashboard
+        analytics: Analytics
         items: Items
-        metadata: Metadata
-        sort_fields: Sort fields
         tags: Tags
-        search_facets: Search facets
         browse: Browse
         feature_pages: Feature pages
         about_pages: About pages
-        search_configuration: Search
       nav:
         home: "Home"
       header: "Curation"
@@ -293,7 +290,8 @@ en:
         header: Recently Updated Items
         no_documents: There are no documents in this exhibit
       analytics:
-        header: "User Activity Over the Past Month"
+        header: "Analytics"
+        monthly_header: "User Activity Over the Past Month"
         pageviews: "page views"
         users: "unique visits"
         sessions: "visitors"
@@ -465,7 +463,7 @@ en:
       reindexing_in_progress: "Reindexing all resources"
     roles:
       index:
-        title: Site Administration - Users
+        title: Site Configuration - Users
         header: Users
         name: Username
         role: "Role"
@@ -485,8 +483,8 @@ en:
           which will be displayed here.
         not_searchable_html: >
           This exhibit is not currently searchable. To perform searches that can be saved as
-          additional browse categories, an Administrator must temporarily turn on the Searchable
-          option in the search configuration section of the Administration > %{href} page.
+          additional browse categories, temporarily turn on the Display search box
+          option in the Options section of the Configuration > %{href} page.
       edit:
         header: "Edit Browse Category"
         title: "Curation - Browse"
@@ -551,8 +549,6 @@ en:
       redo: Redo changes
       undo_error: Unable to undo changes
   shared:
-    exhibit_masthead:
-      more_exhibits: More Exhibits
     share_follow:
       share_follow: "Share & Follow"
     home_sidebar:

data/config/routes.rb

@@ -39,7 +39,9 @@ Spotlight::Engine.routes.draw do
 
     resources :custom_fields
 
-    resource :dashboard, only: :show
+    resource :dashboard, only: [:show] do
+      get :analytics
+    end
 
     resources :resources do
       collection do

data/db/migrate/20151124101123_remove_default_from_spotlight_exhibit.rb

@@ -0,0 +1,13 @@
+class RemoveDefaultFromSpotlightExhibit < ActiveRecord::Migration
+  def up
+    return unless Spotlight::Exhibit.column_names.include? :default
+
+    remove_column :spotlight_exhibits, :default
+    remove_index :spotlight_exhibits, :default
+  end
+  
+  def down
+    add_column :spotlight_exhibits, :default, :boolean, default: true
+    add_index :spotlight_exhibits, :default, unique: true
+  end
+end

data/db/migrate/20151124105543_update_custom_field_names.rb

@@ -0,0 +1,31 @@
+class UpdateCustomFieldNames < ActiveRecord::Migration
+  def up
+    fields = {}
+
+    Spotlight::CustomField.find_each do |f|
+      f.update(field: f.send(:field_name))
+      fields[f.solr_field] = f
+    end
+
+    Spotlight::SolrDocumentSidecar.find_each do |f|
+      f.data.select { |k, v| fields.has_key? k }.each do |k, v|
+        f.data[fields[k].send(:field_name)] = f.data.delete(k)
+      end
+    end
+  end
+
+  def down
+    fields = {}
+
+    Spotlight::CustomField.find_each do |f|
+      fields[f.field] = f
+      f.update(field: f.send(:solr_field))
+    end
+
+    Spotlight::SolrDocumentSidecar.find_each do |f|
+      f.data.select { |k, v| fields.has_key? k }.each do |k, v|
+        f.data[fields[k].send(:solr_field)] = f.data.delete(k)
+      end
+    end
+  end
+end

data/lib/generators/spotlight/templates/catalog_controller.rb

@@ -17,7 +17,7 @@ class CatalogController < ApplicationController
     # solr field configuration for search results/index views
     config.index.title_field = 'full_title_tesim'
 
-    config.add_search_field 'all_fields', label: 'All fields'
+    config.add_search_field 'all_fields', label: 'Everything'
 
     config.add_sort_field 'relevance', sort: 'score desc', label: 'Relevance'