blacklight-spotlight 3.0.0.alpha.7 → 3.0.0.alpha.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61d1cc793dd74339242e08e5a0c66ba33ebde6736f25423fa6315bc52ae7fcbf
-  data.tar.gz: 00a54261d57877c5610e244851d82d32b0700c01cb919af5d2ac17481d5e7de9
+  metadata.gz: eee784e93eaeb64d3b581a84b8969f67ef1365fcb244845541cce3db8743a44d
+  data.tar.gz: 72cc1075f6bf87b3f0ec675d71484ea0f664181d36fe55978878890627d8f264
 SHA512:
-  metadata.gz: 50cba1c7d20e658be91c54ff2c56f9c296b9b521df5d1054e202d6eba74d6f3dbd67dfeec7701e4061e2db0f26e66e0241e3494adea2002280ad68a787a06d2b
-  data.tar.gz: cd32bcc19cfa68295fcc40b2969e47a0623dbe750e3bcb4e3d2fb86b3825f7897a10da3ba87fd4ef3b5f855bb1f7ce875fbca16c12087a53456ca40120a4f0e3
+  metadata.gz: 99dd649874596c8b56267f9757fd4c56a05768289c52545b698932dbd8756c498b280f969602b2578afb31e13c5a26856379a573ea4b4fb5dc7d938f18199b19
+  data.tar.gz: 2477bf2480ec591974433df8bb7a48c58c51ca2961ddfbee954fe3ca5a4a82244cfcd9efbd784a046d8c86b90df9c1078ebc77cef04422e1d77eb66c91f4871e

data/app/controllers/spotlight/admin_users_controller.rb

@@ -10,7 +10,10 @@ module Spotlight
 
     load_and_authorize_resource :site, class: 'Spotlight::Site'
 
-    def index; end
+    def index
+      add_breadcrumb t(:'spotlight.sites.home'), root_url
+      add_breadcrumb t(:'spotlight.admin_users.index.page_title')
+    end
 
     def create
       if update_roles

data/app/controllers/spotlight/exhibits_controller.rb

@@ -22,6 +22,8 @@ module Spotlight
 
     def new
       build_initial_exhibit_contact_emails
+      add_breadcrumb t(:'spotlight.sites.home'), root_url
+      add_breadcrumb t(:'spotlight.exhibits.new.page_title')
     end
 
     def process_import

data/app/controllers/spotlight/sites_controller.rb

@@ -8,9 +8,15 @@ module Spotlight
     before_action :load_site
     load_and_authorize_resource
 
-    def edit; end
+    def edit
+      add_breadcrumb t(:'spotlight.sites.home'), root_url
+      add_breadcrumb t(:'spotlight.sites.edit.page_title')
+    end
 
-    def edit_exhibits; end
+    def edit_exhibits
+      add_breadcrumb t(:'spotlight.sites.home'), root_url
+      add_breadcrumb t(:'spotlight.sites.edit_exhibits.page_title')
+    end
 
     def update
       if @site.update(site_params)

data/app/helpers/spotlight/title_helper.rb

@@ -13,8 +13,18 @@ module Spotlight
     end
 
     def page_title(section, title = nil)
-      set_html_page_title(t(:'spotlight.html_admin_title', section: section, title: title || t(:'.title', default: :'.header')))
-      content_tag(:h1, safe_join([section, content_tag(:small, title || t(:'.header'))], "\n"), class: 'page-header')
+      title ||= t(:'.header', default: '').presence
+
+      head_content = t(:'spotlight.html_admin_title', section: section, title: title) if section && title
+      head_content ||= section || title
+      set_html_page_title(head_content)
+
+      html_content = safe_join([
+        (section if section.present?),
+        (content_tag(:small, title) if title.present?)
+      ].compact, "\n")
+
+      content_tag(:h1, html_content, class: 'page-header')
     end
 
     # rubocop:disable Naming/AccessorMethodName

data/app/views/shared/_site_sidebar.html.erb

@@ -14,6 +14,6 @@
 </ul>
 
 <ul class="nav sidenav nav-pills nav-stacked">
-  <li class="nav-item"><%= link_to t(:'spotlight.sites.new.page_title'), spotlight.new_exhibit_path, class: 'btn btn-outline-secondary btn-nav', role: 'button' if can? :create, Spotlight::Exhibit %></li>
+  <li class="nav-item"><%= link_to t(:'spotlight.exhibits.new.page_title'), spotlight.new_exhibit_path, class: 'btn btn-outline-secondary btn-nav', role: 'button' if can? :create, Spotlight::Exhibit %></li>
 </ul>
 <% end %>

data/app/views/spotlight/admin_users/index.html.erb

@@ -1,4 +1,4 @@
-<%= page_title(t('.section'), t('.page_title')) %>
+<%= page_title(t('.page_title')) %>
 <%= bootstrap_form_for Spotlight::Engine.user_class.new, html: { class: 'admin-users' }, url: spotlight.admin_users_path do |f| %>
   <div class="mb-4">
     <h3 class="instructions"><%= t :'.instructions' %></h3>

data/app/views/spotlight/exhibits/new.html.erb

@@ -1,4 +1,4 @@
-<%= page_title t(:'spotlight.sites.new.section') %>
+<%= page_title t(:'.page_title') %>
 <%= render 'new_exhibit_form' %>
 
 <% content_for(:sidebar_position) { 'order-last' } %>

data/app/views/spotlight/sites/edit.html.erb

@@ -1,4 +1,4 @@
-<%= page_title(t('.section'), t('.page_title')) %>
+<%= page_title(t('.page_title')) %>
 <div role="tabpanel">
   <%= bootstrap_form_for @site, url: spotlight.site_path, layout: :horizontal, label_col: 'col-md-2', control_col: 'col-md-10' do |f| %>
     <ul class="nav nav-tabs" role="tablist">

data/app/views/spotlight/sites/edit_exhibits.html.erb

@@ -1,4 +1,4 @@
-<%= page_title(t('.section'), t('.page_title')) %>
+<%= page_title(t('.page_title')) %>
 <%= bootstrap_form_for @site, url: spotlight.site_path, layout: :horizontal, label_col: 'col-md-2', control_col: 'col-md-10' do |f| %>
   <p class="instructions"><%= t :'.instructions' %></p>
   <table class="table table-striped dd-table">

data/config/locales/spotlight.en.yml

@@ -187,7 +187,6 @@ en:
         page_title: Manage users
         pending: pending
         save: Add role
-        section: Manage exhibits
         update: Make user an administrator
     appearances:
       edit:
@@ -423,7 +422,7 @@ en:
           language: Language
           public: Public
       new:
-        header: Create a new exhibit
+        page_title: Create a new exhibit
       new_exhibit_form:
         fields:
           slug:
@@ -787,7 +786,6 @@ en:
         basic_settings:
           heading: Title
         page_title: Customize appearance
-        section: Manage exhibits
         site_masthead:
           heading: Site masthead
           help: |
@@ -796,13 +794,10 @@ en:
       edit_exhibits:
         instructions: Drag and drop the exhibits below to specify the order in which they are displayed on the exhibits homepage.
         page_title: Order exhibits
-        section: Manage exhibits
       exhibit:
         published: Published
         unpublished: Unpublished
-      new:
-        page_title: Create a new exhibit
-        section: Manage exhibits
+      home: Exhibits
     tags:
       index:
         actions: Actions

data/lib/spotlight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spotlight
-  VERSION = '3.0.0.alpha.7'
+  VERSION = '3.0.0.alpha.8'
 end

data/spec/features/create_exhibit_spec.rb

@@ -13,8 +13,7 @@ describe 'Create a new exhibit', type: :feature do
     within '.dropdown-menu' do
       click_link 'Create new exhibit'
     end
-    expect(page).to have_selector 'h1', text: 'Manage exhibits'
-    expect(page).to have_selector 'h1 small', text: 'Create a new exhibit'
+    expect(page).to have_selector 'h1', text: 'Create a new exhibit'
   end
 
   it 'allows admins to create a new exhibit' do

data/spec/helpers/spotlight/title_helper_spec.rb

@@ -17,6 +17,19 @@ describe Spotlight::TitleHelper, type: :helper do
       expect(title).to have_selector 'h1', text: 'Section'
       expect(title).to have_selector 'h1 small', text: 'Title'
     end
+
+    it 'renders just the section title if that was all that was provided' do
+      allow(helper).to receive(:t).and_call_original
+      allow(helper).to receive(:t).with(:'.header', default: '').and_return('')
+
+      title = helper.page_title('Section')
+
+      expect(title).to have_selector 'h1', text: 'Section'
+      expect(title).not_to have_selector 'h1 small'
+
+      title = helper.instance_variable_get(:@page_title)
+      expect(title).to eq 'Section | Application'
+    end
   end
 
   describe '#set_html_page_title' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha.7
+  version: 3.0.0.alpha.8
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-03 00:00:00.000000000 Z
+date: 2020-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on