pageflow 15.8.0 → 16.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1bbd00f3c57790e6bdeb0ffd65d56fa29eb3c239b31a1b92c11fed242f9423e
-  data.tar.gz: d9d44c5a5273ffd92086d3303bf5806347c16406083ff60ece793b6e09de7e71
+  metadata.gz: 9eecaf374cbaeadfc23532153d00c0a52a936c42d36ab65bbed903991ba6f0cf
+  data.tar.gz: 5b59c6b626e32a1fd748fdfea56e96741c9dce6061ec9709b2ac905722dba6ee
 SHA512:
-  metadata.gz: 96f45b7ee97ae6218a92b973b9265437dafc8709587f50035d1a8cfb733022d7dbdfd82a79e3545fa71f5e6d8f45347fcd207c897a2c0cf961c6441045a60381
-  data.tar.gz: 786c1620c4977004d401dcd85ee51868abfb5bb4ce6c48c0131ce4e79fa481e1f8880f05c2a3498bc782b409769eff81d6b7e6c45f496a56901a266b02a4bd59
+  metadata.gz: 331856460e25d862e8dd49b835ae55fb838bea2db00de10a59d45a1ae5d501ccdb9e671b81714d832cc5dfe741d3e6dc96e261bb3732bae2b60827ece4766f27
+  data.tar.gz: 9b9119cd2f1ac7db1daeaf3273210b6b02a2d2e00633ae432213a6c828a4798ac8db6926fb608116dbdf653326385e8adfb312eeeb664d40c7ecad2fef82ba46

data/CHANGELOG.md

@@ -1,152 +1,232 @@
 # CHANGELOG
 
-### Version 15.8.0
+### Version 16.1.0
 
-2022-12-23
+2023-10-25
 
-[Compare changes](https://github.com/codevise/pageflow/compare/15-7-stable...v15.8.0)
+[Compare changes](https://github.com/codevise/pageflow/compare/16-0-stable...v16.1.0)
 
 #### Core
 
-##### Rails Engine
+##### Published Entry
 
-- Permalinks
-  ([#1883](https://github.com/codevise/pageflow/pull/1883))
-- Add user_changed hook
-  ([#1859](https://github.com/codevise/pageflow/pull/1859))
-- Allow adding id in data attribute when adding editor main menu item
-  ([#1837](https://github.com/codevise/pageflow/pull/1837))
+- Add feature flag to use HLS in all Desktop browsers
+  ([#1924](https://github.com/codevise/pageflow/pull/1924))
+- Atom feeds
+  ([#1941](https://github.com/codevise/pageflow/pull/1941),
+   [#1949](https://github.com/codevise/pageflow/pull/1949))
+- Add XML sitemaps for sites
+  ([#1944](https://github.com/codevise/pageflow/pull/1944),
+   [#1945](https://github.com/codevise/pageflow/pull/1945))
+  ([#1924](https://github.com/codevise/pageflow/pull/1924))
+- Allow using custom feeds urls for sites
+  ([#1952](https://github.com/codevise/pageflow/pull/1952),
+   [#1953](https://github.com/codevise/pageflow/pull/1953))
 
 ##### Admin
 
-- Improve membership update
-  ([#1862](https://github.com/codevise/pageflow/pull/1862))
+- Hide permalink directory drop down with single item
+  ([#1917](https://github.com/codevise/pageflow/pull/1917))
 
 ##### Editor
 
-- Improve file import controller
-  ([#1847](https://github.com/codevise/pageflow/pull/1847))
+- Allow turning default widgets off
+  ([#1965](https://github.com/codevise/pageflow/pull/1965))
+- Use short label for editor help button
+  ([#1970](https://github.com/codevise/pageflow/pull/1970))
+- Filter out widgets of unknown widget types
+  ([#1961](https://github.com/codevise/pageflow/pull/1961))
+- Bug fix: Prevent normalizing color input too early
+  ([#1992](https://github.com/codevise/pageflow/pull/1992))
+- Bug fix: Do not scale images up when creating panorama styles
+  ([#1920](https://github.com/codevise/pageflow/pull/1920))
 
-##### Published Entry
+##### Rails Engine
 
-- Display opt-out vendors as accepted by default on privacy page
-  ([#1899](https://github.com/codevise/pageflow/pull/1899))
+- Add public_entry_cache_control_header config option
+  ([#1999](https://github.com/codevise/pageflow/pull/1999))
+- Make default published until duration configurable
+  ([#1955](https://github.com/codevise/pageflow/pull/1955))
+- Exclude react-rails 2.7 from supported versions
+  ([#1963](https://github.com/codevise/pageflow/pull/1963))
+- Allow any 2.6 version of react-rails
+  ([#1964](https://github.com/codevise/pageflow/pull/1964))
 
 ##### JavaScript API
 
-- Pass alt text in media events
-  ([#1901](https://github.com/codevise/pageflow/pull/1901))
-- Provide more tracking data
-  ([#1885](https://github.com/codevise/pageflow/pull/1885))
+- Add throttled media events
+  ([#1939](https://github.com/codevise/pageflow/pull/1939))
 
-##### Internal
+##### Documentation
 
-- Migrate to supported setup-ruby action
-  ([#1892](https://github.com/codevise/pageflow/pull/1892))
+- Make CORS config json
+  ([#1956](https://github.com/codevise/pageflow/pull/1956))
 
+##### Internal
+
+- Run core specs agains Rails 6.1/Ruby 3.2
+  ([#1998](https://github.com/codevise/pageflow/pull/1998))
+- Fix Zeitwerk compatibility
+  ([#2013](https://github.com/codevise/pageflow/pull/2013))
+- Run plugin specs in reusable workflow against Rails 6.1
+  ([#2012](https://github.com/codevise/pageflow/pull/2012))
+- Move RailsVersion helper from support to core gem
+  ([#2006](https://github.com/codevise/pageflow/pull/2006))
+- Fix paged specs for Rails 6
+  ([#2004](https://github.com/codevise/pageflow/pull/2004))
+- Fix scrolled specs for Rails 6
+  ([#2003](https://github.com/codevise/pageflow/pull/2003))
+- Fix core specs for Rails 6
+  ([#2000](https://github.com/codevise/pageflow/pull/2000))
+- Fix Active Record errors deprecation warning
+  ([#2015](https://github.com/codevise/pageflow/pull/2015))
+- Fix SSR webpack-dev-server client code removal for Webpack 5
+  ([#2018](https://github.com/codevise/pageflow/pull/2018))
+- Support both Webpacker and Shakapacker
+  ([#2017](https://github.com/codevise/pageflow/pull/2017))
+- Remove Coveralls integration
+  ([#2016](https://github.com/codevise/pageflow/pull/2016))
+- Fix webdrivers for Chrome 115
+  ([#1983](https://github.com/codevise/pageflow/pull/1983))
 
 #### Paged Entry Type
 
 ##### Published Entry
 
-- Add feature flag to enforce usage of FullHD videos
-  ([#1879](https://github.com/codevise/pageflow/pull/1879))
-- Allow enforcing best video quality in Paged entries
-  ([#1863](https://github.com/codevise/pageflow/pull/1863))
-- Ensure scroller content is accessible via OS X Spoken Content
-  ([#1870](https://github.com/codevise/pageflow/pull/1870))
+- Bug fix: Fix scrolling classic page content on Windows 10 with touch screen
+  ([#1916](https://github.com/codevise/pageflow/pull/1916))
 
 ##### Internal
 
-- Missing semicolon in themes/default/page.scss
-  ([#1898](https://github.com/codevise/pageflow/pull/1898))
+- Allow seeding text to paged entries
+  ([#1929](https://github.com/codevise/pageflow/pull/1929))
 
 #### Scrolled Entry Type
 
-##### Editor
-
-- Set correct lang attribute on html element in editor preview iframe
-  ([#1867](https://github.com/codevise/pageflow/pull/1867),
-   [#1872](https://github.com/codevise/pageflow/pull/1872))
-- Bug: Ensure link tooltip is readable in inverted sections
-  ([#1849](https://github.com/codevise/pageflow/pull/1849))
-
 ##### Published Entry
 
-- Section and chapter inline links
-  ([#1886](https://github.com/codevise/pageflow/pull/1886))
-- Typography variants
-  ([#1842](https://github.com/codevise/pageflow/pull/1842),
-   [#1845](https://github.com/codevise/pageflow/pull/1845))
-- Improve backdrop hiding
-  ([#1882](https://github.com/codevise/pageflow/pull/1881),
-   [#1881](https://github.com/codevise/pageflow/pull/1882))
-- Backdrop effects
-  ([#1841](https://github.com/codevise/pageflow/pull/1841),
-   [#1846](https://github.com/codevise/pageflow/pull/1846))
-- Make border radius of cards appearance configurable
-  ([#1838](https://github.com/codevise/pageflow/pull/1838))
-- Allow using SVG images as backdrops and inline images
-  ([#1860](https://github.com/codevise/pageflow/pull/1860))
-- Improve scrolled favicons
-  ([#1858](https://github.com/codevise/pageflow/pull/1858))
-- Use public translations from pageflow-public-i18n in scrolled
-  ([#1853](https://github.com/codevise/pageflow/pull/1853))
-- Rewrite backdrop/motif area logic based on CSS as experimental feature
-  ([#1854](https://github.com/codevise/pageflow/pull/1854),
-   [#1855](https://github.com/codevise/pageflow/pull/1855),
-   [#1856](https://github.com/codevise/pageflow/pull/1856))
-- Bug: Prevent foreground shadow from overlaying next section
-  ([#1900](https://github.com/codevise/pageflow/pull/1900))
-- Bug: Ensure backdrop covers viewport in iOS in-app browers
-  ([#1884](https://github.com/codevise/pageflow/pull/1884))
+- Support portrait backdrop videos
+  ([#1930](https://github.com/codevise/pageflow/pull/1930))
+- Clear inlined float
+  ([#1995](https://github.com/codevise/pageflow/pull/1995))
+- Allow placing floated elements side by side
+  ([#1979](https://github.com/codevise/pageflow/pull/1979))
+- Improve blessing media elements for iOS
+  ([#1928](https://github.com/codevise/pageflow/pull/1928))
+- Make feature flag to enforce FullHD videos available for scrolled
+  ([#1927](https://github.com/codevise/pageflow/pull/1927))
+- Upgrade to video.js 7.21 and http-streaming 2.16
+  ([#1925](https://github.com/codevise/pageflow/pull/1925))- Decrease external link font size on mobile
+  ([#1926](https://github.com/codevise/pageflow/pull/1926))
+- Reduce spacing between list items
+  ([#1938](https://github.com/codevise/pageflow/pull/1938))
+- Make text block spacing more consistent between editor and published entry
+  ([#1997](https://github.com/codevise/pageflow/pull/1997))
+- Improve onVisible/onInvisible callbacks
+  ([#1947](https://github.com/codevise/pageflow/pull/1947),
+   [#1950](https://github.com/codevise/pageflow/pull/1950))
+- Set text direction attribute for scrolled entries
+  ([#1975](https://github.com/codevise/pageflow/pull/1975))
+- Use Rails fragment cache for scrolled entries
+  ([#2001](https://github.com/codevise/pageflow/pull/2001))
+- Fix two column motif area content measuring
+  ([#1990](https://github.com/codevise/pageflow/pull/1990))
+- Bug fix: Ignore volume setting in Scrolled
+  ([#1921](https://github.com/codevise/pageflow/pull/1921))
+- Bug fix: Prevent line artifact between sections on Chrome
+  ([#1935](https://github.com/codevise/pageflow/pull/1935))
+- Bug fix: Remove legacy clip for revealed sections
+  ([#1993](https://github.com/codevise/pageflow/pull/1993))
 
 ##### Content Elements
 
-- Disable automatic hyphenation in text block headings
-  ([#1875](https://github.com/codevise/pageflow/pull/1875))
-- Disable top padding for new headings
-  ([#1896](https://github.com/codevise/pageflow/pull/1896))
-- Remove space before heading in cards appearance
-  ([#1851](https://github.com/codevise/pageflow/pull/1851))
-- Text block line breaks
-  ([#1869](https://github.com/codevise/pageflow/pull/1869),
-   [#1871](https://github.com/codevise/pageflow/pull/1871))
-- Improve mobile block quote size
-  ([#1868](https://github.com/codevise/pageflow/pull/1868))
-- Preserve Tweet hide when unloading
-  ([#1864](https://github.com/codevise/pageflow/pull/1864))
-- Question content element
-  ([#1861](https://github.com/codevise/pageflow/pull/1861))
-- Improve video embed content element
-  ([#1848](https://github.com/codevise/pageflow/pull/1848),
-   [#1850](https://github.com/codevise/pageflow/pull/1850))
+- Enable full screen view for inline images
+  ([#1902](https://github.com/codevise/pageflow/pull/1902))
+- Add stand-alone quote element
+  ([#1931](https://github.com/codevise/pageflow/pull/1931),
+   [#1932](https://github.com/codevise/pageflow/pull/1932),
+   [#1958](https://github.com/codevise/pageflow/pull/1958),
+   [#1982](https://github.com/codevise/pageflow/pull/1982))
+- Add counter content element
+  ([#1934](https://github.com/codevise/pageflow/pull/1934),
+   [#1940](https://github.com/codevise/pageflow/pull/1940),
+   [#1943](https://github.com/codevise/pageflow/pull/1943),
+   [#1984](https://github.com/codevise/pageflow/pull/1984),
+   [#2007](https://github.com/codevise/pageflow/pull/2007))
+- Add image gallery content element
+  ([#1966](https://github.com/codevise/pageflow/pull/1966),
+   [#1980](https://github.com/codevise/pageflow/pull/1980),
+   [#1968](https://github.com/codevise/pageflow/pull/1968),
+   [#1969](https://github.com/codevise/pageflow/pull/1969),
+   [#1978](https://github.com/codevise/pageflow/pull/1978))
+- Custom margin for image galleries
+  ([#1971](https://github.com/codevise/pageflow/pull/1971),
+   [#1972](https://github.com/codevise/pageflow/pull/1972),
+   [#1973](https://github.com/codevise/pageflow/pull/1973))
+- Content element widths
+  ([#1989](https://github.com/codevise/pageflow/pull/1989))
+- Consent opt-in for iframe embed element
+  ([#2005](https://github.com/codevise/pageflow/pull/2005))
+- Bug fix: Prevent white lines around external link image
+  ([#1994](https://github.com/codevise/pageflow/pull/1994))
+- Allow setting portrait version for inline videos
+  ([#2019](https://github.com/codevise/pageflow/pull/2019))
 
 ##### Widgets
 
-- Fix info box position when all share providers are disabled
-  ([#1877](https://github.com/codevise/pageflow/pull/1877))
-- Add option to prevent collapsing default navigation on desktop
-  ([#1891](https://github.com/codevise/pageflow/pull/1891))
-- Options for scrolled default navigation
-  ([#1866](https://github.com/codevise/pageflow/pull/1866))
+- Display rights of all files in credits box
+  ([#1959](https://github.com/codevise/pageflow/pull/1959))
+- Extract scrolled consent bar into widget
+  ([#1976](https://github.com/codevise/pageflow/pull/1976))
 
-##### Themes
+##### Editor
 
-- Let themes define external link list variants
-  ([#1880](https://github.com/codevise/pageflow/pull/1880))
-- Text block theme properties
-  ([#1873](https://github.com/codevise/pageflow/pull/1873))
-- Add theme properties for cards colors
-  ([#1865](https://github.com/codevise/pageflow/pull/1865))
-- Pass consistent arguments when transforming theme options
-  ([#1844](https://github.com/codevise/pageflow/pull/1844))
+- Display and edit section transitions via outline
+  ([#2009](https://github.com/codevise/pageflow/pull/2009),
+   [#2010](https://github.com/codevise/pageflow/pull/2010),
+   [#2011](https://github.com/codevise/pageflow/pull/2011))
+- Duplicating sections
+  ([#2008](https://github.com/codevise/pageflow/pull/2008))
+- Add file type drop down to link dialog
+  ([#1919](https://github.com/codevise/pageflow/pull/1919))
+- File links
+  ([#1918](https://github.com/codevise/pageflow/pull/1918))
+- Introduce palettes
+  ([#1936](https://github.com/codevise/pageflow/pull/1936),
+   [#1946](https://github.com/codevise/pageflow/pull/1946))
+- Introduce file type priorities to fix text track upload in scrolled
+  ([#1962](https://github.com/codevise/pageflow/pull/1962))
+- Do not display single item position drop down
+  ([#1996](https://github.com/codevise/pageflow/pull/1996))
+
+##### Theme API
+
+- Improve content color properties
+  ([#1923](https://github.com/codevise/pageflow/pull/1923))
+- Make content text color available in custom property
+  ([#1937](https://github.com/codevise/pageflow/pull/1937))
+- Add theme properties for quote mark font family and color
+  ([#1977](https://github.com/codevise/pageflow/pull/1977))
+- Add list related theme properties
+  ([#1981](https://github.com/codevise/pageflow/pull/1981))
+- Add theme property for marker color of unordered list items
+  ([#1985](https://github.com/codevise/pageflow/pull/1985))
+- Allow changing light and dark text color of headings
+  ([#1987](https://github.com/codevise/pageflow/pull/1987))
+- Allow using SVG data URLs as quote marks
+  ([#1988](https://github.com/codevise/pageflow/pull/1988))
+- Allow coloring SVG quote mark symbol with palette colors
+  ([#2002](https://github.com/codevise/pageflow/pull/2002))
+- Let themes use quote variant with centered quote mark
+  ([#2014](https://github.com/codevise/pageflow/pull/2014))
 
 ##### Internal
 
-- Also set Webpack public path for editor JS.
-  ([#1874](https://github.com/codevise/pageflow/pull/1874))
+- Support scopes in storybook theme properties
+  ([#1986](https://github.com/codevise/pageflow/pull/1986))
+- Use different widths in appearance stories
+  ([#1991](https://github.com/codevise/pageflow/pull/1991))
 
 See
-[15-7-stable branch](https://github.com/codevise/pageflow/blob/15-7-stable/CHANGELOG.md)
+[16-0-stable branch](https://github.com/codevise/pageflow/blob/16-0-stable/CHANGELOG.md)
 for previous changes.

data/README.md

@@ -2,7 +2,6 @@
 
 [![Gem Version](https://badge.fury.io/rb/pageflow.svg)](http://badge.fury.io/rb/pageflow)
 [![Build Status](https://github.com/codevise/pageflow/workflows/tests/badge.svg)](https://github.com/codevise/pageflow/actions)
-[![Coverage Status](https://coveralls.io/repos/github/codevise/pageflow/badge.svg?branch=master)](https://coveralls.io/github/codevise/pageflow?branch=master)
 [![Code Climate](https://codeclimate.com/github/codevise/pageflow/badges/gpa.svg)](https://codeclimate.com/github/codevise/pageflow)
 [![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com)
 

data/Rakefile

@@ -30,7 +30,7 @@ end
 require File.expand_path('spec/support/pageflow/dummy/app', File.dirname(__FILE__))
 APP_RAKEFILE = File.expand_path("../#{Pageflow::Dummy::App.new.directory}/Rakefile", __FILE__)
 
-load 'rails/tasks/engine.rake' if File.exists?(APP_RAKEFILE)
+load 'rails/tasks/engine.rake' if File.exist?(APP_RAKEFILE)
 load File.expand_path('lib/tasks/pageflow_tasks.rake', File.dirname(__FILE__))
 
 Bundler::GemHelper.install_tasks

data/admins/pageflow/accounts.rb

@@ -59,12 +59,11 @@ module Pageflow
 
     show :title => :name do |account|
       render 'account_details', :account => account
-      render 'theming_details', :account => account
 
-      tabs_view(Pageflow.config.admin_resource_tabs.find_by_resource(account.default_theming),
+      tabs_view(Pageflow.config.admin_resource_tabs.find_by_resource(account),
                 i18n: 'pageflow.admin.resource_tabs',
-                authorize: :see_theming_admin_tab,
-                build_args: [account.default_theming])
+                authorize: :see_account_admin_tab,
+                build_args: [account])
     end
 
     controller do
@@ -76,14 +75,14 @@ module Pageflow
 
       def new
         @account = Account.new
-        @account.build_default_theming
+        @account.build_default_site
       end
 
       def create
         account_params = permitted_params[:account] || {}
         @account = Account.new(account_params)
-        @account.build_default_theming(permitted_params.fetch(:account, {})[
-                                         :default_theming_attributes])
+        @account.build_default_site(permitted_params.fetch(:account, {})[
+                                         :default_site_attributes])
         super
       end
 
@@ -100,7 +99,7 @@ module Pageflow
       end
 
       def scoped_collection
-        super.includes(:default_theming)
+        super.includes(:default_site)
       end
 
       private
@@ -115,12 +114,12 @@ module Pageflow
         [
           :name,
           :default_file_rights,
-          default_theming_attributes: permitted_theming_attributes
+          default_site_attributes: permitted_site_attributes
         ] +
           permitted_attributes_for(:account)
       end
 
-      def permitted_theming_attributes
+      def permitted_site_attributes
         [
           :cname,
           :additional_cnames,
@@ -131,15 +130,12 @@ module Pageflow
           :privacy_link_url,
           :home_url
         ] +
-          permitted_attributes_for(:theming)
+          permitted_attributes_for(:site)
       end
 
       def permitted_attributes_for(resource_name)
-        if params[:id]
-          Pageflow.config_for(resource).admin_form_inputs.permitted_attributes_for(resource_name)
-        else
-          []
-        end
+        config = params[:id] ? Pageflow.config_for(resource) : Pageflow.config
+        config.admin_form_inputs.permitted_attributes_for(resource_name)
       end
 
       def permit_feature_states(attributes)

data/admins/pageflow/entry.rb

@@ -99,13 +99,13 @@ module Pageflow
                                   .order(:name)
                               end)
 
-    searchable_select_options(name: :eligible_themings,
-                              text_attribute: :name,
+    searchable_select_options(name: :eligible_sites,
+                              text_attribute: :name_with_account_prefix,
                               scope: lambda do |params|
-                                entry = Entry.find(params[:entry_id])
-                                ThemingPolicy::Scope
-                                  .new(current_user, Theming)
-                                  .themings_allowed_for(entry.account)
+                                account = Account.find(params[:account_id])
+                                SitePolicy::Scope
+                                  .new(current_user, Site)
+                                  .sites_allowed_for(account)
                               end,
                               filter: lambda do |term, scope|
                                 scope.ransack(account_name_cont: term).result
@@ -139,11 +139,13 @@ module Pageflow
       end
     end
 
-    collection_action :entry_type_name_input do
+    collection_action :entry_site_and_type_name_input do
       account = Pageflow::Account.find(params[:account_id])
       @entry = Pageflow::Entry.new(account: account,
                                    type_name: params[:entry_type_name])
 
+      apply_entry_defaults(@entry)
+
       if authorized?(:see_entry_types, account)
         render(layout: false)
       else
@@ -197,15 +199,15 @@ module Pageflow
       helper FoldersHelper
       helper EntriesHelper
       helper EmbedCodeHelper
-      helper ThemingsHelper
+      helper SitesHelper
       helper Admin::EntriesHelper
       helper Admin::FeaturesHelper
       helper Admin::FormHelper
       helper Admin::MembershipsHelper
-      helper Admin::PermalinksHelper
       helper Admin::RevisionsHelper
 
       helper_method :account_policy_scope
+      helper_method :site_policy_scope
 
       after_build do |entry|
         apply_entry_defaults(entry)
@@ -218,8 +220,8 @@ module Pageflow
       end
 
       before_update do |entry|
-        if entry.account_id_changed? && !authorized?(:update_theming_on, resource)
-          entry.theming = entry.account.default_theming
+        if entry.account_id_changed? && !authorized?(:update_site_on, resource)
+          entry.site = entry.account.default_site
         end
       end
 
@@ -232,7 +234,7 @@ module Pageflow
       def scoped_collection
         result =
           super
-          .includes(:theming,
+          .includes(:site,
                     {permalink: :directory},
                     :account,
                     {memberships: :user},
@@ -256,15 +258,15 @@ module Pageflow
 
       def apply_entry_defaults(entry)
         entry.account ||= account_policy_scope.entry_creatable.first || Account.first
-        entry.theming ||= entry.account.default_theming
+        entry.site ||= entry.account.default_site
       end
 
       def account_policy_scope
         AccountPolicy::Scope.new(current_user, Account)
       end
 
-      def theming_policy_scope
-        ThemingPolicy::Scope.new(current_user, Theming)
+      def site_policy_scope
+        SitePolicy::Scope.new(current_user, Site)
       end
 
       def permitted_attributes
@@ -286,10 +288,10 @@ module Pageflow
         if params[:id]
           accounts = resource.account
         else
-          accounts = account_policy_scope.themings_accessible
+          accounts = account_policy_scope.sites_accessible
         end
 
-        result += permitted_theming_attributes(accounts)
+        result += permitted_site_attributes(accounts)
 
         result
       end
@@ -301,26 +303,26 @@ module Pageflow
         end
       end
 
-      def permitted_theming_attributes(accounts)
-        if (create_or_new_action? || authorized?(:update_theming_on, resource)) &&
-           theming_params_present? && theming_in_allowed_themings_for?(accounts)
-          [:theming_id]
+      def permitted_site_attributes(accounts)
+        if (create_or_new_action? || authorized?(:update_site_on, resource)) &&
+           site_params_present? && site_in_allowed_sites_for?(accounts)
+          [:site_id]
         else
           []
         end
       end
 
-      def theming_params_present?
-        params[:entry] && params[:entry][:theming_id]
+      def site_params_present?
+        params[:entry] && params[:entry][:site_id]
       end
 
       def create_or_new_action?
         [:create, :new, :permalink_inputs].include?(action_name.to_sym)
       end
 
-      def theming_in_allowed_themings_for?(accounts)
-        theming_policy_scope.themings_allowed_for(accounts)
-          .include?(Theming.find(params[:entry][:theming_id]))
+      def site_in_allowed_sites_for?(accounts)
+        site_policy_scope.sites_allowed_for(accounts)
+          .include?(Site.find(params[:entry][:site_id]))
       end
 
       def permitted_account_attributes

data/admins/pageflow/entry_templates.rb

@@ -5,7 +5,7 @@ module Pageflow
     actions :index, :new, :create, :edit, :update
     form partial: 'form'
 
-    belongs_to :account, parent_class: Pageflow::Account
+    belongs_to :site, parent_class: Pageflow::Site
 
     breadcrumb do
       breadcrumb_links.first 3
@@ -20,9 +20,7 @@ module Pageflow
       end
 
       def new
-        account = Account.find(params[:account_id])
-        @entry_template = EntryTemplate.new(
-          account: account,
+        @entry_template = parent.entry_templates.build(
           entry_type_name: params[:entry_type_name]
         )
 
@@ -32,8 +30,8 @@ module Pageflow
       end
 
       def create
-        @entry_template = EntryTemplate.new(
-          entry_template_params.merge(account_id: permitted_params[:account_id])
+        @entry_template = parent.entry_templates.build(
+          entry_template_params
         )
         @page_title = page_title('new', @entry_template.entry_type_name)
         authorize!(:create, @entry_template)
@@ -87,7 +85,7 @@ module Pageflow
       end
 
       def redirect_path
-        admin_account_path(params[:account_id], tab: 'entry_templates')
+        admin_account_site_path(parent.account, parent, tab: 'entry_templates')
       end
 
       def entry_template_params