pageflow 15.1.2 → 15.4.0

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/controllers/pageflow/editor/widgets_controller.rb

@@ -45,7 +45,7 @@ module Pageflow
         if params[:collection_name] == 'entries'
           DraftEntry.find(params[:subject_id])
         else
-          Theming.find(params[:subject_id])
+          EntryTemplate.find(params[:subject_id])
         end
       end
     end

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/pages_helper.rb

@@ -19,6 +19,7 @@ module Pageflow
       classes << 'chapter_beginning' if page.position == 0
       classes << 'first_page' if page.is_first
       classes << 'no_text_content' if !page_has_content(page)
+      classes << 'hide_logo' if page.configuration['hide_logo']
       classes.join(' ')
     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

@@ -10,9 +10,11 @@ module Pageflow
     has_many :entry_memberships, through: :entries, source: :memberships
 
     has_many :themings, dependent: :destroy
+    has_many :entry_templates, dependent: :destroy
     belongs_to :default_theming, :class_name => 'Theming'
 
     validates :default_theming, :presence => true
+    validates_associated :entry_templates
 
     accepts_nested_attributes_for :default_theming, :update_only => true
 
@@ -24,6 +26,30 @@ module Pageflow
       end
     end
 
+    def first_paged_entry_template
+      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
       [:features_configuration]
     end

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/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) }
@@ -51,11 +52,18 @@ module Pageflow
     after_create unless: :skip_draft_creation do
       create_draft!
       draft.storylines.create!(configuration: {main: true})
-      theming.copy_defaults_to(draft)
+      entry_template.copy_defaults_to(draft)
+    end
+
+    def entry_template
+      @entry_template ||= EntryTemplate.find_or_initialize_by(
+        account_id: account.id,
+        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
@@ -132,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

@@ -0,0 +1,69 @@
+module Pageflow
+  class EntryTemplate < ApplicationRecord
+    include ThemeReferencer
+    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(self), options)
+    end
+
+    def copy_defaults_to(revision)
+      widgets.copy_all_to(revision)
+      copy_attributes_to(revision)
+    end
+
+    def share_providers=(share_providers)
+      self.default_share_providers = share_providers
+    end
+
+    def share_providers
+      default_share_providers
+    end
+
+    def default_share_providers
+      self[:default_share_providers].presence ||
+        hashify_provider_array(Pageflow.config.default_share_providers)
+    end
+
+    private
+
+    def copy_attributes_to(revision)
+      revision.update(
+        author: default_author.presence || Pageflow.config.default_author_meta_tag,
+        publisher: default_publisher.presence || Pageflow.config.default_publisher_meta_tag,
+        keywords: default_keywords.presence || Pageflow.config.default_keywords_meta_tag,
+        share_providers: default_share_providers,
+        theme_name: theme_name,
+        configuration: configuration,
+        locale: default_locale
+      )
+    end
+
+    def available_themes
+      Pageflow.config_for(self).themes
+    end
+
+    def hashify_provider_array(arr)
+      Hash[arr.reject(&:blank?).map { |v| [v.to_s, true] }]
+    end
+  end
+end

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/revision.rb

@@ -102,7 +102,7 @@ module Pageflow
     end
 
     def share_providers
-      self[:share_providers] || entry.theming.default_share_providers
+      self[:share_providers] || entry.entry_template.default_share_providers
     end
 
     def author

data/app/models/pageflow/theming.rb

@@ -1,11 +1,6 @@
 module Pageflow
   class Theming < ApplicationRecord
-    include ThemeReferencer
-
-    serialize :default_share_providers, JSON
-
     belongs_to :account
-    has_many :widgets, as: :subject, dependent: :destroy
 
     has_many :entries
 
@@ -14,55 +9,21 @@ module Pageflow
 
     validates :account, :presence => true
 
-    def resolve_widgets(options = {})
-      widgets.resolve(Pageflow.config_for(account), options)
-    end
-
     def cname_domain
       cname.split('.').pop(2).join('.')
     end
 
     def name
-      I18n.t('pageflow.admin.themings.name', :account_name => account.name, :theme_name => theme_name)
-    end
-
-    def copy_defaults_to(revision)
-      widgets.copy_all_to(revision)
-      copy_attributes_to(revision)
-    end
-
-    def share_providers=(share_providers_array)
-      self.default_share_providers = hashify_provider_array(share_providers_array)
-    end
-
-    def share_providers
-      default_share_providers.to_a
-    end
-
-    def default_share_providers
-      self[:default_share_providers].presence || hashify_provider_array(Pageflow.config.default_share_providers)
-    end
-
-    private
-
-    def copy_attributes_to(revision)
-      revision.update(
-        author: default_author.presence || Pageflow.config.default_author_meta_tag,
-        publisher: default_publisher.presence || Pageflow.config.default_publisher_meta_tag,
-        keywords: default_keywords.presence || Pageflow.config.default_keywords_meta_tag,
-        share_providers: default_share_providers,
-        theme_name: theme_name,
-        home_button_enabled: home_button_enabled_by_default,
-        locale: default_locale
-      )
-    end
-
-    def available_themes
-      Pageflow.config_for(account).themes
+      I18n.t('pageflow.admin.themings.name',
+             account_name: account.name,
+             theme_name: 'default')
     end
 
-    def hashify_provider_array(arr)
-      Hash[arr.reject(&:blank?).map { |v| [v.to_s, true] }]
+    # @deprecated Depending on what you need this for, consider
+    # scoping your code to an entry type or look at a specific entry's
+    # theme name.
+    def theme_name
+      account.first_paged_entry_template.theme_name
     end
   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

@@ -0,0 +1,22 @@
+module Pageflow
+  class EntryTemplatePolicy < ApplicationPolicy
+    def initialize(user, entry_template)
+      @user = user
+      @entry_template = entry_template
+    end
+
+    def create?
+      update?
+    end
+
+    def update?
+      allows?(%w(publisher manager))
+    end
+
+    private
+
+    def allows?(roles)
+      @user.memberships.where(role: roles, entity: @entry_template.account).any?
+    end
+  end
+end