blacklight-spotlight 0.3.1 → 0.4.1

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

@@ -1,19 +1,15 @@
 <%= cache [@exhibit, search, search.count] do %>
-<div class="media col-md-6">
-<%= link_to spotlight.exhibit_browse_path(@exhibit, search), class: 'pull-left' do %>
-  <%= image_tag(search.featured_image, width: 180) %>
-<% end if search.featured_image%>
-
-  <div class="media-body">
-  <h4 class="media-heading"><%= link_to search.title, spotlight.exhibit_browse_path(@exhibit, search) %>
-    <small class="item-count"><%= t :'.item_count', count: search.count %></small>
-  </h4>
-
-  <% if search.short_description %>
-  <p>
-    <%= search.short_description %>
-  </p>
-  <% end %>
+  <div class="col-sm-4 col-xs-12 category">
+    <%= link_to spotlight.exhibit_browse_path(@exhibit, search) do %>
+      <div class="image-overlay">
+        <%= image_tag(search.thumbnail.image.thumb, class: 'img-responsive') if search.thumbnail %>
+        <div class="text-overlay">
+           <h2 class="browse-category-title">
+             <%= search.title%>
+             <small><%= t :'spotlight.browse.search.item_count', count: search.count %></small>
+           </h2>
+         </div>
+      </div>
+    <% end %>
   </div>
-</div>
 <% end %>

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

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

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

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

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

@@ -1,15 +1,21 @@
 <% set_html_page_title @search.title %>
-  <div class="media row">
-    <%= image_tag @search.featured_image, class: 'col-md-3' %>
-    <div class="media-body col-md-9">
-      <%= exhibit_edit_link @search, class: 'edit-button pull-right btn btn-primary' if can? :edit, @search %>
-      <h1 class="media-heading"><%= @search.title %></h1>
-      <small class="item-count"><%= t :'spotlight.browse.search.item_count', count: @search.count %></small>
-      <p><%= @search.long_description %></p>
-    </div>
-  </div>
+<div>
+  <%= 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 %>
+    <% content_for :masthead do %>
+      <div class='search-title'>
+        <%= render 'search_title', search: @search %>
+      </div>
+    <% end %>
+  <% end %>
+  <% if @search.long_description.present? %>
+    <p class="long-description-text"><%= @search.long_description %></p>
+  <% end %>
+</div>
 
-<div class="col-md-9 col-md-offset-3">
+<div>
   <%= render 'sort_and_per_page' %>
   <%= render_document_index(@document_list) %>
   <%= render 'results_pagination' %>

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

@@ -7,7 +7,10 @@
     <% 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 %>
-    <%= link_to t('.new.non_repo_item'), new_exhibit_resources_upload_path(current_exhibit), class: 'btn btn-default' %>
+    
+    <% 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>
-<% end %>
+<% end %>

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

@@ -1,10 +1,22 @@
-<% # header bar for doc items in index view -%>
+<%# header bar for doc items in index view -%>
 <div class="documentHeader row" data-label-toggle="<%= document.id %>">
-   <h5 class="index_title col-sm-9 col-lg-10">
-     <% counter = document_counter_with_offset(document_counter) %>
-     <span class="document-counter">
-       <%= t('blacklight.search.documents.counter', :counter => counter) if counter %>
-     </span>
-     <%= link_to_document document, truncate(presenter(document).document_show_html_title, length: 89), :counter => counter %>
+  <%# main title container for doc partial view
+      How many bootstrap columns need to be reserved
+      for bookmarks control depends on size.
+  -%>
+  <% document_actions = capture do %>
+    <% # bookmark functions for items/docs -%>
+    <%= render_index_doc_actions document, wrapping_class: "index-document-functions col-sm-3 col-lg-2" %>
+  <% end %>
+
+  <h5 class="index_title <%= document_actions.present? ? "col-sm-9 col-lg-10" : "col-md-12" %>">
+    <% if counter = document_counter_with_offset(document_counter) %>
+      <span class="document-counter">
+        <%= t('blacklight.search.documents.counter', counter: counter) %>
+      </span>
+    <% end %>
+    <%= link_to_document document, document_show_link_field(document), counter: counter %>
   </h5>
+
+  <%= document_actions %>
 </div>

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

@@ -1,11 +1,28 @@
-<%= bootstrap_form_for document, url: spotlight.exhibit_catalog_path(current_exhibit, document), html: {:'data-form-observer' => true} do |f| %>
+<%= bootstrap_form_for document, url: spotlight.exhibit_catalog_path(current_exhibit, document), html: {:'data-form-observer' => true, multipart: true} do |f| %>
 <div class="edit-fields">
-  <%= f.fields_for :sidecar do |c| %>
+  
+  <%= f.fields_for :sidecar, document.sidecar(current_exhibit) do |c| %>
+    <%= c.check_box :public %>
+  <% end %>
+
+  <%= f.fields_for :uploaded_resource do |r| %>
+    <%= r.url_field :url, type: "file", help: t('.url-field.help', extensions: Spotlight::Engine.config.allowed_upload_extensions.join(' ')), label: "File" %>
+  <% end if document.uploaded_resource? %>
+
+  <%= f.fields_for :sidecar, document.sidecar(current_exhibit) do |c| %>
     <%= c.fields_for :data do |d| %>
+      <% if document.uploaded_resource? %>
+        <%= d.fields_for :configured_fields do |e| %>
+          <% Spotlight::Resources::Upload.fields(current_exhibit).each do |config| %>
+            <%= e.send((config.form_field_type || :text_field), config.field_name, value: (document.sidecar(current_exhibit).data["configured_fields"] || {})[config.field_name.to_s], label: uploaded_field_label(config)) %>
+          <% end %>
+        <% end %>
+      <% end %>
+
       <% current_exhibit.custom_fields.each do |field| %>
         <div class="form-group">
           <%= d.label field.field, field.label %>
-          <%= d.text_field_without_bootstrap field.field, value: document[field.field], class: 'form-control' %>
+          <%= d.text_field_without_bootstrap field.field, value: document.sidecar(current_exhibit).data[field.field.to_s], class: 'form-control' %>
           <% unless field.configured_to_display? %>
             <p class="bg-warning help-block">
               <%= t(:'.blank_field_warning_html',
@@ -14,11 +31,6 @@
           <% end %>
         </div>
       <% end %>
-      <% if document.uploaded_resource? %>
-        <% Spotlight::Resources::Upload.fields(current_exhibit).each do |config| %>
-          <%= d.send((config.form_field_type || :text_field), config.field_name, value: document.first(config.solr_field), label: uploaded_field_label(config)) %>
-        <% end %>
-      <% end %>
     <% end %>
   <% end %>
 

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

@@ -1,21 +1,21 @@
-      <% # header bar for doc items in index view -%>
-      <td>
-        <%= render_document_partial document, 'spotlight/catalog/admin_thumbnail', document_counter: document_counter %>
-      </td>
-      <td>
-        <%= render_document_partial document, 'admin_index_header', document_counter: document_counter %>
+<% # header bar for doc items in index view -%>
+<td>
+  <%= render_document_partial document, 'spotlight/catalog/admin_thumbnail', document_counter: document_counter %>
+</td>
+<td>
+  <%= render_document_partial document, 'admin_index_header', document_counter: document_counter %>
 
-    <div class="page-links">
-      <%= view_link document, url_for_document(document), class: 'btn btn-link' %> &middot;
-      <%= exhibit_edit_link document, [:edit, current_exhibit, document], class: 'btn btn-link' %>
-    </div>
-      </td>
+  <div class="page-links">
+  <%= view_link document, url_for_document(document), class: 'btn btn-link' %> &middot;
+  <%= exhibit_edit_link document, [:edit, current_exhibit, document], class: 'btn btn-link' %>
+  </div>
+</td>
 
-      <td>
-        <%= l Date.parse(document[blacklight_config.index.timestamp_field]) if document[blacklight_config.index.timestamp_field] %>
-      </td>
-      
-      <td class="checkbox-toggle">
-        <%= render partial: 'document_visibility_control', locals: { document: document} %>
-      </td>
+<td>
+  <%= l Date.parse(document[blacklight_config.index.timestamp_field]) if document[blacklight_config.index.timestamp_field] %>
+</td>
+
+<td class="checkbox-toggle">
+  <%= render partial: 'document_visibility_control', locals: { document: document} %>
+</td>
 

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

@@ -8,7 +8,7 @@
 
   <%= f.file_field :avatar, data: { croppable: true, aspect_ratio: 1, box_width: 600 } %>
 
-  <div class="form-group <%= "missing-croppable" unless @contact.avatar.present? %>">
+  <div class="form-group croppable-loading-area <%= "missing-croppable" unless @contact.avatar.present? %>">
     <div class="col-sm-5 col-sm-offset-2">
       <%= hidden_field_tag :contact_avatar_crop, ([@contact.avatar_crop_x.to_i, @contact.avatar_crop_y.to_i, @contact.avatar_crop_x.to_i + @contact.avatar_crop_w.to_i, @contact.avatar_crop_y.to_i + @contact.avatar_crop_h.to_i].to_json if @contact.avatar_crop_x) %>
       <%= f.previewbox :avatar %>

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

@@ -2,6 +2,12 @@
 
   <%= f.text_field :label %>
   <%= f.text_area :short_description %>
+
+  <%= f.form_group :field_type, label: { text: t(:'.field_type.label') } do %>
+    <%= f.radio_button :field_type, "text", label: t(:'.field_type.text') %>
+    <%= f.radio_button :field_type, "vocab", label: t(:'.field_type.vocab') %>
+  <% end %>
+
   <div class="form-actions">
     <div class="primary-actions">
       <%= link_to t(:"cancel"), exhibit_edit_metadata_path(current_exhibit), class: "btn btn-link" %>

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

@@ -1,3 +1,7 @@
 <h3><%= t :'.header' %></h3>
 
-<%= render partial: 'spotlight/catalog/document_admin_table', locals: { documents: @solr_documents } unless @solr_documents.empty? %>
+<% unless @solr_documents.empty? %>
+  <%= render partial: 'spotlight/catalog/document_admin_table', locals: { documents: @solr_documents } %>
+<% else %>
+  <%= t(:'.no_documents') %>
+<% end %>

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

@@ -0,0 +1,9 @@
+<div role="tabpanel" class="tab-pane" id="delete">
+  <div class="callout callout-danger row">
+    <h4><%= t(:".heading") %></h4>
+    <p class='col-md-9'><%= t(:".warning_html", export_link: link_to(t(:'spotlight.exhibits.export.download'), spotlight.import_exhibit_path(current_exhibit))) %></p>
+    <div class='col-md-3'>
+      <%= delete_link current_exhibit, class: 'btn btn-default' %>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,8 @@
+<div role="tabpanel" class="tab-pane" id="export">        
+  <div class="row col-md-12">
+    <p class="instructions"><%= t :'.instructions' %></p>
+    <div class="primary-actions">
+      <%= link_to t(:'.download'), get_exhibit_path(current_exhibit, format: 'json'), class: 'btn btn-primary' %>
+    </div>
+  </div>
+</div>

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

@@ -9,10 +9,6 @@
   <% end %>
   <p class="help-block"><%= t(:'.fields.contact_emails.help_block') %></p>
   <% end %>
-  <%= f.file_field :featured_image %>
-  <%= f.form_group :featured_image_preview do %>
-    <%= image_tag @exhibit.featured_image.url %>
-  <% end %>
   <%= f.form_group :published, label: { text: nil, class: nil }, help: nil do %>
   <%= f.check_box :published, label: "" %>
   <p class="help-block"><%= t(:'.fields.published.help_block') %></p>

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

@@ -0,0 +1,15 @@
+<div role="tabpanel" class="tab-pane" id="import">
+  <%= bootstrap_form_for [:import, current_exhibit], html: { class: 'clearfix', multipart: true } do |f| %>
+    <div class="row col-md-12">
+      <p class="instructions"><%= t :'.instructions' %></p>
+      <div class="form-group">
+        <%= file_field_tag :file, class: 'form-control' %>
+      </div>
+      <div class="form-actions">
+        <div class="primary-actions">
+          <%= f.submit t(:'.button'), class: 'btn btn-primary' %>
+        </div>
+      </div>
+    </div>
+  <% end %>
+</div>

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

@@ -1,12 +1,34 @@
 <%= render 'spotlight/shared/curation_sidebar' %>
 <div id="content" class="col-md-9 exhibit-admin">
   <%= administration_page_title %>
-  <%= render 'form' %>
-  <div class="callout callout-danger row">
-    <h4><%= t(:".delete_exhibit") %></h4>
-    <p class='col-md-9'><%= t(:".delete_exhibit_warning_html", export_link: link_to(t(:'spotlight.exhibits.import.export.download'), spotlight.import_exhibit_path(@exhibit))) %></p>
-    <div class='col-md-3'>
-      <%= delete_link @exhibit, class: 'btn btn-default' %>
+  <div role="tabpanel">
+    <ul class="nav nav-tabs" role="tablist">
+      <li role="presentation" class="active">
+        <a href="#basic" area-controls="basic" role="tab" data-toggle="tab"><%= t(:'.basic_settings.heading') %></a>
+      </li>
+      <% if can? :import, current_exhibit %>
+        <li role="presentation">
+          <a href="#import" area-controls="import" role="tab" data-toggle="tab"><%= t(:'spotlight.exhibits.import.heading') %></a>
+        </li>
+      <% end %>
+      <% if can? :export, current_exhibit %>
+        <li role="presentation">
+          <a href="#export" area-controls="export" role="tab" data-toggle="tab"><%= t(:'spotlight.exhibits.export.heading') %></a>
+        </li>
+      <% end %>
+      <% if can? :destroy, current_exhibit %>
+        <li role="presentation">
+          <a href="#delete" area-controls="delete" role="tab" data-toggle="tab"><%= t(:'spotlight.exhibits.delete.heading') %></a>
+        </li>
+      <% end %>
+    </ul>
+    <div class="tab-content">
+      <div role="tabpanel" class="tab-pane active" id="basic">
+        <%= render 'form' %>
+      </div>
+      <%= render 'import' if can? :import, current_exhibit %>
+      <%= render 'export' if can? :export, current_exhibit %>
+      <%= render 'delete' if can? :destroy, current_exhibit %>
     </div>
   </div>
 </div>

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

@@ -0,0 +1,26 @@
+<% if can? :edit, @page %>
+  <div class="empty-page-block">
+    <h2>Building this feature page</h2>
+
+    <ol>
+      <li>
+        To add content to this page, click the Edit button above to enter Edit mode.
+      </li>
+      <li>
+        In Edit mode, click the plus sign icon to display the widget selection panel. This panel displays a range of widgets, each of which adds a different type of content to the page.
+      </li>
+      <li>
+        Select a widget to configure. Click <strong>Save changes</strong> when you're ready to add it to the page.
+      </li>
+      <li>
+        Repeat the steps above to continue adding widgets to build out the page. To work more efficiently, you can configure multiple widgets before saving the page. Use the icons in the lower right of the widget configuration panel to preview, reorder, or delete widgets.
+      </li>
+      <li>
+        Note the <strong>Options</strong> and <strong>Thumbnail</strong> tabs at the top of the page in Edit mode. Options in these tabs enable you to publish or unpublish the page, turn on or off the page sidebar, and create a thumbnail image to represent the page.
+      </li>
+      <li>
+        Visit the Spotlight <%= link_to 'documentation pages', 'https://github.com/sul-dlss/spotlight/wiki' %> to learn more about creating exhibit pages.
+      </li>
+    </ol>
+  </div>
+<% end %>

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

@@ -1,6 +1,6 @@
 <div>
-  <%= f.check_box :published %> <%= f.label :published, t(:'.published') %>
+  <%= f.check_box :published %>
 </div>
 <div>
-  <%= f.check_box :display_sidebar?, disabled: @page.child_pages.published.present? %> <%= f.label :display_sidebar?, t(:'spotlight.administration.show_sidebar') %>
+  <%= f.check_box :display_sidebar?, disabled: @page.child_pages.published.present? %>
 </div>

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

@@ -0,0 +1,32 @@
+<% 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.radio_button(:source, :exhibit, label: t(:'.source.exhibit.label')) %>
+    <div>
+      <%= f.hidden_field(:document_global_id) %>
+      <%= f.hidden_field(:remote_image_url, data: jcrop_options) %>
+      <%= text_field_tag(:document_title, (presenter(f.object.document).document_show_html_title if f.object.document), class: "form-control", data: {input_select_target: "##{form_prefix}_source_exhibit", masthead_typeahead: true, target_panel: "##{form_prefix}-target-panel", :'id-field' => "##{form_prefix}_document_global_id", remote_url_field: "##{form_prefix}_remote_image_url" }) %>
+      <div id="<%= form_prefix %>-target-panel" style="display:none">
+        <div class="panel-heading">
+          <div data-item-title="true"></div>
+          <div data-panel-image-pagination="true"></div>
+        </div>
+      </div>
+      <p class="help-block"><%= t(:'.source.exhibit.help') %></p>
+    </div>
+  </div>
+  <div>
+    <%= f.radio_button(:source, :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

@@ -0,0 +1,35 @@
+<div class="empty-page-block">
+  <h2>Welcome to your new exhibit!</h2>
+
+  <% unless current_user %>
+    <p>In order to curate exhibit content, you need to <%= link_to t('spotlight.header_links.login'), main_app.new_user_session_path %></p>
+  <% end %>
+
+  <% if can? :edit, @page %>
+    <p>When you're ready to begin building your exhibit, here's how to get started:</p>
+
+    <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>
+      <% end %>
+
+      <% if can? :update, current_exhibit.appearance %>
+        <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>
+      <% 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>
+      <% end %>
+
+      <% unless Spotlight::Engine.config.resource_providers.any? %>
+        <li>Add items to the exhibit. Go to the <%= link_to "Curation > Items", admin_exhibit_catalog_index_path(current_exhibit) %> page and click <strong>Add non-repository item</strong>. You can add items individually or in bulk via a CSV file.</li>
+      <% end %>
+
+      <% if can? :update, current_exhibit.blacklight_configuration %>
+        <li>Use the other Curation pages, such as <%= link_to "Curation > Metadata", exhibit_edit_metadata_path(current_exhibit) %> and <%= link_to "Curation > Search Facets", exhibit_edit_facets_path(current_exhibit) %>, to customize the way various features are presented to exhibit visitors.</li>
+      <% end %>
+
+      <li>Visit the Spotlight <%= link_to "documentation pages", "https://github.com/sul-dlss/spotlight/wiki" %> to learn how to add and edit feature pages, about pages, custom browse categories, and more.</li>
+    </ol>
+  <% end %>
+</div>

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

@@ -1,7 +1,2 @@
-<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>
+<%= f.check_box :display_title %>
+<%= f.check_box :display_sidebar?, disabled: !current_exhibit.searchable? %>