pageflow 15.2.2 → 15.6.1

data/app/assets/stylesheets/pageflow/themes/default/player_controls/waveform/wave.scss

@@ -15,7 +15,7 @@
 
     position: relative;
     z-index: 1;
-    pointer-events: all;
+    pointer-events: auto;
     height: 70px;
 
     @media (min-height: 600px) {

data/app/assets/stylesheets/pageflow/ui/forms.scss

@@ -24,7 +24,8 @@ label:hover span.name {
 select,
 textarea,
 input {
-  font-family: Helvetica, "Sans-Serif";
+  font-family: Helvetica, Arial, "Sans-Serif";
+  font-size: 13px;
   display: block;
   width: 100%;
   border: solid 1px #888;
@@ -158,6 +159,12 @@ textarea.short {
     margin: 7px 0;
     float: left;
   }
+
+  &.disabled .slider,
+  &.disabled .value {
+    opacity: 0.5;
+    pointer-events: none;
+  }
 }
 
 .validation {
@@ -189,7 +196,7 @@ textarea.short {
     width: 20px;
     height: 17px;
     text-align: center;
-    pointer-events: all;
+    pointer-events: auto;
   }
 
   position: absolute;

data/app/assets/stylesheets/pageflow/ui/input/extended_select_input.scss

@@ -1,6 +1,6 @@
 .extended_select_input {
   .ui-selectmenu-button span.ui-selectmenu-text {
-    font-family: Helvetica, Sans-Serif;
+    font-family: Helvetica, Arial, Sans-Serif;
     font-size: 13px;
   }
 }
@@ -91,7 +91,7 @@
   }
 
   .ui-widget {
-    font-family: Helvetica, Sans-Serif;
+    font-family: Helvetica, Arial, Sans-Serif;
     font-size: 13px;
 
     .item-description {

data/app/assets/stylesheets/pageflow/ui/tooltip.scss

@@ -1,10 +1,9 @@
 .tooltip {
-  $background-color: rgba(0, 0, 0, 0.7);
+  $background-color: rgba(0, 0, 0, 0.9);
 
   position: absolute;
   z-index: 10001;
   top: 40px;
-  left: 400px;
   max-width: 70%;
   padding: 10px 15px;
   color: #fff;
@@ -46,6 +45,21 @@
     }
   }
 
+  &.align_top_center {
+    transform: translate(-50%, -100%);
+
+    &:after {
+      border-top: solid 10px $background-color;
+      border-right: solid 10px transparent;
+      border-bottom: solid 10px transparent;
+      border-left: solid 10px transparent;
+
+      top: 100%;
+      left: 50%;
+      transform: translateX(-50%);
+    }
+  }
+
   &.align_bottom_right {
     @include transform(translateX(-100%));
 
@@ -54,4 +68,4 @@
       left: auto;
     }
   }
-}
+}

data/app/helpers/pageflow/admin/entries_helper.rb

@@ -18,6 +18,22 @@ module Pageflow
           I18n.t(state, scope: 'activerecord.values.pageflow/entry.publication_states')
         end
       end
+
+      def entry_type_collection
+        entry_type_collection_for_config(Pageflow.config)
+      end
+
+      def entry_type_collection_for_account(target)
+        entry_type_collection_for_config(Pageflow.config_for(target))
+      end
+
+      private
+
+      def entry_type_collection_for_config(config)
+        config.entry_types.map(&:name).index_by do |type|
+          I18n.t(type, scope: 'activerecord.values.pageflow/entry.type_names')
+        end
+      end
     end
   end
 end

data/app/helpers/pageflow/structured_data_helper.rb

@@ -6,8 +6,6 @@ module Pageflow
     include MetaTagsHelper
 
     def structured_data_for_entry(entry)
-      return '' unless Pageflow.config_for(entry).features.enabled?('structured_data')
-
       content_tag(:script, type: 'application/ld+json') do
         render_json_partial('pageflow/structured_data/entry',
                             entry: entry,

data/app/models/pageflow/account.rb

@@ -27,7 +27,27 @@ module Pageflow
     end
 
     def first_paged_entry_template
-      EntryTemplate.find_or_initialize_by(account: self, entry_type: 'paged')
+      EntryTemplate.find_or_initialize_by(account: self, entry_type_name: 'paged')
+    end
+
+    def existing_and_potential_entry_templates
+      entry_type_names = Pageflow.config_for(self).entry_types.map(&:name)
+      existing_entry_templates = EntryTemplate.where(account_id: id).load
+      allowed_existing_entry_templates =
+        existing_entry_templates.select do |template|
+          entry_type_names.include?(template.entry_type_name)
+        end
+      free_type_names =
+        entry_type_names - allowed_existing_entry_templates.map(&:entry_type_name)
+
+      potential_entry_templates = free_type_names.map do |type_name|
+        EntryTemplate.new(
+          account_id: id,
+          entry_type_name: type_name
+        )
+      end
+
+      allowed_existing_entry_templates + potential_entry_templates
     end
 
     def blacklist_for_serialization

data/app/models/pageflow/account_role_query.rb

@@ -32,7 +32,7 @@ module Pageflow
           INNER JOIN pageflow_memberships ON
           pageflow_memberships.user_id = :user_id AND
           pageflow_memberships.entity_id = pageflow_accounts.id AND
-          pageflow_memberships.entity_type = "Pageflow::Account" AND
+          pageflow_memberships.entity_type = 'Pageflow::Account' AND
           pageflow_memberships.role IN (:roles)
         SQL
       end

data/app/models/pageflow/chapter.rb

@@ -1,10 +1,13 @@
 module Pageflow
   class Chapter < ApplicationRecord
     include SerializedConfiguration
+    include NestedRevisionComponent
 
     belongs_to :storyline, touch: true
     has_many :pages, -> { order('position ASC') }, dependent: :destroy, inverse_of: :chapter
 
+    nested_revision_components :pages
+
     attr_accessor :is_first
 
     delegate :entry, to: :storyline
@@ -12,14 +15,5 @@ module Pageflow
     def pages
       super.tap { |p| p.first.is_first = true if is_first && p.present? }
     end
-
-    def copy_to(storyline)
-      chapter = dup
-      storyline.chapters << chapter
-
-      pages.each do |page|
-        page.copy_to(chapter)
-      end
-    end
   end
 end

data/app/models/pageflow/entry.rb

@@ -37,6 +37,7 @@ module Pageflow
 
     validates :account, :theming, :presence => true
     validates :title, presence: true
+    validate :entry_type_is_available_for_account
     validate :folder_belongs_to_same_account
 
     scope :editing, -> { joins(:edit_lock).merge(Pageflow::EditLock.active) }
@@ -57,12 +58,12 @@ module Pageflow
     def entry_template
       @entry_template ||= EntryTemplate.find_or_initialize_by(
         account_id: account.id,
-        entry_type: type_name
+        entry_type_name: type_name
       )
     end
 
     def entry_type
-      Pageflow.config_for(self).entry_types.find_by_name!(type_name)
+      Pageflow.config.entry_types.find_by_name!(type_name)
     end
 
     def edit_lock
@@ -139,6 +140,12 @@ module Pageflow
       errors.add(:folder, :must_be_same_account) if folder.present? && folder.account_id != account_id
     end
 
+    def entry_type_is_available_for_account
+      return if Pageflow.config_for(account).entry_types.map(&:name).include?(type_name)
+
+      errors.add(:type_name, :must_be_available_for_account, type_name: type_name)
+    end
+
     def update_password!(options)
       if options[:password].present?
         self.password = options[:password]

data/app/models/pageflow/entry_duplicate.rb

@@ -35,6 +35,7 @@ module Pageflow
 
     def new_attributes
       {
+        type_name: original_entry.type_name,
         title: new_title,
         account: original_entry.account,
         theming: original_entry.theming,

data/app/models/pageflow/entry_template.rb

@@ -4,12 +4,26 @@ module Pageflow
     include SerializedConfiguration
     serialize :default_share_providers, JSON
     belongs_to :account
+    delegate :enabled_feature_names, to: :account
     has_many :widgets, as: :subject, dependent: :destroy
 
     validates :account, presence: true
+    validates :entry_type_name, presence: true
+    validates :entry_type_name,
+              uniqueness: {
+                scope: :account
+              }
+
+    def entry_type
+      Pageflow.config.entry_types.find_by_name!(entry_type_name)
+    end
+
+    def translated_entry_type_name
+      I18n.t("activerecord.values.pageflow/entry.type_names.#{entry_type_name}")
+    end
 
     def resolve_widgets(options = {})
-      widgets.resolve(Pageflow.config_for(account), options)
+      widgets.resolve(Pageflow.config_for(self), options)
     end
 
     def copy_defaults_to(revision)
@@ -45,7 +59,7 @@ module Pageflow
     end
 
     def available_themes
-      Pageflow.config_for(account).themes
+      Pageflow.config_for(self).themes
     end
 
     def hashify_provider_array(arr)

data/app/models/pageflow/managed_user_query.rb

@@ -26,7 +26,7 @@ module Pageflow
         <<-SQL
           INNER JOIN pageflow_memberships account_memberships ON
           account_memberships.user_id = users.id AND
-          account_memberships.entity_type = "Pageflow::Account"
+          account_memberships.entity_type = 'Pageflow::Account'
         SQL
       end
 

data/app/models/pageflow/page.rb

@@ -1,6 +1,7 @@
 module Pageflow
   class Page < ApplicationRecord
     include SerializedConfiguration
+    include NestedRevisionComponent
     include AutoGeneratedPermaId
 
     belongs_to :chapter, touch: true
@@ -23,9 +24,5 @@ module Pageflow
       self.display_in_navigation = value['display_in_navigation']
       super
     end
-
-    def copy_to(chapter)
-      chapter.pages << dup
-    end
   end
 end

data/app/models/pageflow/revision.rb

@@ -170,10 +170,6 @@ module Pageflow
         widget.copy_to(revision)
       end
 
-      storylines.each do |storyline|
-        storyline.copy_to(revision)
-      end
-
       file_usages.each do |file_usage|
         file_usage.copy_to(revision)
       end

data/app/models/pageflow/storyline.rb

@@ -10,15 +10,8 @@ module Pageflow
 
     has_many :pages, through: :chapters
 
-    delegate :entry, to: :revision
-
-    def copy_to(revision)
-      storyline = dup
-      revision.storylines << storyline
+    nested_revision_components :chapters
 
-      chapters.each do |chapter|
-        chapter.copy_to(storyline)
-      end
-    end
+    delegate :entry, to: :revision
   end
 end

data/app/policies/pageflow/account_policy.rb

@@ -88,6 +88,16 @@ module Pageflow
          query.has_at_least_role?(:manager))
     end
 
+    def see_user_quota?
+      user.admin? ||
+        query.has_at_least_role?(:manager)
+    end
+
+    def see_entry_types?
+      user.admin? ||
+        query.has_at_least_role?(:publisher)
+    end
+
     def edit_role_on?
       user.admin? || query.has_at_least_role?(:manager)
     end

data/app/policies/pageflow/entry_template_policy.rb

@@ -5,7 +5,11 @@ module Pageflow
       @entry_template = entry_template
     end
 
-    def edit?
+    def create?
+      update?
+    end
+
+    def update?
       allows?(%w(publisher manager))
     end
 

data/app/policies/pageflow/folder_policy.rb

@@ -24,9 +24,9 @@ module Pageflow
         user.accounts.joins(sanitize_sql_array([
           'LEFT OUTER JOIN pageflow_memberships as pageflow_memberships_2 ON ' \
           'pageflow_memberships_2.user_id = :user_id AND ' \
-          'pageflow_memberships_2.entity_type = "Pageflow::Account" AND ' \
+          'pageflow_memberships_2.entity_type = \'Pageflow::Account\' AND ' \
           'pageflow_memberships_2.entity_id = pageflow_accounts.id AND ' \
-          'pageflow_memberships_2.role IN ("previewer", "editor", "publisher", "manager")',
+          'pageflow_memberships_2.role IN (\'previewer\', \'editor\', \'publisher\', \'manager\')',
           user_id: user.id])).where('pageflow_memberships_2.entity_id IS NOT NULL')
       end
     end

data/app/policies/pageflow/membership_policy.rb

@@ -19,9 +19,9 @@ module Pageflow
       private
 
       def permissions_appropriate
-        sanitize_sql_array(['pageflow_memberships.entity_type = "Pageflow::Account" AND ' \
+        sanitize_sql_array(['pageflow_memberships.entity_type = \'Pageflow::Account\' AND ' \
                             'pageflow_memberships.entity_id IN (:managed_account_ids) OR ' \
-                            'pageflow_memberships.entity_type = "Pageflow::Entry" AND ' \
+                            'pageflow_memberships.entity_type = \'Pageflow::Entry\' AND ' \
                             'pageflow_memberships.entity_id IN (:common_entry_ids) OR '\
                             'pageflow_memberships.user_id = :user_id',
                             managed_account_ids: managed_account_ids,

data/app/policies/pageflow/theming_policy.rb

@@ -25,8 +25,8 @@ module Pageflow
                             'pageflow_memberships.user_id = :user_id AND ' \
                             'pageflow_themings.account_id IN (:accounts_ids) AND ' \
                             'pageflow_memberships.entity_id IN (:accounts_ids) AND ' \
-                            'pageflow_memberships.entity_type = "Pageflow::Account" AND ' \
-                            'pageflow_memberships.role IN ("publisher", "manager")',
+                            'pageflow_memberships.entity_type = \'Pageflow::Account\' AND ' \
+                            'pageflow_memberships.role IN (\'publisher\', \'manager\')',
                             user_id: user.id, accounts_ids: accounts_ids])
       end
 

data/app/policies/pageflow/user_policy.rb

@@ -16,7 +16,7 @@ module Pageflow
                                  .new(@user, Account).member_addable.map(&:id)
 
           scope.joins(:memberships)
-            .where('pageflow_memberships.entity_type = "Pageflow::Account"')
+            .where('pageflow_memberships.entity_type = \'Pageflow::Account\'')
             .where(membership_in_managed_account(manager_accounts_ids)).distinct
         end
       end

data/app/views/admin/accounts/_entry_template_details.html.arb

@@ -1,17 +1,19 @@
-extensible_attributes_table_for(account.first_paged_entry_template,
-                                Pageflow.config_for(account)
+h5(entry_template.translated_entry_type_name)
+
+extensible_attributes_table_for(entry_template,
+                                Pageflow.config_for(entry_template.account)
                                   .admin_attributes_table_rows.for(:entry_template)) do
   row :theme, class: 'theme' do
-    account.first_paged_entry_template.theme_name
+    entry_template.theme_name
   end
   row :default_locale, class: 'default_locale' do
-    t('pageflow.public._language', locale: account.first_paged_entry_template.default_locale)
+    t('pageflow.public._language', locale: entry_template.default_locale)
   end
   row :default_author, class: 'default_author'
   row :default_publisher, class: 'default_publisher'
   row :default_keywords, class: 'default_keywords'
   row :default_share_providers, class: 'default_share_providers' do
-    account.first_paged_entry_template.default_share_providers
+    entry_template.default_share_providers
            .select { |_k, v| v == true }.keys.map(&:camelize).join(', ')
   end
 end