hyrax 2.1.0.beta1 → 2.1.0.beta2

data/app/views/hyrax/batch_select/_add_button.html.erb

@@ -1,3 +1,3 @@
 <div data-behavior="batch-add-button">
-  <%= check_box_tag "batch_document_ids[]", document.id, false, class:"batch_document_selector", id: "batch_document_#{document.id}" %>
-</div>
+  <%= check_box_tag "batch_document_ids[]", document.id, true, class:"batch_document_selector", id: "batch_document_#{document.id}" %>
+</div>

data/app/views/hyrax/citations/work.html.erb

@@ -2,12 +2,12 @@
 
 <h4>MLA</h4>
 <span class="mla-citation"><%= export_as_mla_citation(@presenter) %></span>
-<br/><br/>
+<br /><br />
 
 <h4>APA</h4>
 <span class="apa-citation"><%= export_as_apa_citation(@presenter) %></span>
-<br/><br/>
+<br /><br />
 
 <h4>Chicago</h4>
 <span class="chicago-citation"><%= export_as_chicago_citation(@presenter) %></span>
-<br/><br/>
+<br /><br />

data/app/views/hyrax/collections/_collection.html.erb

@@ -1,2 +1,2 @@
-<%-# This is a search result view %>
+<%- # This is a search result view %>
 <%= render partial: 'catalog/document', locals: { document: collection, document_counter: collection_counter } %>

data/app/views/hyrax/collections/_default_group.html.erb

@@ -4,7 +4,7 @@
   <tr>
     <th class="check-all"><label for="check_all" class="sr-only"><%= t("hyrax.dashboard.my.sr.check_all_label") %></label><%= render_check_all %></th>
     <th><%= t("hyrax.dashboard.my.heading.title") %></th>
-    <th class="sorts-dash"><i id="<%= CatalogController.uploaded_field %>" class="<%= params[:sort] == "#{CatalogController.uploaded_field} desc" ? 'caret' : params[:sort] == "#{CatalogController.uploaded_field} asc" ? 'caret up' : ''%>"></i><%= t("hyrax.dashboard.my.heading.date_uploaded") %></th>
+    <th class="sorts-dash"><i id="<%= CatalogController.uploaded_field %>" class="<%= params[:sort] == "#{CatalogController.uploaded_field} desc" ? 'caret' : params[:sort] == "#{CatalogController.uploaded_field} asc" ? 'caret up' : '' %>"></i><%= t("hyrax.dashboard.my.heading.date_uploaded") %></th>
     <th><%= t("hyrax.dashboard.my.heading.visibility") %></th>
     <th><%= t("hyrax.dashboard.my.heading.action") %></th>
   </tr>

data/app/views/hyrax/collections/_list_collections.html.erb

@@ -21,7 +21,7 @@
   <td class="collection_type">
     <span class="label label-success"><%= collection_presenter.collection_type_badge %></span>
   </td>
-  <td class="text-center date"><%=collection_presenter.modified_date.try(:to_formatted_s, :standard) %> </td>
+  <td class="text-center date"><%= collection_presenter.modified_date.try(:to_formatted_s, :standard) %> </td>
   <td class="text-center">
     <%= render_visibility_link(collection_presenter.solr_document) %>
   </td>
@@ -42,7 +42,7 @@
       <dd class="col-xs-9 col-lg-10">
       <% if collection_presenter.edit_groups.present? %>
         <%= t("hyrax.dashboard.my.collection_list.groups") %> <%= collection_presenter.edit_groups.join(', ') %>
-        <br/>
+        <br />
       <% end %>
         <%= t("hyrax.dashboard.my.collection_list.users") %> <%= collection_presenter.edit_people.join(', ') %>
       </dd>

data/app/views/hyrax/collections/_list_works.html.erb

@@ -1,7 +1,7 @@
 <tr id="document_<%= document.id %>">
 
   <td>
-    <label for="batch_document_<%= document.id %>" class="sr-only"><%=t("hyrax.dashboard.my.sr.batch_checkbox")%></label>
+    <label for="batch_document_<%= document.id %>" class="sr-only"><%= t("hyrax.dashboard.my.sr.batch_checkbox") %></label>
     <%= render 'hyrax/batch_select/add_button', document: document %>&nbsp;
   </td>
 

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

@@ -1,8 +1,8 @@
 <dl>
-	<% present_terms(@presenter, @presenter.terms_with_values) do |r, term| %>
-		<div>
-			<dt><%= r.label(term) %></dt>
-			<dd><%= r.value(term) %></dd>
-		</div>
-	<% end %>
+  <% present_terms(@presenter, @presenter.terms_with_values) do |r, term| %>
+    <div>
+      <dt><%= r.label(term) %></dt>
+      <dd><%= r.value(term) %></dd>
+    </div>
+  <% end %>
 </dl>

data/app/views/hyrax/collections/_show_document_list_row.html.erb

@@ -2,7 +2,7 @@
 <tr id="document_<%= id %>">
   <td>&nbsp;
     <% if current_user and document.depositor != current_user.user_key %>
-      <i class="glyphicon glyphicon-share-alt"/>
+      <i class="glyphicon glyphicon-share-alt" />
     <% end %>
   </td>
   <td>
@@ -35,7 +35,7 @@
       <dd class="col-xs-9 col-lg-10">
         <% if document.edit_groups.present? %>
           Groups: <%= document.edit_groups.join(', ') %>
-          <br/>
+          <br />
         <% end %>
         Users: <%= document.edit_people.join(', ') %>
       </dd>

data/app/views/hyrax/collections/_show_parent_collections.html.erb

@@ -1,41 +1,14 @@
 <% if presenter.total_parent_collections <= 0 %>
-		<div class="alert alert-warning" role="alert"><%= t('hyrax.collections.show.no_visible_parent_collections') %></div>
+    <div class="alert alert-warning" role="alert"><%= t('hyrax.collections.show.no_visible_parent_collections') %></div>
 <% else %>
-  <% if presenter.use_parent_more_less? %>
-  	<div class="less-parent-collections-block" id="less-parent-collections">
-  		<% presenter.visible_parent_collections.each do |document| %>
-  			<ul>
-  				<li>
-  					<strong><%= link_to document, [hyrax, document], id: "src_copy_link_#{document.id}" %></strong>
-  				</li>
-  			</ul>
-  		<% end %>
-  		<% if presenter.more_parent_collections? %>
-  				<button id="show-more-parent-collections" class="btn show-more-parent-collections-btn"><%= t("hyrax.collections.show.show_more_parent_collections") %></button>
-  		<% end %>
-  	</div>
-  	<% if presenter.more_parent_collections? %>
-  		<div class="more-parent-collections-block" id="more-parent-collections">
-  			<% presenter.more_parent_collections.each do |document| %>
-  				<ul>
-  					<li>
-  						<strong><%= link_to document, [hyrax, document], id: "src_copy_link_#{document.id}" %></strong>
-  					</li>
-  				</ul>
-  			<% end %>
-        <button id="show-less-parent-collections" class="btn show-less-parent-collections-btn"><%= t("hyrax.collections.show.show_less_parent_collections") %></button>
-  		</div>
-    <% end %>
-  <% else %>
-		<% presenter.parent_collections.documents.each do |document| %>
-			<ul>
-				<li>
-					<strong><%= link_to document, [hyrax, document], id: "src_copy_link_#{document.id}" %></strong>
-				</li>
-			</ul>
-		<% end %>
-    <div class="row">
-      <%= render 'hyrax/collections/paginate', solr_response: presenter.parent_collections, page_param_name: :parent_collection_page  %>
-    </div>
-	<% end %>
+  <% presenter.parent_collections.documents.each do |document| %>
+    <ul>
+      <li>
+        <strong><%= link_to document, [hyrax, document], id: "src_copy_link_#{document.id}" %></strong>
+      </li>
+    </ul>
+  <% end %>
+  <div class="row">
+    <%= render 'hyrax/collections/paginate', solr_response: presenter.parent_collections, page_param_name: :parent_collection_page %>
+  </div>
 <% end %>

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

@@ -1,16 +1,16 @@
 <% if show_sort_and_per_page? && active_sort_fields.many? %>
-	<%= form_tag collection_path(collection), method: :get, class: 'per_page form-horizontal' do %>
+  <%= form_tag collection_path(collection), method: :get, class: 'per_page form-horizontal' do %>
     <%= render 'view_type_group' %>
-		<fieldset class="pull-left">
-			<legend class="sr-only"><%= t('hyrax.sort_label') %></legend>
-			<%= label_tag(:sort, '<span>Sort by:</span>'.html_safe) %>
-			<%= select_tag(:sort, options_from_collection_for_select(active_sort_fields, 'first', lambda {|field| field.last.label}, h(params[:sort]))) %>
-			<%= label_tag(:per_page) do %>
-		    <span class="tiny-nudge">Results per page:</span>
-				<%= select_tag(:per_page, options_for_select(['10', '20', '50', '100'], h(params[:per_page])), title: "Number of results to display per page") %>
-			<% end %>
-			<%= render_hash_as_hidden_fields(search_state.params_for_search.except(:per_page, :sort)) %>
-			&nbsp;<button class="btn btn-xs btn-default tiny-nudge"><span class="glyphicon glyphicon-refresh"></span> Refresh</button>
-		</fieldset>
-	<% end %>
+    <fieldset class="pull-left">
+      <legend class="sr-only"><%= t('hyrax.sort_label') %></legend>
+      <%= label_tag(:sort, '<span>Sort by:</span>'.html_safe) %>
+      <%= select_tag(:sort, options_from_collection_for_select(active_sort_fields, 'first', lambda {|field| field.last.label}, h(params[:sort]))) %>
+      <%= label_tag(:per_page) do %>
+        <span class="tiny-nudge">Results per page:</span>
+        <%= select_tag(:per_page, options_for_select(['10', '20', '50', '100'], h(params[:per_page])), title: "Number of results to display per page") %>
+      <% end %>
+      <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:per_page, :sort)) %>
+      &nbsp;<button class="btn btn-xs btn-default tiny-nudge"><span class="glyphicon glyphicon-refresh"></span> Refresh</button>
+    </fieldset>
+  <% end %>
 <% end %>

data/app/views/hyrax/collections/_subcollection_list.html.erb

@@ -9,5 +9,5 @@
     </li>
   </ul>
 <% end %>
-<%= render 'hyrax/collections/paginate', solr_response: @subcollection_solr_response, page_param_name: :sub_collection_page  %>
+<%= render 'hyrax/collections/paginate', solr_response: @subcollection_solr_response, page_param_name: :sub_collection_page %>
 <% end %>

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

@@ -2,7 +2,7 @@
 <div class="view-type pull-right">
   <span class="sr-only"><%= t('blacklight.search.view_title') %></span>
   <div class="view-type-group btn-group">
-    <%  document_index_views.each do |view, config| %>
+    <% document_index_views.each do |view, config| %>
       <%= link_to collection_path(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>

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

@@ -1,125 +1,125 @@
 <% provide :page_title, construct_page_title(@presenter.title) %>
 <div class="hyc-container" itemscope itemtype="http://schema.org/CollectionPage">
-	<div class="row hyc-header">
-		<div class="col-md-12">
-
-			<% unless @presenter.banner_file.blank? %>
-					<header class="hyc-banner" style="background-image:url(<%= @presenter.banner_file %>)">
-			<% else %>
-					<header class="hyc-generic">
-			<% end %>
-
-			<div class="hyc-title">
-				<h1><%=@presenter.title.first%></h1>
-				<span class="label label-success"><%= @presenter.collection_type_badge %></span>
-				<%= @presenter.permission_badge %>
-			</div>
-
-			<% unless @presenter.logo_record.blank? %>
-					<div class="hyc-logos">
-						<% @presenter.logo_record.each_with_index  do |lr, i| %>
-
-								<% if lr[:linkurl].blank? %>
-										<img alt="<%= lr[:alttext] %>" src="<%= lr[:file_location] %>">
-								<% else %>
-										<a href="<%= lr[:linkurl] %>">
-											<img alt="<%= lr[:alttext] %>" src="<%= lr[:file_location] %>">
-										</a>
-								<% end %>
-
-						<% end %>
-					</div>
-			<% end %>
-
-			<% unless @presenter.total_viewable_items.blank? %>
-					<div class="hyc-bugs">
-						<div class="hyc-item-count">
-							<b><%= @presenter.total_viewable_items %></b>
-							<%= 'Item'.pluralize(@presenter.total_viewable_items) %></div>
-
-						<% unless @presenter.creator.blank? %>
-								<div class="hyc-created-by">Created by: <%= @presenter.creator.first %></div>
-						<% end %>
-
-						<% unless @presenter.modified_date.blank? %>
-								<div class="hyc-last-updated">Last Updated: <%= @presenter.modified_date %></div>
-						<% end %>
-					</div>
-			<% end %>
-
-			</header>
-
-		</div>
-	</div>
-
-	<div class="row hyc-body">
-		<div class="col-md-8 hyc-description">
-			<%= render 'collection_description', presenter: @presenter %>
-
-			<% if @presenter.collection_type_is_nestable? && @presenter.total_parent_collections > 0 %>
-					<div class="hyc-blacklight hyc-bl-title">
-						<h2>
-							<%= t('.parent_collection_header') %> (<%= @presenter.total_parent_collections %>)
-						</h2>
-					</div>
-					<div class="hyc-blacklight hyc-bl-results">
-						<%= render 'show_parent_collections', presenter: @presenter %>
-					</div>
-			<% end %>
-
-		</div>
-		<div class="col-md-4 hyc-metadata">
-			<% unless has_collection_search_parameters? %>
-					<h2>Collection Details</h2>
-					<%= render 'show_descriptions' %>
-			<% end %>
-		</div>
-	</div>
-
-	<!-- Search results label -->
-	<% if @members_count > 0 || @presenter.subcollection_count > 0 %>
-		<div class="hyc-blacklight hyc-bl-title">
-			<h2>
-				<% if has_collection_search_parameters? %>
-						<%= t('hyrax.dashboard.collections.show.search_results') %>
-				<% end %>
-			</h2>
-		</div>
-	<% end %>
-
-	<!-- Search bar -->
-	<div class="hyc-blacklight hyc-bl-search hyc-body row">
-		<div class="col-sm-8">
-			<%= render 'search_form', presenter: @presenter, url: hyrax.collection_path(@presenter.id) %>
-		</div>
-	</div>
-
-	<!-- Subcollections -->
-	<% if @presenter.collection_type_is_nestable? && @subcollection_count > 0 %>
-			<div class="hyc-blacklight hyc-bl-title">
-				<h4><%= t('.subcollection_count') %> (<%= @subcollection_count %>)</h4>
-			</div>
-			<div class="hyc-blacklight hyc-bl-results">
-				<%= render 'subcollection_list', collection: @subcollection_docs %>
-			</div>
-	<% end %>
-
-	<!-- Works -->
-	<% if @members_count > 0 %>
-			<div class="hyc-blacklight hyc-bl-title">
-				<h4><%= t('.works_in_collection') %> (<%= @members_count %>)</h4>
-			</div>
-
-			<div class="hyc-blacklight hyc-bl-sort">
-				<%= render 'sort_and_per_page', collection: @presenter %>
-			</div>
-
-			<div class="hyc-blacklight hyc-bl-results">
-				<%= render_document_index @member_docs %>
-			</div>
-
-			<div class="hyc-blacklight hyc-bl-pager">
-				<%= render 'paginate' %>
-			</div>
-	<% end # if @members_count > 0 %>
+  <div class="row hyc-header">
+    <div class="col-md-12">
+
+      <% unless @presenter.banner_file.blank? %>
+          <header class="hyc-banner" style="background-image:url(<%= @presenter.banner_file %>)">
+      <% else %>
+          <header class="hyc-generic">
+      <% end %>
+
+      <div class="hyc-title">
+        <h1><%= @presenter.title.first %></h1>
+        <span class="label label-success"><%= @presenter.collection_type_badge %></span>
+        <%= @presenter.permission_badge %>
+      </div>
+
+      <% unless @presenter.logo_record.blank? %>
+          <div class="hyc-logos">
+            <% @presenter.logo_record.each_with_index  do |lr, i| %>
+
+                <% if lr[:linkurl].blank? %>
+                    <img alt="<%= lr[:alttext] %>" src="<%= lr[:file_location] %>" />
+                <% else %>
+                    <a href="<%= lr[:linkurl] %>">
+                      <img alt="<%= lr[:alttext] %>" src="<%= lr[:file_location] %>" />
+                    </a>
+                <% end %>
+
+            <% end %>
+          </div>
+      <% end %>
+
+      <% unless @presenter.total_viewable_items.blank? %>
+          <div class="hyc-bugs">
+            <div class="hyc-item-count">
+              <b><%= @presenter.total_viewable_items %></b>
+              <%= 'Item'.pluralize(@presenter.total_viewable_items) %></div>
+
+            <% unless @presenter.creator.blank? %>
+                <div class="hyc-created-by">Created by: <%= @presenter.creator.first %></div>
+            <% end %>
+
+            <% unless @presenter.modified_date.blank? %>
+                <div class="hyc-last-updated">Last Updated: <%= @presenter.modified_date %></div>
+            <% end %>
+          </div>
+      <% end %>
+
+      </header>
+
+    </div>
+  </div>
+
+  <div class="row hyc-body">
+    <div class="col-md-8 hyc-description">
+      <%= render 'collection_description', presenter: @presenter %>
+
+      <% if @presenter.collection_type_is_nestable? && @presenter.total_parent_collections > 0 %>
+          <div class="hyc-blacklight hyc-bl-title">
+            <h2>
+              <%= t('.parent_collection_header') %> (<%= @presenter.total_parent_collections %>)
+            </h2>
+          </div>
+          <div class="hyc-blacklight hyc-bl-results">
+            <%= render 'show_parent_collections', presenter: @presenter %>
+          </div>
+      <% end %>
+
+    </div>
+    <div class="col-md-4 hyc-metadata">
+      <% unless has_collection_search_parameters? %>
+          <h2>Collection Details</h2>
+          <%= render 'show_descriptions' %>
+      <% end %>
+    </div>
+  </div>
+
+  <!-- Search results label -->
+  <% if @members_count > 0 || @presenter.subcollection_count > 0 %>
+    <div class="hyc-blacklight hyc-bl-title">
+      <h2>
+        <% if has_collection_search_parameters? %>
+            <%= t('hyrax.dashboard.collections.show.search_results') %>
+        <% end %>
+      </h2>
+    </div>
+  <% end %>
+
+  <!-- Search bar -->
+  <div class="hyc-blacklight hyc-bl-search hyc-body row">
+    <div class="col-sm-8">
+      <%= render 'search_form', presenter: @presenter, url: hyrax.collection_path(@presenter.id) %>
+    </div>
+  </div>
+
+  <!-- Subcollections -->
+  <% if @presenter.collection_type_is_nestable? && @subcollection_count > 0 %>
+      <div class="hyc-blacklight hyc-bl-title">
+        <h4><%= t('.subcollection_count') %> (<%= @subcollection_count %>)</h4>
+      </div>
+      <div class="hyc-blacklight hyc-bl-results">
+        <%= render 'subcollection_list', collection: @subcollection_docs %>
+      </div>
+  <% end %>
+
+  <!-- Works -->
+  <% if @members_count > 0 %>
+      <div class="hyc-blacklight hyc-bl-title">
+        <h4><%= t('.works_in_collection') %> (<%= @members_count %>)</h4>
+      </div>
+
+      <div class="hyc-blacklight hyc-bl-sort">
+        <%= render 'sort_and_per_page', collection: @presenter %>
+      </div>
+
+      <div class="hyc-blacklight hyc-bl-results">
+        <%= render_document_index @member_docs %>
+      </div>
+
+      <div class="hyc-blacklight hyc-bl-pager">
+        <%= render 'paginate' %>
+      </div>
+  <% end # if @members_count > 0 %>
 </div>