Render controls navbar in work and collection show views

Set the (overrideable) theme to be used in the work and collection controlers, and use the 1_column layout to pick up the controls navbar.

Fixes samvera-labs/nurax-pre2023#71

app/controllers/concerns/hyrax/works_controller_behavior.rb

@@ -7,7 +7,6 @@ module WorksControllerBehavior
 
     included do
       layout :decide_layout
-
       copy_blacklight_config_from(::CatalogController)
       class_attribute :show_presenter, :search_builder_class
       self.show_presenter = Hyrax::WorkShowPresenter
@@ -17,6 +16,7 @@ module WorksControllerBehavior
         storage_adapter: Valkyrie.config.storage_adapter
       )
 
+      self.theme = 'hyrax/1_column'
       attr_accessor :curation_concern
       helper_method :curation_concern, :contextual_path
 

app/controllers/hyrax/collections_controller.rb

@@ -5,6 +5,8 @@ class CollectionsController < ApplicationController
     layout :decide_layout
     load_and_authorize_resource except: [:index, :show, :create], instance_name: :collection
 
+    self.theme = 'hyrax/1_column'
+
     # Renders a JSON response with a list of files in this collection
     # This is used by the edit form to populate the thumbnail_id dropdown
     def files

spec/controllers/hyrax/citations_controller_spec.rb

@@ -14,7 +14,7 @@
         expect(controller).to receive(:add_breadcrumb).with('My Dashboard', Hyrax::Engine.routes.url_helpers.dashboard_path(locale: 'en'))
         get :work, params: { id: work }
         expect(response).to be_successful
-        expect(response).to render_template('layouts/hyrax')
+        expect(response).to render_template('layouts/hyrax/1_column')
         expect(assigns(:presenter)).to be_kind_of Hyrax::WorkShowPresenter
       end
     end
@@ -42,7 +42,7 @@
         expect(controller).to receive(:add_breadcrumb).with('My Dashboard', Hyrax::Engine.routes.url_helpers.dashboard_path(locale: 'en'))
         get :file, params: { id: file_set }
         expect(response).to be_successful
-        expect(response).to render_template('layouts/hyrax')
+        expect(response).to render_template('layouts/hyrax/1_column')
         expect(assigns(:presenter)).to be_kind_of Hyrax::FileSetPresenter
       end
     end

spec/controllers/hyrax/collections_controller_spec.rb

@@ -31,6 +31,7 @@
         expect(controller).to receive(:add_breadcrumb).with(I18n.t('hyrax.dashboard.title'), Hyrax::Engine.routes.url_helpers.dashboard_path(locale: 'en'))
         get :show, params: { id: collection }
         expect(response).to be_successful
+        expect(response).to render_template("layouts/hyrax/1_column")
         expect(assigns[:presenter]).to be_kind_of Hyrax::CollectionPresenter
         expect(assigns[:presenter].title).to match_array collection.title
         expect(assigns[:member_docs].map(&:id)).to match_array [asset1, asset2, asset3].map { |asset| asset.id.to_s }

spec/controllers/hyrax/generic_works_controller_spec.rb

@@ -58,7 +58,7 @@
           expect(controller).to receive(:add_breadcrumb).with('test title', main_app.hyrax_generic_work_path(work.id, locale: 'en'))
           get :show, params: { id: work }
           expect(response).to be_successful
-          expect(response).to render_template("layouts/hyrax")
+          expect(response).to render_template("layouts/hyrax/1_column")
         end
       end