blacklight-spotlight 0.13.0 → 0.14.0

data/app/views/shared/_masthead.html.erb

@@ -0,0 +1,32 @@
+<%= render 'spotlight/shared/report_a_problem' if show_contact_form? %>
+
+<div class="masthead <%= 'image-masthead' if current_masthead %> <%= 'resource-masthead' if resource_masthead? %>">
+  <% if current_masthead %>
+    <span class='background-container' style="background-image: url('<%= image_path(current_masthead.image.cropped) %>')"></span>
+    <span class='background-container-gradient'></span>
+  <% end %>
+  
+  <%= render 'shared/exhibit_navbar' if current_exhibit && resource_masthead? %>
+
+  <div class="container site-title-container">
+    <div class="site-title h1">
+      <% if content_for? :masthead %>
+        <%= content_for :masthead %>
+      <% elsif current_exhibit %>
+        <%= current_exhibit.title %>
+        <% if current_exhibit.subtitle.present? %>
+          <small><%= current_exhibit.subtitle %></small>
+        <% end %>
+      <% else %>
+        <%= application_name %>
+        <% if current_site.subtitle.present? %>
+          <small><%= current_site.subtitle %></small>
+        <% end %>
+      <% end %>
+    </div>
+  </div>
+
+  <%= render 'shared/exhibit_navbar' if current_exhibit && !resource_masthead? %>
+</div>
+
+<%= render 'shared/breadcrumbs' unless resource_masthead? %>

data/app/views/shared/_site_sidebar.html.erb

@@ -0,0 +1,16 @@
+<% if can?(:manage, Spotlight::Site.instance) || can?(:create, Spotlight::Exhibit) %>
+<h4 class="nav-heading"><%=t(:'.header') %></h4>
+<ul class="nav sidenav">
+  <% if can? :manage, Spotlight::Site.instance %>
+    <li><%= link_to t(:'spotlight.sites.edit.section'), spotlight.edit_site_path %></li>
+  <% end %>
+
+  <% if can? :manange, Spotlight::Exhibit %>
+    <li><%= link_to t(:'spotlight.sites.edit_exhibits.section'), spotlight.edit_site_exhibits_path %></li>
+  <% end %>
+</ul>
+
+<ul class="nav sidenav nav-pills nav-stacked">
+  <li><%= link_to t('.create_exhibit'), new_exhibit_path, class: 'btn btn-default btn-nav', role: 'button' if can? :create, Spotlight::Exhibit %></li>
+</ul>
+<% end %>

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

@@ -1,9 +1,11 @@
 <% cache_unless current_user, [current_exhibit, @page] do %>
 <div id="sidebar" class="col-md-3" role="complementary">
-  <h4><%= current_exhibit.main_navigations.about.label_or_default %></h4>
+  <h4 class="nav-heading"><%= current_exhibit.main_navigations.about.label_or_default %></h4>
   <ul class="nav sidenav">
     <% current_exhibit.about_pages.published.each do |page| %>
-      <li class="<%= 'active' if current_page? [page.exhibit, page] %>"><%= link_to_unless_current page.title, [page.exhibit, page] %></li>
+      <li class="<%= 'active' if current_page? [page.exhibit, page] %>">
+        <%= link_to page.title, [page.exhibit, page] %>
+      </li>
     <% end %>
   </ul>
   <%= cache current_exhibit do %>

data/app/views/spotlight/browse/_search_title.html.erb

@@ -1,2 +1,2 @@
-<h1><%= search.title %></h1>
+<%= search.title %>
 <small class="item-count"><%= t :'spotlight.browse.search.item_count', count: search.documents.size %></small>

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

@@ -1,6 +1,8 @@
 <% set_html_page_title %>
-<h1 class="sr-only"><%= t :'.header' %></h1>
+<div class="col-md-12">
+  <h1 class="sr-only"><%= t :'.header' %></h1>
 
-<div class="browse-landing">
-  <%= render collection: @searches, partial: 'spotlight/browse/search' %>
-</div>
+  <div class="browse-landing">
+    <%= render collection: @searches, partial: 'spotlight/browse/search' %>
+  </div>
+</div>

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

@@ -1,21 +1,19 @@
 <% set_html_page_title @search.title %>
-<div>
+<div class="col-md-12">
   <%= exhibit_edit_link @search, class: 'edit-button pull-right btn btn-primary' if can? :edit, @search %>
-  <% if exhibit_masthead? %>
-    <%= render 'search_title', search: @search %>
-  <% else %>
+  <% if resource_masthead? %>
     <% content_for :masthead do %>
-      <div class='search-title'>
-        <%= render 'search_title', search: @search %>
-      </div>
+      <%= render 'search_title', search: @search %>
     <% end %>
+  <% else %>
+    <h1><%= render 'search_title', search: @search %></h1>
   <% end %>
   <% if @search.long_description.present? %>
     <p class="long-description-text"><%= @search.long_description %></p>
   <% end %>
 </div>
 
-<div>
+<div class="col-md-12">
   <%= render 'sort_and_per_page' %>
   <%= render_document_index(@document_list) %>
   <%= render 'results_pagination' %>

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

@@ -1,16 +1,19 @@
 <% if can? :manage, Spotlight::Resource.new(exhibit: current_exhibit) %>
-<div class="add-items-nav clearfix">
-  <div class="pull-left">
-    <%= link_to t('.reindex'), reindex_all_exhibit_resources_path(current_exhibit), method: :post, class: 'btn btn-default' %>
+  <div data-behavior='reindex-monitor' data-monitor-url="<%= monitor_exhibit_resources_path(current_exhibit) %>">
+    <%= render 'reindex_progress_panel' %>
   </div>
-  <div class="pull-right">
-    <% if Spotlight::Engine.config.new_resource_partials.any? %>
-      <%= link_to t('.new.repo_item'), new_exhibit_catalog_path(current_exhibit), class: 'btn btn-default' %>
-    <% end %>
-    
-    <% if Spotlight::Engine.config.uploaded_resource_partials.any? %>
-      <%= link_to t('.new.non_repo_item'), new_exhibit_resources_upload_path(current_exhibit), class: 'btn btn-default' %>
-    <% end %>
+  <div class="add-items-nav clearfix">
+    <div class="pull-left">
+      <%= link_to t('.reindex'), reindex_all_exhibit_resources_path(current_exhibit), method: :post, class: 'btn btn-default' %>
+    </div>
+    <div class="pull-right">
+      <% if Spotlight::Engine.config.new_resource_partials.any? %>
+        <%= link_to t('.new.repo_item'), new_exhibit_catalog_path(current_exhibit), class: 'btn btn-default' %>
+      <% end %>
+
+      <% if Spotlight::Engine.config.uploaded_resource_partials.any? %>
+        <%= link_to t('.new.non_repo_item'), new_exhibit_resources_upload_path(current_exhibit), class: 'btn btn-default' %>
+      <% end %>
+    </div>
   </div>
-</div>
 <% end %>

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

@@ -0,0 +1,21 @@
+<div class="panel panel-info index-status" style='display:none;'>
+  <div class="panel-heading">
+    <h3 class="panel-title"><%= t('.heading') %></h3>
+  </div>
+  <div class="panel-body">
+    <p data-behavior='monitor-start'>
+      <span class="text-muted" data-behavior='date'></span> <%= t('.begin_html') %>
+    </p>
+    <p data-behavior='monitor-current'>
+      <span class="text-muted" data-behavior='date'></span> <%= t('.completed_html') %>
+    </p>
+
+    <p class="bg-warning" data-behavior='monitor-error' style='display:none;'>
+      <%= t('.error') %>
+    </p>
+
+    <div class="progress">
+      <div class="progress-bar progress-bar-striped active" role="progressbar" aria-valuenow="" aria-valuemin="0" aria-valuemax=""></div>
+    </div>
+  </div>
+</div>

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

@@ -5,7 +5,9 @@
       <% if can?(:manage, Spotlight::Exhibit) %>
         <li role="presentation"><a href="#unpublished" aria-controls="unpublished" role="tab" data-toggle="tab"><%= t('.unpublished') %></a></li>
       <% end %>
-      <li role="presentation"><a href="#user" aria-controls="user" role="tab" data-toggle="tab"><%= t('.user') %></a></li>
+      <% if current_user && current_user.exhibits.any? %>
+        <li role="presentation"><a href="#user" aria-controls="user" role="tab" data-toggle="tab"><%= t('.user') %></a></li>
+      <% end %>
     </ul>
   <% end %>
 
@@ -47,5 +49,5 @@
 </div>
 
 <aside class="col-md-3">
-  <%= render "shared/home_sidebar" %>
+  <%= render "shared/site_sidebar" %>
 </aside>

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

@@ -0,0 +1,17 @@
+<% form_prefix = f.object_name.parameterize("_") %>
+<%= field_set_tag do %>
+  <%= f.check_box(:display) %>
+<% end if f.object.is_a? Spotlight::Masthead %>
+<%= field_set_tag(t(:'.source.header')) do %>
+  <div>
+    <%= f.hidden_field(:source, value: :remote, label: t(:'.source.remote.label')) %>
+    <%= f.file_field_without_bootstrap(:image, data: jcrop_options.merge(input_select_target: "##{form_prefix}_source_remote")) %>
+  </div>
+<% end %>
+<%= field_set_tag(t(:'.source.remote.header')) do %>
+  <p class="instructions"><%= t(:'.source.remote.help') %></p>
+  <div class="form-group croppable-loading-area <%= "missing-croppable" unless f.object.try(:image).present? %>">
+    <%= hidden_field_tag :"#{jcrop_options.fetch(:selector, "image")}_crop", ([f.object.image_crop_x.to_i, f.object.image_crop_y.to_i, f.object.image_crop_x.to_i + f.object.image_crop_w.to_i, f.object.image_crop_y.to_i + f.object.image_crop_h.to_i].to_json if f.object.try(:image_crop_x)) %>
+    <%= f.cropbox :image %>
+  </div>
+<% end %>

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

@@ -15,7 +15,7 @@
         <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) %>
+      <% if can? :manage, Spotlight::Role.new(resource: current_exhibit) %>
         <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 %>
 

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

@@ -8,9 +8,9 @@
         <%= field.hidden_field :label, value: index_field_label(nil, key), class: 'form-control input-sm', data: {:"edit-field-target" => 'true'} %>
        </div>
     </td>
-    <td class="checkbox-cell"><%= field.check_box :show, inline: true, checked: config.show, label: "" %></td>
+    <td class="checkbox-cell text-center"><%= field.check_box :show, inline: true, checked: config.show, label: "" %></td>
     <% available_view_fields.keys.each do |type| %>
-    <td class="checkbox-cell"><%= field.check_box type, inline: true, checked: config.send(type), label: "" %></td>
+    <td class="checkbox-cell text-center"><%= field.check_box type, inline: true, checked: config.send(type), label: "" %></td>
     <% end %>
   <% end %>
 </tr>

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

@@ -6,18 +6,18 @@
 
     <p class="instructions"><%= t :'.instructions' %></p>
 
-    <table id="nested-fields" class="table table-striped">
+    <table id="nested-fields" class="table table-striped dd-table">
       <thead>
         <tr>
           <th><%= t :'.fields.label' %></th>
-          <th>
+          <th class="text-center">
             <div>
               <%= t :'.view.show', default: t(:'blacklight.search.view.show') %>
             </div>
             <%= select_deselect_button %>
           </th>
           <% available_view_fields.keys.each do |type| %>
-            <th>
+            <th class="text-center">
               <div>
                 <%= t :".view.#{type}", default: t(:".view.#{type}") %>
               </div>

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

@@ -1,10 +1,10 @@
-<h4><%=t(:'spotlight.configuration.sidebar.header') %></h4>
+<h4 class="nav-heading"><%=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) %>
+  <% if can? :manage, Spotlight::Role.new(resource: 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 %>

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

@@ -1,4 +1,4 @@
-<h4><%=t(:'spotlight.curation.sidebar.header') %></h4>
+<h4 class="nav-heading"><%=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 %>

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

@@ -0,0 +1,18 @@
+<% exhibit = f.object %>
+<tr class="dd-item dd3-item" data-id="<%= exhibit.id %>">
+  <td>
+     <div class="handle-wrap">
+       <div class="dd-handle dd3-handle"><%= t :drag %></div>
+
+       <%= f.hidden_field :id %>
+       <%= f.hidden_field :weight, data: { property: "weight" } %>
+
+       <%= link_to exhibit.title, exhibit %>
+     </div>
+
+  </td>
+  <td class="text-right"><%= exhibit.published? ? t(:'.published') : t(:'.unpublished') %></td>
+  <td class="text-right"><%= exhibit.requested_by %></td>
+  <td class="text-right"><%= l exhibit.created_at, format: :short %></td>
+  <td class="text-right"><%= l exhibit.updated_at, format: :short %></td>
+</tr>

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

@@ -0,0 +1,40 @@
+<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', html: {class: "row"} 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>
+
+        <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, jcrop_options: default_masthead_jcrop_options %>
+          <% end %>
+        </div>
+      </div>
+
+      <div class="form-actions">
+        <div class="primary-actions">
+          <%= f.submit nil, class: 'btn btn-primary' %>
+        </div>
+      </div>
+    </div>
+  <% end %>
+</div>
+
+<aside class="col-md-3">
+  <%= render "shared/site_sidebar" %>
+</aside>

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

@@ -0,0 +1,32 @@
+<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>
+
+    <div class="form-actions">
+      <div class="primary-actions">
+        <%= f.submit nil, class: 'btn btn-primary' %>
+      </div>
+    </div>
+  <% end %>
+</div>
+
+<aside class="col-md-3">
+  <%= render "shared/site_sidebar" %>
+</aside>

data/config/locales/spotlight.en.yml

@@ -55,6 +55,7 @@ en:
         destroyed: "The %{model} was deleted."
       exhibit: *spotlight_default
       search: *spotlight_default
+      site: *spotlight_default
       contact_form:
         create: "Send"
         created: "Thanks. Your feedback has been sent."
@@ -83,6 +84,8 @@ en:
     attributes:
       "spotlight/contact":
           avatar: "Photo"
+      "spotlight/exhibit":
+          published: "Published?"
       "spotlight/page":
         display_sidebar?: "Show sidebar"
         display_title: "Show title"
@@ -261,6 +264,11 @@ en:
           non_repo_item: "Add non-repository item"
       new:
         header: Import items
+      reindex_progress_panel:
+        heading: Reindexing status
+        begin_html: "Began reindexing a total of <span data-behavior='total'></span> items."
+        completed_html: "Reindexed <span data-behavior='completed'></span> of <span data-behavior='total'></span> items."
+        error: 'An error occured while reindexing. Contact your exhibits administrator for more information.'
     invitation_mailer:
       invitation_instructions:
         hello: "Hello %{email}!"
@@ -431,7 +439,7 @@ en:
       page_options:
         published: "Publish"
     featured_images:
-      form:
+      form: &featured_images_form
         source:
           header: "Image source"
           exhibit:
@@ -443,6 +451,7 @@ en:
             help: >
               Adjust the cropping box to cover the area of the image you want to use
               as the thumbnail image. Click "Save Changes" to save the cropped area.
+      upload_form: *featured_images_form
 
     resources:
       new:
@@ -486,6 +495,24 @@ en:
         email: "Email Address"
         role: "Role"
         actions: "Actions"
+    sites:
+      edit:
+        section: Customize appearance
+        page_title: Exhibits landing page
+        basic_settings:
+          heading: Title
+        site_masthead:
+          heading: Site masthead
+          help: >
+              You can select and crop an image to use as a background for your home page 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.
+      edit_exhibits:
+        section: Manage exhibits
+        page_title: Existing exhibits
+        instructions: Drag and drop the exhibits below to specify the order in which they are displayed on the exhibits homepage.
     searches: &search
       nav_link: "Browse"
       index:
@@ -569,5 +596,6 @@ en:
   shared:
     share_follow:
       share_follow: "Share & Follow"
-    home_sidebar:
+    site_sidebar:
+      header: Actions
       create_exhibit: 'Create a new exhibit'