hyrax 2.8.0 → 3.0.0.pre.rc2

data/app/assets/stylesheets/hyrax/_work-show.scss

@@ -36,11 +36,6 @@ ul.tabular {
   list-style: none;
 }
 
-.show-actions {
-  padding: $panel-body-padding;
-  // text-align: center;
-}
-
 .work-show {
   dt,
   dd {
@@ -53,6 +48,10 @@ ul.tabular {
 
 .work-type-tag {
   color: #808080;
+  font-size: 24px;
+  font-weight: 500;
+  margin-bottom: $padding-large-vertical;
+  margin-top: $padding-large-vertical * 2;
 }
 
 .work-type {
@@ -65,6 +64,44 @@ ul.tabular {
       word-break: break-word;
     }
   }
+
+  // Button row which sits below the title, and above panel content for a page
+  .button-row-top-two-column {
+    margin-bottom: $padding-large-vertical;
+    margin-top: $padding-large-vertical;
+
+    @media screen and (max-width: 767px) {
+      > div {
+        text-align: center;
+
+        &:first-child {
+          padding-bottom: $padding-small-vertical;
+        }
+      }
+    }
+  }
+}
+
+.work-title-wrapper {
+  margin-bottom: $padding-large-vertical * 2;
+
+  .title-with-badges {
+    align-items: center;
+    display: flex;
+
+    h1,
+    h2 {
+      margin: 0;
+    }
+
+    .label {
+      margin-left: 5px;
+
+      &:first-of-type {
+        margin-left: 10px;
+      }
+    }
+  }
 }
 
 .panel-workflow {

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

@@ -29,10 +29,10 @@ $admin-panel-border-color: #dedede !default;
   .media-body {
     width: 18vw;
   }
+}
 
-  .works-list-batch-checkbox-label-text {
-    margin: 0 5px;
-  }
+.batch-checkbox-label-text {
+  margin: 0 5px;
 }
 
 body.dashboard {

data/app/authorities/qa/authorities/collections.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Qa::Authorities
   class Collections < Qa::Authorities::Base
     class_attribute :search_builder_class
@@ -19,12 +20,12 @@ module Qa::Authorities
 
     private
 
-      def search_builder(controller)
-        access = controller.params[:access] || 'read'
-        search_builder_class.new(controller)
-                            .where(controller.params[:q])
-                            .with_access(access)
-                            .rows(100)
-      end
+    def search_builder(controller)
+      access = controller.params[:access] || 'read'
+      search_builder_class.new(controller)
+                          .where(controller.params[:q])
+                          .with_access(access)
+                          .rows(100)
+    end
   end
 end

data/app/authorities/qa/authorities/find_works.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Qa::Authorities
   class FindWorks < Qa::Authorities::Base
     class_attribute :search_builder_class
@@ -19,8 +20,8 @@ module Qa::Authorities
 
     private
 
-      def search_builder(controller)
-        search_builder_class.new(controller)
-      end
+    def search_builder(controller)
+      search_builder_class.new(controller)
+    end
   end
 end

data/app/builders/hyrax/bootstrap_breadcrumbs_builder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # The BootstrapBreadcrumbsBuilder is a Bootstrap compatible breadcrumb builder.
 # It provides basic functionalities to render a breadcrumb navigation according to Bootstrap's conventions.
 #
@@ -11,8 +12,8 @@ class Hyrax::BootstrapBreadcrumbsBuilder < BreadcrumbsOnRails::Breadcrumbs::Buil
   def render
     return "" if @elements.blank?
 
-    @context.content_tag(:nav, breadcrumbs_options) do
-      @context.content_tag(:ol) do
+    @context.tag.nav(breadcrumbs_options) do
+      @context.tag.ol do
         safe_join(@elements.uniq.collect { |e| render_element(e) })
       end
     end
@@ -21,12 +22,12 @@ class Hyrax::BootstrapBreadcrumbsBuilder < BreadcrumbsOnRails::Breadcrumbs::Buil
   def render_element(element)
     html_class = 'active' if @context.current_page?(compute_path(element)) || element.options["aria-current"] == "page"
 
-    @context.content_tag(:li, class: html_class) do
+    @context.tag.li(class: html_class) do
       @context.link_to_unless(html_class == 'active', @context.truncate(compute_name(element), length: 30, separator: ' '), compute_path(element), element.options)
     end
   end
 
   def breadcrumbs_options
-    { class: 'breadcrumb', role: "region", "aria-label" => "Breadcrumb" }
+    { class: 'breadcrumb', role: "navigation", "aria-label" => "Breadcrumb" }
   end
 end

data/app/builders/hyrax/form_builder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   class FormBuilder < SimpleForm::FormBuilder
     def input_label(attribute_name, options = {})

data/app/builders/hyrax/manifest_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   class ManifestHelper
     include Rails.application.routes.url_helpers
@@ -18,7 +19,7 @@ module Hyrax
     def build_rendering(file_set_id)
       file_set_document = query_for_rendering(file_set_id)
       label = file_set_document.label.present? ? ": #{file_set_document.label}" : ''
-      mime = file_set_document.mime_type.present? ? file_set_document.mime_type : I18n.t("hyrax.manifest.unknown_mime_text")
+      mime = file_set_document.mime_type.presence || I18n.t("hyrax.manifest.unknown_mime_text")
       {
         '@id' => Hyrax::Engine.routes.url_helpers.download_url(file_set_document.id, host: @hostname),
         'format' => mime,

data/app/channels/hyrax/application_cable/channel.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   module ApplicationCable
     class Channel < ActionCable::Channel::Base

data/app/channels/hyrax/application_cable/connection.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   module ApplicationCable
     class Connection < ActionCable::Connection::Base
@@ -9,24 +10,24 @@ module Hyrax
 
       private
 
-        def find_verified_user
-          user = ::User.find_by(id: user_id)
-          if user
-            user
-          else
-            reject_unauthorized_connection
-          end
+      def find_verified_user
+        user = ::User.find_by(id: user_id)
+        if user
+          user
+        else
+          reject_unauthorized_connection
         end
+      end
 
-        def user_id
-          session['warden.user.user.key'][0][0]
-        rescue NoMethodError
-          nil
-        end
+      def user_id
+        session['warden.user.user.key'][0][0]
+      rescue NoMethodError
+        nil
+      end
 
-        def session
-          cookies.encrypted[Rails.application.config.session_options[:key]]
-        end
+      def session
+        cookies.encrypted[Rails.application.config.session_options[:key]]
+      end
     end
   end
 end

data/app/channels/hyrax/notifications_channel.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   class NotificationsChannel < ApplicationCable::Channel
     def subscribed

data/app/connections/hyrax/clean_connection.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   # This stands in for ActiveFedora::CleanConnection. It behaves the same way,
   # but it doesn't clear the has_model assertion
@@ -13,13 +14,13 @@ module Hyrax
 
     private
 
-      def omit_uris
-        [
-          ::RDF::Vocab::Fcrepo4.ServerManaged,
-          ::RDF::Vocab::LDP.PreferContainment,
-          ::RDF::Vocab::LDP.PreferEmptyContainer,
-          ::RDF::Vocab::LDP.PreferMembership
-        ]
-      end
+    def omit_uris
+      [
+        ::RDF::Vocab::Fcrepo4.ServerManaged,
+        ::RDF::Vocab::LDP.PreferContainment,
+        ::RDF::Vocab::LDP.PreferEmptyContainer,
+        ::RDF::Vocab::LDP.PreferMembership
+      ]
+    end
   end
 end

data/app/controllers/concerns/hyrax/admin/stats_behavior.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   module Admin
     ##
@@ -33,12 +34,12 @@ module Hyrax
 
       private
 
-        def build_presenter(stats_filters, limit)
-          presenter_class = self.class.admin_stats_presenter
-          services_opts   = self.class.admin_stats_services
+      def build_presenter(stats_filters, limit)
+        presenter_class = self.class.admin_stats_presenter
+        services_opts   = self.class.admin_stats_services
 
-          presenter_class.new(stats_filters, limit, **services_opts)
-        end
+        presenter_class.new(stats_filters, limit, **services_opts)
+      end
     end
   end
 end

data/app/controllers/concerns/hyrax/admin/users_controller_behavior.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   module Admin
     module UsersControllerBehavior
@@ -18,9 +19,9 @@ module Hyrax
 
       private
 
-        def ensure_admin!
-          authorize! :read, :admin_dashboard
-        end
+      def ensure_admin!
+        authorize! :read, :admin_dashboard
+      end
     end
   end
 end

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

@@ -1,66 +1,69 @@
+# frozen_string_literal: true
 module Hyrax
   module API
     # Generate appropriate json response for +response_type+
-
-    def self.generate_response_body(response_type: :success, message: nil, options: {})
-      json_body = default_responses[response_type].merge(options)
-      json_body[:description] = message if message
-      json_body
-    end
-
-    # Default (json) responses for various response types
-    def self.default_responses
+    DEFAULT_RESPONSES =
       {
         success: {
           code: 200,
           message: "Request Succeeded",
           description: I18n.t('hyrax.api.success.default')
-        },
+        }.freeze,
         deleted: {
           code: 200,
           message: I18n.t('hyrax.api.deleted.default')
-        },
+        }.freeze,
         created: {
           code: 201,
           message: "Created the Resource"
-        },
+        }.freeze,
         accepted: {
           code: 202,
           message: "Accepted",
           description: I18n.t('hyrax.api.accepted.default')
-        },
+        }.freeze,
         bad_request: {
           code: 400,
           message: "Bad Request",
           description: I18n.t('hyrax.api.bad_request.default')
-        },
+        }.freeze,
         unauthorized: {
           code: 401,
           message: "Authentication Required",
           description: I18n.t('hyrax.api.unauthorized.default')
-        },
+        }.freeze,
         forbidden: {
           code: 403,
           message: "Not Authorized",
           description: I18n.t('hyrax.api.forbidden.default')
-        },
+        }.freeze,
         not_found: {
           code: 404,
           message: "Resource not found",
           description: I18n.t('hyrax.api.not_found.default')
-        },
+        }.freeze,
         unprocessable_entity: {
           code: 422,
           message: "Unprocessable Entity",
           description: I18n.t('hyrax.api.unprocessable_entity.default'),
           errors: {}
-        },
+        }.freeze,
         internal_error: {
           code: 500,
           message: "Internal Server Error",
           description: I18n.t('hyrax.api.internal_error.default')
-        }
-      }
+        }.freeze
+      }.freeze
+
+    def self.generate_response_body(response_type: :success, message: nil, options: {})
+      json_body = default_responses[response_type].merge(options)
+      json_body[:description] = message if message
+      json_body
+    end
+
+    # Default (json) responses for various response types
+    def self.default_responses
+      DEFAULT_RESPONSES
     end
   end
 end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   module Breadcrumbs
     extend ActiveSupport::Concern
@@ -7,6 +8,8 @@ module Hyrax
         trail_from_referer
       else
         default_trail
+        add_breadcrumb_for_controller if user_signed_in?
+        add_breadcrumb_for_action
       end
     end
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   module BreadcrumbsForCollections
     extend ActiveSupport::Concern
@@ -13,9 +14,9 @@ module Hyrax
 
     def add_breadcrumb_for_action
       case action_name
-      when 'edit'.freeze
-        add_breadcrumb I18n.t("hyrax.collection.browse_view"), collection_path(params["id"]), mark_active_action
-      when 'show'.freeze
+      when 'edit'
+        add_breadcrumb I18n.t("hyrax.collection.edit_view"), collection_path(params["id"]), mark_active_action
+      when 'show'
         add_breadcrumb presenter.to_s, polymorphic_path(presenter), mark_active_action
       end
     end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   module BreadcrumbsForWorks
     extend ActiveSupport::Concern
@@ -14,29 +15,29 @@ module Hyrax
 
     private
 
-      def build_breadcrumbs
-        return super if action_name == 'show'
-        # These breadcrumbs are for the edit/create actions
-        add_breadcrumb t(:'hyrax.controls.home'), root_path
-        add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
-        add_breadcrumb_for_controller
-        add_breadcrumb_for_action
-      end
+    def build_breadcrumbs
+      return super if action_name == 'show'
+      # These breadcrumbs are for the edit/create actions
+      add_breadcrumb t(:'hyrax.controls.home'), root_path
+      add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
+      add_breadcrumb_for_controller
+      add_breadcrumb_for_action
+    end
 
-      def add_breadcrumb_for_controller
-        add_breadcrumb I18n.t(:'hyrax.dashboard.my.works'), hyrax.my_works_path
-      end
+    def add_breadcrumb_for_controller
+      add_breadcrumb I18n.t(:'hyrax.dashboard.my.works'), hyrax.my_works_path
+    end
 
-      def add_breadcrumb_for_action
-        case action_name
-        when 'edit'.freeze
-          add_breadcrumb curation_concern.to_s, main_app.polymorphic_path(curation_concern)
-          add_breadcrumb t(:'hyrax.works.edit.breadcrumb'), request.path
-        when 'new'.freeze
-          add_breadcrumb t(:'hyrax.works.create.breadcrumb'), request.path
-        when 'show'.freeze
-          add_breadcrumb presenter.to_s, main_app.polymorphic_path(presenter)
-        end
+    def add_breadcrumb_for_action
+      case action_name
+      when 'edit'
+        add_breadcrumb curation_concern.to_s, main_app.polymorphic_path(curation_concern)
+        add_breadcrumb t(:'hyrax.works.edit.breadcrumb'), request.path
+      when 'new'
+        add_breadcrumb t(:'hyrax.works.create.breadcrumb'), request.path
+      when 'show'
+        add_breadcrumb presenter.to_s, main_app.polymorphic_path(presenter)
       end
+    end
   end
 end