pageflow 15.1.0 → 15.2.2

data/app/assets/javascripts/pageflow/admin/accounts.js

@@ -1,8 +1,8 @@
 jQuery(function($) {
   $('.admin_accounts').filter('.new, .edit').find('form.pageflow_account').each(function() {
-    var themeSelect = $('#account_default_theming_attributes_theme_name', this);
+    var themeSelect = $('#account_paged_entry_template_attributes_theme_name', this);
     var themeOptions = JSON.parse($('script#theme_options', this).text());
-    var homeButtonCheckBox = $('#account_default_theming_attributes_home_button_enabled_by_default', this);
+    var homeButtonCheckBox = $('#account_paged_entry_template_attributes_configuration_home_button_enabled', this);
 
     updateThemeFeatures();
     themeSelect.on('change', updateThemeFeatures);
@@ -27,4 +27,4 @@ jQuery(function($) {
       }
     }
   });
-});
+});

data/app/assets/javascripts/pageflow/dist/frontend.js

@@ -284,6 +284,7 @@
     updateCommonPageCssClasses: function updateCommonPageCssClasses(pageElement, configuration) {
       pageElement.toggleClass('invert', configuration.get('invert'));
       pageElement.toggleClass('hide_title', configuration.get('hide_title'));
+      pageElement.toggleClass('hide_logo', !!configuration.get('hide_logo'));
       toggleModeClass(pageflow.Page.textPositions, 'text_position');
       toggleModeClass(pageflow.Page.delayedTextFadeIn, 'delayed_text_fade_in');
       toggleModeClass(pageflow.Page.scrollIndicatorModes, 'scroll_indicator_mode');
@@ -4704,6 +4705,7 @@
         function updateClasses(page) {
           that.element.toggleClass('invert', page.hasClass('invert'));
           that.element.toggleClass('first_page', page.index() === 0);
+          that.element.toggleClass('hide_logo', page.hasClass('hide_logo'));
         }
       }
     });

data/app/assets/javascripts/pageflow/dist/ui.js

@@ -1141,6 +1141,7 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
 
   var inputView = {
     ui: {
+      label: 'label',
       labelText: 'label .name',
       inlineHelp: 'label .inline_help'
     },
@@ -1186,6 +1187,7 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
         this.ui.inlineHelp.hide();
       }
 
+      this.setLabelFor();
       this.updateDisabled();
       this.setupVisibleBinding();
     },
@@ -1221,6 +1223,13 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
         html: true
       }), this.options.additionalInlineHelpText]).join(' ');
     },
+    setLabelFor: function setLabelFor() {
+      if (this.ui.input && this.ui.label.length === 1 && !this.ui.input.attr('id')) {
+        var id = 'input_' + this.model.modelName + '_' + this.options.propertyName;
+        this.ui.input.attr('id', id);
+        this.ui.label.attr('for', id);
+      }
+    },
     updateDisabled: function updateDisabled() {
       if (this.ui.input) {
         this.updateDisabledAttribute(this.ui.input);

data/app/assets/stylesheets/pageflow/themes/default/logo/variant/background_image.scss

@@ -110,4 +110,8 @@ $logo-background-image-variant-banner-phone-height: null !default;
   .first_page .scroller > div:after {
     opacity: $logo-background-image-variant-first-page-opacity;
   }
+
+  .page.hide_logo .content_and_background .scroller > div:after {
+    display: none;
+  }
 }

data/app/assets/stylesheets/pageflow/themes/default/logo/variant/watermark.scss

@@ -105,6 +105,11 @@ $logo-watermark-mobile-height: null !default;
     opacity: 1;
   }
 
+  .header.hide_logo .header_logo:before,
+  .header.hide_logo .header_logo:after {
+    opacity: 0;
+  }
+
   .header.near_top .header_logo {
     pointer-events: all;
   }

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/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/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,10 @@ module Pageflow
       end
     end
 
+    def first_paged_entry_template
+      EntryTemplate.find_or_initialize_by(account: self, entry_type: 'paged')
+    end
+
     def blacklist_for_serialization
       [:features_configuration]
     end

data/app/models/pageflow/draft_entry.rb

@@ -17,11 +17,9 @@ module Pageflow
              :type_name,
              :to => :entry)
 
-    delegate(:title, :summary, :credits, :manual_start,
+    delegate(:title, :summary, :credits,
              :widgets,
              :storylines, :main_storyline_chapters, :chapters, :pages,
-             :emphasize_chapter_beginning,
-             :emphasize_new_pages,
              :share_url, :share_image_id, :share_image_x, :share_image_y,
              :share_providers, :active_share_providers,
              :find_files, :find_file, :find_file_by_perma_id,
@@ -116,6 +114,18 @@ module Pageflow
       OverviewButton.new(draft)
     end
 
+    def manual_start
+      revision.configuration['manual_start']
+    end
+
+    def emphasize_chapter_beginning
+      revision.configuration['emphasize_chapter_beginning']
+    end
+
+    def emphasize_new_pages
+      revision.configuration['emphasize_new_pages']
+    end
+
     def resolve_widgets(options = {})
       widgets.resolve(Pageflow.config_for(entry), options)
     end

data/app/models/pageflow/entry.rb

@@ -51,7 +51,14 @@ 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: type_name
+      )
     end
 
     def entry_type

data/app/models/pageflow/entry_template.rb

@@ -0,0 +1,55 @@
+module Pageflow
+  class EntryTemplate < ApplicationRecord
+    include ThemeReferencer
+    include SerializedConfiguration
+    serialize :default_share_providers, JSON
+    belongs_to :account
+    has_many :widgets, as: :subject, dependent: :destroy
+
+    validates :account, presence: true
+
+    def resolve_widgets(options = {})
+      widgets.resolve(Pageflow.config_for(account), 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(account).themes
+    end
+
+    def hashify_provider_array(arr)
+      Hash[arr.reject(&:blank?).map { |v| [v.to_s, true] }]
+    end
+  end
+end

data/app/models/pageflow/published_entry.rb

@@ -20,9 +20,7 @@ module Pageflow
              :storylines, :main_storyline_chapters, :chapters, :pages,
              :find_files, :find_file, :find_file_by_perma_id,
              :image_files, :video_files, :audio_files,
-             :summary, :credits, :manual_start,
-             :emphasize_chapter_beginning,
-             :emphasize_new_pages,
+             :summary, :credits,
              :share_url, :share_image_id, :share_image_x, :share_image_y,
              :share_providers, :active_share_providers,
              :locale,
@@ -43,6 +41,18 @@ module Pageflow
       revision.title.presence || entry.title
     end
 
+    def manual_start
+      revision.configuration['manual_start']
+    end
+
+    def emphasize_chapter_beginning
+      revision.configuration['emphasize_chapter_beginning']
+    end
+
+    def emphasize_new_pages
+      revision.configuration['emphasize_new_pages']
+    end
+
     def stylesheet_model
       custom_revision? ? revision : entry
     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/entry_template_policy.rb

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

data/app/policies/pageflow/theming_policy.rb

@@ -44,10 +44,6 @@ module Pageflow
       allows?(%w(publisher manager))
     end
 
-    def index_widgets_for?
-      @user.admin?
-    end
-
     private
 
     def allows?(roles)

data/app/views/admin/accounts/_configuration_label.html.erb

@@ -0,0 +1,5 @@
+<li>
+  <label class='label'>
+    <%= t('activerecord.attributes.pageflow/entry_template.configuration.group_label') %>
+  </label>
+</li>

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

@@ -0,0 +1,17 @@
+extensible_attributes_table_for(account.first_paged_entry_template,
+                                Pageflow.config_for(account)
+                                  .admin_attributes_table_rows.for(:entry_template)) do
+  row :theme, class: 'theme' do
+    account.first_paged_entry_template.theme_name
+  end
+  row :default_locale, class: 'default_locale' do
+    t('pageflow.public._language', locale: account.first_paged_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
+           .select { |_k, v| v == true }.keys.map(&:camelize).join(', ')
+  end
+end

data/app/views/admin/accounts/_form.html.erb

@@ -18,48 +18,68 @@
     <% end %>
 
     <%= f.inputs do %>
-      <%= theming.input :default_locale,
+      <%= theming.input :imprint_link_label %>
+      <%= theming.input :imprint_link_url %>
+      <%= theming.input :copyright_link_label %>
+      <%= theming.input :copyright_link_url %>
+      <%= theming.input :privacy_link_url %>
+
+      <% account_config.admin_form_inputs.find_all_for(:theming).each do |form_input| %>
+        <%= form_input.build(theming) %>
+      <% end %>
+    <% end %>
+  <% end %>
+
+  <%= f.semantic_fields_for 'paged_entry_template_attributes', @entry_template do |et| %>
+    <%= f.inputs do %>
+      <%= et.input :default_locale,
                         as: :select,
                         include_blank: false,
                         collection: Pageflow.config.available_public_locales.map{ |locale|
                           [t('pageflow.public._language', locale: locale), locale.to_s]
                         },
                         hint: t('pageflow.admin.themings.default_locale_hint') %>
-      <%= theming.input :default_author,
+      <%= et.input :default_author,
         hint: t('pageflow.admin.themings.default_author_hint'),
         placeholder: Pageflow.config.default_author_meta_tag %>
-      <%= theming.input :default_publisher,
+      <%= et.input :default_publisher,
         hint: t('pageflow.admin.themings.default_publisher_hint'),
         placeholder: Pageflow.config.default_publisher_meta_tag %>
-      <%= theming.input :default_keywords,
+      <%= et.input :default_keywords,
         hint: t('pageflow.admin.themings.default_keywords_hint'),
         placeholder: Pageflow.config.default_keywords_meta_tag %>
-      <%= theming.input :share_providers,
-                        as: :check_boxes,
-                        collection: Pageflow.config.available_share_providers,
-                        member_label: Proc.new { |s| s.to_s.camelize } %>
-
-    <% end %>
-
-    <%= f.inputs do %>
-      <%= theming.input :imprint_link_label %>
-      <%= theming.input :imprint_link_url %>
-      <%= theming.input :copyright_link_label %>
-      <%= theming.input :copyright_link_url %>
-      <%= theming.input :privacy_link_url %>
-
-      <% account_config.admin_form_inputs.find_all_for(:theming).each do |form_input| %>
-        <%= form_input.build(theming) %>
+      <%= render('admin/accounts/share_providers_label') %>
+      <%= et.semantic_fields_for :share_providers,
+         OpenStruct.new(
+           @account.first_paged_entry_template.default_share_providers
+         ) do |providers| %>
+           <% Pageflow.config.available_share_providers.each do |provider| %>
+               <%= providers.input provider,
+                      as: :boolean,
+                       label: provider.to_s.camelize,
+                   checked_value: 'true',
+                   unchecked_value: 'false' %>
+           <% end %>
       <% end %>
     <% end %>
 
     <%= f.inputs do %>
       <%= render('admin/accounts/theming_defaults_inline_help') %>
-      <%= theming.input :theme_name, include_blank: false, collection: account_config.themes.names %>
-      <%= theming.input :home_button_enabled_by_default %>
-      <%= admin_widgets_fields(theming, account_config) %>
+        <%= et.input :theme_name, include_blank: false, collection: account_config.themes.names %>
+        <%= render('admin/accounts/configuration_label') %>
+        <%= et.semantic_fields_for :configuration,
+          OpenStruct.new(
+              @account.first_paged_entry_template.configuration
+          ) do |config| %>
+            <%= config.input :home_button_enabled,
+                   as: :boolean,
+                    label: I18n.t('activerecord.attributes.pageflow/entry_template.'\
+                                  'configuration.home_button_enabled') %>
+        <% end %>
+      <%= admin_widgets_fields(et, account_config) %>
     <% end %>
   <% end %>
+
   <%= f.actions do %>
     <%= f.action(:submit) %>
     <%= f.action(:cancel, :wrapper_html => {:class => 'cancel'}) %>