blacklight-spotlight 0.0.2 → 0.0.3

data/app/models/spotlight/home_page.rb

@@ -1,10 +1,23 @@
 module Spotlight
   class HomePage < Spotlight::Page
-    before_save do
+    before_save :publish
+    before_create :default_content
+
+    def title_or_default
+      title.present? ? title : I18n.t('spotlight.pages.index.home_pages.title')
+    end
+
+    private
+    def self.default_content_text
+      "This is placeholder content for the exhibit homepage. Curators of this exhibit can edit this page to customize it for the exhibit."
+    end
+
+    def publish
       self.display_sidebar = true
       self.published = true
     end
-    before_create do
+
+    def default_content
       self.content = {
         "data" => [
           {"type" => "text",
@@ -15,9 +28,5 @@ module Spotlight
         ]
       }.to_json
     end
-    private
-    def self.default_content_text
-      "This is placeholder content for the exhibit homepage. Curators of this exhibit can edit this page to customize it for the exhibit."
-    end
   end
 end

data/app/models/spotlight/page.rb

@@ -3,12 +3,15 @@ module Spotlight
     MAX_PAGES = 50
 
     belongs_to :exhibit
+    belongs_to :created_by, class_name: "::User"
+    belongs_to :last_edited_by, class_name: "::User"
     validates :weight, :inclusion => { :in => Proc.new{ 0..Spotlight::Page::MAX_PAGES } }
     validates :exhibit, presence: true
 
     default_scope { order("weight ASC") }
     scope :at_top_level, -> { where(parent_page_id: nil) }
     scope :published, -> { where(published: true) }
+    scope :recent, -> { order("updated_at DESC").limit(10)}
     
     # explicitly set the partial path so that 
     # we don't have to duplicate view logic.
@@ -31,5 +34,10 @@ module Spotlight
     def top_level_page_or_self
       parent_page || self
     end
+
+    # Subclasses may override this if they have a default
+    def title_or_default
+      title
+    end
   end
 end

data/app/models/spotlight/role.rb

@@ -1,7 +1,9 @@
 class Spotlight::Role < ActiveRecord::Base
+
+  ROLES = %w(admin curator)
   belongs_to :exhibit
   belongs_to :user, class_name: '::User', autosave: true
-  validates :role, inclusion: { in: %w(admin curate) }
+  validates :role, inclusion: { in: ROLES }
   validates :user_key, presence: true
   validate :user_must_exist, if: -> { user_key.present? }
   validate :user_must_be_unique, if: :user

data/app/models/spotlight/search.rb

@@ -6,7 +6,11 @@ class Spotlight::Search < ActiveRecord::Base
   scope :published, -> { where(on_landing_page: true) }
 
   before_create do
+    begin
     self.featured_image ||= default_featured_image 
+    rescue => e
+      logger.error e
+    end
   end
 
   include Blacklight::SolrHelper

data/app/models/spotlight/solr_document_sidecar.rb

@@ -5,5 +5,27 @@ module Spotlight
     serialize :data, Hash
 
     delegate :has_key?, to: :data
+
+    def to_solr
+      { id: solr_document_id, visibility_field => public? }.merge(data_to_solr)
+    end
+
+    def private!
+      update public: false
+    end
+
+    def public!
+      update public: true
+    end
+
+    protected
+
+    def visibility_field
+      Spotlight::SolrDocument.visibility_field(exhibit)
+    end
+
+    def data_to_solr
+      Hash[data.map { |k,v| [k,v] }]
+    end
   end
 end

data/app/views/_user_util_links.html.erb

@@ -4,11 +4,8 @@
       <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%=current_user%> <b class="caret"></b></a>
         <ul class="dropdown-menu">
           <li><%= link_to "Change Password", edit_user_registration_path %></li>
-          <% if can? :update, Spotlight::Exhibit.default %>
-            <li><%= link_to "Administration", spotlight.edit_exhibit_path(Spotlight::Exhibit.default) %></li>
-          <% end %>
-          <% if can? :curate, Spotlight::Exhibit.default %>
-            <li><%= link_to "Curation", spotlight.admin_exhibit_catalog_index_path(Spotlight::Exhibit.default) %></li>
+          <% if can? :curate, current_exhibit %>
+            <li><%= link_to t('spotlight.dashboards.show.header'), spotlight.exhibit_dashboard_path(current_exhibit) %></li>
           <% end %>
           <li class="divider"></li>
           <li><%= link_to t('spotlight.header_links.logout'), destroy_user_session_path %></li>
@@ -17,5 +14,5 @@
     <% else %>
       <li><%= link_to t('spotlight.header_links.login'), new_user_session_path %></li>
     <% end %>
-    <li><%= link_to t('spotlight.header_links.contact'), spotlight.new_contact_form_path %></li>
+    <li><%= link_to t('spotlight.header_links.contact'), spotlight.new_exhibit_contact_form_path(current_exhibit) %></li>
   </ul>

data/app/views/catalog/_image_default.html.erb

@@ -3,4 +3,4 @@
 <div class="thumbnail">
   <%= tn %>
 </div>  
-<%- end %>
+<%- end %>

data/app/views/catalog/_save_search.html.erb

@@ -1,7 +1,7 @@
 <%= button_tag t(:'spotlight.saved_search.label'), class: 'btn btn-default',  data: {toggle:"modal", target:"#save-modal"} %>
 <div class="modal fade" id="save-modal" tabindex="-1" role="dialog" aria-labelledby="save-modal-label" aria-hidden="true">
   <div class="modal-dialog">
-  <%= bootstrap_form_for [spotlight, Spotlight::Exhibit.default, Spotlight::Search.new] do |f| %>
+  <%= bootstrap_form_for [spotlight, current_exhibit, Spotlight::Search.new] do |f| %>
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>

data/app/views/catalog/_sort_and_per_page.html.erb

@@ -1,7 +1,7 @@
 <div id="sortAndPerPage" class="clearfix">
   <%= render :partial => "paginate_compact", :object => @response %>
   <div class="search-widgets pull-right">
-    <%= render('save_search') if can?( :curate, Spotlight::Exhibit.default) %>
+    <%= render('save_search') if current_exhibit and can?( :curate, current_exhibit) %>
     <%= render :partial => 'sort_widget' %>
     <%= render :partial => 'per_page_widget' %>
     <%= render :partial => 'view_type_group' %>

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

@@ -1,12 +1,12 @@
 <% if current_exhibit %>
 <div id="exhibit-masthead" class="jumbotron">
   <div class="container">
-    <h1>
+    <div class="site-title h1">
       <%= current_exhibit.title %>
       <% if current_exhibit.subtitle %>
         <small><%= current_exhibit.subtitle %></small>
       <% end %>
-    </h1>
+    </div>
   </div>
 </div>
 <% end %>

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

@@ -3,11 +3,11 @@
 <div id="exhibit-navbar" class="navbar navbar-default" role="navigation">
   <div class="container">
     <ul class="nav navbar-nav">
-      <li class="<%= "active" if current_page?(root_url) %>"><%= link_to t(:'spotlight.curation.home.nav_catalog_link'), root_url %></li>
+      <li class="<%= "active" if current_page?(root_url) %>"><%= link_to t(:'spotlight.nav.home'), root_url %></li>
       <% unless published_top_level_feature_pages.empty? %>
         <% if published_top_level_feature_pages.length > 1 %>
         <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= t(:'spotlight.curation.feature_pages.nav_link') %> <b class="caret"></b></a>
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= t(:'spotlight.feature_pages.nav_link') %> <b class="caret"></b></a>
           <ul class="dropdown-menu">
             <% published_top_level_feature_pages.each do |page| %>
               <li>
@@ -21,9 +21,9 @@
         <% end %>
       <% end %>
       <% if current_exhibit.has_browse_categories? %>
-      <li class="<%= "active" if on_browse_page? %>"><%= link_to t(:'spotlight.curation.browse.header'), spotlight.exhibit_browse_index_path(current_exhibit) %></li>
+      <li class="<%= "active" if on_browse_page? %>"><%= link_to t(:'spotlight.browse.nav_link'), spotlight.exhibit_browse_index_path(current_exhibit) %></li>
       <% end %>
-      <li class="<%= "active" if on_about_page? %>"><%= link_to t(:'spotlight.curation.about_pages.nav_link'), [spotlight, current_exhibit.main_about_page] if current_exhibit.main_about_page %></li>
+      <li class="<%= "active" if on_about_page? %>"><%= link_to t(:'spotlight.about_pages.nav_link'), [spotlight, current_exhibit.main_about_page] if current_exhibit.main_about_page %></li>
     </ul>
 
     <div class="navbar-right col-sm-4 col-md-4"> 
@@ -34,9 +34,13 @@
 <% end %>
 <div id="content-header" class="navbar">
   <div class="container">
-    <%= content_for :breadcrumbs %>
-    <div class="navbar-right">
-      <%= content_for :curation_mode_widget %>
+    <div class="row">
+      <div class="col-sm-8 col-md-8"> 
+        <%= render_breadcrumbs :builder => Spotlight::BootstrapBreadcrumbsBuilder %>
+      </div>
+      <div class="navbar-right col-sm-4 col-md-4"> 
+        <%= content_for :curation_mode_widget %>
+      </div>
     </div>
   </div>
 </div>

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

@@ -2,7 +2,7 @@
   <div class="container">
     <div class="navbar-header">
     <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#user-util-collapse">
-      <span class="sr-only">Toggle navigation</span>
+      <span class="sr-only"><%= t :toggle_nav %></span>
       <span class="icon-bar"></span>
       <span class="icon-bar"></span>
       <span class="icon-bar"></span>

data/app/views/sir-trevor/blocks/_item_text_block.html.erb

@@ -12,5 +12,5 @@
       </div>
     <%- end -%>
   </div>
-  <%= block['item-text'] %>
+  <%= sir_trevor_markdown block["text"] %>
 </div>

data/app/views/sir-trevor/blocks/_multi_up_item_grid_block.html.erb

@@ -0,0 +1,25 @@
+<% block_ids = item_grid_block_ids(block) %>
+<% unless block_ids.blank? %>
+  <% documents = get_solr_response_for_field_values("id", item_grid_block_ids(block)).last %>
+  <div class="spotlight-flexbox">
+    <% block_ids.each do |block_id| %>
+      <% document = documents.find{|d| d[:id] == block_id} %>
+      <% if document %>
+        <div class="box" data-id="<%= document[:id] %>">
+          <div class="contents">
+            <% if has_thumbnail? document %>
+              <div>
+                <%= render_thumbnail_tag(document) %>
+              </div>
+            <% end %>
+            <% if block['item-grid-display-caption'] == 'true' %>
+              <div class="title">
+                <%= document_heading(document) %>
+              </div>
+            <% end %>
+          </div>
+        </div>
+      <% end %>
+    <% end %>
+  </div>
+<% end %>

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

@@ -0,0 +1,19 @@
+<li class="dd-item dd3-item" data-id="<%= f.object.id %>" itemscope itemtype="http://schema.org/Person">
+  <div class="dd-handle dd3-handle"><%= t :drag %></div>
+  <div class="dd3-content panel panel-default">
+    <div class="panel-heading page">
+      <div class="contact-links pull-right">
+        <%= edit_link f.object, :class => 'btn btn-text' %> &middot;
+        <%= delete_link f.object, :class => 'btn btn-text' %>
+      </div>
+      <%= f.check_box :show_in_sidebar, label: '' %>
+      <%= f.hidden_field :id %>
+      <%= f.hidden_field :weight, data: {property: "weight"} %>
+      <div class="main">
+        <%= render partial: "contact_properties", locals: {contact: f.object} %>
+      </div>
+    </div>
+  </div>
+
+</li>
+

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

@@ -0,0 +1,5 @@
+          <div itemprop="name" class="name"><%= contact.name %></div>
+          <div itemprop="jobTitle"><%= contact.title %></div>
+          <div itemprop="workLocation"><%= contact.location %></div>
+          <div><%= mail_to contact.email, contact.email, itemprop: "email" %></div>
+

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

@@ -1,8 +1,19 @@
 <div id="sidebar" class="col-md-3" role="complementary">
-  <h4><%= t :'spotlight.curation.about_pages.nav_link' %></h4>
+  <h4><%= t :'.nav_link' %></h4>
   <ul class="nav sidenav">
     <% current_exhibit.about_pages.published.each do |page| %>
       <li class="<%= 'active' if current_page? page %>"><%= link_to_unless_current page.title, page %></li>
     <% end %>
   </ul>
+
+  <% if current_exhibit.contacts.published.present? %>
+    <h4 class='contacts-header'><%= t :'.contact' %></h4>
+    <ol class="nav sidenav contacts">
+      <% current_exhibit.contacts.published.each do |contact| %>
+        <li itemscope itemtype="http://schema.org/Person">
+          <%= render partial: "contact_properties", locals: {contact: contact} %>
+        </li>
+      <% end %>
+    </ol>
+  <% end %> 
 </div>

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

@@ -0,0 +1,20 @@
+<%= render 'spotlight/shared/curation_sidebar' %>
+<div id="content" class="col-md-9">
+  <%= render 'order_pages' %>
+  <%= bootstrap_form_for @exhibit, url: exhibit_contacts_path(@exhibit),
+      style: :horizontal, html: {class: 'exhibit-contacts'} do |f| %>
+    <h3><%= t :".contacts" %></h3>
+    <p><%= t :'.instructions' %></p>
+    <div class="panel-group dd contacts_admin">
+      <ol class="dd-list">
+        <%= f.fields_for :contacts do |c| %>
+          <%= render partial: 'contact', locals: {f: c} %>
+        <% end %>
+      </ol>
+    </div>
+    <div class="pull-right" style="margin-top: 1em;">
+      <%= f.submit nil %>
+    </div>
+  <% end %>
+  <%= exhibit_create_link Spotlight::Contact.new, class: "btn btn-primary" %>
+</div>

data/app/views/spotlight/blacklight_configurations/edit_facet_fields.html.erb

@@ -1,45 +1,35 @@
 <%= render 'spotlight/shared/curation_sidebar' %>
 <div id="content" class="col-md-9">
-<%= bootstrap_form_for @blacklight_configuration, url: spotlight.exhibit_blacklight_configuration_path(@exhibit), style: :horizontal, right: "col-sm-5" do |f| %>
-    <div class="row">
-      <h1><%= t('spotlight.curation.header') %></h1>
-    </div>
-    <div class="row">
-      <div class="col-sm-5">
-        <h2><small><%= t('spotlight.curation.facet_fields.header') %></small></h2>
-      </div>
-      <div class="col-sm-2">
-        <%= f.submit nil %>
-      </div>
-    </div>
+  <%= curation_page_title %>
+<%= bootstrap_form_for @blacklight_configuration, url: spotlight.exhibit_blacklight_configuration_path(@exhibit), style: :horizontal, left: 'col-md-3', right: 'col-sm-5' do |f| %>
     <div class="panel-group dd facet_fields" id="nested-fields">
     <ol class="dd-list">
 
       <%= f.fields_for :facet_fields do |idxf| %>
         <% @exhibit.blacklight_configuration.all_facet_fields.each do |key, config| %>
           <li class="dd-item" data-id="<%= key.parameterize %>">
-  <div class="dd-handle dd3-handle">Drag</div>
+  <div class="dd-handle dd3-handle"><%= t :drag %></div>
           <%= idxf.fields_for key do |facet| %>
             <div class="dd3-content panel panel-default facet-config-<%= key.parameterize %>">
               <div class="panel-heading">
-              <a class="pull-right btn btn-text" data-toggle="collapse" href="#collapse-facet-<%= key.parameterize %>"><%= t(:'spotlight.feature_pages.options') %>
+              <a class="pull-right btn btn-text" data-toggle="collapse" href="#collapse-facet-<%= key.parameterize %>"><%= t(:'.options') %>
       <span class="glyphicon glyphicon-chevron-right"></span>
     </a>
 
                 <%= facet.hidden_field :weight, 'data-property' => 'weight' %>
-                <%= facet.check_box :enabled, checked: (@exhibit.blacklight_configuration.facet_fields[key] || {}).fetch(:enabled, true), label: (@exhibit.blacklight_configuration.facet_fields[key] || {}).fetch(:label, @exhibit.blacklight_configuration.default_blacklight_config.facet_fields[key].label), title: key %>
+                <%= facet.check_box :show, checked: (@exhibit.blacklight_configuration.facet_fields[key] || @exhibit.blacklight_configuration.default_blacklight_config.facet_fields[key]).fetch(:show), label: (@exhibit.blacklight_configuration.facet_fields[key] || {}).fetch(:label, @exhibit.blacklight_configuration.default_blacklight_config.facet_fields[key].label), title: key %>
 
                 <% if metadata =  @fields.fetch(key.to_s, {}) %>
                 <div class="text-muted">
-                  <%= content_tag :span, t(:'spotlight.curation.facet_fields.items_count', count: metadata.fetch('docs', 0)), class: 'btn btn-text' %> •
+                  <%= content_tag :span, t(:'.items_count', count: metadata.fetch('docs', 0)), class: 'btn btn-text' %> •
 
-                  <%= link_to t(:'spotlight.curation.facet_fields.values_count', count: metadata.fetch('distinct', 0)), catalog_facet_path(key), class: 'btn btn-text btn-with-tooltip', 'data-container' => 'body', 'data-toggle' => 'tooltip', 'data-placement' => 'top', 'title' => render_field_value(metadata.fetch('topTerms', {}).map { |k,v| String.new(k) }, config) %>
+                  <%= link_to t(:'.values_count', count: metadata.fetch('distinct', 0)), catalog_facet_path(key), class: 'btn btn-text btn-with-tooltip', 'data-container' => 'body', 'data-toggle' => 'tooltip', 'data-placement' => 'top', 'title' => render_field_value(metadata.fetch('topTerms', {}).map { |k,v| String.new(k) }, config) %>
                   <% end %>
                 </div>
               </div>
               <div id="collapse-facet-<%= key.parameterize %>" class="panel-collapse collapse">
                 <div class="panel-body">
-                  <%= facet.text_field :label, value: @exhibit.blacklight_configuration.facet_fields.fetch(key, {})[:label], label: t('spotlight.curation.facet_fields.options.label'), placeholder: @exhibit.blacklight_configuration.default_blacklight_config.facet_fields[key].label %>
+                  <%= facet.text_field :label, value: @exhibit.blacklight_configuration.facet_fields.fetch(key, {})[:label], label: t('.field.label'), placeholder: @exhibit.blacklight_configuration.default_blacklight_config.facet_fields[key].label %>
                 </div>
               </div>
             </div>
@@ -49,5 +39,8 @@
    <% end %>
    </ol>
    </div>
+  <div class="pull-right">
+    <%= f.submit nil, class: 'btn btn-primary' %>
+  </div>
 <% end %>
 </div>

data/app/views/spotlight/blacklight_configurations/edit_metadata_fields.html.erb

@@ -1,23 +1,19 @@
 <%= render 'spotlight/shared/curation_sidebar' %>
 <div id="content" class="col-md-9">
-<%= bootstrap_form_for @blacklight_configuration, url: spotlight.exhibit_blacklight_configuration_path(@exhibit), style: :horizontal, right: "col-sm-5" do |f| %>
-    <h1><%= t('spotlight.curation.header') %></h1>
-    <div class="pull-right">
-      <%= f.submit nil %>
-    </div>
-    <h2 class="text-muted clearfix"><%= t('spotlight.curation.metadata_fields.header') %></h2>
-    <h3><%= t('spotlight.curation.metadata_fields.order_header') %></h3>
+<%= curation_page_title %>
+<%= bootstrap_form_for @blacklight_configuration, url: spotlight.exhibit_blacklight_configuration_path(@exhibit), style: :horizontal, right: "col-sm-5"  do |f| %>
+    <h3><%= t(:'.order_header') %></h3>
 
-    <p class="instuctions">Select metadata fields to display on each type of page. Drag and drop fields to specify the order they are displayed on the Item Details page.</p>
+    <p class="instructions"><%= t :'.instructions' %></p>
 
     <table id="nested-fields" class="table table-striped">
       <thead>
         <tr>
-          <th><%= t :'spotlight.curation.metadata_fields.label' %></th>
-          <th><%= t :'spotlight.curation.metadata_fields.view.show', default: t(:'blacklight.search.view.show') %></th>
+          <th><%= t :'.fields.label' %></th>
+          <th><%= t :'.view.show', default: t(:'blacklight.search.view.show') %></th>
           <% @exhibit.blacklight_configuration.default_blacklight_config.view.keys.each do |type| %>
 
-          <th><%= t "spotlight.curation.metadata_fields.view.#{type}", default: t("blacklight.search.view.#{type}") %></th>
+          <th><%= t :".view.#{type}", default: t(:".view.#{type}") %></th>
           <% end %>
         </tr>
       </thead>
@@ -28,9 +24,10 @@
                 <%= idxf.fields_for key do |field| %>
                   <td>
                     <%= field.hidden_field :weight, 'data-property' => 'weight' %>
-                    <div class="dd-handle dd3-handle">Drag</div>
+                    <div class="dd-handle dd3-handle"><%= t :drag %></div>
 
-                  <%= config.label %>
+                  <a href="#edit-in-place" class="field-label"><%= (@exhibit.blacklight_configuration.index_fields[key] || {}).fetch(:label, config.label) %></a>
+                  <%= field.hidden_field :label, value: @exhibit.blacklight_configuration.index_fields.fetch(key, {})[:label], class: 'form-control input-sm' %>
                   </td>
                   <td><%= field.check_box :show, checked: (@exhibit.blacklight_configuration.index_fields[key] || {})[:show], label: "" %></td>
                   <% @exhibit.blacklight_configuration.default_blacklight_config.view.keys.each do |type| %>
@@ -41,12 +38,15 @@
           <% end %>
         <% end %>
      </tbody>
-   </table>
+  </table>
+  <div class="clearfix">
+    <%= f.submit nil, class: 'btn btn-primary pull-right' %>
+  </div>
 <% end %>
 
 
-    <h3><%= t('spotlight.curation.metadata_fields.exhibit_specific_header') %></h3>
-    <p class="instuctions">You can add metadata fields to supplement the metadata fields that are part of the repository item record.</p>
+    <h3><%= t(:'.exhibit_specific.header') %></h3>
+    <p class="instructions"><%= t(:'.exhibit_specific.instructions') %></p>
 
     <table class="table table-striped" id="exhibit-specific-fields">
       <tbody>
@@ -55,8 +55,8 @@
             <td>
               <div class="field-label"><%= field.label %></div>
               <div class="actions">
-                <%= link_to t('helpers.submit.edit'), edit_custom_field_path(field), class: 'btn btn-text' %> &middot;
-                <%= link_to t('helpers.submit.destroy'), custom_field_path(field), method: :delete, data: { confirm: t(:'spotlight.curation.metadata_fields.destroy_are_you_sure') }, class: 'btn btn-text' %>
+                <%= edit_link field, class: 'btn btn-text' %> &middot;
+                <%= delete_link field, class: 'btn btn-text' %>
               </div>
             </td>
             <td class="field-description">
@@ -69,5 +69,5 @@
     </table>
 
 
-<%= link_to t(:'spotlight.curation.metadata_fields.new_custom_field'), new_exhibit_custom_field_path(current_exhibit), class: 'btn btn-primary' %>
+<%= exhibit_create_link Spotlight::CustomField.new, class: 'btn btn-primary' %>
 </div>