sufia 4.0.0.rc2 → 4.0.0

data/LICENSE.md

@@ -1,177 +1,14 @@
+Copyright 2012 Penn State University  
+Additional copyright may be held by others, as reflected in the commit history.
 
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+   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
 
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+       http://www.apache.org/licenses/LICENSE-2.0
 
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
+   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.

data/README.md

@@ -1,12 +1,5 @@
 # Sufia [![Version](https://badge.fury.io/rb/sufia.png)](http://badge.fury.io/rb/sufia) [![Build Status](https://travis-ci.org/projecthydra/sufia.png?branch=master)](https://travis-ci.org/projecthydra/sufia) [![Dependency Status](https://gemnasium.com/projecthydra/sufia.png)](https://gemnasium.com/projecthydra/sufia)
 
-# Please Note!
-Sufia is currently in transition to a new 4.0 release scheduled for late summer 2014.  If wish to use Sufia now,
-please ensure you using version 3.7.2, available from RubyGems.org. For documentation specific to this version,
-please consult the [Sufia 3.7.2 documentation](http://rubydoc.info/gems/sufia/3.7.2/frames).
-
-If you have questions or need help, please email `hydra-tech@googlegroups.com`
-
 ## What is Sufia?
 Sufia is a component that adds self-deposit institutional repository features to a Rails app.
 Sufia is created with Ruby on Rails and builds on the Hydra Framework.
@@ -41,6 +34,14 @@ Sufia has the following features:
 * Dynamically configurable featured works and researchers on homepage
 * Proxy deposit and transfers of ownership (coming soon!)
 
+## License
+
+Sufia is available under [the Apache 2.0 license](LICENSE.md).
+
+## Contributing
+
+We'd love to accept your contributions.  Please see our guide to [contributing to Sufia](CONTRIBUTING.md).
+
 ## Sufia needs the following software to work:
 1. Solr
 1. [Fedora Commons](http://www.fedora-commons.org/) digital repository
@@ -51,6 +52,10 @@ Sufia has the following features:
 
 #### !! Ensure that you have all of the above components installed before you continue. !!
 
+## Need Help?
+
+If you have questions or need help, please email [the Hydra community development list](mailto:hydra-tech@googlegroups.com).
+
 ## Creating an application
 ### Generate base Rails install
 ```rails new my_app```
@@ -227,6 +232,8 @@ See https://ffmpeg.org/trac/ffmpeg/wiki/UbuntuCompilationGuide
 This information is for people who want to modify the engine itself, not an application that uses the engine:
 
 ### run the tests
+
+```
 rake clean spec
 ```
 
@@ -243,3 +250,10 @@ To change what happens to files that fail validation add an after_validation hoo
       end
     end
 ```
+
+## Acknowledgments
+
+This software has been developed by and is brought to you by the Hydra community.  Learn more at the
+[Project Hydra website](http://projecthydra.org)
+
+![Project Hydra Logo](https://github.com/uvalib/libra-oa/blob/a6564a9e5c13b7873dc883367f5e307bf715d6cf/public/images/powered_by_hydra.png?raw=true)

data/SUFIA_VERSION

@@ -1 +1 @@
-4.0.0.rc2
+4.0.0

data/app/assets/javascripts/sufia/batch.js

@@ -1,7 +1,12 @@
 Blacklight.onLoad(function() {
-  $('#add_descriptions').click(function() {
+  $('#show_addl_descriptions').click(function() {
     $('#more_descriptions').show();
-    $('#add_descriptions').hide();
+    $('#show_addl_descriptions').hide();
+    return false;
+  });
+  $('#hide_addl_descriptions').click(function() {
+    $('#more_descriptions').hide();
+    $('#show_addl_descriptions').show();
     return false;
   });
   $('#more_descriptions').hide();

data/app/assets/javascripts/sufia/dashboard_actions.js

@@ -9,18 +9,29 @@ Blacklight.onLoad(function() {
     }
   });
 
-  // show/hide more information on the dashboard when clicking
+  function show_details(item) {
+    var button = $(this);
+    //button.id format: "expand_NNNNNNNNNN"
+    var array = item.id.split("expand_");
+    if (array.length > 1) {
+      var docId = array[1];
+      $("#detail_" + docId + " .expanded-details").slideToggle();
+      button.toggleClass('glyphicon-chevron-right glyphicon-chevron-down');
+    }
+  }
+
+        // show/hide more information on the dashboard when clicking
   // plus/minus
   $('.glyphicon-chevron-right').on('click', function() {
-  var button = $(this);
-  //this.id format: "expand_NNNNNNNNNN"
-  var array = this.id.split("expand_");
-  if (array.length > 1) {
-    var docId = array[1];
-    $("#detail_" + docId + " .expanded-details").slideToggle();
-    button.toggleClass('glyphicon-chevron-right glyphicon-chevron-down');
-  }
-  return false;
+    show_details(this);
+    return false;
+  });
+
+  $('a').filter( function() {
+      return $(this).find('.glyphicon-chevron-right').length === 1;
+   }).on('click', function() {
+    show_details($(this).find(".glyphicon-chevron-right")[0]);
+    return false;
   });
 
 });

data/app/assets/javascripts/terms_of_service.js

@@ -20,7 +20,7 @@ Blacklight.onLoad(function () {
     // if box is checked - enable submit, otherwise disable 
     var disable = (bool) ? false : true;
     $('input[data-activate]').attr('checked', bool);
-    $('.activate-submit').attr('disabled', disable);
+    $('.activate-submit').attr('disabled', disable).attr('aria-disabled', disable);
   })
 
   // show/hide the tooltip depending if the agreement is already checked

data/app/assets/stylesheets/batch-edit.css.scss

@@ -0,0 +1,21 @@
+.help-icon {
+  @extend .glyphicon;
+  @extend .glyphicon-question-sign;
+  @extend .large-icon;
+  top: 5px;
+}
+
+.form-horizontal .batch-group {
+  @extend .form-group;
+  margin-left: 0px;
+  margin-right: 0px;
+}
+
+#hide_addl_descriptions {
+  margin-bottom: 10px;
+}
+
+#additional_title_clone {
+  padding-top: 5px;
+}
+

data/app/assets/stylesheets/collections.css.scss

@@ -22,6 +22,10 @@
   font-size: 10vw;
 }
 
+.thumbnail {
+  text-align: center;
+}
+
 .collection-icon-small {
   font-size: 2vw;
 }

data/app/assets/stylesheets/home-page.css.scss

@@ -47,4 +47,11 @@
 
 #home_content {
   padding: 2em 0;
-}
+}
+
+// When we put a hidden label before the main search field, bootstrap stops
+// displaying rounded corners. This puts them back in.
+#search-field-header {
+  border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+}

data/app/assets/stylesheets/styles.css.scss

@@ -18,9 +18,10 @@ body {
   background-image: linear-gradient(to bottom, #E1E1E1 0%, #FFFFFF 100%);
 }
 
-#page-positioner h1, #page-positioner h2, #page-positioner h3,
-#page-positioner h4, #page-positioner h5, #page-positioner h6 {
-  font-family: 'Lato', Verdana, Arail, Helvetica, sans-serif;
+#page-positioner {
+  h1, h2, h3, h4, h5, h6, .attribute-label {
+    font-family: 'Lato', Verdana, Arail, Helvetica, sans-serif;
+  }
 }
 
 #page-positioner {
@@ -31,8 +32,10 @@ body {
   font-weight: 300;
 }
 
-#page-positioner h3, #page-positioner h4 {
-  font-weight: 400;
+#page-positioner {
+  h3, h4, .attribute-label {
+    font-weight: 400;
+  }
 }
 
 .input-group {

data/app/assets/stylesheets/sufia.css.scss

@@ -23,6 +23,7 @@
 @import 'styles';
 @import 'file-listing';
 @import 'collections';
+@import 'batch-edit';
 
 #browse-everything {
   top:10%;

data/app/builders/sufia/bootstrap_breadcrumbs_builder.rb

@@ -0,0 +1,28 @@
+# The BootstrapBreadcrumbsBuilder is a Bootstrap compatible breadcrumb builder.
+# It provides basic functionalities to render a breadcrumb navigation according to Bootstrap's conventions.
+#
+# BootstrapBreadcrumbsBuilder accepts a limited set of options:
+#
+# You can use it with the :builder option on render_breadcrumbs:
+#     <%= render_breadcrumbs builder: Sufia::BootstrapBreadcrumbsBuilder %>
+#
+class Sufia::BootstrapBreadcrumbsBuilder < BreadcrumbsOnRails::Breadcrumbs::Builder
+  include ActionView::Helpers::OutputSafetyHelper
+  def render
+    if @elements.blank?
+      return ""
+    end
+
+    @context.content_tag(:ul, class: 'breadcrumb') do
+      safe_join(@elements.uniq.collect {|e| render_element(e)})
+    end 
+  end
+
+  def render_element(element)
+    html_class = 'active' if @context.current_page?(compute_path(element))
+
+    @context.content_tag(:li, class: html_class) do
+      @context.link_to_unless_current(@context.truncate(compute_name(element), length: 30, separator: ' '), compute_path(element), element.options)
+    end
+  end
+end

data/app/controllers/collections_controller.rb

@@ -4,10 +4,12 @@ class CollectionsController < ApplicationController
   include Blacklight::Catalog::SearchContext
   include BlacklightAdvancedSearch::ParseBasicQ
   include BlacklightAdvancedSearch::Controller
+  include Sufia::Breadcrumbs
   prepend_before_filter :normalize_identifier, except: [:index, :create, :new]
   before_filter :filter_docs_with_read_access!, except: :show
   before_filter :has_access?, except: :show
   before_filter :initialize_fields_for_edit, only: [:edit, :new]
+  before_filter :build_breadcrumbs, only: [:edit, :show]
   CollectionsController.solr_search_params_logic += [:add_access_controls_to_solr_params]
 
   layout "sufia-one-column"

data/app/controllers/concerns/sufia/batch_edits_controller_behavior.rb

@@ -1,9 +1,11 @@
 module Sufia
   module BatchEditsControllerBehavior
     extend ActiveSupport::Concern
-    
+    include Sufia::Breadcrumbs
+
     included do
       layout "sufia-one-column"
+      before_filter :build_breadcrumbs, only: :edit
     end
 
     def edit