pageflow 15.8.0 → 16.0.0

data/entry_types/scrolled/package/widgets/defaultNavigation.js

@@ -1,4 +1,4 @@
-import { useI18n, utils, Tooltip, useFileRights, useLegalInfo, useCredits, Widget, ThemeIcon, useShareUrl, useMediaMuted, useTheme, useOnUnmuteMedia, useChapters, useCurrentChapter, usePhonePlatform, useShareProviders, useScrollPosition, frontend } from 'pageflow-scrolled/frontend';
+import { useTheme, useI18n, utils, Tooltip, useFileRights, useLegalInfo, useCredits, Widget, ThemeIcon, useShareUrl, useMediaMuted, useOnUnmuteMedia, useChapters, useCurrentChapter, usePhonePlatform, useShareProviders, useScrollPosition, frontend } from 'pageflow-scrolled/frontend';
 import React, { useRef, useEffect, useCallback, useState } from 'react';
 import classNames from 'classnames';
 import { media } from 'pageflow/frontend';
@@ -79,18 +79,20 @@ function _slicedToArray(arr, i) {
 
 var styles = {"breakpoint-below-md":"(max-width: 767px)","navigationBar":"DefaultNavigation-module_navigationBar__2RK0h scope-defaultNavigation","navigationBarExpanded":"DefaultNavigation-module_navigationBarExpanded__C3sLq","navigationBarContentWrapper":"DefaultNavigation-module_navigationBarContentWrapper__3narH","menuIcon":"DefaultNavigation-module_menuIcon__2bb8s","contextIcons":"DefaultNavigation-module_contextIcons__2e65s","contextIcon":"DefaultNavigation-module_contextIcon__ELsqa utils-module_unstyledButton__3rgne","logo":"DefaultNavigation-module_logo__3gUbx","chapterList":"DefaultNavigation-module_chapterList__3VoXX scope-defaultNavigationChapterList","chapterListItem":"DefaultNavigation-module_chapterListItem__1YF5e","navigationTooltip":"DefaultNavigation-module_navigationTooltip__26Fvn","progressBar":"DefaultNavigation-module_progressBar__1jvov","progressIndicator":"DefaultNavigation-module_progressIndicator__2d_e3","hasChapters":"DefaultNavigation-module_hasChapters__3ab-r","navigationChapters":"DefaultNavigation-module_navigationChapters__3M6zh","navigationChaptersHidden":"DefaultNavigation-module_navigationChaptersHidden__2TrUo"};
 
-var styles$1 = {"breakpoint-md":"(min-width: 768px)","burgerMenuIconContainer":"HamburgerIcon-module_burgerMenuIconContainer__3aBkk","burgerMenuIcon":"HamburgerIcon-module_burgerMenuIcon__1WUV0"};
+var styles$1 = {"breakpoint-md":"(min-width: 768px)","burgerMenuIconContainer":"HamburgerIcon-module_burgerMenuIconContainer__3aBkk","burgerMenuIcon":"HamburgerIcon-module_burgerMenuIcon__1WUV0","small":"HamburgerIcon-module_small__asAkY"};
 
 var hamburgerIconStyles = {"hamburger":"HamburgerIcons-module_hamburger__SOreS","is-active":"HamburgerIcons-module_is-active__2jpzX","hamburger-inner":"HamburgerIcons-module_hamburger-inner__Wv7Dn","hamburger-box":"HamburgerIcons-module_hamburger-box__10MR1","hamburger--collapse":"HamburgerIcons-module_hamburger--collapse__1xOkf"};
 
 function HamburgerIcon(props) {
+  var theme = useTheme();
+
   var _useI18n = useI18n(),
       t = _useI18n.t;
 
   return /*#__PURE__*/React.createElement("div", {
     className: styles$1.burgerMenuIconContainer
   }, /*#__PURE__*/React.createElement("button", {
-    className: classNames(styles.menuIcon, styles$1.burgerMenuIcon, hamburgerIconStyles.hamburger, hamburgerIconStyles['hamburger--collapse'], _defineProperty({}, hamburgerIconStyles['is-active'], !props.mobileNavHidden)),
+    className: classNames(styles.menuIcon, styles$1.burgerMenuIcon, hamburgerIconStyles.hamburger, hamburgerIconStyles['hamburger--collapse'], _defineProperty({}, styles$1.small, theme.options.defaultNavigationMenuIconVariant === 'small'), _defineProperty({}, hamburgerIconStyles['is-active'], !props.mobileNavHidden)),
     title: props.mobileNavHidden ? t('pageflow_scrolled.public.navigation.open_mobile_menu') : t('pageflow_scrolled.public.navigation.close_mobile_menu'),
     type: "button",
     onClick: props.onClick
@@ -189,7 +191,7 @@ function LegalInfoMenu(props) {
   })));
 }
 
-var styles$4 = {"shareIcon":"SharingMenu-module_shareIcon__2iW2l","sharingTooltip":"SharingMenu-module_sharingTooltip__2Tyev","shareLinkContainer":"SharingMenu-module_shareLinkContainer__3-3W6","shareLink":"SharingMenu-module_shareLink__3PdRE"};
+var styles$4 = {"sharingTooltip":"SharingMenu-module_sharingTooltip__2Tyev","shareLinkContainer":"SharingMenu-module_shareLinkContainer__3-3W6","shareLink":"SharingMenu-module_shareLink__3PdRE"};
 
 function SharingMenu(_ref) {
   var shareProviders = _ref.shareProviders;
@@ -200,7 +202,6 @@ function SharingMenu(_ref) {
 
   function renderShareLinks(shareProviders) {
     return shareProviders.map(function (shareProvider) {
-      var Icon = shareProvider.icon;
       return /*#__PURE__*/React.createElement("div", {
         key: shareProvider.name,
         className: styles$4.shareLinkContainer
@@ -209,8 +210,8 @@ function SharingMenu(_ref) {
         href: shareProvider.url.replace('%{url}', shareUrl),
         target: '_blank',
         rel: "noopener noreferrer"
-      }, /*#__PURE__*/React.createElement(Icon, {
-        className: styles$4.shareIcon
+      }, /*#__PURE__*/React.createElement(ThemeIcon, {
+        name: shareProvider.iconName
       }), shareProvider.name));
     });
   }
@@ -586,7 +587,7 @@ function DefaultNavigation(_ref) {
   }
 
   var hideSharingButton = configuration.hideSharingButton || !shareProviders.length;
-  return /*#__PURE__*/React.createElement("header", {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("header", {
     className: classNames(styles.navigationBar, (_classNames2 = {}, _defineProperty(_classNames2, styles.navigationBarExpanded, navExpanded || !isPhonePlatform && configuration.fixedOnDesktop || !mobileNavHidden), _defineProperty(_classNames2, styles.hasChapters, hasChapters), _classNames2))
   }, /*#__PURE__*/React.createElement("div", {
     className: styles.navigationBarContentWrapper
@@ -607,7 +608,13 @@ function DefaultNavigation(_ref) {
     style: {
       width: readingProgress + '%'
     }
-  })));
+  }))), /*#__PURE__*/React.createElement(Widget, {
+    role: "defaultNavigationExtra",
+    props: {
+      navigationExpanded: navExpanded,
+      mobileNavigationVisible: !mobileNavHidden
+    }
+  }));
 }
 
 frontend.widgetTypes.register('defaultNavigation', {

data/lib/pageflow/ability_mixin.rb

@@ -95,7 +95,11 @@ module Pageflow
         Admin::EntryTabPolicy.new(user, tab).see?
       end
 
-      can :see_theming_admin_tab, Admin::Tab do |tab|
+      can :see_site_admin_tab, Admin::Tab do |tab|
+        Admin::AdminOnlyTabPolicy.new(user, tab).see?
+      end
+
+      can :see_account_admin_tab, Admin::Tab do |tab|
         Admin::AdminOnlyTabPolicy.new(user, tab).see?
       end
 
@@ -112,8 +116,8 @@ module Pageflow
           AccountPolicy.new(user, account).configure_folder_on?
         end
 
-        can :update_theming_on_entry_of, Account do |account|
-          AccountPolicy.new(user, account).update_theming_on_entry_of?
+        can :update_site_on_entry_of, Account do |account|
+          AccountPolicy.new(user, account).update_site_on_entry_of?
         end
 
         can :create, Entry do |entry|
@@ -180,8 +184,8 @@ module Pageflow
           EntryPolicy.new(user, entry).update_feature_configuration_on?
         end
 
-        can :update_theming_on, Entry do |entry|
-          EntryPolicy.new(user, entry).update_theming_on?
+        can :update_site_on, Entry do |entry|
+          EntryPolicy.new(user, entry).update_site_on?
         end
 
         can :use_files, Entry, EntryPolicy::Scope.new(user, Entry).resolve do |entry|
@@ -222,8 +226,12 @@ module Pageflow
           EntryPolicy.new(user, storyline.revision.entry).edit?
         end
 
-        can :edit, Theming do |theming|
-          ThemingPolicy.new(user, theming).edit?
+        can :read, Site do |site|
+          SitePolicy.new(user, site).read?
+        end
+
+        can :update, Site do |site|
+          SitePolicy.new(user, site).update?
         end
 
         can :create, EntryTemplate do |entry_template|
@@ -275,7 +283,7 @@ module Pageflow
         can :manage, [Entry, Revision]
         can :manage, Pageflow.config.file_types.map(&:model)
         can :manage, Folder
-        can :manage, Theming
+        can :manage, Site
         can :manage, EntryTemplate
         can :manage, ::User
       end

data/lib/pageflow/admin/attributes_table_rows.rb

@@ -12,7 +12,7 @@ module Pageflow
 
       # Insert an additional row into an attribute table.
       #
-      # @param resource_name [Symbol] Either :entry, :account or :theming.
+      # @param resource_name [Symbol] Either :entry, :account or :site.
       #
       # @param name [Symbol] Name of the attribute to display.
       #

data/lib/pageflow/admin/form_inputs.rb

@@ -11,7 +11,7 @@ module Pageflow
       # Register a proc which adds additional inputs to admin forms.
       #
       # @param resource_name [Symbol] A resource name like `:entry`,
-      #   `:account` or `:theming`
+      #   `:account` or `:site`
       # @param attribute_name [Symbol] The name of the additional
       #   attribute
       # @param options [Hash] Formtastic options

data/lib/pageflow/admin/tabs.rb

@@ -9,7 +9,7 @@ module Pageflow
       # Display additional tabs on admin resource pages.
       #
       # @param [Symbol] resource_name A resource name like `:entry`,
-      #   `:user` or `:account`
+      #   `:user`, `:account` or `:site`.
       # @param [Hash] options
       # @option options [Symbol] :name Unique identifier.
       # @option options [Arbre::Component] :component Component to

data/lib/pageflow/configuration/permissions.rb

@@ -6,7 +6,7 @@ module Pageflow
       def initialize
         @only_admins_may_update_features = false
         @only_admins_may_see_admin_boolean = false
-        @only_admins_may_update_theming = false
+        @only_admins_may_update_site = false
       end
 
       # Restrict access to features tabs to admins. Defaults to false.
@@ -18,10 +18,10 @@ module Pageflow
       # @since 12.1
       attr_accessor :only_admins_may_see_admin_boolean
 
-      # Restrict access to theming drop down on entry edit admin page
+      # Restrict access to site drop down on entry edit admin page
       # to admins. Defaults to false.
       # @since 12.1
-      attr_accessor :only_admins_may_update_theming
+      attr_accessor :only_admins_may_update_site
     end
   end
 end

data/lib/pageflow/configuration.rb

@@ -151,21 +151,21 @@ module Pageflow
     attr_accessor :editor_routing_constraint
 
     # Either a lambda or an object with a `call` method taking two
-    # parameters: An `ActiveRecord` scope of {Pageflow::Theming} records
+    # parameters: An `ActiveRecord` scope of {Pageflow::Site} records
     # and an {ActionDispatch::Request} object. Has to return the scope
-    # in which to find themings.
+    # in which to find sites.
     #
-    # Defaults to {CnameThemingRequestScope} which finds themings
+    # Defaults to {CnameSiteRequestScope} which finds sites
     # based on the request subdomain. Can be used to alter the logic
-    # of finding a theming whose home_url to redirect to when visiting
+    # of finding a site whose home_url to redirect to when visiting
     # the public root path.
     #
     # Example:
     #
-    #     config.theming_request_scope = lambda do |themings, request|
-    #       themings.where(id: Pageflow::Account.find_by_name!(request.subdomain).default_theming_id)
+    #     config.site_request_scope = lambda do |sites, request|
+    #       sites.where(id: Pageflow::Account.find_by_name!(request.subdomain).default_site_id)
     #     end
-    attr_accessor :theming_request_scope
+    attr_accessor :site_request_scope
 
     # Either a lambda or an object with a `call` method taking two
     # parameters: An `ActiveRecord` scope of `Pageflow::Entry` records
@@ -196,7 +196,7 @@ module Pageflow
     attr_accessor :public_entry_redirect
 
     # Either a lambda or an object with a `call` method taking a
-    # {Theming} as paramater and returing a hash of options used to
+    # {Site} as paramater and returing a hash of options used to
     # construct the url of a published entry.
     #
     # Can be used to change the host of the url under which entries
@@ -204,13 +204,13 @@ module Pageflow
     #
     # Example:
     #
-    #     config.public_entry_url_options = lambda do |theming|
-    #       {host: "#{theming.account.name}.example.com"}
+    #     config.public_entry_url_options = lambda do |site|
+    #       {host: "#{site.account.name}.example.com"}
     #     end
     attr_accessor :public_entry_url_options
 
     # Either a lambda or an object with a `call` method taking a
-    # {Theming} as paramater and returing a hash of options used to
+    # {Site} as paramater and returing a hash of options used to
     # construct the embed url of a published entry.
     attr_accessor :entry_embed_url_options
 
@@ -281,7 +281,7 @@ module Pageflow
     # @since 0.10
     attr_accessor :available_public_locales
 
-    # Array of sharing providers which can be configured on theming level.
+    # Array of sharing providers which can be configured on site level.
     # Defaults to `[:facebook, :twitter, :linked_in, :whats_app, :telegram, :email]`.
     # @since 14.1
     attr_accessor :available_share_providers
@@ -310,7 +310,7 @@ module Pageflow
 
     # Share provider defaults.
     #
-    # Default share providers for new themings.
+    # Default share providers for new sites.
     # Must be a subset or equal to `available_share_providers`
     # @since 14.1
     attr_accessor :default_share_providers
@@ -402,10 +402,10 @@ module Pageflow
       @thumbnail_styles = Defaults::THUMBNAIL_STYLES.dup
       @css_rendered_thumbnail_styles = Defaults::CSS_RENDERED_THUMBNAIL_STYLES.dup
 
-      @theming_request_scope = CnameThemingRequestScope.new
+      @site_request_scope = CnameSiteRequestScope.new
       @public_entry_request_scope = lambda { |entries, request| entries }
       @public_entry_redirect = ->(_entry, _request) { nil }
-      @public_entry_url_options = Pageflow::ThemingsHelper::DEFAULT_PUBLIC_ENTRY_OPTIONS
+      @public_entry_url_options = Pageflow::SitesHelper::DEFAULT_PUBLIC_ENTRY_OPTIONS
       @entry_embed_url_options = {protocol: 'https'}
 
       @transform_theme_customization_overrides = ->(overrides, _entry) { overrides }
@@ -515,9 +515,9 @@ module Pageflow
     end
 
     # @api private
-    def theming_url_options(theming)
+    def site_url_options(site)
       options = public_entry_url_options
-      options.respond_to?(:call) ? options.call(theming) : options
+      options.respond_to?(:call) ? options.call(site) : options
     end
 
     # @api private

data/lib/pageflow/entry_export_import/entry_serialization.rb

@@ -44,7 +44,7 @@ module Pageflow
       def create_entry(data, options)
         entry_data = data.except(*DEFAULT_REMOVAL_COLUMNS)
         entry_data['account_id'] = options[:account].id
-        entry_data['theming_id'] = options[:account].default_theming.id
+        entry_data['site_id'] = options[:account].default_site.id
         Entry.create!(entry_data.merge(skip_draft_creation: true))
       end
 

data/lib/pageflow/primary_domain_entry_redirect.rb

@@ -5,20 +5,20 @@ module Pageflow
   # @since 12.4
   class PrimaryDomainEntryRedirect
     def call(entry, request)
-      theming = entry.theming
+      site = entry.site
 
-      if theming.cname.present? &&
-         !known_domains(theming).include?(request.host)
-        [request.protocol, theming.cname, request.fullpath].join
+      if site.cname.present? &&
+         !known_domains(site).include?(request.host)
+        [request.protocol, site.cname, request.fullpath].join
       end
     end
 
     private
 
-    def known_domains(theming)
+    def known_domains(site)
       [
-        theming.cname,
-        (theming.additional_cnames || '').split(',').map(&:strip)
+        site.cname,
+        (site.additional_cnames || '').split(',').map(&:strip)
       ].flatten
     end
   end

data/lib/pageflow/seeds.rb

@@ -19,7 +19,7 @@ module Pageflow
   module Seeds
     DEFAULT_USER_PASSWORD = '!Pass123'
 
-    # Create an {Account} with a default {Theming} if no account by
+    # Create an {Account} with a default {Site} if no account by
     # that name exists.
     #
     # @param [Hash] attributes  attributes to override defaults
@@ -30,29 +30,29 @@ module Pageflow
       Account.find_or_create_by!(attributes.slice(:name)) do |account|
         account.attributes = attributes.reverse_merge(name: 'Pageflow')
 
-        build_default_theming_for(account)
+        build_default_site_for(account)
 
         say_creating_account(account)
         yield(account) if block_given?
       end
     end
 
-    # Build a default {Theming} for an {Account}. To be used inside a
+    # Build a default {Site} for an {Account}. To be used inside a
     # block passed to {#account}.
     #
     # @example
     #
     #   account(name: 'example') do |account|
-    #     build_default_theming_for(account) do |theming|
-    #       theming.theme_name = 'mdr'
+    #     build_default_site_for(account) do |site|
+    #       site.theme_name = 'mdr'
     #     end
     #   end
     #
     # @param [Account] account  the account to build a default themeing for
     # @param [Hash] attributes  further attributes to override defaults
-    # @yield [theming] a block which is passed the newly built theming
-    # @return [Theming] newly built theming
-    def build_default_theming_for(account, attributes = {}, &block)
+    # @yield [site] a block which is passed the newly built site
+    # @return [Site] newly built site
+    def build_default_site_for(account, attributes = {}, &block)
       default_attributes = {
         imprint_link_label: 'Impressum',
         imprint_link_url: 'http://example.com/impressum.html',
@@ -60,7 +60,7 @@ module Pageflow
         copyright_link_url: 'http://www.example.com/copyright.html'
       }
 
-      account.build_default_theming(default_attributes.merge(attributes), &block)
+      account.build_default_site(default_attributes.merge(attributes), &block)
     end
 
     # Create a {User} if none with the given email exists yet.
@@ -110,7 +110,7 @@ module Pageflow
 
       if entry.nil?
         entry = Entry.create!(attributes) do |created_entry|
-          created_entry.theming = attributes.fetch(:account).default_theming
+          created_entry.site = attributes.fetch(:account).default_site
 
           say_creating_entry(created_entry)
           yield(created_entry) if block_given?

data/lib/pageflow/theme_customizations.rb

@@ -5,10 +5,10 @@ module Pageflow
   # @since 15.7
   class ThemeCustomizations
     # Override theme options and files for entries of an entry type in
-    # a specific account.
-    def update(account:, entry_type_name:, overrides: {}, file_ids: {})
+    # a specific site.
+    def update(site:, entry_type_name:, overrides: {}, file_ids: {})
       ThemeCustomization
-        .find_or_initialize_by(account: account, entry_type_name: entry_type_name)
+        .find_or_initialize_by(site: site, entry_type_name: entry_type_name)
         .update!(overrides: overrides, selected_file_ids: file_ids)
     end
 
@@ -16,10 +16,10 @@ module Pageflow
     # its theme without actually updating the theme customization.
     #
     # @return [PublishedEntry]
-    def preview(account:, entry:, overrides: {}, file_ids: {})
+    def preview(site:, entry:, overrides: {}, file_ids: {})
       theme_customization =
         ThemeCustomization
-        .find_or_initialize_by(account: account, entry_type_name: entry.type_name)
+        .find_or_initialize_by(site: site, entry_type_name: entry.type_name)
 
       theme_customization.assign_attributes(overrides: overrides, selected_file_ids: file_ids)
 
@@ -30,12 +30,12 @@ module Pageflow
       PublishedEntry.new(entry, entry.draft, theme: theme)
     end
 
-    # Get customization for entry type and account.
+    # Get customization for entry type and site.
     #
     # @return [ThemeCustomization]
-    def get(account:, entry_type_name:)
+    def get(site:, entry_type_name:)
       ThemeCustomization
-        .find_or_initialize_by(account: account, entry_type_name: entry_type_name)
+        .find_or_initialize_by(site: site, entry_type_name: entry_type_name)
     end
 
     # Upload a file that shall be used to customize a theme. Uploading
@@ -43,10 +43,10 @@ module Pageflow
     # assign a role via the `file_ids` parameter.
     #
     # @return [ThemeCustomizationFile]
-    def upload_file(account:, entry_type_name:, type_name:, attachment:)
+    def upload_file(site:, entry_type_name:, type_name:, attachment:)
       theme_customization_file =
         ThemeCustomization
-        .find_or_create_by(account: account, entry_type_name: entry_type_name)
+        .find_or_create_by(site: site, entry_type_name: entry_type_name)
         .uploaded_files
         .build(type_name: type_name)
 

data/lib/pageflow/version.rb

@@ -1,3 +1,3 @@
 module Pageflow
-  VERSION = '15.8.0'.freeze
+  VERSION = '16.0.0'.freeze
 end

data/package/editor.js

@@ -2684,10 +2684,10 @@ var EditLockContainer = Backbone.Model.extend({
   handleError: function handleError() {}
 });
 
-var Theming = Backbone.Model.extend({
-  modelName: 'theming',
-  i18nKey: 'pageflow/theming',
-  collectionName: 'themings'
+var Site = Backbone.Model.extend({
+  modelName: 'site',
+  i18nKey: 'pageflow/site',
+  collectionName: 'sites'
 });
 
 var ChapterConfiguration = Configuration.extend({
@@ -5272,7 +5272,7 @@ var EditMetaDataView = Marionette.Layout.extend({
     configurationEditor.tab('widgets', function () {
       editor.entryType.appearanceInputs && editor.entryType.appearanceInputs(this, {
         entry: entry,
-        theming: state.theming
+        site: state.site
       });
       entry.widgets && this.view(EditWidgetsView, {
         model: entry,
@@ -8141,7 +8141,7 @@ app.addInitializer(function (options) {
   state.entry = editor.createEntryModel(options, {
     widgets: widgets
   });
-  state.theming = new Theming(options.theming);
+  state.site = new Site(options.site);
   state.account = new Backbone.Model(options.account);
   widgets.subject = state.entry;
   state.storylineOrdering = new StorylineOrdering(state.storylines, state.pages);
@@ -8257,4 +8257,4 @@ app.addRegions({
   sidebarFooterRegion: 'sidebar .sidebar_footer_container'
 });
 
-export { AudioFile, BackButtonDecoratorView, BackgroundImageEmbeddedView, BackgroundPositioningPreviewView, BackgroundPositioningSlidersView, BackgroundPositioningView, ChangeThemeDialogView, Chapter, ChapterConfiguration, ChapterPagesCollection, ChapterScaffold, ChaptersCollection, ChooseImporterView, Configuration, ConfirmEncodingView, ConfirmFileImportUploadView, ConfirmUploadView, ConfirmableFileItemView, DropDownButtonItemListView, DropDownButtonItemView, DropDownButtonView, EditConfigurationView, EditEntryView, EditFileView, EditLock, EditLockContainer, EditMetaDataView, EditWidgetView, EditWidgetsView, EditorApi, EditorView, EmulationModeButtonView, EncodedFile, EncodingConfirmation, Entry, EntryMetadata, EntryMetadataFileSelectionHandler, EntryPublication, EntryPublicationQuotaDecoratorView, ExplorerFileItemView, Failure, FileConfiguration, FileImport, FileInputView, FileItemView, FileMetaDataItemValueView, FileMetaDataItemView, FileProcessingStateDisplayView, FileReuse, FileSettingsDialogView, FileStage, FileStageItemView, FileThumbnailView, FileTypes, FileTypesCollection, FileUploader, FilesCollection, FilesExplorerView, FilesImporterView, FilesView, FilteredFilesView, ForeignKeySubsetCollection, HelpButtonView, HelpImageView, HelpView, ImageFile, InfoBoxView, InvalidNestedTypeError, LazyVideoEmbeddedView, ListItemView, ListView, LoadingView, LockedView, ModelThumbnailView, NestedFilesCollection, NestedFilesView, NestedTypeError, NotificationsView, OrderedPageLinksCollection, OtherEntriesCollection, OtherEntriesCollectionView, OtherEntry, OtherEntryItemView, Page, PageConfigurationFileSelectionHandler, PageLink, PageLinkConfigurationEditorView, PageLinkFileSelectionHandler, PageLinkItemView, PageLinksCollection, PageLinksView, PageThumbnailView, PagesCollection, PublishEntryView, ReferenceInputView, ReusableFile, Scaffold, ScrollingView, SelectButtonView, SidebarController, SidebarFooterView, SidebarRouter, StaticThumbnailView, Storyline, StorylineChaptersCollection, StorylineConfiguration, StorylineOrdering, StorylineScaffold, StorylineTransitiveChildPages, StorylinesCollection, SubsetCollection, TextFileMetaDataItemValueView, TextTrackFile, TextTracksFileMetaDataItemValueView, TextTracksView, Theme, ThemeInputView, ThemeItemView, ThemesCollection, Theming, UnmatchedUploadError, UploadError, UploadableFile, UploadableFilesView, UploaderView, VideoFile, Widget, WidgetConfiguration, WidgetConfigurationFileSelectionHandler, WidgetItemView, WidgetTypes, WidgetsCollection, addAndReturnModel, app, authenticationProvider, configurationContainer, delayedDestroying, dialogView, editor, entryTypeEditorControllerUrls, failureIndicatingView, failureTracking, fileWithType, filesCountWatcher, formDataUtils, loadable, modelLifecycleTrackingView, orderedCollection, persistedPromise, polling, retryable, selectableView, stageProvider, startEditor, state, stylesheet, transientReferences, validFileTypeTranslationList };
+export { AudioFile, BackButtonDecoratorView, BackgroundImageEmbeddedView, BackgroundPositioningPreviewView, BackgroundPositioningSlidersView, BackgroundPositioningView, ChangeThemeDialogView, Chapter, ChapterConfiguration, ChapterPagesCollection, ChapterScaffold, ChaptersCollection, ChooseImporterView, Configuration, ConfirmEncodingView, ConfirmFileImportUploadView, ConfirmUploadView, ConfirmableFileItemView, DropDownButtonItemListView, DropDownButtonItemView, DropDownButtonView, EditConfigurationView, EditEntryView, EditFileView, EditLock, EditLockContainer, EditMetaDataView, EditWidgetView, EditWidgetsView, EditorApi, EditorView, EmulationModeButtonView, EncodedFile, EncodingConfirmation, Entry, EntryMetadata, EntryMetadataFileSelectionHandler, EntryPublication, EntryPublicationQuotaDecoratorView, ExplorerFileItemView, Failure, FileConfiguration, FileImport, FileInputView, FileItemView, FileMetaDataItemValueView, FileMetaDataItemView, FileProcessingStateDisplayView, FileReuse, FileSettingsDialogView, FileStage, FileStageItemView, FileThumbnailView, FileTypes, FileTypesCollection, FileUploader, FilesCollection, FilesExplorerView, FilesImporterView, FilesView, FilteredFilesView, ForeignKeySubsetCollection, HelpButtonView, HelpImageView, HelpView, ImageFile, InfoBoxView, InvalidNestedTypeError, LazyVideoEmbeddedView, ListItemView, ListView, LoadingView, LockedView, ModelThumbnailView, NestedFilesCollection, NestedFilesView, NestedTypeError, NotificationsView, OrderedPageLinksCollection, OtherEntriesCollection, OtherEntriesCollectionView, OtherEntry, OtherEntryItemView, Page, PageConfigurationFileSelectionHandler, PageLink, PageLinkConfigurationEditorView, PageLinkFileSelectionHandler, PageLinkItemView, PageLinksCollection, PageLinksView, PageThumbnailView, PagesCollection, PublishEntryView, ReferenceInputView, ReusableFile, Scaffold, ScrollingView, SelectButtonView, SidebarController, SidebarFooterView, SidebarRouter, Site, StaticThumbnailView, Storyline, StorylineChaptersCollection, StorylineConfiguration, StorylineOrdering, StorylineScaffold, StorylineTransitiveChildPages, StorylinesCollection, SubsetCollection, TextFileMetaDataItemValueView, TextTrackFile, TextTracksFileMetaDataItemValueView, TextTracksView, Theme, ThemeInputView, ThemeItemView, ThemesCollection, UnmatchedUploadError, UploadError, UploadableFile, UploadableFilesView, UploaderView, VideoFile, Widget, WidgetConfiguration, WidgetConfigurationFileSelectionHandler, WidgetItemView, WidgetTypes, WidgetsCollection, addAndReturnModel, app, authenticationProvider, configurationContainer, delayedDestroying, dialogView, editor, entryTypeEditorControllerUrls, failureIndicatingView, failureTracking, fileWithType, filesCountWatcher, formDataUtils, loadable, modelLifecycleTrackingView, orderedCollection, persistedPromise, polling, retryable, selectableView, stageProvider, startEditor, state, stylesheet, transientReferences, validFileTypeTranslationList };

data/spec/factories/accounts.rb

@@ -2,8 +2,9 @@ FactoryBot.define do
   factory :account, class: Pageflow::Account do
     name { 'Account Name' }
 
-    after(:build) do |account|
-      account.default_theming ||= build(:theming, account: account)
+    after(:build) do |account, evaluator|
+      account.default_site ||=
+        build(:site, account: account, **evaluator.default_site_attributes)
     end
 
     trait(:with_first_paged_entry_template) do
@@ -21,6 +22,8 @@ FactoryBot.define do
 
       with_feature { nil }
       without_feature { nil }
+
+      default_site_attributes { {} }
     end
 
     after(:create) do |account, evaluator|

data/spec/factories/draft_entries.rb

@@ -4,7 +4,7 @@ module Pageflow
       transient do
         title
         account
-        theming
+        site
         type_name { 'paged' }
         revision_attributes { {} }
 
@@ -16,7 +16,7 @@ module Pageflow
         DraftEntry.new(create(:entry,
                               title: title,
                               account: account,
-                              theming: theming,
+                              site: site,
                               type_name: type_name,
                               draft_attributes: revision_attributes,
                               with_feature: with_feature,

data/spec/factories/entries.rb

@@ -10,7 +10,7 @@ module Pageflow
       account
 
       after(:build) do |entry|
-        entry.theming ||= entry.account.default_theming
+        entry.site ||= entry.account.default_site
       end
 
       transient do
@@ -58,7 +58,7 @@ module Pageflow
             evaluator.permalink_attributes[:directory] ||
             build(
               :permalink_directory,
-              theming: entry.theming,
+              site: entry.site,
               path: evaluator.permalink_attributes.fetch(:directory_path, '')
             )
 

data/spec/factories/entry_templates.rb

@@ -1,7 +1,7 @@
 module Pageflow
   FactoryBot.define do
     factory :entry_template, class: Pageflow::EntryTemplate do
-      account
+      site
       entry_type_name { 'paged' }
       theme_name { 'default' }
     end

data/spec/factories/permalink_directory.rb

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :permalink_directory, class: Pageflow::PermalinkDirectory do
-    theming
+    site
     path { '' }
   end
 end

data/spec/factories/published_entries.rb

@@ -4,7 +4,7 @@ module Pageflow
       transient do
         title
         account
-        theming
+        site
         type_name { 'paged' }
         revision_attributes { {} }
         permalink_attributes { nil }
@@ -18,7 +18,7 @@ module Pageflow
                                   :published,
                                   title: title,
                                   account: account,
-                                  theming: theming,
+                                  site: site,
                                   type_name: type_name,
                                   published_revision_attributes: revision_attributes,
                                   permalink_attributes: permalink_attributes,

data/spec/factories/sites.rb

@@ -0,0 +1,9 @@
+module Pageflow
+  FactoryBot.define do
+    factory :site, class: Pageflow::Site do
+      after(:build) do |site|
+        site.account ||= build(:account, default_site: site)
+      end
+    end
+  end
+end