blacklight-spotlight 0.0.2 → 0.0.3

data/app/assets/stylesheets/spotlight/{catalog.css.scss → _catalog.css.scss}

@@ -1,5 +1,3 @@
-@import 'bootstrap';
-
 #documents.table {
   .documentHeader {
 
@@ -36,12 +34,22 @@ form.edit_solr_document {
   }
 }
 
+.bootstrap-tagsinput {
+  .twitter-typeahead {
+    width: auto;
+  }
+
+  .tt-input {
+    vertical-align: baseline !important;
+  }
+}
+
 .blacklight-catalog-edit, .blacklight-catalog-show {
   .thumbnail {
     @extend .col-md-6;
   }
 
-  .edit-fields {
+  .edit_solr_document {
     float: right;
     @extend .col-md-6;
     border-bottom: 1px solid #ccc;

data/app/assets/stylesheets/spotlight/{curation.css.scss → _curation.css.scss}

@@ -55,10 +55,12 @@
   }
 }
 
-.instuctions {
-  border-top: 1px solid lightgray;
-  padding-top: 5px;
- }
+h1,h2,h3,h4,h5,h6 {
+  & + .instructions {
+    border-top: 1px solid lightgray;
+    padding-top: 5px;
+  }
+}
  
 .label.curation-widget {
   display: inline-block;
@@ -73,4 +75,13 @@
 #content-header {
   height: auto;
   min-height: 0;
+}
+.spotlight-admin-thumbnail {
+  position: relative;
+  .label {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+  }
 }

data/app/assets/stylesheets/spotlight/_header.css.scss

@@ -0,0 +1,41 @@
+#exhibit-masthead, #exhibit-navbar {
+  margin-top: -30px;
+  z-index: 1;
+}
+
+#exhibit-masthead {
+  padding: 24px 0;
+  .site-title {
+    font-size: 30px;
+  }
+
+  small {
+    display: block;
+  }
+}
+
+#content-header {
+  .breadcrumb {
+    padding: 8px 0;
+    background: none;
+    margin-bottom: 0;
+  }
+}
+
+.col-md-4 {
+  .submit-search-text {
+    // hide 'search' label 
+      // copied from .sr-only, sadly can't seem to use @extend in a media
+      // query like this, have to copy. 
+      position: absolute;
+      width: 1px;
+      height: 1px;
+      margin: -1px;
+      overflow: hidden;
+      clip: rect(0,0,0,0);
+      border: 0;
+  }
+  .glyphicon-search {
+    line-height: $line-height-computed;
+  }
+}

data/app/assets/stylesheets/spotlight/{item_text_block.css.scss → _item_text_block.css.scss}

@@ -32,10 +32,16 @@
   .field {
     width: 75%;
   }
-  textarea {
+
+  #item-text {
+    @extend .form-control;
+
+    min-height: 7em;
+
     &:hover, &:active {
       @include record-thubmnail-textarea;
     }
     @include record-thubmnail-textarea;
+    
   }
 }

data/app/assets/stylesheets/spotlight/_multi_up_item_grid.css.scss

@@ -0,0 +1,41 @@
+.item-grid-admin {
+  .field {
+    input[type='text'] {
+      margin-left: 10px;
+      margin-bottom: 10px;
+      width: 89%;
+    }
+    .twitter-typeahead {
+      display: inline !important;
+    }
+  }
+  .field-select {
+    margin-top: 15px;
+    select {
+      display: block;
+      width: 90%;
+    }
+  }
+}
+
+.spotlight-flexbox {
+  display: -webkit-box;
+  display: -moz-box;
+  display: -ms-flexbox;
+  display: -webkit-flex;
+  display: flex;
+  .box {
+    text-align: center;
+    .title {
+      margin-top: 5px;
+    }
+    img {
+      max-width: 80%;
+    }
+    -webkit-box-flex: 1;
+    -moz-box-flex: 1;
+    -webkit-flex: 1;
+    -ms-flex: 1;
+    flex: 1;
+  }
+}

data/app/assets/stylesheets/spotlight/_pages.css.scss

@@ -0,0 +1,43 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/
+
+#nested-pages {
+  margin-bottom: 1em;  
+}
+
+.st-title {
+  position: absolute;
+  top: 0;
+  left: 0;
+  display: none;
+  background-color: #34e0c2;
+  padding: 3px 8px;
+  color: white;
+  font-weight: bold;
+}
+
+.st-block__inner:hover {
+  .st-title {
+    display: block;
+  }
+}
+#sidebar {
+  .contacts-header {
+    margin-top: 40px;
+  }
+  ol.contacts {
+    li {
+      margin-top: 10px;
+      .name {
+        font-weight: bold;
+      }
+    }
+  }
+}
+
+.contacts_admin .name {
+  font-size: 16px;
+  font-weight: 500;
+}

data/app/assets/stylesheets/spotlight/_variables_bootstrap.css.scss

@@ -0,0 +1,7 @@
+$font-size-base: 14px;
+$font-size-h1:            floor(($font-size-base * 2.15)) !default; // ~30px
+$font-size-h2:            floor(($font-size-base * 1.7)) !default; // ~24px
+$font-size-h3:            ceil(($font-size-base * 1.53)) !default; // ~201px
+$font-size-h4:            ceil(($font-size-base * 1.21)) !default; // ~17px
+$font-size-h5:            $font-size-base !default;
+$font-size-h6:            ceil(($font-size-base * 0.85)) !default; // ~12px

data/app/assets/stylesheets/spotlight/{application.css → application.css.scss}

@@ -8,9 +8,10 @@
  * You're free to add application-wide styles to this file and they'll appear at the top of the
  * compiled file, but it's generally better to create a new file per style scope.
  *
- *= require_self
  *= require sir-trevor
  *= require bootstrap-tagsinput
- *= require_tree .
  */
+@import "spotlight/variables";
+@import "bootstrap/variables";
+@import 'spotlight/spotlight';
 

data/app/assets/stylesheets/spotlight/spotlight.css.scss

@@ -0,0 +1,15 @@
+@import "spotlight/sir-trevor";
+@import "spotlight/attachments";
+@import "spotlight/pages";
+@import "spotlight/browse";
+@import "spotlight/header";
+@import "spotlight/catalog";
+@import "spotlight/curation";
+@import "spotlight/exhibit_admin";
+@import "spotlight/item_text_block";
+@import "spotlight/multi_up_item_grid";
+@import "spotlight/nestable";
+@import "spotlight/blacklight_configuration";
+@import "spotlight/typeahead";
+@import "spotlight/bootstrap_overrides";
+

data/app/assets/stylesheets/spotlight/typeahead.css

@@ -2,7 +2,6 @@
   width: 100%;
 }
 
-
 .typeahead,
 .tt-query,
 .tt-hint {

data/app/builders/spotlight/bootstrap_breadcrumbs_builder.rb

@@ -0,0 +1,24 @@
+# The BootstrapBreadcrumbsBuilder is a Bootstrap compatible breadcrumb builder.
+# It provides basic functionalities to render a breadcrumb navigation according to Bootstrap's conventions.
+#
+# BootstrapBreadcrumbsBuilder accepts a limited set of options:
+#
+# You can use it with the :builder option on render_breadcrumbs:
+#     <%= render_breadcrumbs :builder => Spotlight::BootstrapBreadcrumbsBuilder %>
+#
+class Spotlight::BootstrapBreadcrumbsBuilder < BreadcrumbsOnRails::Breadcrumbs::Builder
+  include ActionView::Helpers::OutputSafetyHelper
+  def render
+    @context.content_tag(:ul, class: 'breadcrumb') do
+      safe_join(@elements.uniq.collect {|e| render_element(e)})
+    end
+  end
+
+  def render_element(element)
+    html_class = 'active' if @context.current_page?(compute_path(element))
+
+    @context.content_tag(:li, :class => html_class) do
+      @context.link_to_unless_current(compute_name(element), compute_path(element), element.options)
+    end
+  end
+end

data/app/controllers/spotlight/about_pages_controller.rb

@@ -1,16 +1,38 @@
 module Spotlight
   class AboutPagesController < PagesController
+    load_and_authorize_resource :exhibit, class: Spotlight::Exhibit, only: :update_contacts
 
-    private
-    def page_model
-      :about_page
+    def update_contacts
+      if @exhibit.update(contact_params)
+        redirect_to exhibit_about_pages_path(@exhibit), notice: 'Contacts were successfully updated.'
+      else
+        render action: 'index'
+      end
     end
-    def cast_page_instance_variable
-      if @about_pages
-        @pages = @about_pages
-      elsif @about_page
-        @page = @about_page
+
+    protected
+
+    def attach_breadcrumbs
+      return if action_name == 'update_contacts'
+      super
+      if @page
+        if action_name == 'edit'
+          add_breadcrumb t(:'spotlight.pages.index.about_pages.header'), exhibit_about_pages_path(@exhibit)
+        else
+          add_breadcrumb t(:'spotlight.about_pages.nav_link'), @exhibit.main_about_page
+        end
+
+        unless @page == @exhibit.main_about_page
+          add_breadcrumb @page.title, action_name == 'edit' ? edit_about_page_path(@page) : @page 
+        end
+      elsif action_name == 'index'
+        add_breadcrumb t(:'spotlight.curation.sidebar.header'), exhibit_dashboard_path(@exhibit)
+        add_breadcrumb t(:'spotlight.pages.index.about_pages.header'), exhibit_about_pages_path(@exhibit)
       end
     end
+
+    def contact_params
+      params.require(:exhibit).permit("contacts_attributes" => [:id, :show_in_sidebar, :weight])
+    end
   end
 end

data/app/controllers/spotlight/blacklight_configurations_controller.rb

@@ -16,11 +16,17 @@ class Spotlight::BlacklightConfigurationsController < Spotlight::ApplicationCont
   ##
   # Edit the index and show view metadata fields
   def edit_metadata_fields
+    add_breadcrumb @exhibit.title, @exhibit
+    add_breadcrumb t(:'spotlight.curation.sidebar.header'), exhibit_dashboard_path(@exhibit)
+    add_breadcrumb t(:'spotlight.curation.sidebar.metadata'), exhibit_edit_metadata_path(@exhibit)
   end
 
   ##
   # Edit the index and show view metadata fields
   def edit_facet_fields
+    add_breadcrumb @exhibit.title, @exhibit
+    add_breadcrumb t(:'spotlight.curation.sidebar.header'), exhibit_dashboard_path(@exhibit)
+    add_breadcrumb t(:'spotlight.curation.sidebar.search_facets'), exhibit_edit_facets_path(@exhibit)
     @fields = blacklight_solr.get('admin/luke', params: { fl: '*', 'json.nl' => 'map' })['fields']
   end
 
@@ -36,11 +42,11 @@ class Spotlight::BlacklightConfigurationsController < Spotlight::ApplicationCont
   def exhibit_configuration_index_params
     views = @blacklight_configuration.default_blacklight_config.view.keys | [:show]
 
-    (@blacklight_configuration.all_index_fields.keys  + @blacklight_configuration.custom_index_fields.keys).inject({}) { |result, element| result[element] = ([:enabled, :weight] | views); result }
+    (@blacklight_configuration.all_index_fields.keys  + @blacklight_configuration.custom_index_fields.keys).inject({}) { |result, element| result[element] = ([:enabled, :label, :weight] | views); result }
   end
 
   def exhibit_configuration_facet_params
-    @blacklight_configuration.all_facet_fields.keys.inject({}) { |result, element| result[element] = [:enabled, :label, :weight]; result }
+    @blacklight_configuration.all_facet_fields.keys.inject({}) { |result, element| result[element] = [:show, :label, :weight]; result }
   end
 
-end
+end

data/app/controllers/spotlight/browse_controller.rb

@@ -4,18 +4,47 @@ module Spotlight
     copy_blacklight_config_from ::CatalogController
 
     load_resource :exhibit, class: "Spotlight::Exhibit", only: [:index]
+    before_filter :load_search, only: :show
+    before_filter :attach_breadcrumbs
     
     def index
       @searches = @exhibit.searches.published
     end
 
     def show
-      @search = Spotlight::Search.published.find(params[:id])
+      add_breadcrumb @search.title, exhibit_browse_path(@exhibit, @search)
       (@response, @document_list) = get_search_results @search.query_params
     end
     
+    protected
+    ##
+    # Browsing an exhibit should start a new search session
+    def start_new_search_session?
+      params[:action] == 'show'
+    end
+
+    # WARNING: Blacklight::Catalog::SearchContext sets @searches in history_session in a before_filter
+    # See https://github.com/projectblacklight/blacklight/pull/780
+    def history_session
+      #nop
+    end
+
+    def attach_breadcrumbs
+      load_exhibit
+      add_breadcrumb @exhibit.title, @exhibit
+      add_breadcrumb t(:'spotlight.browse.nav_link'), exhibit_browse_index_path(@exhibit)
+    end
+
+    def load_search
+      @search = Spotlight::Search.published.find(params[:id])
+    end
+
+    def load_exhibit
+      @exhibit ||= @search.exhibit
+    end
+
     def _prefixes
       @_prefixes ||= super + ['catalog']
     end
   end
-end
+end

data/app/controllers/spotlight/catalog_controller.rb

@@ -2,16 +2,42 @@ class Spotlight::CatalogController < Spotlight::ApplicationController
   include Blacklight::Catalog
   include Spotlight::Catalog
   load_resource :exhibit, class: Spotlight::Exhibit
-  before_filter :authenticate_user!, only: [:admin, :edit]
-  before_filter :check_authorization, only: [:admin, :edit]
-  load_and_authorize_resource instance_name: :document, class: ::SolrDocument, only: [:edit]
+  before_filter :authenticate_user!, only: [:admin, :edit, :make_public, :make_private]
+  before_filter :check_authorization, only: [:admin, :edit, :make_public, :make_private]
+
+  before_filter :attach_breadcrumbs
 
   copy_blacklight_config_from ::CatalogController
 
+  def index
+    super
+
+    add_breadcrumb t(:'spotlight.catalog.breadcrumb.index'), request.fullpath if has_search_parameters?
+  end
+
+  def show
+    super
+
+    if @document.private? current_exhibit
+      authenticate_user!
+      authorize! :curate, current_exhibit
+    end
+
+    if current_browse_category
+      add_breadcrumb t(:'spotlight.browse.nav_link'), exhibit_browse_index_path(current_browse_category.exhibit)
+      add_breadcrumb current_browse_category.title, exhibit_browse_path(current_browse_category.exhibit, current_browse_category)
+    else
+      add_breadcrumb t(:'spotlight.catalog.breadcrumb.index'), search_action_url(current_search_session[:query_params]) if current_search_session
+    end
+    add_breadcrumb Array(@document[blacklight_config.view_config(:show).title_field]).join(', '), exhibit_catalog_path(@exhibit, @document)
+  end
+
   def admin
     self.blacklight_config.view.reject! { |k,v| true }
     self.blacklight_config.view.admin_table.partials = [:index_compact]
 
+    add_breadcrumb t(:'spotlight.curation.sidebar.header'), exhibit_dashboard_path(@exhibit)
+    add_breadcrumb t(:'spotlight.curation.sidebar.items'), admin_exhibit_catalog_index_path(@exhibit)
     (@response, @document_list) = get_search_results
     @filters = params[:f] || []
       
@@ -24,9 +50,9 @@ class Spotlight::CatalogController < Spotlight::ApplicationController
     if params[:solr_document]
       @document = ::SolrDocument.find params[:id] 
       authenticate_user!
-      authorize! :update, @document
+      authorize! :curate, current_exhibit
       @document.update(current_exhibit, solr_document_params)
-      @document.save # TODO need to index tags too
+      @document.save
       redirect_to exhibit_catalog_path(current_exhibit, @document)
     else
       super
@@ -34,17 +60,70 @@ class Spotlight::CatalogController < Spotlight::ApplicationController
   end
 
   def edit
+    @document = ::SolrDocument.find(params[:id])
     blacklight_config.view.edit.partials = blacklight_config.view_config(:show).partials.dup
     blacklight_config.view.edit.partials.delete "spotlight/catalog/tags"
     blacklight_config.view.edit.partials.insert(2, :edit)
   end
 
-  def _prefixes
-    @_prefixes ||= super + ['catalog']
+  def make_private
+    @document = ::SolrDocument.find params[:catalog_id] 
+    @document.make_private!(current_exhibit)
+    @document.save
+
+    respond_to do |format|
+      format.html { redirect_to :back }
+      format.json { render json: true }
+    end
+  end
+
+  def make_public
+    @document = ::SolrDocument.find params[:catalog_id] 
+    @document.make_public!(current_exhibit)
+    @document.save
+
+    respond_to do |format|
+      format.html { redirect_to :back }
+      format.json { render json: true }
+    end
   end
 
   protected
 
+  # TODO move this out of app/helpers/blacklight/catalog_helper_behavior.rb and into blacklight/catalog.rb
+  def has_search_parameters?
+    !params[:q].blank? or !params[:f].blank? or !params[:search_field].blank?
+  end
+
+  def attach_breadcrumbs
+    # The "q: ''" is necessary so that the breadcrumb builder recognizes that a path like this:
+    # /exhibits/1?f%5Bgenre_sim%5D%5B%5D=map&q= is not the same as /exhibits/1
+    # Otherwise the exhibit breadcrumb won't be a link.
+    # see http://api.rubyonrails.org/classes/ActionView/Helpers/UrlHelper.html#method-i-current_page-3F
+    add_breadcrumb @exhibit.title, exhibit_path(@exhibit, q: '')
+  end
+
+  ## 
+  # Override Blacklight's #setup_next_and_previous_documents to handle
+  # browse categories too
+  def setup_next_and_previous_documents
+    if current_browse_category
+      index = search_session[:counter].to_i - 1
+      response, documents = get_previous_and_next_documents_for_search index, current_browse_category.query_params
+
+      search_session[:total] = response.total
+      @search_context_response = response
+      @previous_document = documents.first
+      @next_document = documents.last
+    else
+      super
+    end
+  end
+
+  def _prefixes
+    @_prefixes ||= super + ['catalog']
+  end
+
   ##
   # Admin catalog controller should not create a new search
   # session in the blacklight context
@@ -63,4 +142,10 @@ class Spotlight::CatalogController < Spotlight::ApplicationController
   def check_authorization
     authorize! :curate, @exhibit
   end
+
+  def current_browse_category
+    @current_browse_category ||= if current_search_session and current_search_session.query_params[:action] == "show" and current_search_session.query_params[:controller] == "spotlight/browse"
+      Spotlight::Search.find(current_search_session.query_params[:id])
+    end
+  end
 end