sufia 4.0.0.rc1 → 4.0.0.rc2

data/app/views/batch_edits/update_edit.js.erb

@@ -1,5 +1,5 @@
 <% value = "" %>
 <% @vals = [@vals] unless @vals.is_a?(Array) %>
-<% @vals.each { |val|  logger.warn"#{val.inspect}"; value = value + val+'<br />'}%>
+<% @vals.each { |val|  Rails.logger.warn"#{val.inspect}"; value = value + val+'<br />'}%>
 $("#data_<%= @key%>").html( "<%=value.html_safe%>");
 $("#status_<%= @key%>").html("Changes Saved");

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

@@ -1,17 +1,9 @@
 <ul class="facet-values list-unstyled">
   <% paginator = facet_paginator(facet_field, display_facet) %>
-  <% paginator.items.each do |item| -%>
-    <li>
-    <% if facet_in_params?(solr_field, item.value) %>
-        <%= render_selected_facet_value(solr_field, item) %>
-      <% else %>
-        <%= render_facet_value(solr_field, item) %>
-    <% end -%>
-    </li>
-  <% end %>
+  <%= render_facet_limit_list paginator, solr_field %>
 
-  <% if paginator.has_next? and params[:action] != "facet" %>
-    <li class="more_facets_link"><%= link_to('more '+ facet_field.label.pluralize + '»', params.merge(id: solr_field, action: "facet", page: nil), class: "more_facets_link") %></li>
+  <% unless paginator.last_page? || params[:action] == "facet" %>
+    <li class="more_facets_link"><%= link_to 'more ' + facet_field.label.pluralize + '»',
+       params.merge(id: solr_field, action: "facet", page: nil), class: "more_facets_link" %></li>
   <% end %>
-
 </ul>

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

@@ -1,9 +1,8 @@
 <%= form_tag search_form_action, method: :get, id: "search-form-header", role: "search" do %>
   <%= render_hash_as_hidden_fields(params_for_search.except(:q, :search_field, :qt, :page, :utf8)) %>
-  <div class="container-fluid">
-    <div class="row">
 
-      <div class="col-xs-10">
+    <div class="row">
+      <div class="col-xs-12">
         <div class="input-group">
           <%= text_field_tag :q, current_search_parameters , class: "q form-control", id: "search-field-header", 
               placeholder: t("sufia.search.form.q.placeholder") %>
@@ -12,7 +11,10 @@
           <label class="sr-only" for="search-field-header"><%= t("sufia.search.form.q.label") %></label>
 
           <div class="input-group-btn">
-            <button class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+            <button type="submit" class="btn btn-primary" id="search-submit-header">
+              <%= t('sufia.search.button.html') %>
+            </button>
+            <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown">
               <span data-search-element="label"><%= t("sufia.search.form.option.all.label_long") %></span>
               <span class="caret"></span>
             </button>
@@ -44,16 +46,9 @@
 
             </ul>
           </div><!-- /.input-group-btn -->
-        
+
         </div><!-- /.input-group -->
       </div><!-- /text field dropdown -->
-      
-      <div class="col-xs-2">
-        <button type="submit" class="btn btn-primary" id="search-submit-header">
-          <span class="glyphicon glyphicon-search"></span> Go
-        </button>
-      </div><!-- /.go -->
-    
     </div><!-- /.row -->
-  </div><!-- /.container-fluid -->
+
 <% end %>

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

@@ -1,6 +1,6 @@
 <div class="btn-group">
-  <button class="btn btn-small" href="#"><i class="glyphicon glyphicon-wrench"></i> Select an action</button>
-  <button class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#"><span class="glyphicon glyphicon-chevron-down"></span></button>
+  <button class="btn btn-sm" href="#"><i class="glyphicon glyphicon-wrench"></i> Select an action</button>
+  <button class="btn btn-sm dropdown-toggle" data-toggle="dropdown" href="#"><span class="glyphicon glyphicon-chevron-down"></span></button>
   <ul class="dropdown-menu">
    <li>
      <%=  button_for_remove_from_collection(gf, 'Remove from Collection') %>

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

@@ -2,35 +2,14 @@
   <h2>
     <%= link_to collection.title_or_label, [collections, collection] %>
   </h2>
-  <table class="table">
-    <tr>
-      <td rowspan="6" class="span20">
-        <%= link_to [collections, collection] do %>
-          <%= image_tag "folder.png", { width: 150 } %>
-        <% end %>
-      </td>
-      <th><h4>Title:</h4></th>
-      <td><%= collection.title %></td>
-    </tr>
-    <tr>
-      <th><h4>Depositor:<h4></div>
-      <td><%= link_to_profile collection.depositor("no depositor value") %></td>
-    </tr>
-    <tr>
-      <th><h4>Creator:</h4></th>
-      <td><%= collection.creator %></td>
-    </tr>
-    <tr>
-      <th><h4>Description:</h4></th>
-      <td><%= iconify_auto_link(collection.description) %></th>
-    </tr>
-    <tr>
-      <th><h4>Keywords:</h4></th>
-      <td><%= collection.tags.join(', ') %></td>
-    </tr>
-    <tr>
-      <th><h4>Date Uploaded:</h4></th>
-      <td><%= collection.date_uploaded %></td>
-    </tr>
-  </table>
+  <div class="row">
+    <div class="col-sm-3">
+      <%= link_to [collections, collection] do %>
+        <span class="glyphicon glyphicon-th collection-icon-search">
+      <% end %>
+    </div>
+    <div class="col-sm-9">
+      <%= render 'shared/attributes', work: collection %>
+    </div>
+  </div>
 </li>

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

@@ -6,5 +6,5 @@
 <% if params[:action] == "edit" %>
   <%= render partial:'my/_index_partials/default_group', locals:{documents: documents, docs:documents} %>
 <% else %>
-  <%= render 'catalog/document_list', documents: documents %>
+  <%= render partial: 'show_document_list', locals:{documents: documents} %>
 <% end %>

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

@@ -1,5 +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 %>
+  <span class="label label-default"><%= link_to "Browse", collections.collection_path %></span> &nbsp;&nbsp;
+  <span class="label label-default"><%= link_to "Add files",  sufia.dashboard_files_path %></span>
 </p>

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

@@ -6,15 +6,13 @@
       <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 } %>
+          <%= render partial: "records/edit_field", locals: { record: collection, f: f, render_req: true, key: term } %>
         <% end %>
    
       </div><!-- /well -->
     <div class="row">
-      <div class="form-actions">
-        <%= f.button '<i class="glyphicon glyphicon-floppy-disk"></i> Save Descriptions'.html_safe, type: 'submit', class: 'btn-primary',
-          onclick: "confirmation_needed = false;", id: "upload_submit", name: "update_descriptions" %>
-      </div>
+      <%= f.button '<i class="glyphicon glyphicon-floppy-disk"></i> Save Descriptions'.html_safe, type: 'submit', class: 'btn btn-primary',
+        onclick: "confirmation_needed = false;", id: "upload_submit", name: "update_descriptions" %>
     </div>
   <% end %>
 </div>

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

@@ -1,4 +1,4 @@
-<%= bootstrap_form_for [collections, @collection], html: {class: 'form-inline editor'} do |f| %>
+<%= form_for [collections, @collection], html: {class: 'form-horizontal 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">
@@ -14,14 +14,12 @@
     <% end %>
   <% end %>
   
-  <div class="form-actions">
-    <div class="primary-actions">
-      <% if params[:action] == "new" %>
-        <%= f.primary 'Create Collection' %>
-      <% else %>
-        <%= f.primary 'Update Collection' %>
-      <% end %>
-      <%= link_to t(:'helpers.action.cancel'), main_app.root_path, class: 'btn btn-link' %>
-    </div>
+  <div class="primary-actions">
+    <% if params[:action] == "new" %>
+      <%= f.button 'Create Collection', type: 'submit', class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "create_submit", name: "create_collection" %>
+    <% else %>
+      <%= f.button 'Update Collection', type: 'submit', class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "update_submit", name: "update_collection" %>
+    <% end %>
+    <%= link_to t(:'helpers.action.cancel'), main_app.root_path, class: 'btn btn-link' %>
   </div>
 <% end %>

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

@@ -1 +1 @@
-<a href="<%= collections.collection_path %>" target="_new"><img src="/assets/folder.png" alt="No preview available" width="338" /></a>
+<a href="<%= collections.collection_path %>" target="_new"><span class="glyphicon glyphicon-th collection-icon"></span></a>

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

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

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

@@ -1,8 +1,13 @@
-<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 -->
+<h2 class="sr-only">Descriptions</h2>
+<dl class="metadata-collections">
+  <dt><%= get_label("total_items") %></dt>
+  <dd><%= @collection.members.count %></dd>
+  <dt><%= get_label("size") %></dt>
+  <dd><%= number_to_human_size(@collection.bytes) %></dd>
+  <% (@collection.terms_for_display).each do |term| %>
+      <% if @collection.send(term).present? %>
+      <dt><%= get_label(term) %></dt>
+      <dd><%= render_show_field_partial_with_action("records", term, {record: @collection}) %></dd>
+      <% end %>
+  <% end %>
+</dl>

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

@@ -0,0 +1,17 @@
+<table class="table table-zebra-striped">
+  <caption class="sr-only">List of items in this collection</caption>
+  <thead>
+  <tr>
+    <th>&nbsp;</th>
+    <th>Title</th>
+    <th>Date Uploaded</th>
+    <th>Visibility</th>
+    <th>Action</th>
+  </tr>
+  </thead>
+  <tbody>
+    <%= render partial: 'show_document_list_row', collection: documents, as: :document %>
+  </tbody>
+</table>
+
+

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

@@ -0,0 +1,24 @@
+<div class="btn-group">
+  <button class="btn btn-sm dropdown-toggle" data-toggle="dropdown">Select an action <span class="caret"></span>
+  </button>
+  <ul class="dropdown-menu dropdown-menu-right">
+    <li>
+      <%= link_to raw('<i class="glyphicon glyphicon-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="glyphicon glyphicon-pencil"></i> Edit File'), sufia.edit_generic_file_path(noid),
+                  class: 'itemicon itemedit', title: 'Edit File' %>
+    </li>
+    <li>
+      <%= link_to raw('<i class="glyphicon glyphicon-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/_show_document_list_row.html.erb

@@ -0,0 +1,63 @@
+<% noid = document.noid %>
+<tr id="document_<%= noid %>" class="<%= cycle("", "zebra") %>">
+  <% gf = GenericFile.load_instance_from_solr(document.id) %>
+  <td>&nbsp;
+    <%# This block is for adding/removing the magic wand while batch updates are processing %>
+    <% if gf.processing? %>
+      <i class="glyphicon glyphicon-time <%= 'ss-'+gf.batch.noid %>"/>
+    <% elsif gf.depositor != @user.user_key %>
+      <i class="glyphicon glyphicon-share-alt"/>
+    <% end %>
+  </td>
+  <td>
+    <div class="media">
+      <%= link_to sufia.generic_file_path(document), class: "pull-left" do %>
+        <%= render_thumbnail_tag document, { class: "hidden-xs file_listing_thumbnail" }, { suppress_link: true } %>
+      <% end %>
+      <div class="media-body">
+        <h4 class="media-heading">
+          <%= link_to document.title_or_label, sufia.generic_file_path(noid), id: "src_copy_link#{noid}", class: "#{'document-title' if document.title_or_label == document.label}" %>
+          <a href="#" class="small" title="Click for more details"><i id="expand_<%= noid %>" class="glyphicon glyphicon-chevron-right"></i></a>
+        </h4>
+        <%= render_collection_list(gf) %>
+      </div>
+    </div>
+  </td>
+  <td class="text-center"><%= document.date_uploaded %> </td>
+  <td class="text-center">
+    <a href="<%= sufia.generic_file_path(noid) %>/edit/?tab=permissions" id="permission_<%= noid %>" class="visibility-link">
+      <% if document.registered? %>
+        <span class="label label-info" title="<%= t('sufia.institution_name') %>"><%= t('sufia.institution_name') %></span>
+      <% elsif document.public? %>
+        <span class="label label-success" title="Open Access">Open Access</span>
+      <% else %>
+        <span class="label label-danger" title="Private">Private</span>
+      <% end %>
+    </a>
+  </td>
+  <td class="text-center">
+    <%= render partial: 'show_document_list_menu', locals: { noid: noid, gf: gf } %>
+  </td>
+</tr>
+<tr id="detail_<%= noid %>"> <!--  document detail"> -->
+  <td colspan="6">
+    <dl class="expanded-details row">
+      <dt class="col-xs-3 col-lg-2">File Name:</dt>
+      <dd class="col-xs-9 col-lg-4"><%= link_to document.label, sufia.generic_file_path(noid) %></dd>
+      <dt class="col-xs-3 col-lg-2">File Format:</dt>
+      <dd class="col-xs-9 col-lg-4"><%= document.file_format %>JPG</dd>
+      <dt class="col-xs-3 col-lg-2">Creator:</dt>
+      <dd class="col-xs-9 col-lg-4"><%= document.creator %></dd>
+      <dt class="col-xs-3 col-lg-2">Depositor:</dt>
+      <dd class="col-xs-9 col-lg-4"><%= link_to_profile document.depositor %></dd>
+      <dt class="col-xs-3 col-lg-2">Edit Access:</dt>
+      <dd class="col-xs-9 col-lg-10">
+        <% if document.edit_groups.present? %>
+          Groups: <%= document.edit_groups.join(', ') %>
+          <br/>
+        <% end %>
+        Users: <%= document.edit_people.join(', ') %>
+      </dd>
+    </dl>
+  </td>
+</tr>

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

@@ -7,10 +7,10 @@
 
 <% unless has_collection_search_parameters? %>
   <div class="row">
-    <div class="col-xs-12 col-sm-4">
+    <div class="col-xs-12 col-sm-2">
       <%= render partial: 'collections/media_display', locals: { collection: @collection } %>
     </div>
-    <div class="col-xs-12 col-sm-8"><!-- class="column second"> -->
+    <div class="col-xs-12 col-sm-10"><!-- class="column second"> -->
       <%= render partial: 'collections/edit_actions' %>
       <%= render partial: 'collections/form', locals: { record: @collection } %>
     </div><!-- /columns second -->

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

@@ -3,30 +3,39 @@
 <%= 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 itemscope itemtype="http://schema.org/CollectionPage" class="row">
-    <div class="col-xs-12 col-sm-4">
-      <%= render partial: 'collections/media_display', locals: { generic_file: @collection } %>
+    <div class="col-sm-10 pull-right">
+      <header>
+        <h1><%= @collection.title %></h1>
+        <p class="collection_description"><%=@collection.description%></p>
+      </header>
+      <% unless has_collection_search_parameters? %>
+      <%= render partial: 'collections/show_descriptions', locals: { generic_file: @collection } %>
+      <% end %>
     </div>
-    <div class="col-xs-12 col-sm-8"><!-- class="column second"> -->
+    <div class="col-sm-2">
+      <%= render partial: 'collections/media_display', locals: { generic_file: @collection } %>
+      <% unless has_collection_search_parameters? %>
       <%= render partial: 'collections/show_actions' %>
-      <%= render partial: 'collections/show_descriptions', locals: { generic_file: @collection } %>
-    </div><!-- /columns second -->
-  </div> <!-- /columns two-b -->
-<% end %>
+      <% end %>
+    </div>
+  </div>
 
 <%= 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 %>
+<% if has_collection_search_parameters? %>
+    <% header_title = "Search Results within this Collection" %>
+<% else %>
+    <% header_title = "Items in this Collection" %>
+<% end %>
+
+<div>
+  <!-- Use CSS class h2 rather than HTML h2 tag to allow header and search box to align vertically -->
+  <span class="h2"><%= header_title %></span>
   <%= render partial: 'search_form'%>
-  <%= render_document_index @member_docs %>
+</div>
+
+<% @user ||= current_user %>
+<%= render_document_index @member_docs %>
 
-  <%= render partial: 'paginate' %>
+<%= render partial: 'paginate' %>

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

@@ -1,6 +1,6 @@
 <h1>Contact</h1>
-<div class="alert">
-  <%= render partial: 'directions' %>
+<div class="alert alert-info">
+  <%= render 'directions' %>
 </div>
 
 <% if user_signed_in? %>
@@ -14,42 +14,34 @@
 <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' %>
-  <div class="control-group">
-    <%= 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 } %>
+  <div class="form-group">
+    <%= f.label :category, 'Issue Type', class: "col-sm-2 control-label" %>
+    <% issue_types = ContactForm::ISSUE_TYPES.dup %>
+    <% issue_types.unshift(['Select an Issue Type', nil]) %>
+    <div class="col-sm-10">
+      <%= f.select 'category', options_for_select(issue_types), {}, {class: 'form-control', 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>
+  <div class="form-group">
+    <%= f.label :name, 'Your Name', class: "col-sm-2 control-label" %>
+    <div class="col-sm-10"><%= f.text_field :name, value: nm, class: 'form-control', required: true %></div>
   </div>
 
-  <div class="control-group">
-    <%= f.label :email, 'Your Email', class: "control-label" %>
-    <div class="controls">
-    <%= f.text_field :email, class: "input-xlarge", value: em, required: true %>
-    </div>
+  <div class="form-group">
+    <%= f.label :email, 'Your Email', class: "col-sm-2 control-label" %>
+    <div class="col-sm-10"><%= f.text_field :email, value: em, class: 'form-control', required: true %></div>
   </div>
 
-  <div class="control-group">
-    <%= f.label :subject, 'Subject', class: "control-label" %>
-    <div class="controls">
-      <%= f.text_field :subject, class: "input-xlarge", value: "", required: true %>
-    </div>
+  <div class="form-group">
+    <%= f.label :subject, 'Subject', class: "col-sm-2 control-label" %>
+    <div class="col-sm-10"><%= f.text_field :subject, class: 'form-control', required: true %></div>
   </div>
 
-  <div class="control-group">
-    <%= f.label :message, 'Message', class: "control-label" %>
-    <div class="controls">
-    <%= f.text_area :message, class: "input-xlarge", value: "", required: true %>
-    </div>
+  <div class="form-group">
+    <%= f.label :message, 'Message', class: "col-sm-2 control-label" %>
+    <div class="col-sm-10"><%= f.text_area :message, rows: 4, class: 'form-control', required: true %></div>
   </div>
 
-  <div class="form-actions">
-    <%= f.submit value: "Send", class: "btn-primary btn-large"  %>
-  </div>
+  <%= f.submit value: "Send", class: "btn btn-primary" %>
 <% end %>