atrium 0.0.1.alpha → 0.0.1

data/app/controllers/atrium/showcases_controller.rb

@@ -21,16 +21,13 @@ class Atrium::ShowcasesController < Atrium::BaseController
     @atrium_showcase = Atrium::Showcase.find(params[:id])
     #TODO move this update to model rather in controller
     unless session[:folder_document_ids].blank?
-      @atrium_showcase.showcase_items ||= Hash.new
-      selected_document_ids = session[:folder_document_ids]
-      @atrium_showcase.showcase_items[:type]="featured"
-      @atrium_showcase.showcase_items[:solr_doc_ids]=selected_document_ids.join(',')
-    else
-      @atrium_showcase.showcase_items={}
+      selected_document_ids = session[:folder_document_ids] || []
+      #logger.debug("selected items: #{selected_document_ids.inspect}, session:#{session[:folder_document_ids].inspect}")
+      @atrium_showcase.showcase_items=selected_document_ids
     end
     @atrium_showcase.save
-
-    session_folder_ids= [] || session[:copy_folder_document_ids]
+    session_folder_ids= session[:copy_folder_document_ids] || []
+    #logger.debug("Showcase after updating featured: #{@atrium_showcase.inspect}, folder_document_ids to set:#{session_folder_ids.inspect}")
     session[:folder_document_ids] = session_folder_ids
     session[:copy_folder_document_ids]=nil
     if @atrium_showcase && !@atrium_showcase.showcase_items[:solr_doc_ids].nil?
@@ -41,6 +38,22 @@ class Atrium::ShowcasesController < Atrium::BaseController
     end
   end
 
+  def remove_featured
+    @atrium_showcase = Atrium::Showcase.find(params[:id])
+    text=''
+    if params[:solr_doc_id]  && @atrium_showcase.showcase_items && @atrium_showcase.showcase_items[:solr_doc_ids]
+      @featured_items = @atrium_showcase.showcase_items[:solr_doc_ids].split(',') || []
+      @featured_items.delete_if {|x| x.eql?(params[:solr_doc_id]) }
+      @atrium_showcase.showcase_items=@featured_items
+      @atrium_showcase.save
+      text = 'Document with id '+params[:solr_doc_id] +' was remove from featured successfully.'
+    end
+    #logger.debug("Showcase after updating featured: #{@atrium_showcase.inspect}")
+
+    flash[:notice] = text
+    render :text => text
+  end
+
   def featured
     session[:copy_folder_document_ids] = session[:folder_document_ids]
     session[:folder_document_ids] = []
@@ -125,69 +138,4 @@ private
   def unset_edit_showcase_in_session
     session[:edit_showcase] = nil
   end
-
-  #def configure_showcase
-  #  unless  @atrium_showcase
-  #    @atrium_showcase=Atrium::Showcase.find(params[:id])
-  #  end
-  #  @exhibit_navigation_data = get_exhibit_navigation_data
-  #  set_edit_showcase_in_session
-  #  if @atrium_showcase.for_exhibit?
-  #    redirect_to atrium_exhibit_path(:id=>@atrium_showcase.showcases_id, :f=>params[:f])
-  #  else
-  #    @atrium_collection= Atrium::Collection.find_by_id(@atrium_showcase.showcases_id)
-  #    redirect_to atrium_collection_showcase_path(:id=>@atrium_showcase.showcases_id, :showcase_id=>params[:id])
-  #  end
-  #end
-
-  #def index
-  #  @exhibit = Atrium::Exhibit.find(params[:exhibit_id])
-  #  @exhibit_navigation_data = get_exhibit_navigation_data
-  #  set_edit_showcase_in_session
-  #  redirect_to atrium_collection_path(:id=>@exhibit.atrium_collection_id, :exhibit_number=>@exhibit.id)
-  #end
-
-  #def create
-  #  @atrium_showcase = Atrium::Showcase.new(params[:atrium_exhibit_id])
-  #  @atrium_showcase.showcase_items ||= Hash.new
-  #  logger.info("atrium_showcase = #{@atrium_showcase.inspect}")
-  #  @atrium_showcase.save
-  #  logger.info("atrium_showcase = #{@atrium_showcase.inspect}")
-  #  set_edit_showcase_in_session
-  #  if @atrium_showcase.showcases_type=="Atrium::Exhibit"
-  #    redirect_to atrium_exhibit_path(:id=>@atrium_showcase.showcases_id, :f=>params[:facet_selection])
-  #  else
-  #    redirect_to atrium_collection_showcase_path(@atrium_showcase.showcases_id, @atrium_showcase.id, :f=>params[:facet_selection])
-  #  end
-  #end
-
-  #def edit
-    #@atrium_showcase = Atrium::Showcase.find(params[:id])
-    #set_edit_showcase_in_session
-    #redirect_to  parent_url(@atrium_showcase)
-    #if @atrium_showcase.showcases_type=="atrium_exhibit"
-    #  redirect_to atrium_exhibit_path(:id=>@atrium_showcase.showcases_id, :f=>params[:facet_selection])
-    #else
-    #  redirect_to atrium_collection_showcase_path(@atrium_showcase.showcases_id, params[:id], :f=>params[:f])
-    #end
-  #end
-
-  #def update
-  #   @atrium_showcase = Atrium::Showcase.find(params[:showcase_id])
-  #  if @atrium_showcase.update_attributes(params[:atrium_showcase])
-  #    flash[:notice] = 'Browse was successfully updated.'
-  #  end
-  #  redirect_to :action => "edit", :id=>@atrium_showcase.id, :f=>params[:f]
-  #end
-
-  #def selected_featured
-  #   @atrium_showcase = Atrium::Showcase.find(params[:id])
-  #  selected_document_ids = session[:folder_document_ids]
-  #  session[:folder_document_ids] = session[:copy_folder_document_ids]
-  #  @response, @documents = get_solr_response_for_field_values("id",selected_document_ids || [])
-  #  render :layout => false, :locals=>{:selected_document_ids=>selected_document_ids}
-  #end
-
-
-
 end

data/app/models/atrium/showcase.rb

@@ -79,6 +79,12 @@ class Atrium::Showcase < ActiveRecord::Base
     read_attribute(:showcase_items) || write_attribute(:showcase_items, {})
   end
 
+   def showcase_items=(solr_doc_ids = [])
+    showcase_items[:type]="featured"
+    showcase_items[:solr_doc_ids]=solr_doc_ids.join(',')
+    write_attribute(:showcase_items, showcase_items)
+  end
+
   def solr_doc_ids
     showcase_items[:solr_doc_ids] unless showcase_items.blank?
   end

data/app/views/atrium/collections/_form.html.erb

@@ -1,3 +1,7 @@
+
+<% content_for :atrium_side_bar do %>
+  <%= render :partial => 'atrium/collections/edit_navigation' %>
+<% end %>
 <%= form_for(@atrium_collection, :html => {:class => "atrium"}) do |f| %>
   <fieldset>
     <legend>Basic Configuration</legend>
@@ -83,11 +87,12 @@
 <% else %>
   <em>There are no exhibits in this collection.</em>
 <% end %>
-
-<%= form_for(@atrium_exhibit) do |exhibit| %>
-  <%- @atrium_exhibit.set_number = @atrium_collection.exhibits.size + 1 -%>
-  <%- @atrium_exhibit.atrium_collection_id = @atrium_collection[:id] -%>
-  <%= exhibit.hidden_field :set_number %>
-  <%= exhibit.hidden_field :atrium_collection_id %>
-  <%= exhibit.submit 'Add a Exhibit to this Collection', :class => 'button' %>
+<% if can_add_view_exhibit? %>
+  <%= form_for(@atrium_exhibit) do |exhibit| %>
+    <%- @atrium_exhibit.set_number = @atrium_collection.exhibits.size + 1 -%>
+    <%- @atrium_exhibit.atrium_collection_id = @atrium_collection[:id] -%>
+    <%= exhibit.hidden_field :set_number %>
+    <%= exhibit.hidden_field :atrium_collection_id %>
+    <%= exhibit.submit 'Add a Exhibit to this Collection', :class => 'button' %>
+  <% end %>
 <% end %>

data/app/views/atrium/collections/_navigation.html.erb

@@ -3,43 +3,48 @@
     <%= link_to "Configure Collection #{@atrium_exhbit}" , edit_atrium_collection_path(@atrium_collection[:id]), :class => "customize"%>
   </p>
 <% end %>
-<%= link_to 'View Collection',  @atrium_collection  %>
+<%= link_to 'View Collection',  @atrium_collection %>
+
 
 <div id="browse-navigation" class="facet-list">
-  <% if @exhibit_navigation_data.nil? || @exhibit_navigation_data.empty? %>
-    <ul>
-      <% @atrium_collection.exhibits.each do |exhibit| %>
-        <li>
-          <%= link_to "View #{exhibit.pretty_title}", exhibit  %>
-        </li>
-        <% if can? :edit, Atrium::Exhibit %>
+  <% if can_add_view_exhibit? %>
+    <% if @exhibit_navigation_data.nil? || @exhibit_navigation_data.empty? %>
+      <ul>
+        <% @atrium_collection.exhibits.each do |exhibit| %>
           <li>
-            <%= link_to "Customize #{exhibit.pretty_title}", new_atrium_exhibit_showcases_path(exhibit, :facet_selection => params[:f]), :class => "customize" %>
+            <%= link_to "View #{exhibit.pretty_title}", exhibit  %>
           </li>
+          <% if can? :edit, Atrium::Exhibit %>
+            <li>
+              <%= link_to "Customize #{exhibit.pretty_title}", new_atrium_exhibit_showcases_path(exhibit, :facet_selection => params[:f]), :class => "customize" %>
+            </li>
+          <% end %>
         <% end %>
-      <% end %>
-    </ul>
-  <% else %>
-    <%# Recursively render the browse sets. %>
-    <% @exhibit_navigation_data.each do |exhibit| %>
-      <h3 class="facet-heading <%= exhibit.pretty_title%>">
-        <%= link_to exhibit.pretty_title, exhibit %>
-       </h3>
-      <% unless exhibit.browse_levels.nil? || exhibit.browse_levels.empty? %>
-        <%= render :partial => 'shared/navigation_browse_levels',
+      </ul>
+    <% else %>
+      <%# Recursively render the browse sets. %>
+      <% @exhibit_navigation_data.each do |exhibit| %>
+        <h3 class="facet-heading <%= exhibit.pretty_title%>">
+          <%= link_to exhibit.pretty_title, exhibit %>
+         </h3>
+        <% unless exhibit_scoped_to_items?(exhibit.id) %>
+          <% unless exhibit.browse_levels.nil? || exhibit.browse_levels.empty? %>
+            <%= render :partial => 'shared/navigation_browse_levels',
                    :locals=>{
                      :exhibit_number => exhibit.set_number,
                      :browse_levels => exhibit.browse_levels,
                      :browse_facets => exhibit.browse_facet_names,
                      :exhibit_id => exhibit[:id]
-        }%>
+            }%>
+          <% end %>
+        <% end %>
       <% end %>
     <% end %>
   <% end %>
-
-  <% if can? :edit, Atrium::Showcase  %>
-    <% if !session[:edit_showcase] && !params[:atrium_collection_browse] && !params[:atrium_exhibit_browse] %>
-      <%= link_to "Customize this page", get_customize_page_path, :class => "customize"%>
-    <% end %>
+<% if can? :edit, Atrium::Showcase  %>
+  <% if !session[:edit_showcase] && !params[:atrium_collection_browse] && !params[:atrium_exhibit_browse] %>
+    <%= link_to "Customize this page", get_customize_page_path, :class => "customize"%>
   <% end %>
+<% end %>
 </div>
+

data/app/views/atrium/collections/edit.html.erb

@@ -1,3 +1,4 @@
+
 <h1>Editing Collection</h1>
 
 <%= render :partial => "form" %>

data/app/views/atrium/collections/show.html.erb

@@ -1,3 +1,12 @@
+<% content_for :atrium_side_bar do %>
+  <% if is_editing? %>
+    <%= render :partial => 'atrium/showcases/showcase_navigation' %>
+  <% else %>
+    <%= render :partial => 'shared/collection_search_form' %>
+    <%= render :partial => 'atrium/collections/navigation' %>
+  <% end %>
+<% end %>
+
 <%= render :partial=>'shared/collection_title_header'%>
 
 <div id="show-description">

data/app/views/atrium/descriptions/index.html.erb

@@ -1,3 +1,7 @@
+<% content_for :atrium_side_bar do %>
+  <%= render :partial => 'shared/collection_search_form' %>
+  <%= render :partial => 'atrium/collections/navigation' %>
+<% end %>
 <%- if @atrium_descriptions-%>
    <%= render :partial=>'shared/list_descriptions', :locals=>{:descriptions=>@atrium_descriptions} %>
 <%- end -%>

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

@@ -1,3 +1,6 @@
+<% content_for :atrium_side_bar do %>
+  <%= render :partial => 'atrium/collections/edit_navigation' %>
+<% end %>
 <% if @exhibit %>
   <%= form_for(@exhibit, :html => {:class => 'atrium'}) do |f| %>
     <fieldset>
@@ -35,7 +38,11 @@
       <%= link_to("Set Exhibit Scope", atrium_set_exhibit_scope_path(query_params), :class => 'button').html_safe %>
       <%= link_to("Remove Exhibit Scope", atrium_unset_exhibit_scope_path(@exhibit[:id]), :class => 'button').html_safe %>
     </p>
-
+    <% if exhibit_scoped_to_items?(@exhibit.id) %>
+      <p class="warning">
+        Please note that exhibit is scoped to few items. Hence items added through facet group below is hidden in browse view.
+      </p>
+    <% end %>
     <h3>Group Exhibit Items by Facets</h3>
     <p>
       Items present in a exhibit can be further scoped by facet selections. These facets

data/app/views/atrium/exhibits/_navigation.html.erb

@@ -0,0 +1,30 @@
+<%= link_to 'View Collection',  @atrium_collection  if @atrium_collection%>
+<div id="browse-navigation" class="facet-list">
+  <% if can_add_view_exhibit? %>
+    <% unless @exhibit_navigation_data.nil? || @exhibit_navigation_data.empty? && @exhibit_navigation_data.include?(@exhibit) %>
+      <% index =  @exhibit_navigation_data.index(@exhibit)%>
+      <% exhibit =  @exhibit_navigation_data[index]%>
+      <%# Recursively render the browse sets. %>
+      <h3 class="facet-heading <%= exhibit.pretty_title%>">
+        <%= link_to exhibit.pretty_title, exhibit %>
+      </h3>
+      <% unless exhibit_scoped_to_items?(exhibit.id) %>
+        <% unless exhibit.browse_levels.nil? || exhibit.browse_levels.empty? %>
+          <%= render :partial => 'shared/navigation_browse_levels',
+               :locals=>{
+                 :exhibit_number => exhibit.set_number,
+                 :browse_levels => exhibit.browse_levels,
+                 :browse_facets => exhibit.browse_facet_names,
+                 :exhibit_id => exhibit[:id]
+          }%>
+        <% end %>
+      <%end %>
+    <% end %>
+  <% end %>
+<% if can? :edit, Atrium::Showcase  %>
+  <% if !session[:edit_showcase] && !params[:atrium_collection_browse] && !params[:atrium_exhibit_browse] %>
+    <%= link_to "Customize this page", new_atrium_exhibit_showcases_path(@exhibit, :facet_selection => params[:f]), :class => "customize"%>
+  <% end %>
+<% end %>
+</div>
+

data/app/views/atrium/exhibits/show.html.erb

@@ -1,3 +1,11 @@
+<% content_for :atrium_side_bar do %>
+  <% if is_editing? %>
+    <%= render :partial => 'atrium/showcases/showcase_navigation' %>
+  <% else %>
+    <%= render :partial => 'shared/collection_search_form' %>
+    <%= render :partial => 'navigation' %>
+  <% end %>
+<% end %>
 <h2>
   <div class="<%= params[:edit_showcase] && (can? :create, Atrium::Exhibit) ?  "edit-text": "no-edit"%>" id="div_1" data-column-name="atrium_exhibit[label]" data-update-uri=<%=atrium_exhibit_path(@exhibit)%>>
     <%= @exhibit.pretty_title %>
@@ -12,7 +20,7 @@
 
 <div id="show-selected">
 <%- if !@featured_documents.blank? && @featured_documents.any? -%>
-  <%= render :partial=>'shared/featured_sources' %>
+  <%= render :partial=>'shared/featured_sources', :locals=>{:showcase_id=>@atrium_showcase.id}%>
 <%- end -%>
 </div>
 

data/app/views/atrium/showcases/show.html.erb

@@ -1 +1 @@
-<%= render :partial=>'shared/featured_sources' %>
+<%= render :partial=>'shared/featured_sources', :locals=>{:showcase_id=>@atrium_showcase.id}%>

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

@@ -1,4 +1,10 @@
-
+<% content_for :atrium_side_bar do %>
+  <% if (params[:atrium_collection_browse].blank? && params[:atrium_exhibit_browse].blank?) || params[:class] == "edit_collection" %>
+    <% if params[:collection_id] %>
+      <h3 class="collection-browse-link"><%= link_to "Browse This Collection", atrium_collection_path(params[:collection_id]) %></h3>
+    <% end %>
+  <% end %>
+<% end %>
 <% unless has_search_parameters? %>
 	<%# if there are no input/search related params, display the "home" partial -%>
 	<%= render 'home' %>

data/app/views/layouts/atrium.html.erb

@@ -45,36 +45,12 @@
           </div>
         </div>
         <div id="sidebar">
-          <% if params[:controller].eql?( "catalog") %>
-            <% if (params[:atrium_collection_browse].blank? && params[:atrium_exhibit_browse].blank?) || params[:class] == "edit_collection" %>
-              <% if params[:collection_id] %>
-                <h3 class="collection-browse-link"><%= link_to "Browse This Collection", atrium_collection_path(params[:collection_id]) %></h3>
-              <% end %>
-            <% else %>
-	            <%= render :partial => 'shared/collection_search_form' %>
-                <%= render :partial => 'atrium/collections/navigation' %>
-            <% end %>
-          <% elsif params[:controller].eql?("atrium/collections") && !(params[:action].eql?("show"))%>
-            <%= render :partial => 'atrium/collections/edit_navigation' %>
-          <% elsif params[:controller].eql?("atrium/exhibits") && !(params[:action].eql?("show"))%>
-            <%= render :partial => 'atrium/collections/edit_navigation' %>
-          <% elsif params[:controller].eql?("atrium/exhibits") && params[:action].eql?("show") && session[:edit_showcase]%>
-              <%= render :partial => 'atrium/showcases/showcase_navigation' %>
-          <% elsif params[:controller].eql?("atrium/collections") && params[:action].eql?("show") && session[:edit_showcase]%>
-              <%= render :partial => 'atrium/showcases/showcase_navigation' %>
-          <% elsif params[:controller].eql?("atrium/collections") && params[:action].eql?("show")%>
-            <%= render :partial => 'shared/collection_search_form' %>
-            <%= render :partial => 'atrium/collections/navigation' %>
-          <% elsif params[:controller].eql?("atrium/descriptions") && params[:action].eql?("index")%>
-              <%= render :partial => 'shared/collection_search_form' %>
-              <%= render :partial => 'atrium/collections/navigation' %>
-          <% elsif params[:controller].eql?("atrium/descriptions") && !(params[:action].eql?("index"))%>
-          <% elsif params[:controller] != "user_sessions" && !(params[:controller] == "atrium/collections" && params[:action] == "index")%>
-            <%= render :partial => 'shared/collection_search_form' %>
-            <%= render :partial => 'atrium/collections/navigation' %>
+          <% if content_for? :atrium_side_bar %>
+            <%= yield :atrium_side_bar %>
           <% end %>
           <%= sidebar_items.join('').html_safe %>
         </div>
+        <%= emission_items.join('').html_safe %>
       </div>
       <div id="ft">
         <%= yield :footer %>

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

@@ -5,7 +5,7 @@
     <h3 class="search"><label for="q"><%= link_to("Search Complete Collection", atrium_collection_home_path(collection_id)) %></label></h3>
     <%= text_field_tag :q, params[:q], :class => "q" %>
     <%= hidden_field_tag :collection_id, collection_id%>
-    <%= search_as_hidden_fields(:omit_keys => [:q, :f, :search_field, :qt, :action, :id, :controller, :class]).html_safe %>
+    <%= search_as_hidden_fields(:omit_keys => [:q, :f, :search_field, :qt, :action, :id, :controller, :class, :atrium_exhibit_browse, :atrium_collection_browse]).html_safe %>
     <%= submit_tag 'Search', :class=>'submit' %>
     </fieldset>
   <% end %>

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

@@ -14,6 +14,9 @@
 	      </div>
         </div>
         <%= render_document_partial document, :index %>
+        <% if is_editing? && (can? :create, Atrium::Showcase)%>
+          <a class="remove_featured button" href=# action="<%= atrium_showcase_remove_featured_path(showcase_id, :solr_doc_id=>document[:id])%>" title="Remove this featured item">Remove this item</a>
+        <% end %>
       </div>
     <% end %>
   <%- end -%>

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

@@ -1,4 +1,3 @@
-
 <% descriptions.each do |desc| %>
   <%- title= desc.pretty_title %>
   <% if !desc.nil? && !is_editing?%>
@@ -14,7 +13,8 @@
     <% else %>
       <h3><%=title%></h3>
       <%- content= desc.description_solr_id.blank? ? desc.get_essay : get_essay_from_description(@description_hash,desc.description_solr_id)%>
-      <blockquote class="intro"><%= truncate( content, :length =>550, :ommision => "....").html_safe%></blockquote>
+      <%if content %>
+            <blockquote class="intro"><%= truncate( content, :length =>550, :ommision => "....").html_safe%></blockquote>
       <% if content.length>50 %>
         <a class="heading" href="#">[Read the complete essay]</a>
         <div style="display: none"class="content" id="<%= desc[:id] %>">
@@ -22,6 +22,7 @@
         </div>
       <% end %>
     <% end %>
+    <% end %>
   <% elsif is_editing?%>
     <%# need to add dl tag for animated JS to work %>
     <dl>

data/atrium.gemspec

@@ -10,8 +10,7 @@ Gem::Specification.new do |s|
   s.email       = ["hydra-tech@googlegroups.com"]
   s.homepage    = "https://github.com/ndlib/atrium"
   s.summary     = %q{Atrium Rails Engine (requires Rails 3)}
-  s.description = %q{This is an ALPHA release -- you have been warned. It will get much better soon. Atrium is a Rails Engine for for creating collections in either a Blacklight or Hydra context. The full hydra stack includes: Blacklight, Fedora, Solr, active-fedora, solrizer, and om. The first use of the atrium name for a gem was by Hiten Parmar: https://github.com/hrp/atrium}
-
+  s.description = %q{Atrium is a Rails Engine for for creating collections in either a Blacklight or Hydra context. The full hydra stack includes: Blacklight, Fedora, Solr, active-fedora, solrizer, and om. The first use of the atrium name for a gem was by Hiten Parmar: https://github.com/hrp/atrium}
 
   s.add_dependency 'rails', '~> 3.1'
   s.add_dependency 'blacklight', '~> 3.3'
@@ -66,8 +65,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec-given'
   s.add_development_dependency 'guard'
   s.add_development_dependency 'guard-rspec'
-  s.add_development_dependency 'ruby_gntp' if RUBY_PLATFORM =~ /darwin/
-
+  s.add_development_dependency 'ruby_gntp' if RUBY_PLATFORM =~ /[darwin|linux]/
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")