comfy_middle_seat 4.0.4 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4278365e6cb2036d0909007c27e36878cb58dd915c801f4b9e0c9814a632eaf
-  data.tar.gz: 3d17520fe067057e477f7b269fe1eed2afe014846873d21cc5e68eda3041d143
+  metadata.gz: 25bec879fab0f69cf22d27320c22441fd04a2dd10d489223b5f4dfe42d4647e4
+  data.tar.gz: 0ca964528011c2f24c8d804c965f08fb46e1dea98d7b9286557bf9f6cc0da27a
 SHA512:
-  metadata.gz: 046346cefdb3ded2bd29e494d55a7c9ec9d4b84fe129b182a56aff0ce78f9c12802b232ce00bf73898461bd51aa9436759b0e04df0de948e72be45fe59b718e3
-  data.tar.gz: 8d888d9f83bd7c91693ba03335303513dde1f9df574f03ac757dcd67dfdf1ce9fbf6f213da0426a18b2ab9b5d46b8884d82b7881d9a292169052ab81b0ea04a0
+  metadata.gz: ddc4be334bbdd4dcde5f7a703b2f22c8dd6645b79c36ea3ed1e13e77d4d6a077d0e8193c5de10b29520893d7f8463d019921a12553cd3dd5827b9d1d91741ba0
+  data.tar.gz: 4ea20039aeef0f0c580252eee42f09bf1804c7376f2944f5c5dba4927e86126bff5d7c681eda6f4de3e1e79ee33f23d16fa01345a06f90b4f6f178ab9aeea80b

data/CHANGELOG.md

@@ -12,6 +12,47 @@ This changelog follows the project's lineage: **Comfortable Mexican Sofa → Com
 
 ## [Unreleased]
 
+### Changed
+
+- Keep Page editing actions together in a sticky top toolbar.
+- Save edits and publish or unpublish a page with one button.
+- Shorten publication notices and show save hints as button tooltips.
+- Auto-dismiss success and informational notices; keep warnings and errors visible.
+
+### Fixed
+
+- Keep editing buttons aligned with the page heading above publication status.
+- Restore dismissal of admin flash notices.
+- Keep Add Child Layout on one line when space allows.
+
+## [v4.1.0] - 2026-10-12
+
+### Changed
+
+- Refresh the admin with the Harbor navy and teal theme.
+- Hide pages beneath unpublished ancestors without changing their publication settings.
+- Show when a page is hidden by an unpublished ancestor.
+- Group descendant publishing actions in the Child pages menu.
+- Gray out descendant publishing actions when no changes are needed.
+
+### Fixed
+
+- Refresh page and translation navigation when publication changes.
+
+## [v4.0.4] - 2026-10-10
+
+No functional changes from v4.0.3.
+
+## [v4.0.3] - 2026-10-10
+
+### Added
+
+- Publish or unpublish pages directly from the Page index.
+
+### Fixed
+
+- Keep Add Child Page buttons on one line.
+
 ## [v4.0.2] - 2026-09-21
 
 ### Changed
@@ -210,7 +251,10 @@ First release of `comfortable_media_surfer`. This new gem is a revival of [Comfo
 
 - Rebranded **ComfortableMexicanSofa** as **ComfortableMediaSurfer** in order to publish new gem (database table names and schema have not changed).
 
-[Unreleased]: https://github.com/avonderluft/comfy-middle-seat/compare/v4.0.2...master
+[Unreleased]: https://github.com/avonderluft/comfy-middle-seat/compare/v4.1.0...master
+[v4.1.0]: https://github.com/avonderluft/comfy-middle-seat/compare/v4.0.4...v4.1.0
+[v4.0.4]: https://github.com/avonderluft/comfy-middle-seat/compare/ea2bb99c0398e1f4d6e850a25e0c13afc577c3ad...v4.0.4
+[v4.0.3]: https://github.com/avonderluft/comfy-middle-seat/compare/v4.0.2...ea2bb99c0398e1f4d6e850a25e0c13afc577c3ad
 [v4.0.2]: https://github.com/avonderluft/comfy-middle-seat/compare/v4.0.1...v4.0.2
 [v4.0.1]: https://github.com/avonderluft/comfy-middle-seat/compare/v4.0.0...v4.0.1
 [v4.0.0]: https://github.com/avonderluft/comfy-middle-seat/compare/v3.2.1...v4.0.0

data/README.md

@@ -34,7 +34,7 @@ Comfy Middle Seat is best suited to Rails applications that render their own web
 - Revision history with comparison, preview, and restore workflows.
 - Page translations and multilingual publishing.
 - Multi-site publishing from one installation.
-- Controls to publish or unpublish child pages together.
+- Publish individual pages or whole branches, with ancestor-aware visibility.
 
 ### For Rails developers
 
@@ -114,6 +114,14 @@ A Site defines a hostname, path, and language. Layouts define page structure and
 
 When an editor creates a Page using this Layout, the admin automatically presents fields for `title` and `content`. Content tags can also provide Markdown, files, images, dates, numbers, checkboxes, snippets, partials, helpers, navigation, and other reusable content.
 
+### Publishing pages
+
+A page is publicly visible only when it and all its ancestors are published. Unpublishing a parent hides its branch without changing descendants’ individual publication settings. Republishing the parent restores only descendants whose full ancestor chain is published; drafts stay unpublished. Translations must also satisfy their own publication settings.
+
+The Page index toggle changes only that page. The **Child pages** menu’s **Publish descendants** and **Unpublish descendants** actions change all descendants, not the current page or its ancestors. The admin marks published pages hidden by an unpublished ancestor.
+
+Development mode continues to show unpublished pages for preview. Check public visibility in test, staging, or production mode.
+
 ## Compatibility and requirements
 
 | Component | Support |
@@ -143,6 +151,17 @@ When adapting upstream examples, use the `comfy_middle_seat` gem, `config/initia
 
 ## Upgrading
 
+### Ancestor-aware publishing (unreleased)
+
+Review branches with unpublished ancestors: their descendants will no longer be publicly accessible. No database migration is required. After deploying, clear existing rendered content once from the Rails console so cached navigation follows the new rule:
+
+```ruby
+Comfy::Cms::Page.update_all(content_cache: nil)
+Comfy::Cms::Translation.update_all(content_cache: nil)
+```
+
+Content is regenerated on demand. Subsequent publication and parent changes refresh the affected site’s caches automatically.
+
 ### From Comfortable Media Surfer
 
 1. Replace `comfortable_media_surfer` with `comfy_middle_seat` in the `Gemfile`. Do not include both gems.

data/app/assets/javascripts/comfy/admin/cms/application.js

@@ -4,8 +4,10 @@ import ujs from "@rails/ujs";
 window.jQuery = window.$ = jQuery;
 ujs.start();
 
+import "bootstrap/js/src/alert";
 import "bootstrap/js/src/tab";
 import "bootstrap/js/src/collapse";
+import "bootstrap/js/src/dropdown";
 
 import "../../vendor/diff/diff_match_patch.min";
 import "../../vendor/diff/pretty_text_diff";
@@ -19,6 +21,7 @@ import "./draft_forms";
 import "./file_link";
 import "./file_upload";
 import "./files_modal";
+import "./flash_notices";
 import "./page_fragments";
 import "./sortable_list";
 import "./slugify";

data/app/assets/javascripts/comfy/admin/cms/base.js

@@ -32,9 +32,11 @@
     CMS.fileUpload.init();
     CMS.diff();
     CMS.draftForms.init();
+    CMS.flashNotices.init();
   };
 
   CMS.dispose = () => {
+    CMS.flashNotices.dispose();
     CMS.pageFragments.dispose();
     CMS.draftForms.dispose();
     CMS.codemirror.dispose();

data/app/assets/javascripts/comfy/admin/cms/flash_notices.js

@@ -0,0 +1,73 @@
+import $ from "jquery";
+import Alert from "bootstrap/js/src/alert";
+
+(() => {
+  const DELAY = 5000;
+  let cleanups = [];
+
+  const watch = (notice) => {
+    let remaining = DELAY;
+    let startedAt;
+    let timer = null;
+    let hovered = notice.matches(":hover");
+    let focused = notice.contains(document.activeElement);
+
+    const pause = () => {
+      if (timer === null) return;
+      window.clearTimeout(timer);
+      timer = null;
+      remaining = Math.max(0, remaining - (performance.now() - startedAt));
+    };
+
+    const resume = () => {
+      if (timer !== null || hovered || focused || !notice.isConnected) return;
+      startedAt = performance.now();
+      timer = window.setTimeout(() => {
+        timer = null;
+        cleanup();
+        if (window.matchMedia("(prefers-reduced-motion: reduce)").matches) {
+          notice.classList.remove("fade");
+        }
+        new Alert(notice).close();
+      }, remaining);
+    };
+
+    const onMouseEnter = () => { hovered = true; pause(); };
+    const onMouseLeave = () => { hovered = false; resume(); };
+    const onFocusIn = () => { focused = true; pause(); };
+    const onFocusOut = (event) => {
+      focused = notice.contains(event.relatedTarget);
+      if (!focused) resume();
+    };
+    const cleanup = () => {
+      pause();
+      notice.removeEventListener("mouseenter", onMouseEnter);
+      notice.removeEventListener("mouseleave", onMouseLeave);
+      notice.removeEventListener("focusin", onFocusIn);
+      notice.removeEventListener("focusout", onFocusOut);
+      $(notice).off("close.bs.alert", cleanup);
+    };
+
+    notice.addEventListener("mouseenter", onMouseEnter);
+    notice.addEventListener("mouseleave", onMouseLeave);
+    notice.addEventListener("focusin", onFocusIn);
+    notice.addEventListener("focusout", onFocusOut);
+    $(notice).on("close.bs.alert", cleanup);
+    cleanups.push(cleanup);
+    resume();
+  };
+
+  CMS.flashNotices = {
+    init() {
+      this.dispose();
+      document.querySelectorAll(
+        "[data-cms-flash].alert-success, [data-cms-flash].alert-info"
+      ).forEach(watch);
+    },
+
+    dispose() {
+      cleanups.forEach((cleanup) => cleanup());
+      cleanups = [];
+    },
+  };
+})();

data/app/assets/stylesheets/comfy/admin/cms/application.sass

@@ -1,3 +1,4 @@
+@import "comfy/admin/cms/harbor_variables"
 @import "comfy/vendor/bootstrap/bootstrap"
 
 @import "codemirror/lib/codemirror"
@@ -8,4 +9,5 @@
 @import "comfy/admin/cms/codemirror_overrides"
 @import "comfy/admin/cms/redactor_overrides"
 @import "comfy/admin/cms/base"
+@import "comfy/admin/cms/harbor"
 @import "comfy/admin/cms/custom"

data/app/assets/stylesheets/comfy/admin/cms/harbor.sass

@@ -0,0 +1,98 @@
+body#comfy
+  .btn-primary, .btn-secondary
+    @include button-variant($harbor-teal, $harbor-teal, $harbor-hover, $harbor-hover, $harbor-pressed, $harbor-pressed)
+
+  .btn-outline-primary, .btn-outline-secondary
+    @include button-outline-variant($harbor-teal, $harbor-hover, $harbor-tint, $harbor-hover)
+    background-color: $white
+    border-color: $gray-400
+    &:not(:disabled):not(.disabled):active, &:not(:disabled):not(.disabled).active
+      color: $harbor-pressed
+    &:disabled, &.disabled
+      background-color: $white
+      border-color: $gray-300
+
+  a:focus-visible, button:focus-visible, input:focus-visible, select:focus-visible, textarea:focus-visible
+    outline: 2px solid $harbor-teal
+    outline-offset: 2px
+
+  #cms-left
+    nav.navbar ul.nav li
+      a
+        color: $harbor-nav-text
+        @include transition(color .15s ease-in-out, background-color .15s ease-in-out)
+      a:hover
+        color: $white
+        background-color: $gray-700
+      a.active
+        color: $white
+        background-color: $harbor-teal
+        box-shadow: inset 3px 0 0 $harbor-gold
+      a.active:hover
+        background-color: $harbor-hover
+    a:focus-visible, button:focus-visible
+      outline-color: $harbor-gold
+    .left-footer
+      color: $harbor-nav-text
+      a
+        color: $harbor-nav-text
+        &:hover
+          color: $white
+
+  #cms-main
+    .page-header
+      color: $harbor-navy
+    .page-editor-toolbar
+      position: sticky
+      top: 0
+      z-index: 1000
+      display: grid
+      grid-template-columns: max-content minmax(0, 1fr)
+      align-items: center
+      gap: .5rem 1rem
+      padding: .75rem 0
+      background-color: $body-bg
+      .page-editor-heading h2
+        margin-bottom: 0
+      .page-publication-state
+        grid-column: 1 / -1
+      .page-editor-actions
+        display: flex
+        flex-wrap: wrap
+        align-items: center
+        justify-content: flex-end
+        gap: .5rem
+        min-width: 0
+
+      @media (max-width: map-get($grid-breakpoints, lg))
+        top: 3rem
+      @include media-breakpoint-down(sm)
+        grid-template-columns: minmax(0, 1fr)
+        .page-editor-actions
+          justify-content: flex-start
+    .layout-actions .btn-group
+      max-width: 100%
+    ul.list
+      li .row
+        @include transition(background-color .15s ease-in-out)
+        .item .item-title a
+          color: $gray-800
+          &:hover
+            color: $harbor-hover
+          &.draft
+            color: $gray-600
+        .item .item-controls .dragger, .item .item-controls .toggle
+          color: $gray-600
+      li.sortable-ghost > .row, li.sortable-chosen > .row, &:not(.sortable-active) > li > .row:hover
+        background-color: $harbor-tint
+
+  #cms-right
+    .box
+      border-color: $gray-300
+    .box.translations a.translation
+      color: $gray-800
+      &.draft
+        color: $gray-600
+
+  #cms-uploader ul.list .file-path
+    color: $gray-600

data/app/assets/stylesheets/comfy/admin/cms/harbor_variables.sass

@@ -0,0 +1,36 @@
+// Loaded before Bootstrap so forms, alerts, badges, and pagination share the palette.
+$harbor-navy: #172b3a
+$harbor-teal: #0f766e
+$harbor-hover: #0b5e57
+$harbor-pressed: #094c47
+$harbor-tint: #e0f2ef
+$harbor-gold: #d5a34a
+$harbor-nav-text: #bfd0dc
+
+$gray-100: #f3f7fa
+$gray-200: #e4ecf1
+$gray-300: #cbd7e0
+$gray-400: #91aab9
+$gray-500: #718999
+$gray-600: #526777
+$gray-700: #385364
+$gray-800: #243746
+$gray-900: $harbor-navy
+
+$primary: $harbor-teal
+$secondary: $harbor-teal
+$success: #26734d
+$info: #246b8c
+$warning: $harbor-gold
+$danger: #b23a48
+$dark: $harbor-navy
+$light: $gray-100
+$body-color: $gray-800
+$body-bg: #ffffff
+$link-color: $harbor-teal
+$link-hover-color: $harbor-hover
+$input-border-color: $gray-400
+$input-focus-border-color: $harbor-teal
+$input-focus-box-shadow: 0 0 0 .2rem rgba($harbor-teal, .2)
+$custom-select-focus-border-color: $harbor-teal
+$custom-select-focus-box-shadow: $input-focus-box-shadow

data/app/controllers/comfy/admin/cms/pages_controller.rb

@@ -8,7 +8,7 @@ class Comfy::Admin::Cms::PagesController < Comfy::Admin::Cms::BaseController
 
   include ::Comfy::ReorderAction
 
-  helper_method :page_branch_open?
+  helper_method :page_branch_open?, :page_publicly_visible?, :descendant_publication_states
 
   self.reorder_action_resource = ::Comfy::Cms::Page
 
@@ -64,12 +64,28 @@ class Comfy::Admin::Cms::PagesController < Comfy::Admin::Cms::BaseController
   end
 
   def update
-    @page.save!
-    update_family
+    publication_action = params[:publication_action].presence_in(%w[publish unpublish])
+    original_publication = @page.is_published_in_database
+    @page.is_published = publication_action == 'publish' if publication_action
+
+    @page.class.transaction do
+      @page.save!
+      update_family
+    end
     acknowledge_draft_save
-    flash[:success] = I18n.t('comfy.admin.cms.pages.updated')
+    flash[:success] = case publication_action
+                      when 'publish'
+                        I18n.t('comfy.admin.cms.pages.saved_and_published', default: 'Page saved and published')
+                      when 'unpublish'
+                        I18n.t('comfy.admin.cms.pages.saved_and_unpublished', default: 'Page saved and unpublished')
+                      else
+                        I18n.t('comfy.admin.cms.pages.updated')
+                      end
     redirect_to action: :edit, id: @page
-  rescue ActiveRecord::RecordInvalid
+  rescue ActiveRecord::RecordInvalid => e
+    # Keep submitted edits and errors, but show the publication state that was actually saved.
+    @page.is_published = original_publication if publication_action
+    @page.errors.add(:base, e.message) unless e.record == @page
     flash.now[:danger] = I18n.t('comfy.admin.cms.pages.update_failure')
     render action: :edit
   end
@@ -135,12 +151,27 @@ class Comfy::Admin::Cms::PagesController < Comfy::Admin::Cms::BaseController
 
 protected
 
+  # Query one tree level at a time; mixed flags already enable both actions.
+  def descendant_publication_states(page)
+    states = []
+    parent_ids = [page.id]
+    while parent_ids.present? && states.size < 2
+      descendants = @site.pages.where(parent_id: parent_ids).pluck(:id, :is_published)
+      states |= descendants.map(&:last)
+      parent_ids = descendants.map(&:first)
+    end
+    states
+  end
+
   def update_children_publication(is_published, message)
     descendant_ids = @page.descendants.map(&:id)
-    @site.pages
-      .where(id: descendant_ids)
-      .update_all(is_published: is_published, updated_at: Time.current)
-    default = is_published ? 'Child pages published' : 'Child pages unpublished'
+    @page.class.transaction do
+      @site.pages
+        .where(id: descendant_ids)
+        .update_all(is_published: is_published, updated_at: Time.current)
+      @page.clear_site_content_cache!
+    end
+    default = is_published ? 'Descendant pages published' : 'Descendant pages unpublished'
     flash[:success] = I18n.t("comfy.admin.cms.pages.#{message}", default: default)
     redirect_to action: :edit, id: @page
   end
@@ -189,6 +220,20 @@ protected
     pages_by_parent
   end
 
+  # Reuse loaded tree nodes and memoize shared ancestors for filtered results.
+  def page_publicly_visible?(page)
+    @page_visibility ||= {}
+    return @page_visibility[page.id] if @page_visibility.key?(page.id)
+
+    @visibility_pages ||= (Array(@pages) + [@page] + (@pages_by_parent || {}).values.flatten)
+      .compact.index_by(&:id)
+    @page_visibility[page.id] = page.is_published? && (
+      page.parent_id.nil? || page_publicly_visible?(
+        @visibility_pages[page.parent_id] ||= @site.pages.find(page.parent_id)
+      )
+    )
+  end
+
   def page_branch_open?(page)
     page.root? || page_tree_session.member?(page.id.to_s)
   end

data/app/controllers/comfy/cms/content_controller.rb

@@ -80,6 +80,8 @@ protected
                   @cms_site.pages.published.find_by!(full_path: full_path)
                 end
 
+    return nil unless Rails.env == 'development' || @cms_page.published_with_ancestors?
+
     @cms_page.translate!
     @cms_layout = @cms_page.layout
 

data/app/models/comfy/cms/page.rb

@@ -27,6 +27,9 @@ class Comfy::Cms::Page < ActiveRecord::Base
                     :assign_full_path
   before_create     :assign_position
   after_save        :sync_child_full_paths!
+  after_save        :clear_site_content_cache!,
+                    if: -> { is_published_previously_changed? || parent_id_previously_changed? }
+  after_destroy     :clear_site_content_cache!
   after_find        :unescape_slug_and_path
 
   # -- Validations -------------------------------------------------------------
@@ -89,6 +92,16 @@ class Comfy::Cms::Page < ActiveRecord::Base
   end
 
   # -- Instance Methods --------------------------------------------------------
+  def published_with_ancestors?
+    is_published? && ancestors.all?(&:is_published?)
+  end
+
+  def clear_site_content_cache!
+    pages = Comfy::Cms::Page.where(site_id: site_id)
+    pages.update_all(content_cache: nil)
+    Comfy::Cms::Translation.where(page_id: pages.select(:id)).update_all(content_cache: nil)
+  end
+
   # For previewing purposes sometimes we need to have full_path set. This
   # full path take care of the pages and its childs but not of the site path
   def full_path

data/app/views/comfy/admin/cms/layouts/_index_branch.html.haml

@@ -3,7 +3,7 @@
 
 %li{data: {id: layout.id}}
   .row
-    .col-md-8.item
+    .col-12.col-md.item
       .item-controls.d-none.d-md-block
         - if has_siblings
           .dragger
@@ -15,7 +15,7 @@
         .item-meta
           = layout.identifier
 
-    .col-md-4.d-flex.align-items-center.justify-content-md-end
+    .col-12.col-md-auto.layout-actions.d-flex.align-items-center.justify-content-md-end
       .btn-group.btn-group-sm
         = link_to t('.add_child_layout'), new_comfy_admin_cms_site_layout_path(@site, parent_id: layout.id), class: "btn btn-outline-secondary"
         = link_to t('.edit'), edit_comfy_admin_cms_site_layout_path(@site, layout), class: "btn btn-outline-secondary"

data/app/views/comfy/admin/cms/pages/_form.html.haml

@@ -22,11 +22,13 @@
 - if (options = ::Comfy::Cms::Page.options_for_select(site: @site, current_page: @page)).present?
   = form.select :target_page_id, [["---- #{t('.select_target_page')} ----", nil]] + options, bootstrap: {custom_control: true}
 
-= form.check_box :is_published
+- if @page.new_record?
+  = form.check_box :is_published
 
 = comfy_admin_partial "comfy/admin/cms/partials/page_form_after", form: form
 
-= form.form_actions do
-  = submit_tag t(".preview"), name: "preview", formtarget: "comfy-cms-preview", id: nil, class: "btn btn-secondary"
-  = submit_tag t(@page.new_record?? ".create" : ".update"), class: "btn btn-primary ml-sm-1"
-  = link_to t(".cancel"), comfy_admin_cms_site_pages_path, class: "btn btn-link"
+- if @page.new_record?
+  = form.form_actions do
+    = submit_tag t(".preview"), name: "preview", formtarget: "comfy-cms-preview", id: nil, class: "btn btn-secondary"
+    = submit_tag t(".create"), class: "btn btn-primary ml-sm-1"
+    = link_to t(".cancel"), comfy_admin_cms_site_pages_path, class: "btn btn-link"

data/app/views/comfy/admin/cms/pages/_index_branch.html.haml

@@ -5,6 +5,7 @@
 - has_children    = children.present? || page.children_count.to_i.positive?
 - has_siblings    = siblings.size > 1
 - branch_open     = page_branch_open?(page)
+- publicly_visible = page_publicly_visible?(page)
 
 %li{id: dom_id(page), data: {id: page.id}}
   .row
@@ -25,10 +26,12 @@
 
       .item-content
         .item-title
-          - published_css_class = page.is_published? ? "published" : "draft"
+          - published_css_class = publicly_visible ? "published" : "draft"
           = link_to page.label, edit_comfy_admin_cms_site_page_path(@site, page), class: published_css_class
         .item-meta
           = link_to page.url, page.url, target: "_blank"
+          - if page.is_published? && !publicly_visible
+            .publication-status= t('.hidden_by_ancestor', default: 'Hidden by unpublished ancestor')
 
     .col-md-2.item-categories.d-flex.align-items-center
       = render "comfy/admin/cms/categories/categories", object: page

data/app/views/comfy/admin/cms/pages/edit.html.haml

@@ -3,14 +3,50 @@
   = render "comfy/admin/cms/revisions/sidebar", record: @page, link: link
   = render "comfy/admin/cms/translations/sidebar"
 
-.page-header.d-flex.justify-content-between.align-items-center
-  %h2= t('.title')
-  - if @page.children.exists?
-    .btn-group.btn-group-sm
-      = link_to t('.publish_children', default: 'Publish children'), publish_children_comfy_admin_cms_site_page_path(@site, @page), method: :patch, data: {confirm: t('.publish_children_confirmation', default: 'Publish all child pages?')}, class: 'btn btn-success'
-      = link_to t('.unpublish_children', default: 'Unpublish children'), unpublish_children_comfy_admin_cms_site_page_path(@site, @page), method: :patch, data: {confirm: t('.unpublish_children_confirmation', default: 'Unpublish all child pages?')}, class: 'btn btn-outline-secondary'
-
 - draft_data = cms_draft_form_data('site', @site.id, 'page', @page.id, record: @page)
 = comfy_form_with model: @page, scope: :page, url: {action: :update}, html: {multipart: true, data: draft_data} do |form|
   = hidden_field_tag :cms_draft_key, draft_data[:cms_draft_key]
+  .page-header.page-editor-toolbar
+    .page-editor-heading
+      %h2= t('.title')
+
+    .page-editor-actions
+      = submit_tag t('comfy.admin.cms.pages.form.preview'), name: 'preview', formtarget: 'comfy-cms-preview', id: nil, class: 'btn btn-sm btn-outline-secondary text-nowrap', data: {disable_with: false}
+      = submit_tag t('comfy.admin.cms.pages.form.update'), class: 'btn btn-sm btn-primary text-nowrap', data: {disable_with: false}
+      - publication_action = @page.is_published? ? 'unpublish' : 'publish'
+      - publication_label = @page.is_published? ? t('.unpublish', default: 'Unpublish') : t('.publish', default: 'Publish')
+      - publication_hint = @page.is_published? ? t('.save_and_unpublish_hint', default: 'Save and unpublish page') : t('.save_and_publish_hint', default: 'Save and publish page')
+      = button_tag publication_label, name: 'publication_action', value: publication_action, class: 'btn btn-sm btn-outline-secondary text-nowrap', title: publication_hint, aria: {describedby: 'page-publication-hint'}
+      - if @page.children.exists?
+        - publication_states = descendant_publication_states(@page)
+        .dropdown
+          %button#child-pages-menu.btn.btn-sm.btn-outline-secondary.dropdown-toggle.text-nowrap{type: 'button', data: {toggle: 'dropdown'}, aria: {haspopup: 'true', expanded: 'false', controls: 'child-pages-actions'}}
+            = t('.child_pages', default: 'Child pages')
+          #child-pages-actions.dropdown-menu.dropdown-menu-right{aria: {labelledby: 'child-pages-menu'}}
+            - if publication_states.include?(false)
+              = link_to t('.publish_descendants', default: 'Publish descendants'), publish_children_comfy_admin_cms_site_page_path(@site, @page), method: :patch, data: {confirm: t('.publish_descendants_confirmation', default: 'Publish all descendant pages?')}, class: 'dropdown-item'
+            - else
+              %button.dropdown-item.disabled{type: 'button', disabled: true, aria: {disabled: 'true'}}= t('.publish_descendants', default: 'Publish descendants')
+            - if publication_states.include?(true)
+              = link_to t('.unpublish_descendants', default: 'Unpublish descendants'), unpublish_children_comfy_admin_cms_site_page_path(@site, @page), method: :patch, data: {confirm: t('.unpublish_descendants_confirmation', default: 'Unpublish all descendant pages?')}, class: 'dropdown-item'
+            - else
+              %button.dropdown-item.disabled{type: 'button', disabled: true, aria: {disabled: 'true'}}= t('.unpublish_descendants', default: 'Unpublish descendants')
+            .dropdown-divider
+            .px-4.py-1.small.text-muted= t('.descendants_hint', default: 'Changes descendants only; does not save this page’s edits.')
+      = link_to t('comfy.admin.cms.pages.form.cancel'), comfy_admin_cms_site_pages_path(@site), class: 'btn btn-sm btn-link text-nowrap'
+    .page-publication-state.small.text-muted{role: 'status'}
+      - if !@page.is_published?
+        = t('.unpublished_notice', default: 'Unpublished.')
+        = t('.branch_visibility_notice', default: 'Descendants hidden, with their publication settings unchanged.')
+      - elsif !@page.published_with_ancestors?
+        = t('.hidden_status', default: 'Hidden by unpublished ancestor')
+      - else
+        = t('.published', default: 'Published')
+    %span#page-publication-hint{hidden: true}= publication_hint
+
+  - if @page.is_published? && !@page.published_with_ancestors?
+    .alert.alert-info.publication-status{role: 'status'}
+      = t('.hidden_by_ancestor', default: 'Hidden by unpublished ancestor.')
+      = t('.branch_visibility_notice', default: 'Descendants hidden, with their publication settings unchanged.')
+
   = render form

data/app/views/layouts/comfy/admin/cms/_flash.html.haml

@@ -1,4 +1,4 @@
 - flash.to_hash.except('cms_saved_draft_key').each do |type, message|
-  .alert{:class => "alert-#{type}"}
+  .alert.fade.show{class: "alert-#{type}", data: {cms_flash: true}, role: %w[success info].include?(type) ? 'status' : 'alert'}
     %button.close{:type => 'button', :class => "close", :data => {:dismiss => 'alert'}} ×
     = message

data/config/locales/en.yml

@@ -123,10 +123,10 @@ en:
         pages:
           created: Page created, siblings, and parent updated
           creation_failure: Failed to create page
-          updated: Page, siblings, and parent updated
+          updated: Page updated
           update_failure: Failed to update page
-          children_published: Child pages published
-          children_unpublished: Child pages unpublished
+          children_published: Descendant pages published
+          children_unpublished: Descendant pages unpublished
           deleted: Page deleted, siblings, and parent updated
           not_found: Page not found
           layout_not_found: No Layouts found. Please create one.

data/lib/comfy_middle_seat/content/tags/breadcrumbs.rb

@@ -24,16 +24,21 @@ class ComfyMiddleSeat::Content::Tags::Breadcrumbs < ComfyMiddleSeat::Content::Ta
     @style = ''
     @style = "<style>#breadcrumbs {#{@locals['style']}}</style>" if @locals['style']
 
-    @links = '<div id="breadcrumbs">'
-    context.ancestors.reverse.each do |a|
-      next if Rails.env == 'production' && !a.is_published
+    page = context.is_a?(Comfy::Cms::Translation) ? context.page : context
+    @visible = Rails.env.development? || page.published_with_ancestors?
+    @links = ''
+    return unless @visible
 
+    @links = '<div id="breadcrumbs">'
+    page.ancestors.reverse.each do |a|
       @links += "<a href=#{a.url(relative: true)}>#{a.label}</a> &raquo; "
     end
     @links += "#{context.label}</div>"
   end
 
   def content
+    return '' unless @visible
+
     "#{@style}#{@links}"
   end
 end

data/lib/comfy_middle_seat/content/tags/children.rb

@@ -27,15 +27,20 @@ class ComfyMiddleSeat::Content::Tags::Children < ComfyMiddleSeat::Content::Tag
     @exclude = []
     @exclude = @locals['exclude'].split(',').map(&:strip) if @locals['exclude']
     @list = ''
-    # ActiveRecord_Associations_CollectionProxy
-    @page_children = context.children.order(:position).to_ary
-    unless Rails.env == 'development'
-      @page_children.delete_if { |child| !child.is_published }
-    end
+    page = context.is_a?(Comfy::Cms::Translation) ? context.page : context
+    preview = Rails.env.development?
+    @visible = preview || page.published_with_ancestors?
+    @page_children = []
+    return unless @visible
+
+    @page_children = page.children.order(:position).to_ary
+    @page_children.select!(&:is_published?) unless preview
     @page_children.delete_if { |child| @exclude.include? child.slug }
   end
 
   def content
+    return '' unless @visible
+
     if @page_children.any?
       @list = "<ul id=\"children\">\n"
       @page_children.each do |c|

data/lib/comfy_middle_seat/content/tags/siblings.rb

@@ -29,28 +29,32 @@ class ComfyMiddleSeat::Content::Tags::Siblings < ComfyMiddleSeat::Content::Tag
     @exclude = []
     @exclude = @locals['exclude'].split(',') if @locals['exclude']
     @links = ''
-    # ActiveRecord_Associations_CollectionProxy
-    @sibs = context.self_and_siblings.order(:position).to_ary
-    unless Rails.env == 'development'
-      @sibs.delete_if { |sib| !sib.is_published }
-    end
+    @page = context.is_a?(Comfy::Cms::Translation) ? context.page : context
+    preview = Rails.env.development?
+    @visible = preview || @page.published_with_ancestors?
+    @sibs = []
+    return unless @visible
+
+    @sibs = @page.self_and_siblings.order(:position).to_ary
+    @sibs.select!(&:is_published?) unless preview
     @sibs.delete_if { |sib| @exclude.include? sib.slug }
   end
 
   def content
+    return '' unless @visible
+
     if @sibs.count > 1
       @links = '<div id="siblings">'
       prevp = false
       @sibs.each do |sib|
         sib_idx = @sibs.index(sib)
-        next if sib.slug == context.slug
-        next if Rails.env == 'production' && !sib.is_published
-        next unless @sibs.index(context) # current page is excluded
+        next if sib.slug == @page.slug
+        next unless @sibs.index(@page) # current page is excluded
 
-        if sib_idx == @sibs.index(context) - 1
+        if sib_idx == @sibs.index(@page) - 1
           @links += "<a href=#{sib.url(relative: true)}>#{sib.label}</a> &laquo;&nbsp;<em>Previous</em> &bull; "
           prevp = true
-        elsif sib_idx == @sibs.index(context) + 1
+        elsif sib_idx == @sibs.index(@page) + 1
           @links += '&bull;' unless prevp
           @links += "<em>Next</em>&nbsp;&raquo; <a href=#{sib.url(relative: true)}>#{sib.label}</a>"
         end

data/lib/comfy_middle_seat/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ComfyMiddleSeat
-  VERSION = '4.0.4'
+  VERSION = '4.2.0'
 end

data/package-lock.json

@@ -868,8 +868,7 @@
       "version": "3.7.1",
       "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",
       "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/micromatch": {
       "version": "4.0.8",
@@ -918,7 +917,6 @@
       "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
       "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
       "license": "MIT",
-      "peer": true,
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/popperjs"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfy_middle_seat
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 4.2.0
 platform: ruby
 authors:
 - Oleg Khabarov
@@ -237,6 +237,7 @@ files:
 - app/assets/javascripts/comfy/admin/cms/file_link.js
 - app/assets/javascripts/comfy/admin/cms/file_upload.js
 - app/assets/javascripts/comfy/admin/cms/files_modal.js
+- app/assets/javascripts/comfy/admin/cms/flash_notices.js
 - app/assets/javascripts/comfy/admin/cms/page_fragments.js
 - app/assets/javascripts/comfy/admin/cms/slugify.js
 - app/assets/javascripts/comfy/admin/cms/sortable_list.js
@@ -306,6 +307,8 @@ files:
 - app/assets/stylesheets/comfy/admin/cms/base.sass
 - app/assets/stylesheets/comfy/admin/cms/codemirror_overrides.sass
 - app/assets/stylesheets/comfy/admin/cms/custom.sass
+- app/assets/stylesheets/comfy/admin/cms/harbor.sass
+- app/assets/stylesheets/comfy/admin/cms/harbor_variables.sass
 - app/assets/stylesheets/comfy/admin/cms/redactor_overrides.sass
 - app/assets/stylesheets/comfy/vendor/bootstrap/_alert.scss
 - app/assets/stylesheets/comfy/vendor/bootstrap/_badge.scss