sufia 3.7.2 → 4.0.0.beta1

data/app/views/dashboard/_index_partials/_list_files.html.erb

@@ -1,74 +1,79 @@
 <% noid = document.noid %>
-<tr id="document_<%= noid %>" class="<%= cycle("","zebra") %>">
+<tr id="document_<%= noid %>" class="<%= cycle("", "zebra") %>">
   <% gf = GenericFile.load_instance_from_solr(document.id) %>
-  <td width="6%"><%= batch_edit_select(document) %>&nbsp;</td>
-  <td width="1%">
-  <%# This block is for adding/removing the magic wand while batch updates are processing %>
-  <% if gf.processing? %>
-     <i class="icon-magic icon-large <%= 'ss-'+gf.batch.noid%>"/>
-  <% elsif gf.depositor != @user.user_key %>
-     <i class="icon-gift icon-large"/>
-  <% end %>
+  <td width="1%"><%= batch_edit_select(document) %>&nbsp;</td>
+  <td width="2%">
+    <%# This block is for adding/removing the magic wand while batch updates are processing %>
+    <% if gf.processing? %>
+        <i class="glyphicon glyphicon-magic <%= 'ss-'+gf.batch.noid %>"/>
+    <% elsif gf.depositor != @user.user_key %>
+        <i class="glyphicon glyphicon-gift"/>
+    <% end %>
   </td>
-  <td width="37%">
-    <a href="" title="Click for more details"><i id="expand_<%= noid %>" class="icon-plus icon-large fleft"></i></a>&nbsp;
-    <%= render :partial => 'dashboard/_index_partials/thumbnail_display', :locals => {:document=>document} %>
-    <span class=center><%= link_to document.title_or_label, sufia.generic_file_path(noid), :id => "src_copy_link#{noid}" %> <br /></span>
+  <td width="41%">
+    <a href="#" title="Click for more details"><i id="expand_<%= noid %>" class="glyphicon glyphicon-plus"></i></a>&nbsp;
+    <%= render :partial => 'dashboard/_index_partials/thumbnail_display', :locals => {:document => document} %>
+    <span class=center>
+      <%= 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}" %><br/>
+    </span>
   </td>
   <td width="17%"><%= document.date_uploaded %> </td>
   <td width="5%">
-    <% if document.registered? %>
-      <a href="<%= sufia.generic_file_path(noid) %>/edit/?tab=permissions" id="permission_<%= noid %>"><span class="label label-info" title="<%=t('sufia.institution_name') %>"><%=t('sufia.institution_name') %></span></a>
-    <% elsif document.public? %>
-      <a href="<%= sufia.generic_file_path(noid) %>/edit/?tab=permissions" id="permission_<%= noid %>"><span class="label label-success" title="Open Access">Open Access</span></a>
-    <% else %>
-      <a href="<%= sufia.generic_file_path(noid) %>/edit/?tab=permissions" id="permission_<%= noid %>"><span class="label label-important" title="Private">Private</span></a>
-    <% end %>
+    <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 width="23%">
     <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>
-         <%= 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>
-         <%= link_to raw('<i class="icon-trash"></i> Delete File'), sufia.generic_file_path(noid), :class=> 'itemicon itemtrash', :title => 'Delete File', :method => :delete, :data => { :confirm => "Deleting a file from #{t('sufia.product_name')} is permanent. Click OK to delete this file from #{t('sufia.product_name')}, or Cancel to cancel this operation"} %>
-       </li>
-       <li>
-         <%= display_trophy_link(@user, noid) %>
-       </li>
+      <button class="btn btn-small 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>
+          <%= link_to raw('<i class="glyphicon glyphicon-trash"></i> Delete File'), sufia.generic_file_path(noid), :class => 'itemicon itemtrash', :title => 'Delete File', :method => :delete, :data => {:confirm => "Deleting a file from #{t('sufia.product_name')} is permanent. Click OK to delete this file from #{t('sufia.product_name')}, or Cancel to cancel this operation"} %>
+        </li>
+        <li>
+          <%= display_trophy_link(@user, noid) do |text| %>
+            <i class='glyphicon glyphicon-star'></i> <%= text %>
+          <% end %>
+        </li>
       </ul>
     </div>
   </td>
 </tr>
-<tr class="hide" id="detail_<%= noid %>"> <!--  document detail"> -->
+<tr id="detail_<%= noid %>"> <!--  document detail"> -->
   <td colspan="6">
-    <table class="expanded-details">
-      <tr>
-        <td><strong>File Name: </strong> <%= link_to document.label, sufia.generic_file_path(noid) %> </td>
-        <td><strong>File Format: </strong> <%= document.file_format %> </td>
-      </tr>
-      <tr>
-        <td><strong>Creator: </strong> <%= document.creator %> </td>
-        <td><strong>Depositor: </strong> <%= link_to_profile document.depositor %> </td>
-      </tr>
-      <tr>
-        <td colspan="2"><strong>Edit Access: </strong>
-          <% if document.edit_groups.present? %>
+    <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(', ') %>
-        </td>
-      </tr>
-    </table>
+            <br/>
+        <% end %>
+        Users: <%= document.edit_people.join(', ') %>
+      </dd>
+    </dl>
   </td>
 </tr>

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

@@ -1,11 +1,14 @@
-<div style="float: right;" >
-  <%= form_tag sufia.dashboard_index_path, :method => :get, :class => "well form-search" do %>
-    <label class="accessible-hidden">Search My Dashboard</label>
-    <%= text_field_tag :q, params[:q], :class => "q", :placeholder => "Search My Dashboard", :size => '30', :type => "search", :id => "dashboard_search" %>
+<div class="col-xs-12 col-md-6">
+  <%= form_tag sufia.dashboard_index_path, :method => :get, :role => "search" do %>
+    <label for="dashboard_search" class="sr-only">Search My Dashboard</label>
     <%= hidden_field_tag :search_field, 'all_fields' %>
     <%= render_hash_as_hidden_fields(params_for_search().except(:q, :search_field, :qt, :page, :utf8)) %>
-    <button type="submit" class="btn btn-primary" id="dashboard_submit">
-      <i class="icon-search"></i> Go
-    </button>
+    <div class="input-group">
+      <%= text_field_tag :q, params[:q], :class => "q form-control", :placeholder => "Search My Dashboard", :id => "dashboard_search" %>
+      <span class="input-group-btn">
+        <button type="submit" class="btn btn-default" id="dashboard_submit"><i class="glyphicon glyphicon-search"></i> Go</button>
+      </span><!-- / .input-group-btn -->
+    </div> <!-- /.input-group -->
+
   <% end %>
 </div>

data/app/views/dashboard/_show_partials/_default.html.erb

@@ -1,22 +1,4 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
-
 <%# default partial to display solr document fields in catalog show view -%>
-
-
 <div class="document_viewer" id="cover_container">
   <dl class="defList">
     <dt>ID: </dt>

data/app/views/dashboard/_show_partials/_default_details.html.erb

@@ -1,19 +1,3 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
-
 <%# default partial to display solr document fields in catalog show view -%>
 <div>
   <dl class="defList">

data/app/views/dashboard/_show_partials/_facets.html.erb

@@ -1,19 +1,3 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
-
 <% facets_display_heading ||=  "" %>
 <% # main container for facets/limits menu -%>
 <div id="facets">

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

@@ -1,17 +1,18 @@
 <div class="batch-info"> 
   <% session[:batch_edit_state] = "on" %>
   <%=batch_delete%> <%=batch_edit_continue("Edit Selected") %>   
-	<% unless @response.response['numFound'] < 2 %>
-    <%= form_tag sufia.dashboard_index_path, :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])), :class => "span15") %>			      
-      &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", :class => "span10") %> per page
+    <% unless @response.response['numFound'] < 2 %>
+      <%= form_tag sufia.dashboard_index_path, :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, :utf8)) %>
         &nbsp;&nbsp;&nbsp;
-        <button class="btn btn-primary"><i class="icon-refresh"></i> Refresh</button>
-		<% end unless sort_fields.empty? %>
+        <button class="btn btn-primary" id="dashboard_sort_submit"><i class="glyphicon glyphicon-refresh"></i> Refresh</button>
+    <% end unless sort_fields.empty? %>
+
   <% end %>
 </div>

data/app/views/dashboard/facet.html.erb

@@ -1,35 +1,20 @@
 <!-- This was copied from https://github.com/projectblacklight/blacklight/blob/master/app/views/catalog/facet.html.erb
  It implements the facets in the same manner as blacklight does for the main catalog for the individual's dashbord 
 -->
-<% content_for :sidebar do %>
-  <p><%= link_back_to_catalog (route_set: sufia) %></p>
-<% end %>
-
 <div class="facet_pagination top">
   <%= render :partial=>'facet_pagination' %>
 </div>
 
 <div class="modal-header">
-  <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-  <h3><%= facet_field_labels[params[:id]] %></h3>
+  <button type="button" class="ajax-modal-close close" data-dismiss="modal" aria-hidden="true">×</button>
+  <h3 class="modal-title"><%= facet_field_label(@facet.field) %></h3>
 </div>
 <div class="modal-body">
   <div class="facet_extended_list">
-
-    <ul class="facet_extended_list">
-      <% @pagination.items.each do |item| %>
-        <li>
-          <% if facet_in_params?( params[:id], item.value ) %>              
-            <%= render_selected_facet_value(params[:id], item) %>              
-          <% else %>              
-            <%= render_facet_value(params[:id], item) %>              
-          <% end -%>
-        </li>
-      <% end %>
-    </ul>
+    <%= render_facet_limit(@display_facet, layout: false) %>
   </div>
 </div>
-  
+
 <div class="modal-footer">
 
   <div class="facet_pagination bottom">

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

@@ -1,18 +1,3 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
 <% content_for :head do %>
     <%= auto_discovery_link_tag(:rss, sufia.url_for(params.merge(:format => 'rss')), :title => "RSS for results") %>
     <%= auto_discovery_link_tag(:atom, sufia.url_for(params.merge(:format => 'atom')), :title => "Atom for results") %>
@@ -20,47 +5,40 @@ limitations under the License.
 
 <% content_for :local_js do %>
 
-  initialize_audio();
-
-
-  // hide or show the batch update buttons on page startup
-  window.batch_part_on_other_page = <%= @batch_part_on_other_page%>;
-  window.batch_size_on_other_page = <%= @batch_size_on_other_page%>;
-  window.result_set_size = <%= @result_set_size%>;
-  window.document_list_count = <%= @document_list.count %>;
-  toggleButtons(<%= !@empty_batch %>);
-
-  // initialize hydra batch edit and set up select all button toggle after checkboxes have been created
-  $('#documents').batchEdit({afterCheckboxUpdate: setup_buttontoggle});
+    initialize_audio();
 
+    // hide or show the batch update buttons on page startup
+    window.batch_part_on_other_page = <%= @batch_part_on_other_page %>;
+    window.batch_size_on_other_page = <%= @batch_size_on_other_page %>;
+    window.result_set_size = <%= @result_set_size %>;
+    window.document_list_count = <%= @document_list.count %>;
+    toggleButtons(<%= !@empty_batch %>);
 
- <% end %>
+    // initialize hydra batch edit and set up select all button toggle after checkboxes have been created
+    $('#documents').batchEdit({afterCheckboxUpdate: setup_buttontoggle});
 
+<% end %>
 
-  <% @page_title = application_name + " Dashboard" %>
-
-  <div class="accessible-hidden" id="current_user"><%=@user.user_key%></div>
-  <div class="row">
-    <%= render :partial => 'search_form' %>
-    <%= render :partial => 'heading' %>
-  </div>
-
+<% @page_title = application_name + " Dashboard" %>
 
-  <% if params.has_key?("q") %>
-    <div class="alert alert-info"><i class="icon-search icon-large"></i> You searched for: <strong><%= params[:q] %></strong></div>
-  <% end %>
+<% if params.has_key?("q") %>
+    <div class="alert alert-info"><i class="glyphicon glyphicon-search icon-large"></i> You searched for:
+      <strong><%= params[:q] %></strong></div>
+<% end %>
 
-  <%= render :partial => 'did_you_mean' %>
-  <%= render :partial => 'facet_selected' %>
+<%= render :partial => 'did_you_mean' %>
+<%= render :partial => 'facet_selected' %>
 
-	<%= render 'constraints', :localized_params=>params %>
+<%= render 'constraints', :localized_params => params %>
 
-  <%= render 'sort_and_per_page' %>
+<%= render 'sort_and_per_page' %>
 
-  <%= render :partial=>'dashboard/document_list'  %>  
-	<% content_for :sidebar do %>
-	  <%= render :partial=>'facets' %>
-	<%  end %>
+<%= render :partial => 'dashboard/document_list' %>
+<% content_for :sidebar do %>
+    <%= render :partial => 'facets' %>
+<% end %>
 
-  <%= render 'results_pagination' %>
-  <%= render :partial => 'users/activity_log', :locals => {:events => @events} %>
+<%= render 'results_pagination' %>
+<% if @events.present? %>
+    <%= render :partial => 'users/activity_log', :locals => {:events => @events} %>
+<% end %>

data/app/views/error/401.html.erb

@@ -1,19 +1,3 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
-
 <!DOCTYPE html>
 <html>
   <head>
@@ -24,7 +8,7 @@ limitations under the License.
       <div class="column second">
         <h1>Unauthorized</h1>
         <p>
-          You are not authorized to view this page. You might be interested in using 
+          You are not authorized to view this page. You might be interested in using
           <a href="/contact/">the contact form</a> to report the
           error, or <a href="/help/">the help page</a> for looking up
           solutions.

data/app/views/error/404.html.erb

@@ -1,19 +1,3 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
-
 <!DOCTYPE html>
 <html>
   <head>

data/app/views/error/500.html.erb

@@ -1,19 +1,3 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
-
 <h1>System Error</h1>
 <p>
   <%= t('sufia.product_name') %> tried to process your request but encountered