effective_pages 3.4.0 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87905a09b84f0b8cf820024a81ea1066e5f213cd8e6b445f7cafc2d24eb86398
-  data.tar.gz: 7bcd83be6059d46ee284e80420683eeb273df7d2f3788b1b84e0b5c6bb06d1c5
+  metadata.gz: 9e671281634ffe553daa9e05de8737783dd3e75797e8f6cc8351c033195a3225
+  data.tar.gz: '03329baf24496ed2a2e1a6b2ec2a832ee6ca17b61be20f8ba22ce225d569262b'
 SHA512:
-  metadata.gz: b3ec4c9bb169cba79542e2d7d5d6db7d2e04bd3cc69b6e46848542e78cbd7cae0d57b8976e812be8309bb6116cfc6b9745e85f960bc8a8b95876c48b72f87430
-  data.tar.gz: be88b345621ea1f0ee7f31e07a08a44392be1a34706463551b9548be2730bcf6fa77a698ace3ac0237af76290a310639a5521cce745bd8d602c8b715c4c1476f
+  metadata.gz: e7c5fd0aed362d4734239243c1858c55be641c4bef6793d92ca629e78f60fc7a3f2db81c22f7a13f3c3e064a103e8ea93dc50a878879a7b3705227f5fc9c055e
+  data.tar.gz: 80995b8e52e82f1d6fb13942e8395e74ea523b351d116ecde7ccf96e6be100df79d6e39c9bf458a4b8d5591392e4c77b605b598e394b394f7364fc8ccc485af0

data/app/controllers/admin/carousel_items_controller.rb

@@ -5,6 +5,8 @@ module Admin
 
     include Effective::CrudController
 
+    page_title 'Carousels'
+
     def permitted_params
       params.require(:effective_carousel_item).permit!
     end

data/app/controllers/admin/menus_controller.rb

@@ -3,8 +3,11 @@ module Admin
     before_action(:authenticate_user!) if defined?(Devise)
     before_action { EffectiveResources.authorize!(self, :admin, :effective_pages) }
 
+
     include Effective::CrudController
 
+    page_title 'Menus'
+
     resource_scope -> { Effective::Page.all }
 
     if (config = EffectivePages.layout)

data/app/datatables/effective_page_sections_datatable.rb

@@ -8,13 +8,13 @@ class EffectivePageSectionsDatatable < Effective::Datatable
     col :updated_at, visible: false
 
     col :name
-    col :hint
 
     col :title
     col :rich_text_body
 
     col :file
 
+    col :hint, visible: false
     col :link_label, visible: false
     col :link_url, visible: false
     col :caption, visible: false

data/app/helpers/effective_page_banners_helper.rb

@@ -5,11 +5,12 @@ module EffectivePageBannersHelper
   def render_page_banner(page, opts = {}, &block)
     raise('expected a page') unless page.kind_of?(Effective::Page)
 
-    # Do nothing if page.banner is false
-    return unless page.banner?
+    return unless page.banner? || EffectivePages.banners_force_randomize
 
-    page_banner = page.page_banner
-    page_banner ||= Effective::PageBanner.random.first if page.banner_random?
+    # Always return a random banner if config.banners_force_randomize
+    page_banner = Effective::PageBanner.random.first if EffectivePages.banners_force_randomize
+    page_banner ||= page.page_banner if page.banner? && page.page_banner.present?
+    page_banner ||= Effective::PageBanner.random.first if page.banner? && page.banner_random?
 
     raise("unable to find page banner for page #{page}") unless page_banner.present?
 

data/app/models/effective/page.rb

@@ -97,7 +97,7 @@ module Effective
     validates :menu_group, absence: true, if: -> { menu_root? && EffectivePages.menus.present? }
 
     validate(if: -> { banner? && EffectivePages.banners? }) do
-      unless (page_banner.present? ^ banner_random?) # xor
+      unless (page_banner.present? ^ banner_random? ^ EffectivePages.banners_force_randomize) # xor
         self.errors.add(:page_banner_id, "please select a page banner or random")
         self.errors.add(:banner_random, "please select a page banner or random")
       end

data/app/views/admin/carousel_items/_form_carousel_item.html.haml

@@ -7,15 +7,15 @@
   = f.text_field :title
 
   - if defined?(EffectiveArticleEditor)
-    = f.article_editor :rich_text_body, label: 'Body', hint: 'The main content'
+    = f.article_editor :rich_text_body, label: 'Body'
   - else
-    = f.rich_text_area :rich_text_body, label: 'Body', hint: 'The main content'
+    = f.rich_text_area :rich_text_body, label: 'Body'
 
   .row
     .col= f.text_field :link_label
     .col= f.url_field :link_url
 
-  = f.file_field :file, label: 'Image Attachment', hint: 'The image to display on this carousel item'
-  = f.text_field :caption, hint: 'Displayed alongside the image'
+  = f.file_field :file, label: 'Image attachment', hint: EffectivePages.carousels_hint_text
+  = f.text_field :caption, hint: 'Optional'
 
   = effective_submit(f)

data/app/views/admin/carousel_items/index.html.haml

@@ -1,11 +1,5 @@
-%h1= @page_title
-
-%p
-  Click Reorder to drag & drop reorder carousel items.
-  Edit an item to change its content.
-
 - EffectivePages.carousels.each do |carousel|
-  %h3 #{carousel.to_s.titleize} Carousel
-  - datatable = EffectiveCarouselItemsDatatable.new(carousel: carousel)
-  = render_datatable(datatable, simple: true, inline: true)
-  %hr.my-5
+  .bg-white.my-5.p-3.rounded
+    %h3.mb-0 #{carousel.to_s.titleize} Carousel
+    - datatable = EffectiveCarouselItemsDatatable.new(carousel: carousel)
+    = render_datatable(datatable, simple: true, inline: true)

data/app/views/admin/menus/index.html.haml

@@ -1,11 +1,5 @@
-%h1= @page_title
-
-%p
-  Click Reorder to drag & drop reorder menu items.
-  Edit an item to reorder its children items.
-
 - EffectivePages.menus.each do |menu|
-  %h3 #{menu.to_s.titleize} Menu
-  - datatable = EffectivePagesMenuDatatable.new(menu: menu)
-  = render_datatable(datatable, simple: true, inline: true)
-  %hr.my-5
+  .bg-white.my-5.p-3.rounded
+    %h3.mb-0 #{menu.to_s.titleize} Menu
+    - datatable = EffectivePagesMenuDatatable.new(menu: menu)
+    = render_datatable(datatable, simple: true, inline: true)

data/app/views/admin/page_banners/_form_page_banner.html.haml

@@ -1,8 +1,7 @@
 = effective_form_with(model: [:admin, page_banner], engine: true) do |f|
-  = f.text_field :name, hint: 'The name of this banner. Used for reference only'
-
-  = f.file_field :file, label: 'Image Attachment', hint: 'Upload an image to display on this banner'
-  = f.text_field :caption, hint: 'Displayed alongside the image'
+  = f.text_field :name, hint: 'The name of this banner, used only for reference'
+  = f.file_field :file, label: 'Image attachment', hint: EffectivePages.banners_hint_text
+  = f.text_field :caption, hint: 'Optional. Displayed alongside the image'
 
   -# - if defined?(EffectiveArticleEditor)
   -#   = f.article_editor :rich_text_body, label: 'Body', hint: 'The main content'

data/app/views/admin/page_sections/_form_page_section.html.haml

@@ -5,7 +5,8 @@
     = f.static_field :name
 
   - if f.object.hint.present?
-    .mb-4= f.object.hint.html_safe
+    %h4.mt-0 Instructions
+    %p= f.object.hint.html_safe
 
   = f.text_field :title
 

data/app/views/admin/pages/_form_page.html.haml

@@ -24,15 +24,24 @@
     = f.text_field :slug, hint: "The slug controls this page's internet address. Be careful, changing the slug will break links that other websites may have to the old address.<br>#{('This page is currently reachable via ' + link_to(current_url.gsub(f.object.slug, '<strong>' + f.object.slug + '</strong>').html_safe, current_url)) if current_url }".html_safe
 
   - if EffectivePages.banners?
-    = f.check_box :banner, label: 'Yes, display a page banner on this page'
+    - if EffectivePages.banners_force_randomize
+      = f.check_box :banner, label: 'Choose a page banner'
+    - else
+      = f.check_box :banner, label: 'Display a page banner on this page'
 
     = f.show_if(:banner, true) do
-      = card('Page Banner') do
-        %p.text-muted Please visit #{link_to('Page Banners', effective_pages.admin_page_banners_path)} to add or update the page banners.
+      = card do
+        %p.text-muted
+          - if EffectivePages.banners_force_randomize
+            A random banner will always be displayed, or you may choose a specific banner below.
+
+          Please visit #{link_to('Page Banners', effective_pages.admin_page_banners_path)} to add or update the page banners.
+
+        - if !EffectivePages.banners_force_randomize
+          = f.check_box :banner_random, label: 'Display a random page banner. Ignored if you choose a page banner below.'
+
+        = f.select :page_banner_id, Effective::PageBanner.sorted.all, label: 'Choose a page banner'
 
-        = f.select :page_banner_id, Effective::PageBanner.sorted.all, label: 'Display this page banner'
-        %p - or -
-        = f.check_box :banner_random, label: 'Display a random page banner each time the page is refreshed'
 
   = render partial: '/admin/pages/additional_fields', locals: { page: page, form: f, f: f }
 

data/config/effective_pages.rb

@@ -63,10 +63,13 @@ EffectivePages.setup do |config|
   # Allow a page banner to be selected on the Admin::Pages#edit screen
   # Banners can be CRUD by the admin
   config.banners = false
+  config.banners_force_randomize = false # at least return a random banner with render_page_banner()
+  config.banners_hint_text = 'Hint text that includes required image dimensions'
 
   # Page Carousels
   # The menu names a page can belong to
   config.carousels = false
   # config.carousels = [:home, :secondary]
+  config.carousels_hint_text = 'Hint text that includes required image dimensions'
 
 end

data/lib/effective_pages/version.rb

@@ -1,3 +1,3 @@
 module EffectivePages
-  VERSION = '3.4.0'.freeze
+  VERSION = '3.4.2'.freeze
 end

data/lib/effective_pages.rb

@@ -12,7 +12,7 @@ module EffectivePages
       :site_og_image, :site_og_image_width, :site_og_image_height,
       :site_title, :site_title_suffix, :fallback_meta_description,
       :silence_missing_page_title_warnings, :silence_missing_meta_description_warnings, :silence_missing_canonical_url_warnings,
-      :use_effective_roles, :layout, :max_menu_depth,
+      :use_effective_roles, :layout, :max_menu_depth, :banners_hint_text, :carousels_hint_text, :banners_force_randomize,
 
       # Booleans
       :banners,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_pages
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-11 00:00:00.000000000 Z
+date: 2022-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails