sufia 4.0.0.rc1 → 4.0.0.rc2

data/app/views/my/_search_header.html.erb

@@ -0,0 +1,5 @@
+<%= render 'did_you_mean' %>
+
+<%= render 'constraints' %>
+
+<%= render 'sort_and_per_page' %>

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

@@ -3,13 +3,17 @@
     <%= render partial: 'collections/form_for_select_collection', locals: {user_collections: @user_collections}  %>
   </div>
 
-  <div class="batch-toggle">
-    <% session[:batch_edit_state] = "on" %>
-    <%= batch_edit_continue "Edit Selected" %>
-    <%= batch_delete %>
-    <%= button_tag "Add to Collection", class: 'btn btn-primary submits-batches submits-batches-add',
-        data: { toggle: "modal", target: "#collection-list-container" } %>
-  </div>
+  <% if on_my_files? %>
+    <div class="batch-toggle">
+      <% session[:batch_edit_state] = "on" %>
+      <div class="button_to-inline">
+        <%= batch_edit_continue "Edit Selected" %>
+      </div>
+      <%= batch_delete %>
+      <%= button_tag "Add to Collection", class: 'btn btn-primary submits-batches submits-batches-add',
+          data: { toggle: "modal", target: "#collection-list-container" } %>
+    </div>
+  <% end %>
 
   <div class="sort-toggle">
     <% unless @response.response['numFound'] < 2 %>

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

@@ -9,35 +9,29 @@
 
 <% @page_title = application_name + " Dashboard" %>
 
-<% if params.has_key?("q") %>
-    <div class="alert alert-info"><i class="glyphicon glyphicon-search large-icon"></i> You searched for:
-      <strong><%= params[:q] %></strong></div>
-<% end %>
-
-<ul class="nav nav-tabs">
+<ul class="nav nav-tabs" id="my_nav">
   <li class="<%= "active" if @selected_tab == :files %>">
-    <%= link_to "Files", sufia.dashboard_files_path %>
+    <%= link_to t('sufia.dashboard.my.files'), sufia.dashboard_files_path %>
   </li>
   <li class="<%= "active" if @selected_tab == :collections %>">
-    <%= link_to "Collections", sufia.dashboard_collections_path %>
+    <%= link_to t('sufia.dashboard.my.collections'), sufia.dashboard_collections_path %>
   </li>
   <li class="<%= "active" if @selected_tab == :highlighted %>">
-    <%= link_to "Highlighted", sufia.dashboard_highlights_path %>
+    <%= link_to t('sufia.dashboard.my.highlights'), sufia.dashboard_highlights_path %>
   </li>
   <li class="<%= "active" if @selected_tab == :shared %>">
-    <%= link_to "Shared with Me", sufia.dashboard_shares_path %>
+    <%= link_to t('sufia.dashboard.my.shares'), sufia.dashboard_shares_path %>
   </li>
 </ul>
 
-<%= render partial: 'did_you_mean' %>
-<%= render partial: 'facet_selected' %>
-
-<%= render 'sort_and_per_page' %>
+<%= render 'search_header' %>
 
 <%= render partial: 'document_list' %>
 
 <% content_for :sidebar do %>
-    <%= render partial: 'facets' %>
+  <%= link_to t("sufia.dashboard.upload"), sufia.new_generic_file_path, class: "btn btn-primary" %>
+  <%= link_to t("sufia.dashboard.create_collection"), collections.new_collection_path, id: "hydra-collection-add", class: "btn btn-primary" %>
+  <%= render partial: 'facets' %>
 <% end %>
 
 <%= render 'results_pagination' %>

data/app/views/records/_edit_field.html.erb

@@ -2,17 +2,21 @@
   # With render_edit_field_partial_with_action because there is also a 
   # 'render_edit_field_partial' in sufia that uses 'generic_file' as the action. %>
 <% render_req ||= true # render_req is true for single file edit, false for batch edit%>
-<div class="control-group">
-  <% vals =  f.object[key] %>
-  <% if render_req && f.object.required?(key) %>
-    <% tmp = '<span class="error">*</span>' + field_label(key) %>
-    <%= f.label key, tmp.html_safe, class: "control-label"  %>
+<div class="form-group">
+  <% vals = record[key] %>
+  <% if render_req && record.required?(key) %>
+    <% tmp = '<span class="required-field">*</span>' + get_label(key) %>
+    <%= f.label key, tmp.html_safe  %>
   <% else %>
-    <%= f.label key, field_label(key), class: "control-label"%>
+    <%= f.label key, get_label(key) %>
   <% end %>
 
-  <% vals.to_ary.each_with_index do |v, index| %>
-    <%= render_edit_field_partial_with_action('records', key, f: f,  v: v, index: index, render_req: render_req) %>
+  <% if key == :resource_type %>
+    <%# resource_type is a multiselect box, so don't render one row for each %>
+    <%= render_edit_field_partial(key, record: record, f: f, render_req: render_req) %>
+  <% else %>
+    <% vals.to_ary.each_with_index do |v, index| %>
+      <%= render_edit_field_partial(key, record: record, f: f,  v: v, index: index, render_req: render_req) %>
+    <% end %>
   <% end %>
-</div><!-- /control-group -->
-
+</div><!-- /.form-group -->

data/app/views/records/edit_fields/_default.html.erb

@@ -0,0 +1,6 @@
+      <div <%  if index == 0 %> id="additional_<%= key.to_s %>_clone" <% end %>>
+        <% required = render_req && (index == 0) && record.required?(key) %>
+        <%= f.text_field :title, name: "#{ActiveModel::Naming.singular(f.object)}[#{key.to_s}][]", id: "#{ActiveModel::Naming.singular(f.object)}_#{key.to_s}", value: v, class: "input-large", required: required  %>
+        <%= render partial: "records/edit_fields/suffix", locals: { key: key, index: index } %>
+      </div>
+      <div id="additional_<%= key %>_elements"></div>

data/app/views/records/edit_fields/_description.html.erb

@@ -1,10 +1,6 @@
-      <div class="controls" <%  if index == 0 %> id="additional_<%= key.to_s %>_clone" <% end %>>
+      <div  <%  if index == 0%> id="additional_<%= key.to_s %>_clone" <% end %>>
         <% required = render_req && (index == 0) && f.object.required?(key) %>
-        <%= text_area_tag "#{ActiveModel::Naming.singular(f.object)}[#{key.to_s}][]", v, 
-          id: "#{ActiveModel::Naming.singular(f.object)}_#{key.to_s}", class: "input-large", required: required  %>
-        
-        <% unless f.object.class.unique?(key) %>
-          <%= render partial: "records/edit_fields/suffix", locals: { key: key, index: index } %>
-        <% end %>
+        <%= f.text_area :description, name:"#{ActiveModel::Naming.singular(f.object)}[#{key.to_s}][]", id: "#{ActiveModel::Naming.singular(f.object)}_#{key.to_s}", value: v, class: "input-large", required: required %>
+        <%= render partial: "records/edit_fields/suffix", locals: { key: key, index: index, single: f.object.class.unique?(key)} %>
       </div>
       <div id="additional_<%= key %>_elements"></div>

data/app/views/records/edit_fields/_resource_type.html.erb

@@ -1,7 +1,5 @@
 <%# convert class variable to a local variable if the local hasn't been set %>
-<% generic_file ||= @generic_file %>
-        <div class="controls">
-          <p class="help-block">You may select multiple types to apply<p>
-          <%= f.select "resource_type", options_for_select(Sufia.config.resource_types.keys, generic_file.resource_type), {}, { multiple: true, size: 7 } %>
-          <%= help_icon(:resource_type) %>
-        </div>
+<div>
+  <%= f.select "resource_type", options_for_select(Sufia.config.resource_types.keys, record.resource_type), {}, { multiple: true, size: 7 } %>
+  <p class="help-block">You may select multiple types to apply <%= help_icon(:resource_type) %><p>
+</div>

data/app/views/records/edit_fields/_rights.html.erb

@@ -1,6 +1,5 @@
-<div class="controls"<%= if index == 0 ? " id=\"additional_#{key.to_s}_clone\"" : '' %>>
-            <%= f.select "rights", options_for_select(Sufia.config.cc_licenses, v), include_blank: true %>
-        <%= render partial: "generic_files/edit_fields/suffix", locals: { key: key, index: index } %>
-      </div><!-- /controls -->              
+      <div <% if index == 0%> id="additional_<%= key.to_s %>_clone" <% end %>>
+        <%= f.select "rights", options_for_select(Sufia.config.cc_licenses, v), include_blank: true %>
+        <%= render partial: "records/edit_fields/suffix", locals: { key: key, index: index } %>
+      </div>
       <div id="additional_<%= key %>_elements"></div>
-

data/app/views/records/edit_fields/_suffix.html.erb

@@ -1,8 +1,11 @@
+        <% single ||= false %>
         <% if index == 0  %>
-          <%= add_field(key) %>
-          &nbsp;
+          <% unless single %>
+            <%= add_field(key) %>
+          <% end %>
+            &nbsp;
           <%= help_icon(key) %>
-          <%= render partial: "generic_files/rights_modal" if key == "rights" %>
+          <%= render partial: "records/rights_modal" if key == "rights" %>
         <% else %>
           <%= subtract_field(key) %>
         <% end %>

data/app/views/records/edit_fields/_type.html.erb

@@ -1,13 +1,8 @@
-<%# convert class variable to a local variable if the local hasn't been set %>
-<% generic_file = @generic_file unless generic_file  %>
-
-      <div class="control-group">
-        <%= f.label :resource_type, "Resource Types", class: "control-label", for: "resource_type" %>
-        <div class="controls">
-          <p class="help-block">You may select multiple types to apply<p>
-          <%= f.select :resource_type, options_for_select(Sufia.config.resource_types.keys, generic_file.resource_type), {},
-            {multiple: true, size: 7} %>
-          <%= help_icon(:resource_type) %>
-        </div>
-      </div><!-- /control-group -->
+      <div class="form-group">
+        <%= f.label :resource_type, "Resource Types", for: "resource_type" %>
+        <p class="help-block">You may select multiple types to apply<p>
+        <%= f.select :resource_type, options_for_select(Sufia.config.resource_types.keys), {},
+          {multiple: true, size: 7} %>
+        <%= help_icon(:resource_type) %>
+      </div>
 

data/app/views/{generic_files → records}/show_fields/_based_near.html.erb

@@ -1,4 +1,4 @@
-<% @generic_file.based_near.each do |bn| %>
+<% record.based_near.each do |bn| %>
   <span itemprop="contentLocation" itemscope itemtype="http://schema.org/Place">
     <span itemprop="name"><%= link_to_facet(bn, Solrizer.solr_name("desc_metadata__based_near", :facetable)) %></span>
   </span>

data/app/views/{generic_files → records}/show_fields/_contributor.html.erb

@@ -1,5 +1,5 @@
-<% @generic_file.contributor.each do |contributor| %>
-  <span itemprop="contributor" itemscope itemtype="http://schema.org/Thing">
+<% record.contributor.each do |contributor| %>
+  <span itemprop="contributor" itemscope itemtype="http://schema.org/Agent">
     <span itemprop="name"><%= link_to_field('contributor', contributor) %></span>
   </span>
   <br />

data/app/views/records/show_fields/_creator.html.erb

@@ -0,0 +1,6 @@
+<% record.creator.each do |creator| %>
+<span itemprop="creator" itemscope itemtype="http://schema.org/Agent">
+  <span itemprop="name"><%= link_to_facet(creator, Solrizer.solr_name("desc_metadata__creator", :facetable)) %></span>
+</span>
+<br />
+<% end %>

data/app/views/{generic_files → records}/show_fields/_date_created.html.erb

@@ -1,4 +1,4 @@
-<% @generic_file.date_created.each do |dc| %>
+<% record.date_created.each do |dc| %>
   <span itemprop="dateCreated">
   <%= dc %>
   </span>

data/app/views/records/show_fields/_default.html.erb

@@ -0,0 +1,6 @@
+<% Array(record[key]).each do |v| %>
+  <span itemprop="<%= key %>" itemscope itemtype="http://schema.org/Thing">
+    <%= v %>
+  </span>
+  <br />
+<% end %>

data/app/views/records/show_fields/_description.html.erb

@@ -0,0 +1,6 @@
+      <% Array(record.description).each do |desc| %>
+        <span itemprop="description">
+        <%= iconify_auto_link(desc) %>
+        </span>
+        <br />
+      <% end %>

data/app/views/records/show_fields/_identifier.html.erb

@@ -0,0 +1,4 @@
+<% record.identifier.each do |id| %>
+  <%= id %><br />
+<% end %>
+

data/app/views/{generic_files → records}/show_fields/_language.html.erb

@@ -1,4 +1,4 @@
-<% @generic_file.language.each do |lang| %>
+<% record.language.each do |lang| %>
   <span itemprop="inLanguage"><%= link_to_facet(lang, Solrizer.solr_name("desc_metadata__language", :facetable)) %></span><br />
 <% end %>
 

data/app/views/{generic_files → records}/show_fields/_publisher.html.erb

@@ -1,4 +1,4 @@
-<% @generic_file.publisher.each do |pub| %>
+<% record.publisher.each do |pub| %>
   <span itemprop="publisher" itemscope itemtype="http://schema.org/Organization">
     <span itemprop="name"><%= link_to_facet(pub, Solrizer.solr_name("desc_metadata__publisher", :facetable)) %></span>
         </span>

data/app/views/records/show_fields/_related_url.html.erb

@@ -0,0 +1,6 @@
+<% record.related_url.each do |url| %>
+  <div class="related_url">
+    <%= iconify_auto_link(url) %>
+  </div>
+<% end %>
+

data/app/views/{generic_files → records}/show_fields/_resource_type.html.erb

@@ -1,4 +1,4 @@
-<% @generic_file.resource_type.each do |rtype| %>
+<% record.resource_type.each do |rtype| %>
   <%= link_to_facet(rtype, Solrizer.solr_name("desc_metadata__resource_type", :facetable)) %><br />
 <% end %>
 

data/app/views/{generic_files → records}/show_fields/_rights.html.erb

@@ -1,4 +1,4 @@
-<% @generic_file.rights.each do |r| %>
+<% record.rights.each do |r| %>
   <%=link_to_field('rights',r, Sufia.config.cc_licenses_reverse[r])%> <%= iconify_auto_link(r,false) %><br />
 <% end %>
 

data/app/views/{generic_files → records}/show_fields/_subject.html.erb

@@ -1,4 +1,4 @@
-<% @generic_file.subject.each do |sub| %>
+<% record.subject.each do |sub| %>
   <span itemprop="about" itemscope itemtype="http://schema.org/Thing">
     <span itemprop="name"><%= link_to_facet(sub, Solrizer.solr_name("desc_metadata__subject", :facetable)) %></span>
   </span>

data/app/views/{generic_files → records}/show_fields/_tag.html.erb

@@ -1,4 +1,4 @@
-<% @generic_file.tag.each do |t| %>
+<% record.tag.each do |t| %>
   <span itemprop="keywords"><%= link_to_facet(t, Solrizer.solr_name("desc_metadata__tag", :facetable)) %></span><br />
 <% end %>
 

data/app/views/records/show_fields/_title.html.erb

@@ -0,0 +1,6 @@
+            <% Array(record.title).each do |title| %>
+              <span itemprop="name">
+              <%= title %>
+              </span>
+              <br />
+            <% end %>

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

@@ -0,0 +1,27 @@
+      <table class="table">
+        <tr>
+          <th><h4>Title:</h4></th>
+          <td><%= work.title %></td>
+        </tr>
+        <tr>
+          <th><h4>Depositor:<h4></div>
+          <td><%= link_to_profile work.depositor("no depositor value") %></td>
+        </tr>
+        <tr>
+          <th><h4>Creator:</h4></th>
+          <td><%= work.creator %></td>
+        </tr>
+        <tr>
+          <th><h4>Description:</h4></th>
+          <td><%= iconify_auto_link(work.description) %></th>
+        </tr>
+        <tr>
+          <th><h4>Keywords:</h4></th>
+          <td><%= work.tags.join(', ') %></td>
+        </tr>
+        <tr>
+          <th><h4>Date Uploaded:</h4></th>
+          <td><%= work.date_uploaded %></td>
+        </tr>
+      </table>
+

data/app/views/static/agreement.html.erb

@@ -26,7 +26,7 @@ If you select the <%= t('sufia.institution_name') %> access option, you have dec
 By clicking through this license, you grant to <%= t('sufia.institution_name') %> the non-exclusive right to reproduce and/or distribute your submission (including the metadata and abstract) to students, faculty, staff, and walk-in users of the <%= t('sufia.institution_name') %> libraries, in any format or medium for non-commercial, research, educational, or related academic purposes only.  If you have limited access to specific individuals or groups, <%= t('sufia.institution_name') %> will distribute your submission ONLY to those users.  You also authorize <%= t('sufia.institution_name') %> to allow <%= t('sufia.institution_name') %> community users of the repository to distribute your submission (including the metadata and abstract) in any format or medium for <%= t('sufia.institution_name') %> internal non-commercial, research, educational, or related academic purposes only. <%= t('sufia.institution_name') %> will clearly identify your name(s) as the author(s) or owner(s) of the submission, and will not make any alteration, other than as allowed by this license, to your submission.
 </p>
 
-<h3>Visibility Level: <span class="label label-important">PRIVATE</span></h3>
+<h3>Visibility Level: <span class="label label-danger">PRIVATE</span></h3>
 
 <p>
 If you have selected the PRIVATE access option in the <%= t('sufia.product_name') %> deposit process, you have decided to allow <%= t('sufia.institution_name') %> a more limited set of rights than those afforded under the Open Access license option. Your deposit will not be accessible to anyone other than yourself. If you want your work to be accessible to the broader scholarly community, you should consider the regular Open Access or <%= t('sufia.institution_name') %> settings instead.

data/app/views/users/_activity_log.html.erb

@@ -2,7 +2,6 @@
   <caption class="sr-only">Activity of users you follow</caption>
   <thead>
     <tr>
-      <th>&nbsp;</th>
       <th>User Activity</th>
       <th>Date</th>
     </tr>
@@ -11,7 +10,6 @@
   <% events.each do |event| %>
     <% next if event[:action].blank? or event[:timestamp].blank? %>
     <tr>
-      <td>&nbsp;</td>
       <td><%= event[:action].html_safe %></td>
       <td><%= time_ago_in_words(Time.at(event[:timestamp].to_i)) %> ago</td>
     </tr>

data/app/views/users/_follower_modal.html.erb

@@ -1,26 +1,30 @@
 <div class="modal-div">
 
-<!-- Text to trigger modal -->
-<h4><i class="glyphicon glyphicon-hand-left"></i><a data-toggle="modal" href="#followers">Follower(s):</a>  <%= @followers.count %></h4>
-<!-- Modal -->
-<div class="modal hide in" id="followers" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-  <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
-  </div>
-  <div class="modal-body">
-    <% if @followers.count > 0 %>
-      <h3>Follower(s)</h3>
-      <ul>
-      <% @followers.each do |f| %>
-        <li><%= link_to f.name, sufia.profile_path(f), title: "View user's profile" %></li>
-      <% end %>
-      </ul>
-    <%else%>
-      <h3>No Followers</h3>
-    <%end %>
-  </div>
-  <div class="modal-footer">
-    <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true">Close</button>
+  <!-- Text to trigger modal -->
+  <h4>
+    <i class="glyphicon glyphicon-hand-left"></i><a data-toggle="modal" href="#followers">Follower(s):</a>  <%= @followers.count %>
+  </h4>
+
+  <!-- Modal -->
+  <div class="modal fade" id="followers" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-body">
+          <% if @followers.count > 0 %>
+            <h3>Follower(s)</h3>
+            <ul>
+              <% @followers.each do |f| %>
+                <li><%= link_to f.name, sufia.profile_path(f), title: "View user's profile" %></li>
+              <% end %>
+            </ul>
+          <% else %>
+            <h3> <%= t("sufia.user_profile.no_followers") %></h3>
+          <% end %>
+        </div>
+        <div class="modal-footer">
+          <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true">Close</button>
+        </div>
+      </div>
+    </div>
   </div>
-</div>
-</div>
+</div>

data/app/views/users/_following_modal.html.erb

@@ -1,26 +1,30 @@
 <div class="modal-div">
 
-<!-- Text to trigger modal -->
-<h4><i class="glyphicon glyphicon-hand-right"></i><a data-toggle="modal" href="#following">Following:</a>  <%= @following.count %></h4>
-<!-- Modal -->
-<div class="modal hide in" id="following" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-  <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
+  <!-- Text to trigger modal -->
+  <h4>
+    <i class="glyphicon glyphicon-hand-right"></i><a data-toggle="modal" href="#following">Following:</a>  <%= @following.count %>
+  </h4>
+  <!-- Modal -->
+  <!-- Modal -->
+  <div class="modal fade" id="following" tabindex="-1" role="dialog"  aria-hidden="true">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-body">
+          <% if @following.count > 0 %>
+            <h3>Following</h3>
+            <ul>
+              <% @following.each do |f| %>
+                <li><%= link_to f.name, sufia.profile_path(f), title: "View user's profile" %></li>
+              <% end %>
+            </ul>
+          <% else %>
+            <h3><%= t("sufia.user_profile.no_following") %></h3>
+          <% end %>
+        </div>
+        <div class="modal-footer">
+          <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true">Close</button>
+        </div>
+      </div>
+    </div>
   </div>
-  <div class="modal-body">
-    <% if @following.count > 0 %>
-      <h3>Following</h3>
-      <ul>
-      <% @following.each do |f| %>
-        <li><%= link_to f.name, sufia.profile_path(f), title: "View user's profile" %></li>
-      <% end %>
-      </ul>
-    <% else %>
-      <h3>No Following</h3>
-    <% end %>
-  </div>
-  <div class="modal-footer">
-    <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true">Close</button>
-  </div>
-</div>
-</div>
+</div>