sufia 4.0.0 → 4.0.1

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

@@ -3,13 +3,13 @@
       <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" id="col_add_title">Add to collection</h4>
+          <h4 class="modal-title" id="col_add_title"><%= t("sufia.collection.select_form.title") %></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>
+            <em> <%= t("sufia.collection.select_form.no_collections") %></em><br><br><br><br>
           <% else %>
-            Select the collection to add your files to:
+            <%= t("sufia.collection.select_form.select_heading") %>
             <div class="collection-list">
               <ul>
                 <% user_collections.sort! { |c1,c2| c1['desc_metadata__date_modified_dtsi'] <=> c2['desc_metadata__date_modified_dtsi'] }  %>
@@ -24,12 +24,12 @@
           <% end %> <!-- else -->
         </div>
         <div class="modal-footer">
-          <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+          <button type="button" class="btn btn-default" data-dismiss="modal"><%= t("sufia.collection.select_form.close")%></button>
           <% if user_collections.blank? %>
-            <%= button_for_create_collection %>
+            <%= button_for_create_collection t("sufia.collection.select_form.create") %>
           <% else %> 
-            <%= button_for_update_collection %>
-            <%= button_for_create_collection "Add to new Collection" %>
+            <%= button_for_update_collection t("sufia.collection.select_form.update") %>
+            <%= button_for_create_collection t("sufia.collection.select_form.create_new") %>
           <% end %> 
         </div>
       </div><!-- /.modal-content -->

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

@@ -1,13 +1,17 @@
-<div class="row">
-  <div class="portal">
-    <h3><%= t("sufia.dashboard.user_activity") %></h3>
+<div class="panel panel-default" id="activity">
+  <div class="panel-heading dashboard-panel">
+    <h3 class="panel-title "><%= t("sufia.dashboard.user_activity") %></h3>
+  </div>
+  <div class="panel-body">
     <%= render_recent_activity %>
   </div>
 </div>
 
-<div class="row">
-  <div class="portal">
-    <h3><%= t("sufia.dashboard.user_notifications") %></h3>
+<div class="panel panel-default" id="notifications">
+  <div class="panel-heading dashboard-panel">
+    <h3 class="panel-title "><%= t("sufia.dashboard.user_notifications") %></h3>
+  </div>
+  <div class="panel-body">
     <%= render_recent_notifications %>
     <%= link_to_additional_notifications %>
   </div>

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

@@ -1,18 +1,26 @@
 <div class="col-xs-12 heading-row">
   <div class="col-xs-6 col-sm-3 heading-tile">
-    <span class="glyphicon glyphicon-upload"></span>
-    <%= link_to t("sufia.dashboard.upload"), sufia.new_generic_file_path %>
+    <%= link_to sufia.new_generic_file_path do %>
+        <span class="glyphicon glyphicon-upload"></span>
+        <%= t("sufia.dashboard.upload") %>
+    <% end %>
   </div>
   <div class="col-xs-6 col-sm-3 heading-tile">
-    <span class="glyphicon glyphicon-plus"></span>
-    <%= link_to t("sufia.dashboard.create_collection"), collections.new_collection_path, id: "hydra-collection-add" %>
+    <%= link_to collections.new_collection_path, id: "hydra-collection-add" do %>
+        <span class="glyphicon glyphicon-plus"></span>
+        <%= t("sufia.dashboard.create_collection") %>
+    <% end %>
   </div>
   <div class="col-xs-6 col-sm-3 heading-tile">
-    <span class="glyphicon glyphicon-th"></span>
-    <%= link_to t("sufia.dashboard.view_collections"), sufia.dashboard_collections_path, id: "hydra-collection-view" %>
+    <%= link_to sufia.dashboard_collections_path, id: "hydra-collection-view" do %>
+        <span class="glyphicon glyphicon-th"></span>
+        <%= t("sufia.dashboard.view_collections") %>
+    <% end %>
   </div>
   <div class="col-xs-6 col-sm-3 heading-tile">
-    <span class="glyphicon glyphicon-eye-open"></span>
-    <%= link_to t("sufia.dashboard.view_files"), sufia.dashboard_files_path  %>
+    <%= link_to sufia.dashboard_files_path  do %>
+        <span class="glyphicon glyphicon-eye-open"></span>
+        <%= t("sufia.dashboard.view_files") %>
+    <% end %>
   </div>
 </div>

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

@@ -1,8 +1,8 @@
 <div class="col-xs-12 heading-row">
-  <div class="col-xs-3 heading-tile hidden-xs">
+  <div class="col-xs-3 hidden-xs">
     <h1><%= t("sufia.dashboard.title") %></h1>
   </div>
-  <div class="col-xs-9 heading-tile">
-    <h1><%= t("sufia.dashboard.greeting") + current_user.name %></h1>
+  <div class="col-xs-9">
+    <h2><%= t("sufia.dashboard.greeting") + current_user.name %></h2>
   </div>
 </div>

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

@@ -1,20 +1,22 @@
-<h3><%= t("sufia.dashboard.stats.heading") %></h3>
-
-<table class="table table-condensed">
-  <tr>
-    <td><span class="label label-default"><%= number_of_files %></span></td>
-    <td><%= t("sufia.dashboard.stats.files") %></td>
-  </tr>
-  <tr>
-    <td><span class="label label-default"><%= number_of_collections %></span></td>
-    <td><%= t("sufia.dashboard.stats.collections") %></td>
-  </tr>
-  <tr>
-    <td><span class="label label-default"><%= @user.all_following.count %></span></td>
-    <td><%= t("sufia.dashboard.stats.following") %></td>
-  </tr>
-  <tr>
-    <td><span class="label label-default"><%= @user.followers.count %></span></td>
-    <td><%= t("sufia.dashboard.stats.followers") %></td>
-  </tr>
-</table>
+<div class="panel panel-default">
+  <div class="panel-heading dashboard-panel">
+    <h3 class="panel-title"><%= t("sufia.dashboard.stats.heading") %></h3></div>
+  <table class="table table-condensed">
+    <tr>
+      <td><span class="badge"><%= number_of_files %></span></td>
+      <td><%= t("sufia.dashboard.stats.files") %></td>
+    </tr>
+    <tr>
+      <td><span class="badge"><%= number_of_collections %></span></td>
+      <td><%= t("sufia.dashboard.stats.collections") %></td>
+    </tr>
+    <tr>
+      <td><span class="badge"><%= @user.all_following.count %></span></td>
+      <td><%= t("sufia.dashboard.stats.following") %></td>
+    </tr>
+    <tr>
+      <td><span class="badge"><%= @user.followers.count %></span></td>
+      <td><%= t("sufia.dashboard.stats.followers") %></td>
+    </tr>
+  </table>
+</div>

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

@@ -1,18 +1,18 @@
-<div class="row">
-  <div class="col-xs-12">
-    <h3><%= @user.name %></h3>
-    <h5><%= @user.title %></h5>
-    <h5><%= @user.department %></h5>
-    <h6><%= link_to_telephone %></h6>
-    <h6><%= @user.email %></h6>
-  </div>
-</div>
+<div class="panel panel-default">
+  <div class="panel-body">
+    <div class="col-xs-12 user-info">
+      <h3><%= @user.name %></h3>
+      <h4><%= @user.title %></h4>
+      <h4><%= @user.department %></h4>
+      <h5><%= link_to_telephone %></h5>
+      <h5><%= @user.email %></h5>
+    </div>
 
-<div class="row">
-  <div class="col-xs-6">
-    <%= link_to t("sufia.view_profile"), sufia.profile_path(@user), class: "btn btn-info" %>
-  </div>
-  <div class="col-xs-6">
-    <%= link_to t("sufia.edit_profile"), sufia.edit_profile_path(@user), class: "btn btn-info" %>
+    <div class="col-xs-6 col-sm-12 col-md-6 user-info">
+      <%= link_to t("sufia.view_profile"), sufia.profile_path(@user), class: "btn btn-default btn-raised" %>
+    </div>
+    <div class="col-xs-6 col-sm-12 col-md-6 user-info">
+      <%= link_to t("sufia.edit_profile"), sufia.edit_profile_path(@user), class: "btn btn-default btn-raised" %>
+    </div>
   </div>
 </div>

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

@@ -1,20 +1,16 @@
 <%= content_for :heading do %>
 
-  <%= render partial: "dashboard/_index_partials/heading_greetings" %>
+    <%= render partial: "dashboard/_index_partials/heading_greetings" %>
 
-  <%= render partial: "dashboard/_index_partials/heading_actions" %>
+    <%= render partial: "dashboard/_index_partials/heading_actions" %>
 
 <% end %>
 
 <%= content_for :sidebar do %>
-  
-  <div class="row">
-    <div class="portal"><%= render partial: "dashboard/_index_partials/stats" %></div>
-  </div>
-
-  <div class="row">
-    <div class="portal"><%= render partial: "dashboard/_index_partials/user_info" %></div>
-  </div>
+
+    <%= render partial: "dashboard/_index_partials/stats" %>
+
+    <%= render partial: "dashboard/_index_partials/user_info" %>
 
 <% end %>
 

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

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="<%= t("sufia.document_language") %>">
   <head>
     <title>Unauthorized</title>
   </head>

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

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="<%= t("sufia.document_language") %>">
   <head>
     <title>Not found</title>
   </head>

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

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="<%= t("sufia.document_language") %>">
   <head>
     <title>Single use link Not Found</title>
   </head>

data/app/views/generic_files/_permission_form.html.erb

@@ -67,7 +67,7 @@
       <div class="col-sm-3">
         <button class="btn btn-mini btn-inverse" id="add_new_user_skel">
           <span class="sr-only">Add this <%= t('sufia.account_label') %></span>
-          <span aria-hidden="true"><i class="glyphicon glyphicon-plus"></i> Add</span>
+          <span aria-hidden="true"><i class="glyphicon glyphicon-plus"></i></span>
         </button>
         <br /> <span id="directory_user_result"></span>
       </div>
@@ -87,7 +87,7 @@
       </div>
       <div class="col-sm-3">
         <span class="sr-only">Add this group</span>
-        <button class="btn btn-mini btn-inverse" id="add_new_group_skel"><i class="glyphicon glyphicon-plus"></i> Add</button>
+        <button class="btn btn-mini btn-inverse" id="add_new_group_skel"><i class="glyphicon glyphicon-plus"></i></button>
         <br /><span id="directory_group_result"></span>
       </div>
     </div>

data/app/views/homepage/_home_content.html.erb

@@ -13,6 +13,9 @@
   </div>
 </div><!-- /.col-xs-6 -->
 <div class="col-xs-12 col-sm-6">
+  <div>
+    <%= render partial: 'featured_researcher' %>
+  </div>
   <div>
     <%- if blacklight_config.respond_to?(:tag_cloud_field_name) && blacklight_config.tag_cloud_field_name %>
         <div class="row">
@@ -22,7 +25,4 @@
         </div>
     <%- end %>
   </div>
-  <div>
-    <%= render partial: 'featured_researcher' %>
-  </div>
 </div>

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

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="<%= t("sufia.document_language") %>">
   <head>
     <meta charset="utf-8" />
 

data/app/views/layouts/homepage.html.erb

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="<%= t("sufia.document_language") %>">
   <head>
     <%= render partial: "layouts/head_tag_content"%>
   </head>

data/app/views/layouts/sufia-dashboard.html.erb

@@ -1,31 +1,29 @@
 <!DOCTYPE html>
-<html>
+<html lang="<%= t("sufia.document_language") %>">
 <head><%= render partial: 'layouts/head_tag_content' %></head>
-<body> 
-<div id="wrapper"> 
+<body>
+<div id="wrapper">
   <div class="container-fluid">
     <div id="page-positioner">
 
       <%= render partial: '/masthead' %>
       <%= render partial: '/controls' %>
       <%= render partial: '/flash_msg' %>
-      
-      <div id="content-wrapper">
+
+      <div id="content-wrapper" class="dashboard">
         <div class="container-fluid">
           <div id="content-header" class="row"><%= yield :heading %></div>
         </div>
         <div class="container-fluid">
           <div id="content" class="row">
-            <div class="col-xs-12">
-              <div id="sidebar" class="col-md-3"><%= yield :sidebar %></div>
-              <div class="col-sm-9"><%= yield %></div>
-            </div>
+            <div id="sidebar" class="col-xs-12 col-sm-3"><%= yield :sidebar %></div>
+            <div class="col-xs-12 col-sm-9"><%= yield %></div>
           </div>
         </div>
       </div>
-      
+
       <%= render partial: '/footer' %>
-    
+
     </div><!-- /#page-positioner -->
   </div><!-- /.container -->
 </div><!-- /#wrapper -->

data/app/views/layouts/sufia-one-column.html.erb

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html prefix="og:http://ogp.me/ns#">
+<html lang="<%= t("sufia.document_language") %>" prefix="og:http://ogp.me/ns#">
   <head>
     <%= render partial: 'layouts/head_tag_content' %>
   </head>

data/app/views/layouts/sufia-two-column.html.erb

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="<%= t("sufia.document_language") %>">
   <head>
     <%= render partial: 'layouts/head_tag_content' %>
   </head>

data/app/views/mailbox/_notifications.html.erb

@@ -1,9 +1,10 @@
 <table class="table table-striped"> 
   <thead> 
     <tr>
-      <th>Date</th>
-      <th>Subject</th>
-      <th>Message</th> 
+      <th><%= t('sufia.mailbox.date') %></th>
+      <th><%= t('sufia.mailbox.subject') %></th>
+      <th><%= t('sufia.mailbox.message') %></th>
+      <th class="sr-only"><%= t('sufia.mailbox.delete') %></th>
     </tr>
   </thead> 
   <tbody> 
@@ -13,7 +14,7 @@
         <td><%= msg.last_message.subject.html_safe %></td> 
         <td><%= msg.last_message.body.html_safe %></td> 
         <td>
-          <%= link_to raw('<i class="glyphicon glyphicon-trash"></i>'), sufia.notification_path(msg.id), class: "itemicon itemtrash", title: "Delete File", method: :delete %>
+          <%= link_to raw('<i class="glyphicon glyphicon-trash" aria-hidden="true"></i>'), sufia.notification_path(msg.id), class: "itemicon itemtrash", title: "Delete Message", method: :delete %>
         </td>
       <% end %>
     <% end %> 

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

@@ -9,7 +9,7 @@
     </button>
 
   <h4>
-  	<%= t('sufia.dashboard.my.filter', type: current_tab.pluralize) %>
+    <%= t("sufia.dashboard.my.facet_label.#{current_tab}") %>
   </h4>
     </div>
 

data/config/locales/sufia.en.yml

@@ -2,6 +2,7 @@ en:
   sufia:
     account_name:       "My Institution Account Id"
     deposit_agreement:  "Sufia's Deposit Agreement"
+    document_language:  "en"
     upload_tooltip:     "Please accept Deposit Agreement before you can upload."
     share_button:       "Share Your Work"
     view_profile:       "View Profile"
@@ -82,7 +83,11 @@ en:
         collections:  "My Collections"
         highlights:   "My Highlights"
         shares:       "Files Shared with Me"
-        filter:       "Filter your %{type}"
+        facet_label:
+          files:        "Filter your files"
+          collections:  "Filter your collections"
+          highlighted: "Filter your highlights"
+          shared:      "Filter your shares"
         sr:
           show_label:     "Display all details of"
           detail_label:   "Display summary details of"
@@ -141,3 +146,21 @@ en:
       help:
         title: "Filename will be the default title. Please provide a more meaningful title, and filenames will still be preserved by the system."
         resource_type: "You may select multiple types to apply to all files"
+    collection:
+      select_form:
+        title: "Add to collection"
+        no_collections: "You do not have access to any existing collections. You may create a new collection."
+        select_heading: "Select the collection to add your files to:"
+        close: "Close"
+        create: "Create Collection"
+        update: "Update Collection"
+        create_new: "Add to new Collection"
+      metadata:
+        add_another_keyword: "add another Keyword"
+        add_another_creator: "add another Creator"
+        add_another_rights: "add another Rights"
+    mailbox:
+      date:     'Date'
+      subject:  'Subject'
+      message:  'Message'
+      delete:   'Delete Message'

data/fedora_conf/conf/development/fedora.fcfg

@@ -464,7 +464,7 @@
       <comment>The local path for the Fedora-METS 1.0 XML
             schema used to do XML schema validation of digital objects.</comment>
     </param>
-    <param name="xsd_xacml_policy1.0" value="xsd/cs-xacml-schema-policy-1.0.xsd">
+    <param name="xsd_xacml_policy1.0" value="xsd/cs-xacml-schema-policy-01.xsd">
       <comment>The local path for the OASIS XACML XML policy schema 
 			used to do XML schema validation of XACML policies.</comment>
     </param>

data/fedora_conf/conf/test/fedora.fcfg

@@ -464,7 +464,7 @@
       <comment>The local path for the Fedora-METS 1.0 XML
             schema used to do XML schema validation of digital objects.</comment>
     </param>
-    <param name="xsd_xacml_policy1.0" value="xsd/cs-xacml-schema-policy-1.0.xsd">
+    <param name="xsd_xacml_policy1.0" value="xsd/cs-xacml-schema-policy-01.xsd">
       <comment>The local path for the OASIS XACML XML policy schema 
 			used to do XML schema validation of XACML policies.</comment>
     </param>

data/lib/sufia.rb

@@ -30,5 +30,9 @@ module Sufia
 
     config.assets.paths << config.root.join('vendor', 'assets', 'fonts')
     config.assets.precompile << %r(vjs\.(?:eot|ttf|woff)$)
+    config.assets.precompile += %w( fontawesome-webfont.woff )
+    config.assets.precompile += %w( fontawesome-webfont.ttf )
+    config.assets.precompile += %w( fontawesome-webfont.svg )
+    config.assets.precompile += %w( ZeroClipboard.swf )
   end
 end