blacklight-spotlight 0.0.2 → 0.0.3

data/app/controllers/spotlight/contact_forms_controller.rb

@@ -6,6 +6,7 @@ module Spotlight
 
     def create
       @contact_form = Spotlight::ContactForm.new(contact_form_params)
+      @contact_form.current_exhibit = current_exhibit
       @contact_form.request = request
 
       if @contact_form.valid?

data/app/controllers/spotlight/contacts_controller.rb

@@ -0,0 +1,54 @@
+module Spotlight
+  class ContactsController < Spotlight::ApplicationController
+    before_filter :authenticate_user!
+    load_and_authorize_resource :exhibit, class: "Spotlight::Exhibit",  only: [:new, :create]
+    load_and_authorize_resource through: :exhibit, shallow: true
+    before_filter :attach_breadcrumbs
+
+    def new
+      add_breadcrumb t(:'helpers.action.spotlight/contact.create'), new_exhibit_contact_path(@exhibit)
+    end
+
+    def edit
+      add_breadcrumb @contact.name, edit_contact_path(@contact)
+    end
+
+    def update
+      if @contact.update(contact_params)
+        redirect_to exhibit_about_pages_path(@contact.exhibit), notice: "Contact updated."
+      else
+        render 'edit'
+      end
+    end
+
+    def create
+      if @contact.update(contact_params)
+        redirect_to exhibit_about_pages_path(@contact.exhibit), notice: "Contact created."
+      else
+        render 'new'
+      end
+    end
+
+    def destroy
+      @contact.destroy
+      redirect_to exhibit_about_pages_path(@contact.exhibit), notice: "Contact removed."
+    end
+
+    protected
+
+    def attach_breadcrumbs
+      load_exhibit
+      add_breadcrumb @exhibit.title, @exhibit
+      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
+
+    def load_exhibit
+      @exhibit ||= @contact.exhibit
+    end
+
+    def contact_params
+      params.require(:contact).permit(:name, :email, :location, :title)
+    end
+  end
+end

data/app/controllers/spotlight/custom_fields_controller.rb

@@ -2,16 +2,16 @@ class Spotlight::CustomFieldsController < Spotlight::ApplicationController
   before_filter :authenticate_user!
   
   load_resource :exhibit, class: Spotlight::Exhibit, only: [:index, :new, :create]
-  load_and_authorize_resource through: :exhibit, only: [:index, :new, :create]
-
-  load_and_authorize_resource only: [:edit, :update, :destroy]
+  load_and_authorize_resource through: :exhibit, shallow: true
+  before_filter :attach_breadcrumbs, only: [:new, :edit]
 
   def new
+    add_breadcrumb t(:'helpers.action.spotlight/custom_field.create'), new_exhibit_custom_field_path(@exhibit)
 
   end
 
   def edit
-    @exhibit = @custom_field.exhibit
+    add_breadcrumb @custom_field.label, edit_custom_field_path(@custom_field)
   end
 
   def create
@@ -40,6 +40,17 @@ class Spotlight::CustomFieldsController < Spotlight::ApplicationController
 
   protected
 
+  def attach_breadcrumbs
+    load_exhibit
+    add_breadcrumb @exhibit.title, @exhibit
+    add_breadcrumb t(:'spotlight.curation.sidebar.header'), exhibit_dashboard_path(@exhibit)
+    add_breadcrumb t(:'spotlight.blacklight_configurations.edit_metadata_fields.header'), exhibit_edit_metadata_path(@exhibit)
+  end
+
+  def load_exhibit
+    @exhibit ||= @custom_field.exhibit
+  end
+
   def custom_field_params
     params.require(:custom_field).permit(:label, :short_description)
   end

data/app/controllers/spotlight/dashboard_controller.rb

@@ -0,0 +1,13 @@
+require_dependency "spotlight/application_controller"
+
+module Spotlight
+  class DashboardController < Spotlight::ApplicationController
+    before_filter :authenticate_user!
+    load_resource :exhibit, class: Spotlight::Exhibit #TODO authorize user?
+
+    def index
+      add_breadcrumb @exhibit.title, @exhibit
+      add_breadcrumb t(:'spotlight.curation.sidebar.dashboard'), exhibit_dashboard_path(@exhibit)
+    end
+  end
+end

data/app/controllers/spotlight/dashboards_controller.rb

@@ -0,0 +1,36 @@
+module Spotlight
+  class DashboardsController < Spotlight::ApplicationController
+    include Blacklight::Base
+
+    before_filter :authenticate_user!
+    load_resource :exhibit, class: Spotlight::Exhibit # TODO need to authorize user?
+
+    copy_blacklight_config_from Spotlight::CatalogController
+
+    def show
+      authorize! :curate, @exhibit
+
+      @pages = Spotlight::Page.recent.limit(5)
+      @solr_documents = load_recent_solr_documents 5
+      add_breadcrumb @exhibit.title, @exhibit
+      add_breadcrumb t(:'spotlight.curation.sidebar.dashboard'), exhibit_dashboard_path(@exhibit)
+
+      self.blacklight_config.view.reject! { |k,v| true }
+      self.blacklight_config.view.admin_table.partials = ['index_compact']
+    end
+
+    def _prefixes
+      @_prefixes ||= super + ['spotlight/catalog', 'catalog']
+    end
+
+    protected
+
+    def load_recent_solr_documents count
+      solr_params = { sort: 'timestamp desc' }
+      @response = find(solr_params)
+      @response.docs.take(count).map do |doc|
+        ::SolrDocument.new(doc, @response)
+      end
+    end
+  end
+end

data/app/controllers/spotlight/exhibits_controller.rb

@@ -1,11 +1,13 @@
 class Spotlight::ExhibitsController < Spotlight::ApplicationController
   before_filter :authenticate_user!
-  before_filter :default_exhibit
   include Blacklight::SolrHelper
 
-  authorize_resource
+  load_and_authorize_resource
 
   def edit
+    add_breadcrumb @exhibit.title, @exhibit
+    add_breadcrumb t(:'spotlight.administration.sidebar.header'), exhibit_dashboard_path(@exhibit)
+    add_breadcrumb t(:'spotlight.administration.sidebar.settings'), edit_exhibit_path(@exhibit)
     @exhibit.contact_emails << "" unless @exhibit.contact_emails.present?
   end
 
@@ -27,8 +29,4 @@ class Spotlight::ExhibitsController < Spotlight::ApplicationController
       contact_emails_attributes: [:email]
     )
   end
-
-  def default_exhibit
-    @exhibit = Spotlight::Exhibit.default
-  end
 end

data/app/controllers/spotlight/feature_pages_controller.rb

@@ -1,17 +1,20 @@
 module Spotlight
   class FeaturePagesController < PagesController
+    protected
+    def attach_breadcrumbs
+      super
 
-    private
-    def page_model
-      :feature_page
-    end
-    def cast_page_instance_variable
-      if @feature_pages
-        @pages = @feature_pages
-      elsif @feature_page
-        @page = @feature_page
+      if action_name == 'edit'
+        add_breadcrumb t(:'spotlight.curation.sidebar.feature_pages'), exhibit_feature_pages_path(@exhibit)
       end
-    end
 
+      if @page
+        add_breadcrumb @page.parent_page.title, @page.parent_page unless @page.top_level_page?
+        add_breadcrumb @page.title, action_name == 'edit' ? edit_feature_page_path(@page) : @page
+      elsif action_name == 'index'
+        add_breadcrumb t(:'spotlight.curation.sidebar.header'), exhibit_dashboard_path(@exhibit)
+        add_breadcrumb t(:'spotlight.curation.sidebar.feature_pages'), exhibit_feature_pages_path(@exhibit)
+      end
+    end
   end
 end

data/app/controllers/spotlight/home_pages_controller.rb

@@ -1,19 +1,20 @@
 module Spotlight
   class HomePagesController < Spotlight::PagesController
     include Blacklight::SolrHelper
+
     skip_authorize_resource only: :show
 
+    def edit
+      add_breadcrumb t(:'spotlight.curation.sidebar.feature_pages'), exhibit_feature_pages_path(@exhibit)
+      add_breadcrumb @page.title_or_default, edit_home_page_path(@page)
+      super
+    end
+
     def index
       redirect_to exhibit_feature_pages_path(@exhibit)
     end
 
     def show
-      @page = @home_page = if params[:id]
-        Spotlight::HomePage.find_by(id: params[:id])
-      else
-        Spotlight::Exhibit.default.home_page
-      end
-
       (@response, @document_list) = get_search_results
 
       if @page.nil? or !@page.published?
@@ -28,6 +29,7 @@ module Spotlight
     end
     
     private
+
     def search_action_url *args
       exhibit_catalog_index_url(@page.exhibit, *args)
     end
@@ -35,20 +37,11 @@ module Spotlight
     def blacklight_config
       if @page
         @page.exhibit.blacklight_config
-      else 
-        Spotlight::Exhibit.default.blacklight_config
-      end
-    end
-
-    def page_model
-      :home_page
-    end
-    def cast_page_instance_variable
-      if @home_pages
-        @pages = @home_pages
-      elsif @home_page
-        @page = @home_page
+      elsif current_exhibit
+        current_exhibit.blacklight_config
+      else
+        super
       end
     end
   end
-end
+end

data/app/controllers/spotlight/pages_controller.rb

@@ -3,20 +3,21 @@ module Spotlight
     before_filter :authenticate_user!, except: [:show]
 
     load_resource :exhibit, class: Spotlight::Exhibit, only: [:index, :new, :create, :update_all]
-    load_and_authorize_resource only: [:show, :edit, :update, :destroy, :update_all]
-    load_and_authorize_resource through: :exhibit, only: [:index, :new, :create]
+    load_and_authorize_resource through: :exhibit, shallow: true,  instance_name: 'page'
 
-    before_filter :cast_page_instance_variable
+    before_filter :attach_breadcrumbs
 
     include Blacklight::Base
     include Blacklight::Catalog::SearchContext
 
     copy_blacklight_config_from(CatalogController)
 
-    helper_method :get_search_results, :get_solr_response_for_doc_id, :page_model, :page_collection_name
+    helper_method :get_search_results, :get_solr_response_for_doc_id, :get_solr_response_for_field_values, :page_collection_name
 
     # GET /exhibits/1/pages
     def index
+      # set up a model the inline "add a new page" form
+      @page = CanCan::ControllerResource.new(self).send(:build_resource)
     end
 
     # GET /pages/1
@@ -34,6 +35,7 @@ module Spotlight
     # POST /exhibits/1/pages
     def create
       @page.attributes = page_params
+      @page.last_edited_by = @page.created_by = current_user
 
       if @page.save
         redirect_to [@page.exhibit, page_collection_name], notice: 'Page was successfully created.'
@@ -44,7 +46,7 @@ module Spotlight
 
     # PATCH/PUT /pages/1
     def update
-      if @page.update(page_params)
+      if @page.update(page_params.merge(last_edited_by: current_user))
         redirect_to [@page.exhibit, page_collection_name], notice: 'Page was successfully updated.'
       else
         render action: 'edit'
@@ -73,20 +75,25 @@ module Spotlight
     end
 
     def human_name
-      page_collection_name.to_s.humanize
+      @human_name ||= page_collection_name.humanize
+    end
+
+    alias page_collection_name controller_name 
+
+    def attach_breadcrumbs
+      load_exhibit
+      add_breadcrumb @exhibit.title, @exhibit
+    end
+
+    def load_exhibit
+      @exhibit ||= @page.exhibit
     end
 
     private
-      # We don't have a generic page model since Spotlight::Page is now a concern.
-      def page_model
-        ""
-      end
-      def page_collection_name
-        page_model.to_s.pluralize.to_sym
-      end
+
       # Only allow a trusted parameter "white list" through.
       def page_params
-        params.require(page_model).permit(:title, :content)
+        params.require(controller_name.singularize).permit(:title, :content)
       end
   end
 end

data/app/controllers/spotlight/roles_controller.rb

@@ -7,6 +7,9 @@ module Spotlight
     def index
       # every admin should at least see themseleves
       raise CanCan::AccessDenied if @roles.empty?
+      add_breadcrumb @exhibit.title, @exhibit
+      add_breadcrumb t(:'spotlight.administration.sidebar.header'), exhibit_dashboard_path(@exhibit)
+      add_breadcrumb t(:'spotlight.administration.sidebar.users'), exhibit_roles_path(@exhibit)
       @exhibit.roles.build
     end
 

data/app/controllers/spotlight/searches_controller.rb

@@ -3,6 +3,8 @@ class Spotlight::SearchesController < Spotlight::ApplicationController
   before_filter :authenticate_user!
   before_filter :only_curators!
   load_and_authorize_resource through: :exhibit, shallow: true
+  before_filter :attach_breadcrumbs, only: [:index, :edit]
+
 
   def create
     params_copy = params.dup
@@ -18,6 +20,7 @@ class Spotlight::SearchesController < Spotlight::ApplicationController
   end
 
   def edit
+    add_breadcrumb @search.title, edit_search_path(@search)
     @exhibit = @search.exhibit
   end
 
@@ -45,6 +48,13 @@ class Spotlight::SearchesController < Spotlight::ApplicationController
 
   protected
 
+  def attach_breadcrumbs
+    e = @exhibit || (@search.exhibit if @search)
+    add_breadcrumb e.title, e
+    add_breadcrumb t(:'spotlight.curation.sidebar.header'), exhibit_dashboard_path(e)
+    add_breadcrumb t(:'spotlight.curation.sidebar.browse'), exhibit_searches_path(e)
+  end
+
   def search_params
     params.require(:exhibit).permit("searches_attributes" => [:id, :on_landing_page, :weight])
   end

data/app/controllers/spotlight/tags_controller.rb

@@ -2,13 +2,25 @@ module Spotlight
   class TagsController < Spotlight::ApplicationController
     before_filter :authenticate_user!
     load_and_authorize_resource :exhibit, class: Spotlight::Exhibit
-    load_and_authorize_resource class: ActsAsTaggableOn::Tag
 
     def index
+      authorize! :tag, @exhibit
+      @tags = @exhibit.owned_tags
+      add_breadcrumb @exhibit.title, @exhibit
+      add_breadcrumb t(:'spotlight.curation.sidebar.header'), exhibit_dashboard_path(@exhibit)
+      add_breadcrumb t(:'spotlight.curation.sidebar.tags'), exhibit_tags_path(@exhibit)
+
+      respond_to do |format|
+        format.html
+        format.json { render json: @exhibit.owned_tags.map { |x| x.name } }
+      end
     end
 
     def destroy
-      @tag.destroy # warning: this causes every solr document with this tag to reindex.  That could be slow.
+      authorize! :tag, @exhibit 
+      # warning: this causes every solr document with this tag to reindex.  That could be slow.
+      @exhibit.owned_taggings.where(tag_id: params[:id]).destroy_all
+
       redirect_to exhibit_tags_path(@exhibit)
     end
   end

data/app/helpers/spotlight/admin_title_helper.rb

@@ -0,0 +1,27 @@
+module Spotlight
+  module AdminTitleHelper
+    def curation_page_title title = nil
+      page_title t(:'spotlight.curation.header'), title
+    end
+
+    def administration_page_title title = nil
+      page_title t(:'spotlight.administration.header'), title
+    end
+
+    def page_title section, title = nil
+      @page_title = t(:'spotlight.html_admin_title', section: section, title: title || t(:'.title', default: :'.header'), application_name: application_name)
+      content_tag(:h1, safe_join([section, content_tag(:small, title || t(:'.header'))], "\n"), class: "page-header")
+    end
+
+    def header_with_count *args
+      title, count = if args.length == 2
+        args
+      else
+        [t(:'.header'), args.first]
+      end
+
+      safe_join([title, content_tag(:span, count, class: 'label label-default')], " ")
+    end
+
+  end
+end