alchemy_cms 8.2.5 → 8.2.6

data/app/assets/builds/tinymce/skins/content/alchemy/content.min.css

@@ -1 +1 @@
-:root{--a-lightest-grey: hsl(200deg, 5%, 90%);--a-lighter-grey: hsl(200deg, 5%, 70%);--a-light-grey: hsl(200deg, 5%, 35%);--a-grey: hsl(200deg, 5%, 22.5%);--a-dark-grey: hsl(200deg, 5%, 17.5%);--a-darker-grey: hsl(200deg, 5%, 15%);--a-darkest-grey: hsl(200deg, 5%, 12.5%);--color-blue_very_light: hsl(203deg, 32%, 97%);--color-blue_light: hsl(203deg, 32%, 85%);--color-blue_medium: hsl(212deg, 52%, 36%);--color-blue_dark: hsl(212deg, 52%, 26%);--color-green_very_light: hsl(88deg, 47%, 88%);--color-green_light: hsl(127deg, 25%, 69%);--color-green_medium: hsl(127deg, 25%, 48%);--color-green_dark: hsl(128deg, 32%, 26%);--color-yellow_light: hsl(60deg, 81%, 92%);--color-yellow_medium: hsl(56deg, 68%, 85%);--color-yellow_dark: hsl(56deg, 53%, 29%);--color-orange_medium: hsl(42deg, 100%, 74%);--color-orange_dark: hsl(28deg, 77%, 68%);--color-orange_very_dark: hsl(28deg, 77%, 48%);--color-red_very_light: hsl(0deg, 47%, 88%);--color-red_light: hsl(0deg, 25%, 69%);--color-red_medium: hsl(0deg, 51%, 42%);--color-red_dark: hsl(0deg, 51%, 25%);--color-grey_very_light: hsl(0deg, 0%, 97%);--color-grey_light: hsl(0deg, 0%, 94%);--color-grey_medium: hsl(0deg, 0%, 78%);--color-grey_dark: hsl(0deg, 0%, 40%);--color-grey_very_dark: hsl(0deg, 0%, 20%);--color-white: hsl(0deg, 0%, 100%);--spacing-0: 2px;--spacing-1: 4px;--spacing-2: 8px;--spacing-3: 12px;--spacing-4: 16px;--spacing-5: 20px;--spacing-6: 24px;--spacing-7: 28px;--spacing-8: 32px;--spacing-9: 36px;--spacing-10: 40px;--font-mono: Menlo, Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace;--font-sans: "Open Sans", "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Verdana, Tahoma, sans-serif;--font-size_small: 10px;--font-size_medium: 12px;--font-size_large: 16px;--font-weight_normal: 500;--font-weight_bold: 700;--font-default: var(--font-size_medium) var(--font-sans);--border-radius_medium: 3px;--border-width_small: 1px;--border-style: solid;--border-default: var(--border-width_small) var(--border-style) var(--border-color);--transition-duration: 250ms;--transition-easing: linear;--button-border-radius: var(--border-radius_medium);--button-border-style: var(--border-style);--button-border-width: var(--border-width_small);--button-border: var(--button-border-width) var(--button-border-style) var(--button-border-color);--button-font-size: var(--font-size_medium);--button-font-weight: var(--font-weight_bold);--button-height: 30px;--button-line-height: var(--form-field-line-height);--button-margin: var(--form-field-margin);--button-padding: var(--spacing-1) var(--spacing-5);--button-small-padding: 0.4em 0.8em;--datepicker-font-size: var(--font-size_medium);--dialog-header-height: 36px;--dialog-header-font-size: var(--font-size_medium);--dialog-header-padding: 0 var(--spacing-2);--dialog-transition-duration: 150ms;--elements-window-width: 0px;--elements-window-min-width: 400px;--elements-window-transition-easing: ease-in-out;--form-left-column-width: 35%;--form-right-column-width: 65%;--form-field-margin: var(--spacing-1) 0;--form-field-height: 31px;--form-field-addon-width: 30px;--form-field-border-width: var(--border-width_small);--form-field-border-style: var(--border-style);--form-field-padding: var(--spacing-1) var(--spacing-2);--form-field-font-size: var(--font-size_medium);--form-field-line-height: 1.25;--header-height: 29px;--header-border-bottom: var(--border-default);--icon-button-height: 30px;--icon-button-width: 30px;--icon-button-medium-height: 26px;--icon-button-medium-width: 26px;--icon-button-small-height: 15px;--icon-button-small-width: 15px;--icon-size-xs: 0.75rem;--icon-size-sm: 0.875rem;--icon-size-1x: 1rem;--icon-size-md: 1.3rem;--icon-size-xl: 1.5rem;--icon-size-xxl: 1.6rem;--main-menu-width: 170px;--top-menu-height: 75px;--main-menu-entry-max-width: 110px;--pagination-height: 52px;--select-medium-width: 90px;--select-large-width: 120px;--select-x-large-width: 180px;--sidebar-width: 232px;--toolbar-height: 46px;--toolbar-padding: var(--spacing-2) var(--spacing-1)}html{font-size:13px}body{font-family:var(--font-sans);line-height:1.4;margin:1em;color:#333}a{color:#000}table{border-collapse:collapse}table td,table th{border:1px solid #666;padding:.4rem}figure{display:table;margin:1rem auto}figure figcaption{color:#333;display:block;margin-top:.25rem;text-align:center}hr{border-color:#666;border-style:solid;border-width:1px 0 0 0}code{background-color:#999;border-radius:var(--border-radius_medium);padding:.1rem .2rem}.mce-content-body:not([dir=rtl]) blockquote{border-left:2px solid #666;margin-left:1.5rem;padding-left:1rem}.mce-content-body[dir=rtl] blockquote{border-right:2px solid #666;margin-right:1.5rem;padding-right:1rem}
+:root{--a-lightest-grey: hsl(200deg, 5%, 90%);--a-lighter-grey: hsl(200deg, 5%, 70%);--a-light-grey: hsl(200deg, 5%, 35%);--a-grey: hsl(200deg, 5%, 22.5%);--a-dark-grey: hsl(200deg, 5%, 17.5%);--a-darker-grey: hsl(200deg, 5%, 15%);--a-darkest-grey: hsl(200deg, 5%, 12.5%);--color-blue_very_light: hsl(203deg, 32%, 97%);--color-blue_light: hsl(203deg, 32%, 85%);--color-blue_medium: hsl(212deg, 52%, 36%);--color-blue_dark: hsl(212deg, 52%, 26%);--color-green_very_light: hsl(88deg, 47%, 88%);--color-green_light: hsl(127deg, 25%, 69%);--color-green_medium: hsl(127deg, 25%, 48%);--color-green_dark: hsl(128deg, 32%, 26%);--color-yellow_light: hsl(60deg, 81%, 92%);--color-yellow_medium: hsl(56deg, 68%, 85%);--color-yellow_dark: hsl(56deg, 53%, 29%);--color-orange_medium: hsl(42deg, 100%, 74%);--color-orange_dark: hsl(28deg, 77%, 68%);--color-orange_very_dark: hsl(28deg, 77%, 48%);--color-red_very_light: hsl(0deg, 47%, 88%);--color-red_light: hsl(0deg, 25%, 69%);--color-red_medium: hsl(0deg, 51%, 42%);--color-red_dark: hsl(0deg, 51%, 25%);--color-grey_very_light: hsl(0deg, 0%, 97%);--color-grey_light: hsl(0deg, 0%, 94%);--color-grey_medium: hsl(0deg, 0%, 78%);--color-grey_dark: hsl(0deg, 0%, 40%);--color-grey_very_dark: hsl(0deg, 0%, 20%);--color-white: hsl(0deg, 0%, 100%);--spacing-0: 2px;--spacing-1: 4px;--spacing-2: 8px;--spacing-3: 12px;--spacing-4: 16px;--spacing-5: 20px;--spacing-6: 24px;--spacing-7: 28px;--spacing-8: 32px;--spacing-9: 36px;--spacing-10: 40px;--font-mono: Menlo, Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace;--font-sans: "Open Sans", "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Verdana, Tahoma, sans-serif;--font-size_small: 10px;--font-size_medium: 12px;--font-size_large: 16px;--font-weight_normal: 500;--font-weight_bold: 700;--font-default: var(--font-size_medium) var(--font-sans);--border-radius_medium: 3px;--border-width_small: 1px;--border-style: solid;--border-default: var(--border-width_small) var(--border-style) var(--border-color);--transition-duration: 250ms;--transition-easing: linear;--button-border-radius: var(--border-radius_medium);--button-border-style: var(--border-style);--button-border-width: var(--border-width_small);--button-border: var(--button-border-width) var(--button-border-style) var(--button-border-color);--button-font-size: var(--font-size_medium);--button-font-weight: var(--font-weight_bold);--button-height: 30px;--button-line-height: var(--form-field-line-height);--button-margin: var(--form-field-margin);--button-padding: var(--spacing-1) var(--spacing-5);--button-small-padding: 0.4em 0.8em;--datepicker-font-size: var(--font-size_medium);--dialog-header-height: 36px;--dialog-header-font-size: var(--font-size_medium);--dialog-header-padding: 0 var(--spacing-2);--dialog-transition-duration: 150ms;--elements-window-width: 0px;--elements-window-min-width: 300px;--elements-window-transition-easing: ease-in-out;--form-left-column-width: 35%;--form-right-column-width: 65%;--form-field-margin: var(--spacing-1) 0;--form-field-height: 31px;--form-field-addon-width: 30px;--form-field-border-width: var(--border-width_small);--form-field-border-style: var(--border-style);--form-field-padding: var(--spacing-1) var(--spacing-2);--form-field-font-size: var(--font-size_medium);--form-field-line-height: 1.25;--header-height: 29px;--header-border-bottom: var(--border-default);--icon-button-height: 30px;--icon-button-width: 30px;--icon-button-medium-height: 26px;--icon-button-medium-width: 26px;--icon-button-small-height: 15px;--icon-button-small-width: 15px;--icon-size-xs: 0.75rem;--icon-size-sm: 0.875rem;--icon-size-1x: 1rem;--icon-size-md: 1.3rem;--icon-size-xl: 1.5rem;--icon-size-xxl: 1.6rem;--main-menu-width: 170px;--top-menu-height: 75px;--main-menu-entry-max-width: 110px;--pagination-height: 52px;--select-medium-width: 90px;--select-large-width: 120px;--select-x-large-width: 180px;--sidebar-width: 232px;--toolbar-height: 46px;--toolbar-padding: var(--spacing-2) var(--spacing-1)}html{font-size:13px}body{font-family:var(--font-sans);line-height:1.4;margin:1em;color:#333}a{color:#000}table{border-collapse:collapse}table td,table th{border:1px solid #666;padding:.4rem}figure{display:table;margin:1rem auto}figure figcaption{color:#333;display:block;margin-top:.25rem;text-align:center}hr{border-color:#666;border-style:solid;border-width:1px 0 0 0}code{background-color:#999;border-radius:var(--border-radius_medium);padding:.1rem .2rem}.mce-content-body:not([dir=rtl]) blockquote{border-left:2px solid #666;margin-left:1.5rem;padding-left:1rem}.mce-content-body[dir=rtl] blockquote{border-right:2px solid #666;margin-right:1.5rem;padding-right:1rem}

data/app/assets/builds/tinymce/skins/content/alchemy-dark/content.min.css

@@ -1 +1 @@
-:root{--a-lightest-grey: hsl(200deg, 5%, 90%);--a-lighter-grey: hsl(200deg, 5%, 70%);--a-light-grey: hsl(200deg, 5%, 35%);--a-grey: hsl(200deg, 5%, 22.5%);--a-dark-grey: hsl(200deg, 5%, 17.5%);--a-darker-grey: hsl(200deg, 5%, 15%);--a-darkest-grey: hsl(200deg, 5%, 12.5%);--color-blue_very_light: hsl(203deg, 32%, 97%);--color-blue_light: hsl(203deg, 32%, 85%);--color-blue_medium: hsl(212deg, 52%, 36%);--color-blue_dark: hsl(212deg, 52%, 26%);--color-green_very_light: hsl(88deg, 47%, 88%);--color-green_light: hsl(127deg, 25%, 69%);--color-green_medium: hsl(127deg, 25%, 48%);--color-green_dark: hsl(128deg, 32%, 26%);--color-yellow_light: hsl(60deg, 81%, 92%);--color-yellow_medium: hsl(56deg, 68%, 85%);--color-yellow_dark: hsl(56deg, 53%, 29%);--color-orange_medium: hsl(42deg, 100%, 74%);--color-orange_dark: hsl(28deg, 77%, 68%);--color-orange_very_dark: hsl(28deg, 77%, 48%);--color-red_very_light: hsl(0deg, 47%, 88%);--color-red_light: hsl(0deg, 25%, 69%);--color-red_medium: hsl(0deg, 51%, 42%);--color-red_dark: hsl(0deg, 51%, 25%);--color-grey_very_light: hsl(0deg, 0%, 97%);--color-grey_light: hsl(0deg, 0%, 94%);--color-grey_medium: hsl(0deg, 0%, 78%);--color-grey_dark: hsl(0deg, 0%, 40%);--color-grey_very_dark: hsl(0deg, 0%, 20%);--color-white: hsl(0deg, 0%, 100%);--spacing-0: 2px;--spacing-1: 4px;--spacing-2: 8px;--spacing-3: 12px;--spacing-4: 16px;--spacing-5: 20px;--spacing-6: 24px;--spacing-7: 28px;--spacing-8: 32px;--spacing-9: 36px;--spacing-10: 40px;--font-mono: Menlo, Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace;--font-sans: "Open Sans", "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Verdana, Tahoma, sans-serif;--font-size_small: 10px;--font-size_medium: 12px;--font-size_large: 16px;--font-weight_normal: 500;--font-weight_bold: 700;--font-default: var(--font-size_medium) var(--font-sans);--border-radius_medium: 3px;--border-width_small: 1px;--border-style: solid;--border-default: var(--border-width_small) var(--border-style) var(--border-color);--transition-duration: 250ms;--transition-easing: linear;--button-border-radius: var(--border-radius_medium);--button-border-style: var(--border-style);--button-border-width: var(--border-width_small);--button-border: var(--button-border-width) var(--button-border-style) var(--button-border-color);--button-font-size: var(--font-size_medium);--button-font-weight: var(--font-weight_bold);--button-height: 30px;--button-line-height: var(--form-field-line-height);--button-margin: var(--form-field-margin);--button-padding: var(--spacing-1) var(--spacing-5);--button-small-padding: 0.4em 0.8em;--datepicker-font-size: var(--font-size_medium);--dialog-header-height: 36px;--dialog-header-font-size: var(--font-size_medium);--dialog-header-padding: 0 var(--spacing-2);--dialog-transition-duration: 150ms;--elements-window-width: 0px;--elements-window-min-width: 400px;--elements-window-transition-easing: ease-in-out;--form-left-column-width: 35%;--form-right-column-width: 65%;--form-field-margin: var(--spacing-1) 0;--form-field-height: 31px;--form-field-addon-width: 30px;--form-field-border-width: var(--border-width_small);--form-field-border-style: var(--border-style);--form-field-padding: var(--spacing-1) var(--spacing-2);--form-field-font-size: var(--font-size_medium);--form-field-line-height: 1.25;--header-height: 29px;--header-border-bottom: var(--border-default);--icon-button-height: 30px;--icon-button-width: 30px;--icon-button-medium-height: 26px;--icon-button-medium-width: 26px;--icon-button-small-height: 15px;--icon-button-small-width: 15px;--icon-size-xs: 0.75rem;--icon-size-sm: 0.875rem;--icon-size-1x: 1rem;--icon-size-md: 1.3rem;--icon-size-xl: 1.5rem;--icon-size-xxl: 1.6rem;--main-menu-width: 170px;--top-menu-height: 75px;--main-menu-entry-max-width: 110px;--pagination-height: 52px;--select-medium-width: 90px;--select-large-width: 120px;--select-x-large-width: 180px;--sidebar-width: 232px;--toolbar-height: 46px;--toolbar-padding: var(--spacing-2) var(--spacing-1)}html{font-size:13px}body{font-family:var(--font-sans);line-height:1.4;margin:1em;background-color:var(--a-darkest-grey);color:var(--a-lighter-grey)}a{color:var(--a-lightest-grey)}table{border-collapse:collapse}table td,table th{border:1px solid var(--a-grey);padding:.4rem}figure{display:table;margin:1rem auto}figure figcaption{color:var(--a-lighter-grey);display:block;margin-top:.25rem;text-align:center}hr{border-color:var(--a-grey);border-style:solid;border-width:1px 0 0 0}code{background-color:var(--a-darkest-grey);border-radius:var(--border-radius_medium);padding:.1rem .2rem}.mce-content-body:not([dir=rtl]) blockquote{border-left:2px solid var(--a-grey);margin-left:1.5rem;padding-left:1rem}.mce-content-body[dir=rtl] blockquote{border-right:2px solid var(--a-grey);margin-right:1.5rem;padding-right:1rem}
+:root{--a-lightest-grey: hsl(200deg, 5%, 90%);--a-lighter-grey: hsl(200deg, 5%, 70%);--a-light-grey: hsl(200deg, 5%, 35%);--a-grey: hsl(200deg, 5%, 22.5%);--a-dark-grey: hsl(200deg, 5%, 17.5%);--a-darker-grey: hsl(200deg, 5%, 15%);--a-darkest-grey: hsl(200deg, 5%, 12.5%);--color-blue_very_light: hsl(203deg, 32%, 97%);--color-blue_light: hsl(203deg, 32%, 85%);--color-blue_medium: hsl(212deg, 52%, 36%);--color-blue_dark: hsl(212deg, 52%, 26%);--color-green_very_light: hsl(88deg, 47%, 88%);--color-green_light: hsl(127deg, 25%, 69%);--color-green_medium: hsl(127deg, 25%, 48%);--color-green_dark: hsl(128deg, 32%, 26%);--color-yellow_light: hsl(60deg, 81%, 92%);--color-yellow_medium: hsl(56deg, 68%, 85%);--color-yellow_dark: hsl(56deg, 53%, 29%);--color-orange_medium: hsl(42deg, 100%, 74%);--color-orange_dark: hsl(28deg, 77%, 68%);--color-orange_very_dark: hsl(28deg, 77%, 48%);--color-red_very_light: hsl(0deg, 47%, 88%);--color-red_light: hsl(0deg, 25%, 69%);--color-red_medium: hsl(0deg, 51%, 42%);--color-red_dark: hsl(0deg, 51%, 25%);--color-grey_very_light: hsl(0deg, 0%, 97%);--color-grey_light: hsl(0deg, 0%, 94%);--color-grey_medium: hsl(0deg, 0%, 78%);--color-grey_dark: hsl(0deg, 0%, 40%);--color-grey_very_dark: hsl(0deg, 0%, 20%);--color-white: hsl(0deg, 0%, 100%);--spacing-0: 2px;--spacing-1: 4px;--spacing-2: 8px;--spacing-3: 12px;--spacing-4: 16px;--spacing-5: 20px;--spacing-6: 24px;--spacing-7: 28px;--spacing-8: 32px;--spacing-9: 36px;--spacing-10: 40px;--font-mono: Menlo, Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace;--font-sans: "Open Sans", "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Verdana, Tahoma, sans-serif;--font-size_small: 10px;--font-size_medium: 12px;--font-size_large: 16px;--font-weight_normal: 500;--font-weight_bold: 700;--font-default: var(--font-size_medium) var(--font-sans);--border-radius_medium: 3px;--border-width_small: 1px;--border-style: solid;--border-default: var(--border-width_small) var(--border-style) var(--border-color);--transition-duration: 250ms;--transition-easing: linear;--button-border-radius: var(--border-radius_medium);--button-border-style: var(--border-style);--button-border-width: var(--border-width_small);--button-border: var(--button-border-width) var(--button-border-style) var(--button-border-color);--button-font-size: var(--font-size_medium);--button-font-weight: var(--font-weight_bold);--button-height: 30px;--button-line-height: var(--form-field-line-height);--button-margin: var(--form-field-margin);--button-padding: var(--spacing-1) var(--spacing-5);--button-small-padding: 0.4em 0.8em;--datepicker-font-size: var(--font-size_medium);--dialog-header-height: 36px;--dialog-header-font-size: var(--font-size_medium);--dialog-header-padding: 0 var(--spacing-2);--dialog-transition-duration: 150ms;--elements-window-width: 0px;--elements-window-min-width: 300px;--elements-window-transition-easing: ease-in-out;--form-left-column-width: 35%;--form-right-column-width: 65%;--form-field-margin: var(--spacing-1) 0;--form-field-height: 31px;--form-field-addon-width: 30px;--form-field-border-width: var(--border-width_small);--form-field-border-style: var(--border-style);--form-field-padding: var(--spacing-1) var(--spacing-2);--form-field-font-size: var(--font-size_medium);--form-field-line-height: 1.25;--header-height: 29px;--header-border-bottom: var(--border-default);--icon-button-height: 30px;--icon-button-width: 30px;--icon-button-medium-height: 26px;--icon-button-medium-width: 26px;--icon-button-small-height: 15px;--icon-button-small-width: 15px;--icon-size-xs: 0.75rem;--icon-size-sm: 0.875rem;--icon-size-1x: 1rem;--icon-size-md: 1.3rem;--icon-size-xl: 1.5rem;--icon-size-xxl: 1.6rem;--main-menu-width: 170px;--top-menu-height: 75px;--main-menu-entry-max-width: 110px;--pagination-height: 52px;--select-medium-width: 90px;--select-large-width: 120px;--select-x-large-width: 180px;--sidebar-width: 232px;--toolbar-height: 46px;--toolbar-padding: var(--spacing-2) var(--spacing-1)}html{font-size:13px}body{font-family:var(--font-sans);line-height:1.4;margin:1em;background-color:var(--a-darkest-grey);color:var(--a-lighter-grey)}a{color:var(--a-lightest-grey)}table{border-collapse:collapse}table td,table th{border:1px solid var(--a-grey);padding:.4rem}figure{display:table;margin:1rem auto}figure figcaption{color:var(--a-lighter-grey);display:block;margin-top:.25rem;text-align:center}hr{border-color:var(--a-grey);border-style:solid;border-width:1px 0 0 0}code{background-color:var(--a-darkest-grey);border-radius:var(--border-radius_medium);padding:.1rem .2rem}.mce-content-body:not([dir=rtl]) blockquote{border-left:2px solid var(--a-grey);margin-left:1.5rem;padding-left:1rem}.mce-content-body[dir=rtl] blockquote{border-right:2px solid var(--a-grey);margin-right:1.5rem;padding-right:1rem}

data/app/components/alchemy/admin/timezone_select.rb

@@ -22,7 +22,7 @@ module Alchemy
 
       def popover_content
         content_tag(:div, class: "alchemy-popover") do
-          form_tag(helpers.url_for, method: :get, class: "timezone-select") do
+          form_tag(request.path, method: :get, class: "timezone-select") do
             label_tag(:admin_timezone, Alchemy.t(:timezone)) +
               content_tag("alchemy-auto-submit") do
                 select_tag(

data/app/controllers/alchemy/admin/pages_controller.rb

@@ -68,8 +68,8 @@ module Alchemy
       def tree
         @root_page = Alchemy::PageTreePreloader.new(
           page: @current_language.root_page,
-          user: current_alchemy_user,
-          admin_includes: true
+          ability: current_ability,
+          user: current_alchemy_user
         ).call
       end
 
@@ -181,8 +181,8 @@ module Alchemy
             if was_folded
               @page = PageTreePreloader.new(
                 page: @page,
-                user: current_alchemy_user,
-                admin_includes: true
+                ability: current_ability,
+                user: current_alchemy_user
               ).call
             else
               head 200

data/app/controllers/alchemy/api/pages_controller.rb

@@ -28,8 +28,14 @@ module Alchemy
     def nested
       @page = Page.find_by(id: params[:page_id]) || Language.current_root_page
 
-      # Preload the full tree from this page
-      preloaded_page = PageTreePreloader.new(page: @page, user: current_alchemy_user).call
+      authorize! :show, @page
+
+      # Preload the full tree from this page, scoped to what the user may see
+      preloaded_page = PageTreePreloader.new(
+        page: @page,
+        user: current_alchemy_user,
+        ability: current_ability
+      ).call
 
       render json: PageTreeSerializer.new(
         preloaded_page,

data/app/javascript/alchemy_admin/components/element_editor.js

@@ -250,7 +250,10 @@ export class ElementEditor extends HTMLElement {
    */
   setTitle(title) {
     const quote = this.querySelector(".element-header .preview_text_quote")
-    quote.textContent = title
+    // Fixed elements have no header, so there is no quote to update.
+    if (quote) {
+      quote.textContent = title
+    }
   }
 
   /**

data/app/javascript/alchemy_admin/components/elements_window_handle.js

@@ -1,7 +1,11 @@
+const MIN_WIDTH = 400
+const MAX_WIDTH = 1000
 class ElementsWindowHandle extends HTMLElement {
   #dragging = false
   #elementsWindow = null
   #previewWindow = null
+  #minWidth = MIN_WIDTH
+  #maxWidth = MAX_WIDTH
 
   constructor() {
     super()
@@ -30,6 +34,13 @@ class ElementsWindowHandle extends HTMLElement {
 
   onMouseDown() {
     this.#dragging = true
+    // Read the resolved min/max width the browser computed from the CSS
+    // custom properties (incl. calc() and active media queries) once, so the
+    // drag stays clamped to the same bounds the stylesheet defines.
+    const styles = getComputedStyle(this.elementsWindow)
+    this.#minWidth = parseFloat(styles.minWidth) || MIN_WIDTH
+    this.#maxWidth =
+      styles.maxWidth === "none" ? MAX_WIDTH : parseFloat(styles.maxWidth)
     this.elementsWindow.isDragged = true
     this.previewWindow.isDragged = true
     this.classList.add("is-dragged")
@@ -44,7 +55,11 @@ class ElementsWindowHandle extends HTMLElement {
 
   onDrag(pageX) {
     const elementWindowWidth = window.innerWidth - pageX
-    this.elementsWindow.resize(elementWindowWidth)
+    const width = Math.min(
+      Math.max(elementWindowWidth, this.#minWidth),
+      this.#maxWidth
+    )
+    this.elementsWindow.resize(width)
   }
 
   get elementsWindow() {

data/app/javascript/alchemy_admin/components/page_publication_fields.js

@@ -1,12 +1,8 @@
 // Handles the page publication date fields
 export class PagePublicationFields extends HTMLElement {
   connectedCallback() {
-    const public_on_picker = this.querySelector(
-      "alchemy-datepicker:has(#page_public_on)"
-    )
-    const public_until_picker = this.querySelector(
-      "alchemy-datepicker:has(#page_public_until)"
-    )
+    const public_on_picker = this.querySelector("input#page_public_on")
+    const public_until_picker = this.querySelector("input#page_public_until")
     const publication_date_fields = this.querySelector(
       ".page-publication-date-fields"
     )
@@ -16,16 +12,19 @@ export class PagePublicationFields extends HTMLElement {
 
     public_field.addEventListener("click", function (evt) {
       const checkbox = evt.target
-      const now = new Date()
+      const date = new Date()
+      const now = new Date(
+        date.getTime() - date.getTimezoneOffset() * 60000
+      ).toISOString()
 
       if (checkbox.checked) {
         publication_date_fields.classList.remove("hidden")
-        public_on_picker.flatpickr.setDate(now)
+        public_on_picker.value = now.substring(0, now.indexOf("T") + 6)
       } else {
         publication_date_fields.classList.add("hidden")
-        public_on_picker.flatpickr.clear()
+        public_on_picker.value = ""
       }
-      public_until_picker.flatpickr?.clear()
+      public_until_picker.value = ""
     })
   }
 }

data/app/serializers/alchemy/page_tree_serializer.rb

@@ -63,6 +63,12 @@ module Alchemy
     end
 
     def page_elements(page)
+      # Pages usually arrive wrapped in a PageTreePage delegator. Unwrap it so
+      # the ability matches the Alchemy::Page rules instead of the delegator
+      # class, while still supporting a plain Alchemy::Page being passed in.
+      authorized_page = page.try(:__getobj__) || page
+      return Alchemy::Element.none unless opts[:ability].can?(:read, authorized_page)
+
       elements = page.public_version&.elements || Alchemy::Element.none
       if opts[:elements] == "true"
         elements

data/app/services/alchemy/page_tree_preloader.rb

@@ -7,24 +7,24 @@ module Alchemy
   # It handles folded pages and preloads all necessary associations.
   #
   # @example Preload subtree from a specific page
-  #   preloader = Alchemy::PageTreePreloader.new(page: page, user: current_user)
+  #   preloader = Alchemy::PageTreePreloader.new(page: page, ability: current_ability, user: current_user)
   #   page_with_descendants = preloader.call
   #
   class PageTreePreloader
     # @param page [Page] Starting page for loading descendants
+    # @param ability [CanCan::Ability] Ability used to scope descendants to readable pages
     # @param user [User, nil] User for folding support
-    # @param admin_includes [Boolean] Whether to include admin-only associations like :locker
-    def initialize(page:, user: nil, admin_includes: false)
+    def initialize(page:, ability:, user: nil)
       @page = page
+      @ability = ability
       @user = user
-      @admin_includes = admin_includes
     end
 
     # Preloads and returns the page tree
     #
     # @return [Array<Page>] Pages with preloaded children, or array with single page when using from:
     def call
-      pages = page.self_and_descendants
+      pages = page.self_and_descendants.accessible_by(ability, :read)
       folded_page_ids = load_folded_page_ids
       if folded_page_ids.any?
         pages = pages.where(
@@ -45,7 +45,7 @@ module Alchemy
 
     private
 
-    attr_reader :page, :user, :admin_includes
+    attr_reader :page, :user, :ability
 
     # Load folded page IDs for the user
     def load_folded_page_ids
@@ -93,7 +93,9 @@ module Alchemy
         },
         :public_version
       ]
-      associations.push(:locker) if admin_includes
+      # The admin sitemap (and the serializer's admin fields) render lock info,
+      # so only eager-load the locker when the user may administer pages.
+      associations.push(:locker) if ability.can?(:index, :alchemy_admin_pages)
       associations
     end
   end

data/app/stylesheets/alchemy/_custom-properties.scss

@@ -107,7 +107,7 @@
 
   /* Elements */
   --elements-window-width: 0px;
-  --elements-window-min-width: 400px;
+  --elements-window-min-width: 300px;
   --elements-window-transition-easing: ease-in-out;
 
   /* Form */

data/app/stylesheets/alchemy/admin/elements.scss

@@ -32,6 +32,10 @@
 .elements-window-visible {
   --elements-window-width: calc(100vw - var(--main-menu-width));
 
+  @media screen and (min-width: vars.$large-screen-break-point) {
+    --elements-window-min-width: 400px;
+  }
+
   @media screen and (min-width: vars.$large-screen-break-point) {
     --elements-window-width: var(--elements-window-min-width);
   }

data/app/views/alchemy/admin/layoutpages/_layoutpage.html.erb

@@ -8,7 +8,7 @@
         <%= render_icon "file-edit", size: "xl" %>
       </sl-tooltip>
     <% else %>
-      <%= render_icon "file-edit", size: "xl" %>
+      <%= render_icon "file", size: "xl" %>
     <% end %>
     </div>
     <div class="sitemap_sitename without-status">

data/lib/alchemy/cache_digests/template_tracker.rb

@@ -18,8 +18,6 @@ module Alchemy
         when /^alchemy\/page_layouts\/_(\w+)/
           page_definition = PageDefinition.get($1)
           page_definition.elements.map { "alchemy/elements/_#{_1}" }
-        when /^alchemy\/elements\/_(\w+)/
-          ingredient_types($1).map { "alchemy/ingredients/_#{_1.underscore}_view" }.tap(&:uniq!)
         else
           ActionView::DependencyTracker::ERBTracker.call(@name, @template)
         end

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "8.2.5"
+  VERSION = "8.2.6"
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 8.2.5
+  version: 8.2.6
 platform: ruby
 authors:
 - Thomas von Deyen