atrium 0.0.1 → 0.1.1

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

@@ -0,0 +1,3 @@
+<div id="collection-title">
+  <%= collection.display_title %>
+</div>

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

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

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

@@ -0,0 +1,14 @@
+<h1>Collection</h1>
+<% unless @collections.blank? %>
+  <ul>
+    <% for collection in @collections %>
+      <li>
+        <%= link_to collection.title, main_app.collection_path(collection) %>
+        <%= link_to("Edit Collection", edit_collection_path(collection), :class => 'button').html_safe if current_user %>
+      </li>
+    <% end %>
+  </ul>
+<% else %>
+  <em>No collections defined</em>
+<% end %>
+<%= link_to("Add New Collection", new_collection_path, :class => 'button').html_safe if current_user%>

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

@@ -1,6 +1,3 @@
-<%= link_to 'Back to Search', catalog_index_path %>
+<h1>New Collection</h1>
 
-<h1>New collection</h1>
-<%= render :partial => "form" %>
-
-<%= link_to 'Back to Search', catalog_index_path %>
+<%= render :partial => "form" %>

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

@@ -1,31 +1,13 @@
-<% 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 %>
+<%= render :partial => 'atrium/collections/head', :locals => { :collection => @collection } %>
+
+
+
+<% if @exhibits.empty? %>
+    <tr><td colspan='5' align='center'><%= t('Collection.exhibit.none') %></td></tr>
 <% end %>
 
-<%= render :partial=>'shared/collection_title_header'%>
-
-<div id="show-description">
-  <%- if @atrium_showcase && @atrium_showcase.descriptions.any? -%>
-    <%= render :partial=>'shared/list_descriptions', :locals=>{:descriptions=>@atrium_showcase.descriptions} %>
-  <%- end -%>
-</div>
-
-<div id="show-selected">
-  <%- if !@featured_documents.blank? && @featured_documents.any? -%>
-    <%= render :partial=>'shared/featured_sources' %>
-  <%- end -%>
-</div>
-
-<h3 class="list-heading">Complete Sources</h3>
-<div id="complete-sources">
-  <%- if !@collection_items_documents.blank? -%>
-    <%= render :partial=>'collection_items_index' %>
-  <%- else -%>
-    <%= render :partial=>'browse_index'%>
-  <%- end -%>
-</div>
+ <%= render @exhibits %>
+
+
+
+

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

@@ -1,4 +1,9 @@
-<h1>Author a Description</h1>
+<% content_for :atrium_side_bar do %>
+  <%= link_to(
+    'Back to Showcase',
+    polymorphic_path([@showcase.parent,@showcase],action: :edit)
+  )%>
+<% end %>
 <p>
   Descriptions are blocks of text present at the top of the page when viewing
   a showcase. They can be added from within Atrium or they can be ingested
@@ -10,55 +15,48 @@
   &#8220;Select&#8221; checkbox. You can limit the items listed by keyword
   search and or facet selection.
 </p>
-<p>
-  To save your work use the &#8220;Save&#8221; button below. If you wish to
-  close <strong>without</strong> saving close the modal window.
-</p>
-
-<%= form_for(@atrium_description, :html => { :class => 'atrium' }) do |f| %>
-  <fieldset>
-    <legend>Description</legend>
-    <% if @atrium_description.errors.any? %>
-      <ul class="errors">
-        <% @atrium_description.errors.full_messages.each do |msg| %>
-          <li><%= msg %></li>
-        <% end %>
-      </ul>
-    <% end %>
-    <% @atrium_description.atrium_showcase_id = params[:showcase_id] if (params[:showcase_id]) %>
-    <%= f.hidden_field :atrium_showcase_id %>
-    <ol>
-      <li>
-        <%= f.label :title, 'Title:' %>
-        <%= f.text_field :title %>
-      </li>
-      <li class="inline">
-        <%= f.radio_button :page_display, 'samepage', :checked => true %>
-        <%= label :page_display_samepage, 'Include the full text of the description on the showcase page' %>
-      </li>
-      <li class="inline">
-        <%= f.radio_button :page_display, 'newpage' %>
-        <%= label :page_display_newpage, 'Include the summary on the showcase page and open the full text in a new page' %>
-      </li>
-      <%= f.fields_for :essay, @atrium_description.essay do |essay_fields| %>
-        <% @atrium_description.essay.content_type = "essay" %>
-        <li>
-          <%= essay_fields.label :content, 'Full Text:' %>
-          <%= essay_fields.text_area :content, :rows=> '20', :cols => '120', :class =>'jquery-ckeditor' %>
-          <%= essay_fields.hidden_field :atrium_description_id %>
-          <%= essay_fields.hidden_field :content_type %>
-        </li>
+<%if @description %>
+  <%= form_for([@showcase, @description], :html => { :class => 'atrium' }) do |f| %>
+    <fieldset>
+      <legend>Description</legend>
+      <% if @description.errors.any? %>
+          <ul class="errors">
+            <% @description.errors.full_messages.each do |msg| %>
+                <li><%= msg %></li>
+            <% end %>
+          </ul>
       <% end %>
-      <%= f.fields_for :summary, @atrium_description.summary do |summary_fields| %>
-        <% @atrium_description.summary.content_type = "summary" %>
+      <ol>
         <li>
-          <%= summary_fields.label :content, 'Summary:' %>
-          <%= summary_fields.text_area :content, :rows=> '20', :cols => '120', :class =>'jquery-ckeditor' %>
-          <%= summary_fields.hidden_field :atrium_description_id %>
-          <%= summary_fields.hidden_field :content_type %>
+          <%= f.label :title, 'Title:' %>
+          <%= f.text_field :title %>
         </li>
-      <% end %>
-    </ol>
-    <%= f.submit 'Save', :class => 'button' %>
-  </fieldset>
+        <li class="inline">
+          <%= f.radio_button :page_display, 'samepage', :checked => true %>
+          <%= label :page_display_samepage, 'Include the full text of the description on the showcase page' %>
+        </li>
+        <li class="inline">
+          <%= f.radio_button :page_display, 'newpage' %>
+          <%= label :page_display_newpage, 'Include the summary on the showcase page and open the full text in a new page' %>
+        </li>
+        <%= f.fields_for :essay, @description.essay do |essay_fields| %>
+            <% @description.essay.content_type = "essay" %>
+            <li>
+              <%= essay_fields.label :content, 'Full Text:' %>
+              <%= essay_fields.text_area :content, :rows=> '20', :cols => '120', :class =>'jquery-ckeditor' %>
+              <%= essay_fields.hidden_field :content_type %>
+            </li>
+        <% end %>
+        <%= f.fields_for :summary, @description.summary do |summary_fields| %>
+            <% @description.summary.content_type = "summary" %>
+            <li>
+              <%= summary_fields.label :content, 'Summary:' %>
+              <%= summary_fields.text_area :content, :rows=> '20', :cols => '120', :class =>'jquery-ckeditor' %>
+              <%= summary_fields.hidden_field :content_type %>
+            </li>
+        <% end %>
+      </ol>
+    </fieldset>
+    <p><%= f.submit 'Save', :class => 'button' %></p>
+  <% end %>
 <% end %>

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

@@ -1,4 +1,3 @@
-
+<h1>Update This Description</h1>
 
 <%= render :partial => "form" %>
-

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

@@ -1,8 +1,2 @@
-<% 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 -%>
-
+<h1>Descriptions#index</h1>
+<p>Find me in app/views/atrium/descriptions/index.html.erb</p>

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

@@ -1,2 +1,3 @@
-<%= render :partial => "form" %>
+<h1>Author a Description</h1>
 
+<%= render :partial => "form" %>

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

@@ -1,20 +1,2 @@
-<% if params[:exhibit_id] %>
-  <%= link_to "Back to Browse Exhibit",atrium_exhibit_path(:id=>params[:exhibit_id], :f=>params[:f]) %>
-<% else %>
-  <%= link_to "Back to Browse #{@atrium_collection.pretty_title}", @atrium_collection %>
-<% end %>
-
-<div>
-  <h3><%= @atrium_description.pretty_title%></h3>
-  <% if !@atrium_description.description_solr_id.blank? %>
-    <%= get_essay_from_description(@description_hash,@atrium_description.description_solr_id).html_safe%>
-  <% elsif @atrium_description && @atrium_description.essay && @atrium_description.essay.content %>
-    <%= @atrium_description.get_essay %>
-  <% end %>
-</div>
-
-<% if params[:exhibit_id] %>
-  <%= link_to "Back to Browse Exhibit",atrium_exhibit_path(:id=>params[:exhibit_id], :f=>params[:f]) %>
-<% else %>
-  <%= link_to "Back to Browse #{@atrium_collection.pretty_title}", @atrium_collection %>
-<% end %>
+<h1>Descriptions#show</h1>
+<p>Find me in app/views/atrium/descriptions/show.html.erb</p>

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

@@ -0,0 +1 @@
+<li> <%= exhibit.pretty_title %> </li>

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

@@ -1,115 +1,162 @@
-<% content_for :atrium_side_bar do %>
-  <%= render :partial => 'atrium/collections/edit_navigation' %>
-<% end %>
+
+
 <% if @exhibit %>
-  <%= form_for(@exhibit, :html => {:class => 'atrium'}) do |f| %>
+  <%= form_for([@collection, @exhibit], :html => {:class => 'atrium'}) do |f| %>
+    <% if @exhibit.errors.any? %>
+      <ul class="errors">
+        <% @exhibit.errors.full_messages.each do |msg| %>
+          <li><%= msg %></li>
+        <% end %>
+      </ul>
+    <% end %>
+
     <fieldset>
-      <legend>General Configuration</legend>
+      <legend>Exhibit Name</legend>
       <ol>
         <li>
-          <%= f.label :label, 'Title:' %>
+          <%= f.label :label, 'Title Text:' %>
           <%= f.text_field :label %>
         </li>
       </ol>
     </fieldset>
 
-    <h3>Exhibit Scope</h3>
-    <p>
-      An exhibit is a subset of a collection. The scope of the exhibit can be
-      set to any query made in the search interface.
-    </p>
     <fieldset>
-      <legend>Current Scope</legend>
-      <%if @exhibit.filter_query_params %>
-        <ul>
-          <% @exhibit.filter_query_params.each do |key,value| %>
-            <li><label><%= key %>: </label><%= value %></li>
-          <% end %>
-        </ul>
-      <% end %>
-    </fieldset>
-    <% collection_id = @exhibit.atrium_collection_id if @exhibit.atrium_collection_id %>
-    <% query_params = {:collection_id=>collection_id,:edit_exhibit_filter=>true, :exhibit_id=>@exhibit[:id]} %>
-    <% query_params.merge!(@exhibit.filter_query_params) if @exhibit.filter_query_params %>
-    <% query_params.delete(:controller) %>
-    <% query_params.delete(:action) %>
-    <% query_params.delete(:solr_doc_ids) %>
-    <p class="exhibit-scope-controls">
-      <%= 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.
+      <legend>Exhibit Scope</legend>
+      <p>
+        The scope of the exhibit can be set to any query made in the search
+        interface. Technically, an exhibit does not have to be a subset of the
+        collection.
       </p>
-    <% end %>
-    <h3>Group Exhibit Items by Facets</h3>
-    <p>
-      Items present in a exhibit can be further scoped by facet selections. These facets
-      are arranged in a single-level tree with each facet nested beneath its parent.
-    </p>
-    <fieldset>
-      <legend>Current Facets</legend>
-      <% if @exhibit.browse_levels.any? %>
-        <table>
-          <thead>
-            <tr>
-              <th>&nbsp;</th>
-              <th>&nbsp;</th>
-              <th>Facet</th>
-              <th>Label</th>
-              <th>Filter</th>
-              <th>Exclude</th>
-              <th>Remove</th>
-            </tr>
-          </thead>
-          <tbody data-resource="<%= update_atrium_exhibit_facet_order_path %>" data-primary-label="Group By:" data-secondary-label="Then By:" class="sortable">
-            <% @exhibit.browse_levels.each_with_index do |level,index| %>
-              <tr data-id="<%= level[:id] %>" data-order="<%= level.level_number %>" class="ui-state-default">
-                <%= f.fields_for :browse_levels, level do |level_form| %>
-                  <% collection_id = @exhibit.atrium_collection_id if @exhibit.atrium_collection_id %>
-                  <% level_query_params = {:collection_id=>collection_id,:browse_level_id=>level[:id], :exhibit_id=>@exhibit[:id]} %>
-                  <% level_query_params.merge!(level.filter_query_params) if level.filter_query_params %>
-                  <% exclude_query_params = level_query_params.dup %>
-                  <td><span class="ui-icon ui-icon-arrowthick-2-n-s"></span></td>
-                  <td class="label"><%= level.level_number == 1 ? 'Group By:' : 'Then By:' %></td>
-                  <td><%=facet_field_labels[level.solr_facet_name]%></td>
-                  <td><%=level_form.text_field :label, :value=>level.label%></td>
-                  <td><%= link_to("Set Group By Filter", catalog_index_path(level_query_params.merge!(:edit_browse_level_filter=>level[:id]))).html_safe %></td>
-                  <td><%= link_to("Set Exclude Filter", catalog_index_path(exclude_query_params.merge!(:exclude_browse_level_filter=>level[:id]))).html_safe %></td>
-                  <td><%=level_form.check_box :_destroy %></td>
-                <% end %>
-              </tr>
-            <% end %>
-          </tbody>
-        </table>
-      <% end %>
+      <p>
+        <% if f.object.filter_query_params.present? %>
+          Current Scope: <%= Atrium.query_param_beautifier(self,f.object.filter_query_params) %>
+          <%= f.check_box :remove_filter_query_params %>
+          <small>Use the checkbox to delete scope</small>
+        <% end %>
+      </p>
+      <ol>
+        <li>
+          <%= f.label :include_search_id, 'Set Exhibit Scope:' %>
+          <%= f.select(:include_search_id, saved_searches_for_select, { :include_blank => true }) %>
+          <small>Choose from one of your saved searches.</small>
+        </li>
+      </ol>
     </fieldset>
-    <p class="exhibit-facet-controls">
-      <%= f.submit 'Update Exhibit and Facets', :class => 'button' %>
-    </p>
-  <% end %>
 
-  <%= form_for(@exhibit) do |f| %>
-    <% @level = Atrium::BrowseLevel.new%>
-    <% @exhibit.set_number = @atrium_collection.exhibits.size + 1 %>
-    <% @exhibit.atrium_collection_id = @atrium_collection[:id] %>
-    <%= f.fields_for :browse_levels, @level do |level_fields| %>
-      <% if @exhibit.browse_levels.empty? %>
-        <% available_facets = CatalogController.blacklight_config.facet_fields.keys %>
-      <% else %>
-        <% facet_names = @exhibit.browse_levels.collect {|level| level.solr_facet_name}%>
-        <% available_facets = CatalogController.blacklight_config.facet_fields.keys.reject {|facet| facet_names.include?(facet)} %>
-      <% end %>
-      <% @level.level_number = @exhibit.browse_levels.size + 1 %>
+    <% if @exhibit.new_record? %>
+      <p>
+        <%= f.submit 'Create Exhibit', :class => 'button' %>
+      </p>
+    <% else %>
+      <h3>Exhibit Navigation</h3>
+      <p>
+        Items in an exhibit can be further scoped by filters. Filters are nested
+        facets with optional include or exclude rules. Exhibit filters are
+        rendered as a hierarchal navigation control.
+      </p>
       <fieldset>
-        <legend>Add Facets To This Exhibit</legend>
-        <%= level_fields.hidden_field :level_number %>
-        <%= level_fields.label :solr_facet_name, 'Solr Facet:' %>
-        <%= level_fields.select(:solr_facet_name, available_facets.collect {|solr_fname| [facet_field_labels[solr_fname],solr_fname]})%>
-        <%= f.submit 'Add Facet', :class => 'button' %>
+        <legend>Navigation Levels</legend>
+        <% if @exhibit.browse_levels.any? %>
+          <table id="navigation-levels">
+            <thead>
+              <tr>
+                <th>&nbsp;</th>
+                <th>&nbsp;</th>
+                <th>Facet</th>
+                <th>Label</th>
+                <th>Include Filter</th>
+                <th>Exclude Filter</th>
+                <th>Remove</th>
+              </tr>
+            </thead>
+            <tbody data-resource="<%= update_exhibit_facet_order_path %>" data-primary-label="Group By:" data-secondary-label="Then By:" class="sortable">
+              <% @exhibit.browse_levels.each_with_index do |level,index| %>
+                <tr data-id="<%= level[:id] %>" data-order="<%= level.level_number %>" class="ui-state-default">
+                  <%= f.fields_for :browse_levels, level do |level_form| %>
+                    <td><span class="ui-icon ui-icon-arrowthick-2-n-s"></span></td>
+                    <td class="label"><%= level.level_number == 1 ? 'Group By:' : 'Then By:' %></td>
+                    <td><%= Atrium.config.facet_fields[level.solr_facet_name].label  %></td>
+                    <td><%= level_form.text_field :label, :value => level.label %></td>
+                    <td>
+                      <%= level_form.select(:include_search_id, saved_searches_for_select, { :include_blank => true }) %>
+                      <div>
+                        <% if level.filter_query_params.present? %>
+                          Current Scope:
+                          <%= Atrium.query_param_beautifier(self,level.filter_query_params) %>
+                            <%= level_form.check_box :remove_filter_query_params unless level.filter_query_params.blank?%>
+                            <small>Use the checkbox to delete scope from browse level</small>
+                        <% end %>
+                      </div>
+                    </td>
+                      <td>
+                        <%= level_form.select(:exclude_search_id, saved_searches_for_select, { :include_blank => true }) %>
+                        <div>
+                          <% if level.exclude_query_params.present? %>
+                              Current Exclude:
+                              <%= level.exclude_query_params.inspect %>
+                              <%= level_form.check_box :remove_exclude_query_params unless level.exclude_query_params.blank?%>
+                              <small>Use the checkbox to delete scope from browse level</small>
+                          <% end %>
+                        </div>
+                      </td>
+                    <td><%= level_form.check_box :_destroy %></td>
+                  <% end %>
+                </tr>
+              <% end %>
+            </tbody>
+          </table>
+        <% end %>
       </fieldset>
+      <p class="exhibit-facet-controls">
+        <%= f.submit 'Update Exhibit and Navigation', :class => 'button' %>
+      </p>
     <% end %>
   <% end %>
+<% end %>
 
+<% unless @exhibit.new_record? %>
+  <%= form_for([@collection, @exhibit], :html => {:class => 'atrium'}) do |f| %>
+    <fieldset>
+      <legend>Add Navigation Level</legend>
+      <%= f.fields_for :browse_levels, @exhibit.browse_levels.build do |level_form| %>
+        <ol>
+          <li>
+          <%= level_form.label :solr_facet_name, 'Solr Facet:' %>
+          <%= level_form.select(
+            :solr_facet_name,
+            @exhibit.get_available_facets.collect {|solr_fname| [Atrium.config.label_for_facet(solr_fname),solr_fname]},
+            { :include_blank => true }
+          )%>
+          <small>This list is populated by the facets of the parent collection.</small>
+        </li>
+      </ol>
+      <p><%= f.submit 'Add Navigation Level', :class => 'button' %></p>
+    </fieldset>
+  <% end %>
+<% end %>
+
+  <hr />
+
+  <h3>Showcases</h3>
+  <p>
+    A showcase is a container for storing featured items and descriptions.
+  </p>
+
+  <%= link_to 'Add a Showcase to this Exhibit', new_exhibit_showcase_path(@exhibit), :class => 'button' %>
+
+  <hr />
+
+  <%= button_to(
+            'Delete this Exhibit',
+            collection_exhibit_path(@exhibit.collection, @exhibit),
+            :method => :delete,
+            :form_class => 'exhibit-destroy-controls hazardous-action',
+            :confirm => 'Do you really want to delete this exhibit?',
+            :class => 'button'
+    )%>
+<% end %>
+
+<% content_for :atrium_side_bar do %>
+  <%= render :partial => 'shared/navigation' %>
+  <%= link_to "Show related showcases",  exhibit_showcases_path(@exhibit) if @exhibit.showcases.any?  %>
 <% end %>