sufia 3.7.2 → 4.0.0.beta1

data/app/uploaders/tinymce_asset_uploader.rb

@@ -0,0 +1,51 @@
+# encoding: utf-8
+
+class TinymceAssetUploader < CarrierWave::Uploader::Base
+
+  # Include RMagick or MiniMagick support:
+  # include CarrierWave::RMagick
+  # include CarrierWave::MiniMagick
+
+  # Choose what kind of storage to use for this uploader:
+  storage :file
+  # storage :fog
+
+  # Override the directory where uploaded files will be stored.
+  # This is a sensible default for uploaders that are meant to be mounted:
+  def store_dir
+    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+  end
+
+  # Provide a default URL as a default if there hasn't been a file uploaded:
+  # def default_url
+  #   # For Rails 3.1+ asset pipeline compatibility:
+  #   # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
+  #
+  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
+  # end
+
+  # Process files as they are uploaded:
+  # process :scale => [200, 300]
+  #
+  # def scale(width, height)
+  #   # do something
+  # end
+
+  # Create different versions of your uploaded files:
+  # version :thumb do
+  #   process :scale => [50, 50]
+  # end
+
+  # Add a white list of extensions which are allowed to be uploaded.
+  # For images you might use something like this:
+  # def extension_white_list
+  #   %w(jpg jpeg gif png)
+  # end
+
+  # Override the filename of the uploaded files:
+  # Avoid using model.id or version_name here, see uploader/store.rb for details.
+  # def filename
+  #   "something.jpg" if original_filename
+  # end
+
+end

data/app/views/_add_assets_links.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.
-%>
-
 <div class="">
   <%= link_to "Upload", sufia.new_generic_file_path %>
 </div>

data/app/views/_controls.html.erb

@@ -0,0 +1,17 @@
+<div id="masthead_controls" class="container-fluid">
+  <div class="row">
+    <div class="col-xs-12 col-sm-5 col-md-6">
+      <nav class="navbar navbar-default" role="navigation">
+        <ul class="nav navbar-nav">
+            <li <%= 'class=active' if current_page?(root_path) %>><a href="/" >Home</a></li>
+                <li <%= 'class=active' if current_page?(sufia.about_path) %>><a href="/about/" >About</a></li>
+                <li <%= 'class=active' if action_name == "help" %>><a href="/help/" >Help</a></li>
+            <li <%= 'class=active' if current_page?(sufia.contact_path) %>><a href="<%= sufia.contact_form_index_path %>" >Contact</a></li>
+        </ul><!-- /.nav -->
+      </nav><!-- /.navbar -->
+    </div>
+    <div class="col-xs-12 col-sm-7 col-md-6">
+      <%= render :partial => 'catalog/search_form' %>
+    </div>
+  </div> <!-- /.row -->
+</div><!-- /#masthead_controls -->

data/app/views/_flash_msg.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.
-%>
-
 <%
 flash_types_to_classes = {
    :notice => 'alert-success',
@@ -23,8 +7,8 @@ flash_types_to_classes = {
 %>
 <% [:notice, :error, :alert].each do |type| %>
   <% if flash[type] %>
-    <div class="alert <%= flash_types_to_classes[type] rescue '' %> ui-corner-all <%= type.to_s %>">
-      <a class="close" data-dismiss="alert" href="#">×</a>
+    <div class="alert alert-dismissable <%= flash_types_to_classes[type] rescue '' %> ui-corner-all <%= type.to_s %>">
+      <a class="close" data-dismiss="alert" href="#">&times;</a>
       <% if flash[type].respond_to? :join %>
         <%= flash[type].join("<br/>").html_safe %>
       <% else %>

data/app/views/_footer.html.erb

@@ -1,19 +1,14 @@
-<div id="footer-wrapper" class="row-fluid">
-  <div id="footer">
-    <div class="footer-logo">
-      <p class="fright"><%= Sufia::VERSION %></p>
-      <p>A service of Project Hydra.</p>
-    </div>
-    <div class="footer-text">
+<div id="footer" class="container-fluid">
+  <div class="row">
+  <div class="col-xs-12 col-sm-5">
+      <p class="pull-left">A service of Project Hydra.</p>
+      <p>v.<%= Sufia::VERSION %></p>
+  </div>
+    <div class="col-xs-12 col-sm-7">
       <p><strong>Copyright &copy; 2013 Project Hydra</strong> Licensed under the Apache License, Version 2.0</p>
-      <ul>
-        <li><a href="">One</a></li>
-        <li><a href="">Two</a></li>
-        <li><a href="">Three</a></li>
-        <li><a href="">Four</a></li>
-      </ul>
+      <p><%= t('sufia.background_attribution') %></p>
     </div>
-    <div class="clearfix"></div>
   </div><!-- /footer -->
-</div><!-- /footer-wrapper -->
+  </div><!-- /.row -->
+</div><!-- /footer -->
 

data/app/views/_ga.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.
-%>
-
 <%
 if Sufia.config.respond_to? :google_analytics_id
 tracking_id = Sufia.config.google_analytics_id

data/app/views/_logo.html.erb

@@ -1,3 +1,3 @@
-  <a class="brand shield" href="/"><%=t('sufia.product_name') %></a>
-  <a id="logo" href="/"></a>
+<a id="logo" href="/"><span class="glyphicon glyphicon-globe"></span></a><a href="/" class="institution_name"><%=t('sufia.product_name') %></a>
+
 

data/app/views/_masthead.html.erb

@@ -1,38 +1,11 @@
-<%#
-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.
-%>
-
-<div id="masthead">
-  <%= render partial: '/logo' %>
-  <div class="navbar">
-    <div class="nav-inner">
-      <div class="container">
-        <ul class="nav pull-right">
-          <li <%= 'class=active' if params[:controller] == "catalog" and action_name == "index" %>><a href="/" class="top_nav">Home</a></li>
-          <li <%= 'class=active' if action_name == "about" %>><a href="/about/" class="top_nav">About</a></li>
-          <li <%= 'class=active' if action_name == "help" %>><a href="/help/" class="top_nav">Help</a></li>
-          <li <%= 'class=active' if params[:controller] == "contact_form" %>><a href="<%= sufia.contact_form_index_path %>" class="top_nav">Contact</a></li>
-          <li>
-            <div class="btn-group">
-              <%= render partial: '/user_util_links' %>
-            </div><!-- /.btn-group -->
-          </li>
-        </ul><!-- /.nav /.pull-right -->
-      </div><!-- /.container -->
-    </div><!-- /.nav-inner -->
-  </div><!-- /.navbar -->
-  <%= render :partial => 'catalog/search_form' %>
+<div id="masthead" class="container-fluid">
+  <div class="row">
+    <div class="col-xs-6 col-sm-7">
+      <%= render partial: '/logo' %>
+    </div><!-- /.col-xs-5 -->
+    <div class="col-xs-6 col-sm-5">
+        <%= render partial: '/user_util_links' %>
+    </div><!-- /.col-xs-7 -->
+  </div><!-- /.row -->
 </div> <!-- /masthead -->
 

data/app/views/_user_util_links.html.erb

@@ -1,14 +1,19 @@
 <% if user_signed_in? %>
-   <%= render :partial => 'users/notify_link' %>
-  <a href="<%= sufia.profile_path(current_user) %>" class="btn btn-small " title="click for User Profile"><i class="icon-user">&nbsp;</i><%= current_user.name %></a>
-  <a class="btn btn-small dropdown-toggle" data-toggle="dropdown" href="#"><span class="icon-caret-down" title="click for additional menu options"></span></a>
-  <ul class="dropdown-menu">
-      <li><%= link_to raw('<i class="icon-dashboard"></i> my dashboard'), sufia.dashboard_index_path, :id => 'dashboard_nav_link'  %></li>
-      <li><%= link_to raw('<i class="icon-upload-alt"></i> upload'), sufia.new_generic_file_path, :id => 'upload_nav_link'  %></li>
-      <li><%= link_to raw('<i class="icon-cog"></i> edit profile'), sufia.edit_profile_path(current_user), :id => 'upload_nav_link'  %></li>
-      <li class="divider"></li>
-      <li><%= link_to raw('<i class="icon-signout"></i> log out'), destroy_user_session_path, :id => 'logout_nav_link' %></li>
-  </ul>
+    <div class="btn-group" id="user_utility_links">
+      <%= render :partial => 'users/notify_link' %>
+      <a href="<%= sufia.profile_path(current_user) %>" class="btn btn-default " id="profile_link" title="click for User Profile"><i class="glyphicon glyphicon-user">&nbsp;</i><%= current_user.name %>
+      </a>
+      <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#"><span class="icon-caret-down" title="click for additional menu options"></span></a>
+      <ul class="dropdown-menu dropdown-menu-right" role="menu">
+        <li><%= link_to raw('<i class="glyphicon glyphicon-dashboard"></i> my dashboard'), sufia.dashboard_index_path, :id => 'dashboard_nav_link' %></li>
+        <li><%= link_to raw('<i class="glyphicon glyphicon-upload"></i> upload'), sufia.new_generic_file_path, :id => 'upload_nav_link' %></li>
+        <li><%= link_to raw('<i class="glyphicon glyphicon-cog"></i> edit profile'), sufia.edit_profile_path(current_user), :id => 'upload_nav_link' %></li>
+        <li class="divider"></li>
+        <li><%= link_to raw('<i class="glyphicon glyphicon-signout"></i> log out'), destroy_user_session_path, :id => 'logout_nav_link' %></li>
+      </ul>
+    </div><!-- /.btn-group -->
 <% else %>
-    <%= link_to raw('<i class="icon-signin"></i> Login'), new_user_session_path, :class => "btn btn-small" %>
+    <div class="btn-group login_button pull-right">
+    <%= link_to raw('<span class="glyphicon glyphicon-log-in"></span> Login'), new_user_session_path, :class => "btn btn-default btn-group" %>
+    </div>
 <% end %>

data/app/views/advanced/_advanced_search_facets.html.erb

@@ -1,17 +1 @@
-<%#
-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.
-%>
-
 <%= render_facet_partials facet_field_names, :partial => 'facet_limit' %>

data/app/views/advanced/_advanced_search_fields.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.
-%>
-
 <%- search_fields_for_advanced_search.each do |key, field_def| -%>
   <div class="control-group">
       <%= label_tag key, "#{field_def.label }:", :class => 'control-label' %>

data/app/views/advanced/_advanced_search_help.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.
-%>
-
 <div>
   <h2>Search tips</h2>
   <ul class="advanced_help">

data/app/views/advanced/_facet_layout.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.
-%>
-
 <div class="facet_item blacklight-<%= facet_field.field.parameterize %>">
   <h3><%= facet_field.label -%> <span class="adv_facet_selections" style="display:none;"></span></h3>
 

data/app/views/advanced/_facet_limit.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.
-%>
-
 <ul>
   <% display_facet.items.each do |item| -%>
   <li>

data/app/views/advanced/index.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.
-%>
-
 <% @page_title = "More Search Options - #{application_name}" %>
 <% content_for :local_js do %>
   $(document).ready(function(){$("form.advanced input:first").focus();});
@@ -28,8 +12,8 @@ limitations under the License.
   <div class="well">
 <ul id="advanced_search_tips">
     <li><i class="icon-caret-right"></i> Select "match all" to require all fields.</li>
-    <li><i class="icon-caret-right"></i> Select "match any" to find at least one field.</li> 
-    <li><i class="icon-caret-right"></i> Combine keywords and attributes to find specific items.</li> 
+    <li><i class="icon-caret-right"></i> Select "match any" to find at least one field.</li>
+    <li><i class="icon-caret-right"></i> Combine keywords and attributes to find specific items.</li>
     <li><i class="icon-caret-right"></i> Use quotation marks to search as a phrase.  </li>
     <li><i class="icon-caret-right"></i> Use "+" before a term to make it required. (Otherwise results matching only some of your terms may be included).</li>
     <li><i class="icon-caret-right"></i> Use "-" before a word or phrase to exclude. </li>

data/app/views/batch/_metadata.html.erb

@@ -40,7 +40,7 @@
       <%= f.label :tag, "<span class='error'>*</span> Keyword".html_safe, :class=>"control-label" %> 
       <div class="controls" id="additional_tag_clone">
           <%= f.text_field :tag, :name=>"generic_file[tag][]", :value=>"", :required=> true  %> 
-          <button class="adder btn" name="additional_tag" id="additional_tag_submit">+<span class="accessible-hidden">add another Tag</span></button>
+          <button class="adder btn" name="additional_tag" id="additional_tag_submit">+<span class="sr-only">add another Tag</span></button>
           &nbsp;
           <%= help_icon(:tag) %>
       </div>
@@ -51,7 +51,7 @@
       <%= f.label :creator, "<span class='error'>*</span> Creator".html_safe, :class=>"control-label" %>
       <div class="controls" id="additional_creator_clone">
         <%= f.text_field :creator, :name=>"generic_file[creator][]", :value=>"", :required=> true %>
-          <button class="adder btn" name="additional_creator" id="additional_creator_submit">+<span class="accessible-hidden">add another Creator</span></button>
+          <button class="adder btn" name="additional_creator" id="additional_creator_submit">+<span class="sr-only">add another Creator</span></button>
           &nbsp;
           <%= help_icon(:creator) %>
       </div>
@@ -62,7 +62,7 @@
       <%= f.label :rights, '<span class="error">*</span> Rights'.html_safe, :class=>"control-label" %>
       <div class="controls" id="additional_rights_clone">
         <%= f.select "rights", options_for_select(Sufia::Engine::config.cc_licenses, 'http://creativecommons.org/licenses/by-nc-nd/3.0/us/'), :required => true %>
-          <button class="adder btn" name="additional_rights" id="additional_rights_submit">+<span class="accessible-hidden">add another Rights</span></button>
+          <button class="adder btn" name="additional_rights" id="additional_rights_submit">+<span class="sr-only">add another Rights</span></button>
         &nbsp;
         <%= help_icon(:rights) %>
         <%= render :partial => "generic_files/rights_modal" %>

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

@@ -1,25 +1,8 @@
-<%#
-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 :local_js do %>
    if (navigator.userAgent.match("MSIE")){
       $("#new_generic_file").validate();
    }
 
-
 $('#permissions_display').show();
 
 // initialize popover helpers
@@ -28,18 +11,18 @@ $("a[rel=popover]").popover({ html: true });
 confirmation_needed = true;
 window.onbeforeunload = confirmExit;
 function confirmExit(){
-      if(confirmation_needed){ 
+      if(confirmation_needed){
       // if you return a string it will be displayed in between "don't navigate away"
       // and "click Ok to navigate away or cancel to stay put" in the confirm dialog
          return "Your metadata has not been saved.";
       }
- }  
+ }
 <% end %>
 
 <h1>Apply Metadata</h1>
 <br />
-<div class="alert">The information you provide for Title will be applied to the corresponding file only; however all other 
-  information you provide will be applied <em>to the entire batch of files</em> you have just deposited into <%= t('sufia.product_name') %>.  
+<div class="alert">The information you provide for Title will be applied to the corresponding file only; however all other
+  information you provide will be applied <em>to the entire batch of files</em> you have just deposited into <%= t('sufia.product_name') %>.
   You may edit individual files from <%= link_to '<i class="icon-dashboard"></i> my dashboard'.html_safe, sufia.dashboard_index_path %> once
   this step is finished.
 </div>