blacklight-spotlight 0.2.0 → 0.3.0

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

@@ -1,6 +1,7 @@
 <%= render 'spotlight/shared/curation_sidebar' %>
 <div id="content" class="col-md-9 exhibit-admin">
 <%= administration_page_title %>
+
 <%= bootstrap_form_for [:import, @exhibit], html: { class: 'clearfix', multipart: true } do |f| %>
   <div class="row col-md-12">
     <h3><%= t :'.import.header' %></h3>
@@ -15,8 +16,9 @@
       </div>
     </div>
   </div>
-<% end %>
+<% end if can? :import, current_exhibit %>
 
+<% if can? :export, current_exhibit %>
   <div class="row col-md-12">
     <h3><%= t :'.export.header' %></h3>
     <p class="instructions"><%= t :'.export.instructions' %></p>
@@ -24,4 +26,5 @@
       <%= link_to t(:'.export.download'), get_exhibit_path(@exhibit, format: 'json'), class: 'btn btn-primary' %>
     </div>
   </div>
+<% end %>
 </div>

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

@@ -1,16 +1,4 @@
 <div id="content" class="col-md-9 exhibit-admin">
 <%= administration_page_title %>
-<%= bootstrap_form_for @exhibit, layout: :horizontal, label_col: 'col-md-3', control_col: 'col-sm-5' do |f| %>
-  <div class="row col-md-9">
-    <%= f.text_field :title %>
-    <%= f.text_field :subtitle %>
-    <%= f.text_area :description %>
-
-    <div class="form-actions">
-      <div class="primary-actions">
-        <%= f.submit nil, class: 'btn btn-primary' %>
-      </div>
-    </div>
-  </div>
-<% end %>
+<%= render 'form' %>
 </div>

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

@@ -0,0 +1 @@
+<%= exhibit_edit_link @page, edit_exhibit_home_page_path(@page.exhibit), class: 'edit-button pull-right btn btn-primary' %>

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

@@ -1 +1,7 @@
-<%= f.check_box :display_title %> <%= f.label :display_title, t(:'spotlight.administration.display_title') %>
+<div>
+  <%= f.check_box :display_title %> <%= f.label :display_title, t(:'spotlight.administration.display_title') %>
+</div>
+
+<div>
+  <%= f.check_box :display_sidebar?, disabled: !current_exhibit.searchable? %> <%= f.label :display_sidebar?, t(:'spotlight.administration.show_sidebar') %>
+</div>

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

@@ -0,0 +1,2 @@
+<% description current_exhibit.description %>
+<% add_exhibit_twitter_card_content %>

data/app/views/spotlight/indexing_complete_mailer/documents_indexed.html.erb

@@ -0,0 +1,3 @@
+<p><%= t :".title" %></p>
+
+<p><%= t :".body", count: @number, title: @exhibit.title %></p>

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

@@ -0,0 +1 @@
+<%= exhibit_edit_link @page, class: 'edit-button pull-right btn btn-primary' %>

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

@@ -5,7 +5,7 @@
                 :'metadata-url' => spotlight.exhibit_metadata_path(@page.exhibit, format: "json"),
                 :'autocomplete-url'=> spotlight.autocomplete_exhibit_catalog_index_path(@page.exhibit, format: "json"),
                 :'searches-endpoint' => spotlight.exhibit_searches_path(@page.exhibit, format: "json"),
-                :'available-configurations-endpoint' => spotlight.exhibit_available_configurations_path(@page.exhibit, format: "json"),
+                :'available-search-views-endpoint' => spotlight.exhibit_available_search_views_path(@page.exhibit, format: "json"),
                 :'preview-url' => spotlight.exhibit_preview_block_url(@page.exhibit)
               }
             }) do |f| %>

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

@@ -1,16 +1,16 @@
 <% set_html_page_title @page.title if @page.should_display_title? %>
-
+<% render 'tophat' %>
 <%= render 'sidebar' if @page.display_sidebar? %>
 
 <%= cache_unless current_user, @page do %>
 <div class="<%= 'col-md-9' if @page.display_sidebar? %>">
   <div class="clearfix">
-  <%= exhibit_edit_link @page, class: 'edit-button pull-right btn btn-primary' if can? :edit, @page %>
-  <% if @page.should_display_title? %>
-    <h1 class="page-title">
-      <%= @page.title %>
-    </h1>
-  <% end %>
+    <%= render 'edit_page_link' if can? :edit, @page %>
+    <% if @page.should_display_title? %>
+      <h1 class="page-title">
+        <%= @page.title %>
+      </h1>
+    <% end %>
   </div>
   <div>
     <%= render @page.content if @page.has_content? %>

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

@@ -0,0 +1,9 @@
+<%= bootstrap_form_for([current_exhibit, @resource.becomes(Spotlight::Resources::CsvUpload)], layout: :horizontal, label_col: 'col-md-2', control_col: 'col-sm-6 col-md-6', html: { class: 'item-upload-form', multipart: true } ) do |f| %>
+  <%= f.url_field :url, type: "file", help: t('.help_html', link: link_to(t('.template'), template_exhibit_resources_uploads_path)), label: t('.file_label') %>
+  <div class="form-actions">
+    <div class="primary-actions">
+      <%= cancel_link @resource, :back, class: 'btn btn-default' %>
+      <%= f.submit t('.add_item'), class: 'btn btn-primary' %>
+    </div>
+  </div>
+<% end %>

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

@@ -1,8 +1,8 @@
 <%= bootstrap_form_for([current_exhibit, @resource.becomes(Spotlight::Resources::Upload)], layout: :horizontal, label_col: 'col-md-2', control_col: 'col-sm-6 col-md-6', html: { class: 'item-upload-form', multipart: true } ) do |f| %>
   <%= f.url_field :url, type: "file", help: t('.url-field.help', extensions: Spotlight::Engine.config.allowed_upload_extensions.join(' ')), label: "File" %>
   <%= f.fields_for :data do |d| %>
-    <% Spotlight::Resources::Upload.fields(current_exhibit).each do |field, config| %>
-      <%= d.send((config.form_field_type || :text_field), field) %>
+    <% Spotlight::Resources::Upload.fields(current_exhibit).each do |config| %>
+      <%= d.send((config.form_field_type || :text_field), config.field_name, label: uploaded_field_label(config)) %>
     <% end %>
     <% current_exhibit.custom_fields.each do |custom_field| %>
       <%= d.text_field custom_field.field, label: custom_field.label %>

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

@@ -6,7 +6,7 @@
       <li role="presentation" class="active">
         <a href="#single" aria-controls="single" role="tab" data-toggle="tab"><%= t('.single') %></a>
       </li>
-      <li role="presentation" class="disabled">
+      <li role="presentation">
         <a href="#multi" aria-controls="multi" role="tab" data-toggle="tab"><%= t('.multiple') %></a>
       </li>
     </ul>

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

@@ -1,7 +1,15 @@
   <h4><%=t(:'spotlight.administration.sidebar.header') %></h4>
   <ul class="nav sidenav">
+    <% if can? :update, current_exhibit %>
     <li><%= link_to t(:'spotlight.administration.sidebar.settings'), spotlight.edit_exhibit_path(@exhibit) %></li>
+    <% end %>
+    <% if can? :update, current_exhibit.appearance %>
     <li><%= link_to t(:'spotlight.administration.sidebar.appearance'), spotlight.edit_exhibit_appearance_path(@exhibit) %></li>
+    <% end %>
+    <% if can? :manage, Spotlight::Role.new(exhibit: current_exhibit) %>
     <li><%= link_to t(:'spotlight.administration.sidebar.users'), spotlight.exhibit_roles_path(@exhibit) %></li>
+    <% end %>
+    <% if can? :import, current_exhibit %>
     <li><%= link_to t(:'spotlight.administration.sidebar.import'), spotlight.import_exhibit_path(@exhibit) %></li>
+    <% end %>
   </ul>

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

@@ -1,16 +1,27 @@
 <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(@exhibit) %></li>
+    <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(@exhibit) %></li>
-    <li><%= link_to t(:'spotlight.curation.sidebar.metadata'), spotlight.exhibit_edit_metadata_path(@exhibit) %></li>
-    <li><%= link_to t(:'spotlight.curation.sidebar.tags'), spotlight.exhibit_tags_path(@exhibit) %></li>
-    <li><%= link_to t(:'spotlight.curation.sidebar.search_facets'), spotlight.exhibit_edit_facets_path(@exhibit) %></li>
-    <li><%= link_to t(:'spotlight.curation.sidebar.browse'), spotlight.exhibit_searches_path(@exhibit) %></li>
-    <li><%= link_to t(:'spotlight.curation.sidebar.feature_pages'), spotlight.exhibit_feature_pages_path(@exhibit), 'data-no-turbolink' => true %></li>
-    <li><%= link_to t(:'spotlight.curation.sidebar.about_pages'), spotlight.exhibit_about_pages_path(@exhibit), 'data-no-turbolink' => true %></li>
+    <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.exhibit_edit_metadata_path(current_exhibit) %></li>
+    <li><%= link_to t(:'spotlight.curation.sidebar.search_facets'), spotlight.exhibit_edit_facets_path(current_exhibit) %></li>
+    <li><%= link_to t(:'spotlight.curation.sidebar.sort_fields'), spotlight.exhibit_edit_sort_fields_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>

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

@@ -0,0 +1,19 @@
+<% featured_browse_categories_block.with_solr_helper(self) %>
+<div class="spotlight-flexbox browse-categories categories-<%= featured_browse_categories_block.block_objects.length %>" data-sidebar='<%= @page.display_sidebar? %>'>
+  <% featured_browse_categories_block.block_objects.each_with_index do |block_object, index| %>
+    <div class="box category-<%= (index + 1) %>">
+      <a href="<%= spotlight.exhibit_browse_path(current_exhibit, block_object.browse_category) %>">
+        <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("<%= block_object.browse_category.featured_image %>")'>
+          <div class="category-caption">
+            <p class="category-title">
+              <%= block_object.browse_category.title %>
+            </p>
+            <% if featured_browse_categories_block.display_item_counts? %>
+              <span class="item-count"><%= pluralize(block_object.count, 'item') %></span>
+            <% end %>
+          </div>
+        </div>
+      </a>
+    </div>
+  <% end %>
+</div>

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

@@ -1 +1 @@
-<h2><%= heading_block.text %></h2>
+<h2><%= sir_trevor_markdown heading_block.text %></h2>

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

@@ -0,0 +1,24 @@
+<% item_grid_block.with_solr_helper(self) %>
+<% block_objects = item_grid_block.block_objects %>
+<div class="content-block item-grid-block row">
+  
+  <div class="items-col col-md-9 pull-<%= item_grid_block.text_align %>">
+    <% if block_objects.present? %>
+        <% block_objects.each_with_index do |block_object, index| %>
+          <div class="box item-<%= index %>" data-id="<%= block_object.id %>">
+            <% document = block_object.solr_document %>
+            <% if (block_thumb = block_object.thumbnail).present? %>
+              <div class="thumbnail"><%= link_to_document(document, image_tag(block_thumb), counter: -1) %></div>
+            <% elsif has_thumbnail? document %>
+              <div class="thumbnail"><%= render_thumbnail_tag(document, {}, document_counter: -1) %></div>
+            <% end %>
+          </div>
+        <% end %>
+    <% end %>
+  </div>
+
+  <div class="text-col col-md-3">
+    <h3><%= item_grid_block.title %></h3>
+    <%= sir_trevor_markdown item_grid_block.text %>
+  </div>
+</div>

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

@@ -0,0 +1 @@
+<hr />

data/config/locales/spotlight.en.yml

@@ -88,6 +88,11 @@ en:
             url: "File"
       "spotlight/contact":
           avatar: "Photo"
+  blacklight:
+    search:
+      fields:
+        facet:
+          exhibit_tag: Exhibit Tags
   spotlight:
     application_name: "%{exhibit} - %{application_name}"
     html_title: "%{title} | %{application_name}"
@@ -112,26 +117,28 @@ en:
         document_index_view_types: Result page types
         default_per_page: Default results per page
         exhibit_style:
-          heading: "Exhibit Style"
+          heading: "Exhibit style"
           searchable:
             label: "Searchable (offer searchbox and facet sidebar)"
         main_navigation:
-          menu: Main Navigation Menu
+          menu: Main menu
           help: Click a menu item to change its display label. Drag and drop a menu item to change their order in the main navigation menu.
         restore_default: "Restore default"
-        search_results: Search Results
-        sort_fields:
-          heading: Sort fields
-          help: "Select the fields you want to be available to users for sorting results. Click a field title to change its display label. Drag and drop fields to change their order in the sort dropdown menu. The field listed first is the default sort field."
-          sort_keys:
-            asc: ascending
-            desc: descending
-            score: relevancy score
-            sort_date_dtsi: date
-            sort_title_ssi: title
-            sort_type_ssi: type
-            sort_source_ssi: source
-            id: id
+        search_results: Search results
+        site_masthead:
+          heading: Site masthead
+          help: "You can select and crop an image to use as a background in your exhibit site's masthead. To use an image as a masthead background, you should use an image that is at least 120 pixels tall and 1200 pixels wide. For best results use an image at least 1800 pixels wide. You can crop larger images using the cropping tool below."
+          display:
+            label: "Show background image in masthead"
+          source:
+            header: "Image source"
+            exhibit:
+              label: "From this exhibit"
+              help: "To find an image to use as a background, start typing the title of an exhibit item."
+            remote:
+              label: "Upload an image"
+              header: "Cropped image"
+              help: 'Adjust the cropping box to cover the area of the image you want as the masthead background. Click "Save Changes" to save the copped area.'
         thumbnail:
           small: Small
           medium: Medium
@@ -145,6 +152,7 @@ en:
         dashboard: Dashboard
         items: Items
         metadata: Metadata
+        sort_fields: Sort fields
         tags: Tags
         search_facets: Search facets
         browse: Browse
@@ -179,11 +187,24 @@ en:
         view:
           show: "Item Details"
         instructions: Select metadata fields to display on each type of page. Click a field name to edit its display label. Drag and drop fields to specify the order they are displayed on the Item Details page.
+      edit_sort_fields:
+        header: Sort fields
+        help: "Select the fields you want to be available to users for sorting results. Click a field title to change its display label. Drag and drop fields to change their order in the sort dropdown menu. The field listed first is the default sort field."
+        sort_keys:
+          asc: ascending
+          desc: descending
+          score: relevancy score
+          sort_date_dtsi: date
+          sort_title_ssi: title
+          sort_type_ssi: type
+          sort_source_ssi: source
+          id: id
     catalog:
       breadcrumb:
         index: 'Search Results'
       edit_default:
         blank_field_warning_html: "This field is currently hidden on all pages. You can make it visible on the Curation > %{link} page."
+        full_title_tesim: "Title"
       facets:
         exhibit_visibility:
           label: "Item Visibility"
@@ -206,6 +227,7 @@ en:
         title: Curation - Items
         header: Items
       admin_header:
+        reindex: "Reindex items"
         new:
           repo_item: "Add repository item"
           non_repo_item: "Add non-repository item"
@@ -237,19 +259,28 @@ en:
           updated_at: Last Edited
       solr_document_activity:
         header: Recently Updated Items
+      analytics:
+        header: "User Activity Over the Past Month"
+        pageviews: "page views"
+        users: "unique visits"
+        sessions: "visitors"
+        pagetitle: "page title"
+        pages:
+          header: "Most popular pages"
     exhibits:
       breadcrumb: Home
       edit:
         header: Settings
         import: Import
+        delete_exhibit: Delete exhibit
+        delete_exhibit_warning_html: This action is irreversible. Be sure to back up the exhibit settings and content using the %{export_link} feature before proceeding.
+      form:
         fields:
           contact_emails:
             help_block: Each contact email will receive feedback submissions
           published:
             label: "Published"
             help_block: ""
-        delete_exhibit: Delete exhibit
-        delete_exhibit_warning_html: This action is irreversible. Be sure to back up the exhibit settings and content using the %{export_link} feature before proceeding.
       new:
         header: Create a new exhibit
       import:
@@ -314,8 +345,8 @@ en:
         telephone:
           placeholder: Telephone number (optional)
     about_pages:
-      index:
-        contacts: Contacts
+      contacts_form:
+        header: Contacts
         contact:
           legend: Contact Details
         instructions: Enter details for each librarian, curator or other contact person for this exhibit. Select the contacts you want to be show in the sidebar of the About Pages. Drag and drop contacts to specify the order in which they are shown in the sidebar.
@@ -341,20 +372,29 @@ en:
         form:
           template: "Download Template"
       upload:
+        csv:
+          success: "'%{file_name}' has been uploaded.  An email will be sent to you once indexing is complete."
         new:
           header: "Add non-repository items"
           single: "Single item"
           multiple: "Multiple items using CSV file"
         error: "There was a problem uploading your object."
+        multi_item_form:
+          add_item: "Add item"
+          help_html: "%{link}"
+          template: "Download template"
+          file_label: "CSV File"
         success: "Object uploaded successfully."
         single_item_form:
           add_item: "Add item"
           add_item_and_continue: "Add item and continue adding"
+          full_title_tesim: "Title"
           url-field:
             help: "Valid file types: %{extensions}"
       bookmarklet:
         instructions:  "Drag this button to the bookmarks toolbar in your web browser"
         bookmarklet: "%{application_name} widget"
+      reindexing_in_progress: "Reindexing all resources"
     roles:
       index:
         title: Site Administration - Users
@@ -370,7 +410,7 @@ en:
         categories_header: "Browse Categories"
         instructions: "Use the Save search button on a search results page to create a new browse category. Select the categories you want to be displayed on the browse landing page. Drag and drop categories to change the order in which they appear on that page."
         no_saved_searches: "You can save search results while in curation mode to create browse categories, 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 Exhibit Style section of the Administration > %{href} page."
+        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 exhibit style section of the Administration > %{href} page."
       edit:
         header: "Edit Browse Category"
         title: "Curation - Browse"
@@ -410,6 +450,16 @@ en:
     shared:
       report_a_problem:
         title: Contact Us
+    indexing_complete_mailer:
+      documents_indexed:
+        title: "Your CSV file has just finished being processed."
+        body:
+          one: "%{count} document has been indexed from the CSV file and added to the exhibit %{title}."
+          other: "%{count} documents have been indexed from the CSV file and added to the exhibit %{title}."
+    versions:
+      undo: Undo changes
+      redo: Redo changes
+      undo_error: Unable to undo changes
   shared:
     exhibit_masthead:
       more_exhibits: More Exhibits

data/config/routes.rb

@@ -8,6 +8,7 @@ Spotlight::Engine.routes.draw do
       get 'import', to: 'exhibits#import'
       post 'import', to: 'exhibits#process_import'
       patch 'import', to: 'exhibits#process_import'
+      post 'reindex', to: 'exhibits#reindex'
     end
 
     resources :attachments, only: :create
@@ -18,8 +19,9 @@ Spotlight::Engine.routes.draw do
 
     get 'edit/metadata', to: "blacklight_configurations#edit_metadata_fields"
     get 'edit/facets', to: "blacklight_configurations#edit_facet_fields"
+    get 'edit/sort_fields', to: "blacklight_configurations#edit_sort_fields"
     get 'metadata', to: 'blacklight_configurations#metadata_fields'
-    get 'available_configurations', to: 'blacklight_configurations#available_configurations'
+    get 'available_search_views', to: 'blacklight_configurations#available_search_views'
 
     blacklight_for :catalog, only: [:export]
 
@@ -35,15 +37,27 @@ Spotlight::Engine.routes.draw do
       delete 'visiblity', to: "catalog#make_private"
     end
 
+    get "catalog/:id", to: "catalog#show", as: "solr_document"
+
     resources :solr_document, only: [:edit], to: 'catalog#edit'
 
     resources :custom_fields
 
     resource :dashboard, only: :show
 
-    resources :resources
+    resources :resources do
+      collection do
+        post :reindex_all
+      end
+    end
+
+    post :csv_uploads, to: "resources/upload#csv_upload", path: 'upload_resources/csv_upload', as: :resources_csv_uploads
 
-    resources :resources_uploads, controller: 'resources/upload', path: 'upload_resources'
+    resources :resources_uploads, controller: 'resources/upload', path: 'upload_resources' do
+      collection do
+        get :template
+      end
+    end
 
     resources :resources_csvs, controller: 'resources/csv', path: 'csv_resources' do
       collection do
@@ -85,7 +99,9 @@ Spotlight::Engine.routes.draw do
         patch :update_all
       end
     end
+
   end
 
+  post 'versions/:id/revert' => 'versions#revert', as: :revert_version
   get '/:exhibit_id' => 'home_pages#show', as: :exhibit_root
 end