sufia 4.0.0.beta2 → 4.0.0.beta3

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

@@ -12,7 +12,7 @@
 }
 %>
 <h1>SMS This</h1>
-<%= form_tag url_for(:action => 'send_email_record', :style => 'sms'), :id => 'sms_form', :method => :post do %>
+<%= form_tag url_for(action: 'send_email_record', style: 'sms'), id: 'sms_form', method: :post do %>
   <%= label_tag(:to, "Phone Number:") %><br/>
   <%= text_field_tag :sms_to %><br/>
   <%= label_tag(:carrier, "Carrier:") %><br/>

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

@@ -1,15 +1,9 @@
-<% unless @response.response['numFound'] < 2 %>
-  <%= form_tag catalog_index_path, :method => :get, :class => "well form-inline" do %>
-    <div class="sorting">
-      <%= label_tag(:sort, "<strong>Sort by</strong> ".html_safe) %>
-      <%= select_tag(:sort, options_for_select(sort_fields, h(params[:sort])), :class => "input-medium") %>
+<div id="sortAndPerPage" class="clearfix">
+  <%= render partial: "paginate_compact", object: @response %>
+  <div class="search-widgets pull-right">
+    <%= render 'sort_widget' %>
+    <%= render 'per_page_widget' %>
+    <%= render 'view_type_group' %>
+  </div>
+</div>
 
-      <%= label_tag(:per_page) do %>
-        <strong>Show</strong> <%= select_tag(:per_page, options_for_select(['10', '20', '50', '100'], h(params[:per_page])), :title => "Number of results to display per page", :class => "input-small")  %> per page
-        <% end %>
-      <%= render_hash_as_hidden_fields(params_for_search().except(:per_page, :sort, :utf8)) %>
-      <button class="btn btn-primary"><i class="icon-refresh"></i> Refresh</button>
-
-    </div>
-  <% end %>
-<% end %>

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

@@ -1 +1 @@
-<%= render :partial => 'citation' -%>
+<%= render partial: 'citation' -%>

data/app/views/catalog/email.erb

@@ -1 +1 @@
-<%= render :partial => 'email_form' %>
+<%= render partial: 'email_form' %>

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

@@ -1,32 +1,21 @@
-<% unless has_search_parameters? %>
-	<%# if there are no input/search related params, display the "home" partial -%>
-	<%= render 'home' %>
-<% else %>
-    <% content_for :sidebar do %>
-        <%= render :partial=>'facets' %>
-    <% end %>
+<% content_for :sidebar do %>
+  <%= render partial: 'facets' %>
+<% end %>
 
-	<% @page_title = application_name + " Search Results" %>
+<% @page_title = application_name + " Search Results" %>
 
-  <h3>Search Results</h3>
-  <div class="alert alert-info"><i class="icon-search icon-large"></i> You searched for: <strong><%= render_constraints(params) %></strong></div>	
-  <%= render :partial => 'did_you_mean' %>
-  <%= render :partial => 'facet_selected' %>
-	<%# render 'constraints', :localized_params=>params %>
-  
-  <div class="row"> 
-    <%= render 'sort_and_per_page' %>
-    <div class="row">
-      <%= link_to "New Search", catalog_index_path, :id=>"startOverLink", :class=>"btn btn-info btn-medium" %>
+<h3>Search Results</h3>
+<% if query_has_constraints? %>
+  <div class="alert alert-info">
+    <div class="pull-right">
+        <%=link_to t('blacklight.search.start_over'), start_over_path, class: "catalog_startOverLink btn btn-sm btn-text", id: "startOverLink" %>
     </div>
+    <i class="icon-search icon-large"></i> You searched for: <strong><%= render_constraints(params) %></strong></div>
   </div>
-  
-  
-  <%= render 'results_pagination' %>
-  
-	<%= render :partial => 'document_list' %>
-
-  <%= render 'results_pagination' %>
-
 <% end %>
-
+<%= render 'did_you_mean' %>
+<%= render 'facet_selected' %>
+<%= render 'sort_and_per_page' %>
+<%= render 'results_pagination' %>
+<%= render_document_index %>
+<%= render 'results_pagination' %>

data/app/views/catalog/recent.js.erb

@@ -1 +1 @@
-$("#recent_docs").html("<%= escape_javascript(render :partial => "recent_document", :collection => @recent_documents)  %>");
+$("#recent_docs").html("<%= escape_javascript(render partial: "recent_document", collection: @recent_documents)  %>");

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

@@ -4,7 +4,7 @@
 -%>
 <div id="showHead">
   <div id="showUtils">
-    <span class="back_to_cat"><%= link_back_to_catalog :label=>'← Return to search results' %></span>
+    <span class="back_to_cat"><%= link_back_to_catalog label: '← Return to search results' %></span>
     <%- if @previous_document || @next_document -%>
       <div id="previousNextDocument">
 	    <span class="previous"><%= link_to_previous_document(@previous_document) %></span>
@@ -35,6 +35,6 @@
 </div>
 <% if controller.action_name == "edit" %>
   <div class="delete-asset">
-    <%= button_to("Delete This Item", {:action => :destroy, :controller => :assets, :id => @document_fedora.pid}, :confirm => 'Are you sure?', :method => :delete )%>
+    <%= button_to("Delete This Item", {action: :destroy, controller: :assets, id: @document_fedora.pid}, confirm: 'Are you sure?', method: :delete )%>
   </div>
 <% end %>

data/app/views/catalog/sms.erb

@@ -1 +1 @@
-<%= render :partial => 'sms_form' %>
+<%= render partial: 'sms_form' %>

data/app/views/collections/_action_menu.html.erb

@@ -0,0 +1,24 @@
+<div class="btn-group">
+  <button class="btn btn-small" href="#"><i class="icon-wrench"></i> Select an action</button>
+  <button class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#"><span class="icon-caret-down"></span></button>
+  <ul class="dropdown-menu">
+   <li>
+     <%=  button_for_remove_from_collection(gf, 'Remove from Collection') %>
+   </li>
+   <li>
+     <%= link_to raw('<i class="icon-link over"></i> Single-Use Link to File'), '#', class: "copypaste itemicon itemcode", title: "Single-Use Link to File", id: "copy_link_#{noid}" %>
+   </li>
+   <li>
+     <%= link_to raw('<i class="icon-pencil"></i> Edit File'), sufia.edit_generic_file_path(noid), class: 'itemicon itemedit', title: 'Edit File'  %>
+   </li>
+   <li>
+     <%= link_to raw('<i class="icon-download-alt"></i> Download File'), sufia.download_path(noid), class: 'itemicon itemdownload', title: 'Download File', target: '_new' %>
+   </li>
+   <li>
+     <%= display_trophy_link(@user, noid) do |text| %>
+         <i class='glyphicon glyphicon-star'></i> <%= text %>
+     <% end %>
+   </li>
+  </ul>
+</div>
+

data/app/views/collections/_batch_edits_actions.html.erb

@@ -0,0 +1,3 @@
+<li data-behavior="batch-edit-select-none" data-state="on"><a href="#"><i class="icon-ok"></i> Select None</a></li>
+<li data-behavior="batch-edit-select-page" data-state="off"><a href="#"><i class=""></i> Select Current Page</a></li>
+<li><%= button_for_remove_selected_from_collection @collection %></li>

data/app/views/collections/_button_for_creating_empty_collection.html.erb

@@ -0,0 +1,3 @@
+<div class="collection-empty">
+  <%= button_to label, collections.new_collection_path, method: :get, class: "btn btn-primary collection-add collection-empty", 'data-behavior'=>'hydra-collections', id: 'hydra-collection-add' %>
+</div>

data/app/views/collections/_dashboard_document_list.html.erb

@@ -0,0 +1,6 @@
+<% @document_list = documents %>
+<% @batch_size_on_other_page = 0 %>
+<% @all_checked = false %>
+<% @max_batch_size = 100 %>
+<% @user = current_user %>
+<%= render partial:'dashboard/_index_partials/default_group', locals:{documents: documents, docs:documents} %>

data/app/views/collections/_document_list.html.erb

@@ -0,0 +1,10 @@
+<% @document_list = documents %>
+<% @batch_size_on_other_page = 0 %>
+<% @all_checked = false %>
+<% @max_batch_size = 100 %>
+<% @user = current_user %>
+<% if params[:action] == "edit" %>
+  <%= render partial:'dashboard/_index_partials/default_group', locals:{documents: documents, docs:documents} %>
+<% else %>
+  <%= render partial:'catalog/_index_partials/default_group', locals:{documents: documents, docs:documents} %>
+<% end %>

data/app/views/collections/_edit_actions.html.erb

@@ -0,0 +1,5 @@
+<h2 class="non lower">Actions</h2>
+<p>
+  <%= link_to "Go to Browse View", collections.collection_path %>  &nbsp;&nbsp;
+  <%= link_to "Add files from your dashboard",  sufia.dashboard_files_path %>
+</p>

data/app/views/collections/_edit_descriptions.html.erb

@@ -0,0 +1,20 @@
+<%# This mimics the generic_files/descriptions partial & re-uses some of its sub-partials %>
+<div id="descriptions_display" class="tab-pane active">
+  <%= form_for collection, url: collections.collection_path, html: {multipart: true, class: 'form-horizontal'} do |f| %>
+    <%= hidden_field_tag('redirect_tab', 'descriptions') %>
+    <h2 class="non lower">Descriptions <small class="pull-right"><span class="error">*</span> indicates required fields</small> </h2>
+      <div class="well">
+
+        <% (collection.terms_for_editing).each do |term| %>
+          <%= render partial: "generic_files/field_form", locals: { generic_file: collection, f: f, render_req: true, key: term } %>
+        <% end %>
+   
+      </div><!-- /well -->
+    <div class="row">
+      <div class="form-actions">
+        <%= f.button '<i class="icon-save"></i> Save Descriptions'.html_safe, type: 'submit', class: 'btn-primary', 
+          onclick: "confirmation_needed = false;", id: "upload_submit", name: "update_descriptions" %>
+      </div>
+    </div>
+  <% end %>
+</div>

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

@@ -0,0 +1,24 @@
+<%= bootstrap_form_for [collections, @collection], html: {class: 'form-inline editor'} do |f| %>
+  <div id="descriptions_display">
+    <h2 class="non lower">Descriptions <small class="pull-right"><span class="error">*</span> indicates required fields</small> </h2>
+    <div class="well">
+      <% @collection.terms_for_editing.each do |term| %>
+        <%= render partial: "records/edit_field", locals: {record: @collection, f: f, render_req: true, key: term } %>
+      <% end %>
+    </div><!-- /well -->
+  </div>
+  <%= hidden_field_tag :type, params[:type] %>
+  <% if params[:batch_document_ids].present? %>
+    <% params[:batch_document_ids].each do |batch_item| %>
+      <input type="hidden" name="batch_document_ids[]" value="<%= batch_item %>"/>
+    <% end %>
+  <% end %>
+  <%= f.actions do %>
+    <% if params[:action] == "new" %>
+      <%= f.submit 'Create Collection' %>
+    <% else %>
+      <%= f.submit 'Update Collection' %>
+    <% end %>
+    <%= f.cancel %>
+  <% end %>
+<% end %>

data/app/views/collections/_form_for_select_collection.html.erb

@@ -0,0 +1,34 @@
+<div class="modal fade" id="collection-list-container">
+  <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+          <h4 class="modal-title">Add to collection</h4>
+        </div>
+        <div class="modal-body">
+          <% if user_collections.blank? %>
+            <em> You do not have access to any existing collections. You may create a new collection.</em><br><br><br><br>
+          <% else %>
+            Select the collection to add your files to:
+            <div class="collection-list">
+              <ul>
+                <% user_collections.sort! { |c1,c2| c1['desc_metadata__date_modified_dtsi'] <=> c2['desc_metadata__date_modified_dtsi'] }  %>
+                <% user_collections.each do |collection| %>
+                  <li> <%= radio_button_tag(:id, collection.id, true, class: "collection-selector") %><%= label_tag(:collection, collection.title) %> </li>
+                <% end %>
+              </ul>
+            </div><!-- collection-list -->
+          <% end %> <!-- else -->
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+          <% if user_collections.blank? %>
+            <%= button_for_create_collection %>
+          <% else %> 
+            <%= button_for_update_collection %>
+            <%= button_for_create_collection "Add to new Collection" %>
+          <% end %> 
+        </div>
+      </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->

data/app/views/collections/_media_display.html.erb

@@ -0,0 +1 @@
+<a href="<%= collections.collection_path %>" target="_new"><img src="/assets/folder.png" alt="No preview available" width="338" /></a>

data/app/views/collections/_paginate.html.erb

@@ -0,0 +1,6 @@
+<% if @response.total_pages > 1 %>
+    <div class="pager">
+      <%= paginate @response, outer_window: 2, theme: 'blacklight', route_set: collections %>
+      <div class="clearfix"></div>
+    </div><!-- /pager -->
+<% end %>

data/app/views/collections/_search_collection_dashboard_form.html.erb

@@ -0,0 +1,10 @@
+<div style="float: right;" >
+  <%= form_for([collections, @collection], url: collections.edit_collection_path , method: :get, class: "well form-search") do |f| %>
+
+      <label class="accessible-hidden">Search Collection <%= @collection.title %></label>
+      <%= text_field_tag :cq, params[:cq], class: "collection-query", placeholder: "Search Collection", size: '30', type: "search", id: "collection_search" %>
+      <%= hidden_field_tag :sort, params[:sort], id: 'collection_sort' %>
+      <%= render_hash_as_hidden_fields(params_for_search.except(:cq, :sort, :qt, :page)) %>
+      <button type="submit" class="btn btn-primary" id="collection_submit"><i class="icon-search"></i> Go</button>
+  <% end %>
+</div>

data/app/views/collections/_show_actions.html.erb

@@ -0,0 +1,7 @@
+<h2 class="non lower">Actions</h2>
+<p>
+  <% if can? :edit, @collection %>
+      <%= link_to "Edit", collections.edit_collection_path %> &nbsp;&nbsp;
+      <%= link_to "Add files from your dashboard",  sufia.dashboard_files_path %>
+  <%end %>
+</p>

data/app/views/collections/_show_descriptions.html.erb

@@ -0,0 +1,8 @@
+<h2 class="non lower">Descriptions</h2>
+<table class="table table-striped"><!-- class="verticalheadings"> -->
+  <tbody>
+    <%= render partial: 'collections/show_fields/title', locals: {collection: @collection} %>
+    <%= render partial: 'collections/show_fields/creator', locals: {collection: @collection} %>
+    <%= render partial: 'collections/show_fields/description', locals: {collection: @collection} %>
+  </tbody>
+</table> <!-- /verticalheadings -->

data/app/views/collections/_single_item_action_fields.html.erb

@@ -0,0 +1,6 @@
+<%# this includes the fields in a form necissary for manipulating a single item in a collection %>
+<%# form - form these fields will reside in %>
+<%# action - collection action: add or remove %>
+<%# document - current document %>
+<%= form.hidden_field :members, value: action %>
+<%= hidden_field :batch_document_ids, '', {value:document.id} %>

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

@@ -0,0 +1,29 @@
+<div class="batch-info">
+  <div>
+    <%= render partial: 'collections/form_for_select_collection', locals: { user_collections: @user_collections }  %>
+  </div>
+
+  <% if  params[:action] == "edit" %>
+  <div class="batch-toggle">
+     <% session[:batch_edit_state] = "on" %>
+    <%= button_for_remove_selected_from_collection @collection %>
+   </div>
+  <%end %>
+   <div class="sort-toggle">
+     <%# kind of hacky way to get this to work on catalog and folder controllers.  May be able to simple do {action: "index"} but I'm not sure -%>
+     <% unless @response.response['numFound'] < 2 %>
+        <%= form_tag collections.collection_path(@collection.noid), method: :get, class: 'per_page form-inline' do %>
+          <%= label_tag(:sort, "<span>Sort By:</span>".html_safe) %>
+          <%= select_tag(:sort, options_for_select(sort_fields, h(params[:sort]))) %>
+          &nbsp;&nbsp;&nbsp;
+          <%= label_tag(:per_page) do %>
+            Show <%= select_tag(:per_page, options_for_select(['10', '20', '50', '100'], h(params[:per_page])), title: "Number of results to display per page") %> per page
+            <% end %>
+            <%= render_hash_as_hidden_fields(params_for_search.except(:per_page, :sort)) %>
+            &nbsp;&nbsp;&nbsp;
+            <button class="btn btn-primary"><i class="icon-refresh"></i> Refresh</button>
+            <%= render 'view_type_group' %>
+         <% end %>
+      <% end unless sort_fields.empty? %>
+   </div>
+</div>

data/app/views/collections/_view_type_group.html.erb

@@ -0,0 +1,13 @@
+<% if has_alternative_views? -%>
+<div class="view-type">
+  <span class="sr-only"><%= t('blacklight.search.view_title') %></span>
+  <div class="view-type-group btn-group">
+    <%  document_index_views.each do |view, config| %>
+      <%= link_to collections.collection_path(Sufia::Noid.noidify(params[:id]), view: view), title: t("blacklight.search.view_title.#{view}", default: t("blacklight.search.view.#{view}", default: blacklight_config.view[view].title)), class: "btn btn-default view-type-#{ view.to_s.parameterize } #{"active" if document_index_view_type == view}" do %>
+        <%= render_view_type_group_icon view %>
+        <span class="caption"><%= t("blacklight.search.view.#{view}") %></span>
+      <% end %>
+    <% end %>
+  </div>
+</div>
+<% end -%>

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

@@ -0,0 +1,30 @@
+<% @page_title = "Edit Collection #{display_title(@collection)} - #{application_name}" %>
+<%= render partial: 'generic_files/breadcrumbs', locals: {
+  include_file: false, generic_file: GenericFile.new(title: @collection.title) } %>
+
+<h1>Edit Collection: <%= display_title(@collection) %></h1>
+
+<% unless has_collection_search_parameters? %>
+  <div class="row">
+    <div class="col-xs-12 col-sm-4">
+      <%= render partial: 'collections/media_display', locals: { collection: @collection } %>
+    </div>
+    <div class="col-xs-12 col-sm-8"><!-- class="column second"> -->
+      <%= render partial: 'collections/edit_actions' %>
+      <%= render partial: 'collections/form', locals: { record: @collection } %>
+    </div><!-- /columns second -->
+  </div> <!-- /columns two-b -->
+<% end %>
+  
+
+  <h2>Manage Items in this Collection</h2>
+  <%= render partial: 'search_collection_dashboard_form'%>
+  <%= render partial: 'dashboard/did_you_mean' %>
+  <%= render partial: 'dashboard/facet_selected' %>
+
+	<%= render 'dashboard/constraints', localized_params: params %>
+
+  <%= render 'collections/sort_and_per_page' %>
+  <%= render partial:'document_list', locals: { documents: @member_docs, document_list_format: "dashboard" } %>
+
+<%= render partial:'paginate' %>

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

@@ -0,0 +1,32 @@
+<% @page_title = "#{@collection.title} - #{application_name}" %>
+
+<%= render partial: 'generic_files/breadcrumbs', locals: {
+  include_file: false, generic_file: GenericFile.new(title: @collection.title) } %>
+
+<h1 class="lower"><%= @collection.title %></h1>
+
+<h3><%=@collection.description%> </h3>
+
+<% unless has_collection_search_parameters? %>
+  <div class="row">
+    <div class="col-xs-12 col-sm-4">
+      <%= render partial: 'collections/media_display', locals: { generic_file: @collection } %>
+    </div>
+    <div class="col-xs-12 col-sm-8"><!-- class="column second"> -->
+      <%= render partial: 'collections/show_actions' %>
+      <%= render partial: 'generic_files/show_descriptions', locals: { generic_file: @collection } %>
+    </div><!-- /columns second -->
+  </div> <!-- /columns two-b -->
+<% end %>
+
+<%= render 'sort_and_per_page' %>
+
+  <% if has_collection_search_parameters? %>
+    <h2>Search Results within this Collection</h2>
+  <% else %>
+    <h2>Items in this Collection</h2>
+  <% end %>
+  <%= render partial: 'search_form'%>
+  <%= render_document_index @member_docs %>
+
+  <%= render partial: 'paginate' %>

data/app/views/contact_form/new.html.erb

@@ -12,44 +12,44 @@
 <% end %>
 
 <h2>Contact Form</h2>
-<%= form_for(@contact_form, :url => sufia.contact_form_index_path, :html => {:class => 'form-horizontal well'}) do |f| %>
-  <%= f.text_field :contact_method, :class => 'hide' %>
+<%= form_for(@contact_form, url: sufia.contact_form_index_path, html: {class: 'form-horizontal well'}) do |f| %>
+  <%= f.text_field :contact_method, class: 'hide' %>
   <div class="control-group">
-    <%= f.label :category, 'Issue Type', :class => "control-label" %>
+    <%= f.label :category, 'Issue Type', class: "control-label" %>
     <div class="controls">
       <% issue_types = ContactForm::ISSUE_TYPES.dup %>
       <% issue_types.unshift(['Select an Issue Type', nil]) %>
-      <%= f.select 'category', options_for_select(issue_types), {}, {:class=> 'input-large', :required => true } %>
+      <%= f.select 'category', options_for_select(issue_types), {}, {class: 'input-large', required: true } %>
     </div>
   </div>
 
   <div class="control-group">
-    <%= f.label :name, 'Your Name', :class=>"control-label" %>
-    <div class="controls"><%= f.text_field :name, :class=>"input-xlarge", :value => nm, :required => true %>  </div>
+    <%= f.label :name, 'Your Name', class: "control-label" %>
+    <div class="controls"><%= f.text_field :name, class: "input-xlarge", value: nm, required: true %>  </div>
   </div>
 
   <div class="control-group">
-    <%= f.label :email, 'Your Email', :class=>"control-label" %>
+    <%= f.label :email, 'Your Email', class: "control-label" %>
     <div class="controls">
-    <%= f.text_field :email, :class=>"input-xlarge", :value => em, :required => true %>
+    <%= f.text_field :email, class: "input-xlarge", value: em, required: true %>
     </div>
   </div>
 
   <div class="control-group">
-    <%= f.label :subject, 'Subject', :class=>"control-label" %>
+    <%= f.label :subject, 'Subject', class: "control-label" %>
     <div class="controls">
-      <%= f.text_field :subject, :class=>"input-xlarge", :value=>"", :required => true %>
+      <%= f.text_field :subject, class: "input-xlarge", value: "", required: true %>
     </div>
   </div>
 
   <div class="control-group">
-    <%= f.label :message, 'Message', :class=>"control-label" %>
+    <%= f.label :message, 'Message', class: "control-label" %>
     <div class="controls">
-    <%= f.text_area :message, :class=>"input-xlarge", :value=>"", :required => true %>
+    <%= f.text_area :message, class: "input-xlarge", value: "", required: true %>
     </div>
   </div>
 
   <div class="form-actions">
-    <%= f.submit :value => "Send", :class => "btn-primary btn-large"  %>
+    <%= f.submit value: "Send", class: "btn-primary btn-large"  %>
   </div>
 <% end %>