hyrax 2.1.0.beta1 → 2.1.0.beta2

data/app/assets/javascripts/hyrax/content_blocks.js

@@ -9,4 +9,16 @@ Blacklight.onLoad(function() {
     $this.parent().hide();
     $($this.data('target')).show();
   });
-});
+
+  $('.show-confirm').on('click', function(evt) {
+    evt.preventDefault();
+    evt.stopPropagation();
+    $('#change-tab-content-block').modal('show');
+  });
+
+  $('#change-tab-btn').on('click', function(evt) {
+    evt.preventDefault();
+    $('#change-tab-content-block').modal('hide');
+    $('.nav-tabs a[href="' + location.hash + '"]').tab('show');
+  });    
+});

data/app/assets/javascripts/hyrax/editor.es6

@@ -24,6 +24,7 @@ export default class {
     this.relationshipsControl()
     this.saveWorkControl()
     this.saveWorkFixed()
+    this.authoritySelect()
   }
 
   // Used when you have a linked data field that can have terms from multiple
@@ -33,7 +34,7 @@ export default class {
           let authoritySelect = $(this).data().authoritySelect
           let options =  {selectBox: 'select.' + authoritySelect,
                           inputField: 'input.' + authoritySelect}
-          new AuthoritySelect(this, options);
+          new AuthoritySelect(options);
       })
   }
 

data/app/assets/javascripts/hyrax/proxy_rights.js

@@ -42,8 +42,8 @@
     function rowTemplate (data) {
       return '<tr>'+
                 '<td class="depositor-name">'+data.name+'</td>'+
-                '<td><a class="remove-proxy-button" data-method="delete" href="'+data.delete_path+'" rel="nofollow">'+
-                  '<i class="glyphicon glyphicon-remove"></i></a>'+
+                '<td><a class="remove-proxy-button btn btn-danger" data-method="delete" href="'+data.delete_path+'" rel="nofollow">'+
+                $('#delete_button_label').data('label')+'</a>'+
                 '</td>'+
               '</tr>'
     }

data/app/assets/javascripts/hyrax/turbolinks_events.js

@@ -0,0 +1,5 @@
+// Fixes a problem with csrf tokens and turbolinks
+// See https://github.com/rails/jquery-ujs/issues/456
+$(document).on('turbolinks:load', function() {
+  $.rails.refreshCSRFTokens();
+});

data/app/assets/stylesheets/hyrax/_accessibility.scss

@@ -14,3 +14,24 @@
 .select2-default {
   color: #4c4c4c !important;
 }
+
+// Adds a skip to content link for keyboard users, but only makes it visible when element receives focus
+.skip-to-content a {
+  height: 1px;
+  position: absolute;
+  left: -10000px;
+  top: auto;
+  width: 1px;
+  overflow: hidden;
+}
+
+.skip-to-content a:focus {
+  background-color: $admin-content-background-color;
+  height: auto;
+  left: 1rem;
+  padding: 1.5rem;
+  position: absolute;
+  top: 0.5rem;
+  width: auto;
+  z-index: 1005;
+}

data/app/assets/stylesheets/hyrax/_catalog.scss

@@ -25,12 +25,14 @@
 // Styles added to help with newly implemented
 // Bootstrap row / column setup for search results
 .search-result-wrapper {
-  padding-bottom: 30px;
+  border-bottom: 1px dashed #ccc;
+  margin-bottom: 30px;
+  padding-bottom: 0;
 
   .search-results-title-row {
     align-items: center;
     display: flex;
-    padding: 0 0 10px;
+    padding: 0 0 15px;
 
     .search-result-title {
       display: inline-block;
@@ -53,36 +55,38 @@
 
   .list-thumbnail {
     float: none;
+    padding-bottom: 20px;
     width: 100%;
-  }
 
-  .metadata {
-    width: 100%;
-  }
+    @media (max-width: 768px) {
+      img {
+        max-height: 200px;
+      }
 
-  .metadata-row {
+    }
+  }
 
-    > div:first-child {
-      font-weight: bold;
-      padding-right: 0;
-      text-align: right;
+  .collection-icon-search {
+    padding-bottom: 20px;
+  }
 
-      @media (max-width: 768px) {
-        text-align: left;
-      }
-    }
+  .metadata {
+    width: 100%;
   }
 
   .collection-counts-wrapper {
     text-align: right;
 
-    @media (max-width: 768px) {
+    @media (max-width: 992px) {
       text-align: left;
     }
 
     .collection-counts-item {
       background-color: #f5f5f5;
+      color: #666;
       display: inline-block;
+      font-size: 13px;
+      font-weight: bold;
       margin-left: 10px;
       padding: 8px;
       text-align: center;
@@ -94,6 +98,7 @@
       span {
         display: block;
         font-size: 18px;
+        font-weight: normal;
         line-height: 1;
       }
     }

data/app/assets/stylesheets/hyrax/_collections.scss

@@ -42,6 +42,35 @@ header {
   text-align: center;
 }
 
+// Wrapper class for <ul> display list of parent collections, sub collections
+.collections-list {
+  li {
+    margin: 5px 0;
+  }
+
+  .flex-wrapper {
+    align-items: flex-start;
+    display: flex;
+    justify-content: space-between;
+  }
+
+  .collections-list-title {
+    font-weight: bold;
+    padding-right: 10px;
+  }
+
+  @media (max-width: 768px) {
+    .flex-wrapper,
+    .collections-list-title {
+      display: block;
+    }
+
+    .collections-list-title {
+      padding-bottom: 10px;
+    }
+  }
+}
+
 .actions-controls-collections {
   display: block;
   margin: 1em 0 0 1em;
@@ -262,7 +291,7 @@ button.branding-banner-remove:hover {
     display: flex;
     justify-content: space-between;
 
-    @media (max-width: 768px) {
+    @media (max-width: 992px) {
       display: block;
     }
 
@@ -270,25 +299,34 @@ button.branding-banner-remove:hover {
       align-items: center;
       display: flex;
 
-      @media (max-width: 768px) {
+      @media (max-width: 992px) {
         display: block;
         margin-bottom: 10px;
+      }
+
+      .label {
+        margin-left: 5px;
+      }
 
+      @media (max-width: 768px) {
         .btn {
           display: block;
           margin: 0 0 5px;
           width: 100%;
         }
       }
-
-      .label {
-        margin-left: 5px;
-      }
     }
 
     .collection-title {
       display: inline-block;
       margin: 0;
+      padding-right: 5px;
+
+      // Wraps each collection title text, and helpful when there are multiple titles
+      span {
+        display: block;
+        padding-bottom: 5px;
+      }
     }
   }
 
@@ -365,7 +403,8 @@ button.branding-banner-remove:hover {
       }
 
       input,
-      select {
+      select,
+      .select2-container {
         width: 200px;
       }
 
@@ -384,8 +423,10 @@ button.branding-banner-remove:hover {
     .share-status {
       th,
       td {
+        width: 40%;
         &:last-of-type {
           text-align: center;
+          width: 20%;
         }
       }
     }

data/app/assets/stylesheets/hyrax/_modal.scss

@@ -2,3 +2,7 @@ div.collection-list legend {
   font-size: 1.4em;
   border: none;
 }
+
+.modal-body select {
+  max-width: 100%;
+}

data/app/assets/stylesheets/hyrax/_settings.scss

@@ -22,7 +22,7 @@ $icon-border-color-hover: $gray-base !default;
 $icon-font-color-hover: $gray-base !default;
 
 // Collection Icon
-$collection-icon-search-lg: 8em !default;
+$collection-icon-search-lg: 7em !default;
 
 // File Show Page
 $file-show-term-color: $gray-dark !default;

data/app/assets/stylesheets/hyrax/dashboard.scss

@@ -67,7 +67,6 @@ body.dashboard {
     border-top: 2px solid $tab-active-accent-color;
   }
 
-
   /* The #masthead selector below could (and ideally, should) be removed if we can
    * replace the "navbar-static-top" class with "navbar-fixed-top" for the Admin UI only
    */

data/app/controllers/concerns/hyrax/breadcrumbs.rb

@@ -11,16 +11,18 @@ module Hyrax
     end
 
     def default_trail
+      add_breadcrumb I18n.t('hyrax.controls.home'), hyrax.root_path
       add_breadcrumb I18n.t('hyrax.dashboard.title'), hyrax.dashboard_path if user_signed_in?
     end
 
     def trail_from_referer
       case request.referer
       when /catalog/
+        add_breadcrumb I18n.t('hyrax.controls.home'), hyrax.root_path
         add_breadcrumb I18n.t('hyrax.bread_crumb.search_results'), request.referer
       else
         default_trail
-        add_breadcrumb_for_controller
+        add_breadcrumb_for_controller if user_signed_in?
         add_breadcrumb_for_action
       end
     end

data/app/controllers/concerns/hyrax/embargoes_controller_behavior.rb

@@ -5,6 +5,9 @@ module Hyrax
     include Hyrax::Collections::AcceptsBatches
 
     def index
+      add_breadcrumb t(:'hyrax.controls.home'), root_path
+      add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
+      add_breadcrumb t(:'hyrax.embargoes.index.manage_embargoes'), hyrax.embargoes_path
       authorize! :index, Hydra::AccessControls::Embargo
     end
 
@@ -25,7 +28,13 @@ module Hyrax
       copy_visibility = params[:embargoes].values.map { |h| h[:copy_visibility] }
       ActiveFedora::Base.find(batch).each do |curation_concern|
         Hyrax::Actors::EmbargoActor.new(curation_concern).destroy
-        curation_concern.copy_visibility_to_files if copy_visibility.include?(curation_concern.id)
+        # if the concern is a FileSet, set its visibility and skip the copy_visibility_to_files, which is built for Works
+        if curation_concern.file_set?
+          curation_concern.visibility = curation_concern.to_solr["visibility_after_embargo_ssim"]
+          curation_concern.save!
+        elsif copy_visibility.include?(curation_concern.id)
+          curation_concern.copy_visibility_to_files
+        end
       end
       redirect_to embargoes_path
     end
@@ -34,5 +43,12 @@ module Hyrax
     def self.local_prefixes
       ['hyrax/base']
     end
+
+    def edit
+      add_breadcrumb t(:'hyrax.controls.home'), root_path
+      add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
+      add_breadcrumb t(:'hyrax.embargoes.index.manage_embargoes'), hyrax.embargoes_path
+      add_breadcrumb t(:'hyrax.embargoes.edit.embargo_update'), '#'
+    end
   end
 end

data/app/controllers/concerns/hyrax/leases_controller_behavior.rb

@@ -5,6 +5,9 @@ module Hyrax
     include Hyrax::Collections::AcceptsBatches
 
     def index
+      add_breadcrumb t(:'hyrax.controls.home'), root_path
+      add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
+      add_breadcrumb t(:'hyrax.leases.index.manage_leases'), hyrax.leases_path
       authorize! :index, Hydra::AccessControls::Lease
     end
 
@@ -33,5 +36,12 @@ module Hyrax
     def self.local_prefixes
       ['hyrax/base']
     end
+
+    def edit
+      add_breadcrumb t(:'hyrax.controls.home'), root_path
+      add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
+      add_breadcrumb t(:'hyrax.leases.index.manage_leases'), hyrax.leases_path
+      add_breadcrumb t(:'hyrax.leases.edit.lease_update'), '#'
+    end
   end
 end

data/app/controllers/concerns/hyrax/local_file_downloads_controller_behavior.rb

@@ -0,0 +1,86 @@
+module Hyrax
+  module LocalFileDownloadsControllerBehavior
+    protected
+
+      # Handle the HTTP show request
+      def send_local_content
+        response.headers['Accept-Ranges'] = 'bytes'
+        if request.head?
+          local_content_head
+        elsif request.headers['Range']
+          send_range_for_local_file
+        else
+          send_local_file_contents
+        end
+      end
+
+      # render an HTTP Range response
+      def send_range_for_local_file
+        _, range = request.headers['Range'].split('bytes=')
+        from, to = range.split('-').map(&:to_i)
+        to = local_file_size - 1 unless to
+        length = to - from + 1
+        response.headers['Content-Range'] = "bytes #{from}-#{to}/#{local_file_size}"
+        response.headers['Content-Length'] = length.to_s
+        self.status = 206
+        prepare_local_file_headers
+        # For derivatives stored on the local file system
+        send_data IO.binread(file, length, from), local_derivative_download_options.merge(status: status)
+      end
+
+      def send_local_file_contents
+        self.status = 200
+        prepare_local_file_headers
+        # For derivatives stored on the local file system
+        send_file file, local_derivative_download_options
+      end
+
+      def local_file_size
+        File.size(file)
+      end
+
+      def local_file_mime_type
+        mime_type_for(file)
+      end
+
+      # @return [String] the filename
+      def local_file_name
+        params[:filename] || File.basename(file) || (asset.respond_to?(:label) && asset.label)
+      end
+
+      def local_file_last_modified
+        File.mtime(file) if file.is_a? String
+      end
+
+      # Override
+      # render an HTTP HEAD response
+      def local_content_head
+        response.headers['Content-Length'] = local_file_size.to_s
+        head :ok, content_type: local_file_mime_type
+      end
+
+      # Override
+      def prepare_local_file_headers
+        send_file_headers! local_content_options
+        response.headers['Content-Type'] = local_file_mime_type
+        response.headers['Content-Length'] ||= local_file_size.to_s
+        # Prevent Rack::ETag from calculating a digest over body
+        response.headers['Last-Modified'] = local_file_last_modified.utc.strftime("%a, %d %b %Y %T GMT")
+        self.content_type = local_file_mime_type
+      end
+
+    private
+
+      # Override the Hydra::Controller::DownloadBehavior#content_options so that
+      # we have an attachement rather than 'inline'
+      def local_content_options
+        { type: local_file_mime_type, filename: local_file_name, disposition: 'attachment' }
+      end
+
+      # Override this method if you want to change the options sent when downloading
+      # a derivative file
+      def local_derivative_download_options
+        { type: local_file_mime_type, filename: local_file_name, disposition: 'inline' }
+      end
+  end
+end