pageflow 12.6.0 → 13.0.0.beta1

data/app/assets/stylesheets/pageflow/page_types/video.scss

@@ -1,5 +1,4 @@
 @import "./video/content_hiding";
-@import "./video/mobile_poster";
 
 .has_native_video_player .page .videoPage .videoWrapper {
   margin-right: 0;
@@ -115,3 +114,7 @@
 .js .non_js_video {
   display: none;
 }
+
+.has_no_native_video_player .videoPage .background_image {
+  display: none;
+}

data/app/assets/stylesheets/pageflow/themes/default/anchors.scss

@@ -1,7 +1,3 @@
-/// Color of the caret icon displayed in front of links. Same as text
-/// color by default.
-$anchor-icon-color: null !default;
-
 %anchor {
   @include fa-caret-right-icon;
 
@@ -29,6 +25,5 @@ $anchor-icon-color: null !default;
     top: 7px;
     width: 10px;
     height: 12px;
-    color: $anchor-icon-color;
   }
 }

data/app/assets/stylesheets/pageflow/themes/default/base.scss

@@ -16,14 +16,12 @@
 
 @import "./built_in_page_types";
 @import "./anchors";
-@import "./cookie_notice_bar";
 @import "./loading_spinner";
 @import "./logo";
 @import "./page";
 @import "./indicators";
 @import "./navigation";
 @import "./mobile_navigation";
-@import "./background_media_unmute_button";
 @import "./multimedia_alert";
 @import "./overview";
 @import "./player_controls";

data/app/assets/stylesheets/pageflow/themes/default/overview/icons/icon_font.scss

@@ -4,10 +4,7 @@
 
   $button-icon-color,
   $active-button-icon-color,
-  $deactivated-button-icon-color,
-
-  $share-icon-color: null,
-  $active-share-icon-color: null
+  $deactivated-button-icon-color
 ) {
 
   .button {

data/app/assets/stylesheets/pageflow/themes/default/page.scss

@@ -11,9 +11,6 @@ $page-header-typography: () !default;
 /// Typography for header tagline.
 $page-header-tagline-typography: () !default;
 
-/// Typography for header tagline in phone layout.
-$page-header-tagline-phone-typography: () !default;
-
 /// Typography for header title.
 $page-header-title-typography: () !default;
 
@@ -29,9 +26,6 @@ $page-header-first-page-title-phone-typography: () !default;
 /// Typography for header subtitle.
 $page-header-subtitle-typography: () !default;
 
-/// Typography for header subtitle in phone layout.
-$page-header-subtitle-phone-typography: () !default;
-
 /// Typography for content text.
 $page-content-text-typography: () !default;
 
@@ -90,7 +84,6 @@ $page-content-text-font-size: 1.2em !default;
 $page-content-text-line-height: 1.5em !default;
 
 @import "./page/anchors";
-@import "./page/hyphenate";
 @import "./page/paddings";
 @import "./page/scroller";
 @import "./page/shadow";
@@ -148,12 +141,6 @@ $page-content-text-line-height: 1.5em !default;
           letter-spacing: 0
         )
       );
-
-      @include phone {
-        @include typography(
-          $page-header-tagline-phone-typography
-        );
-      }
     }
 
     .title {
@@ -194,12 +181,6 @@ $page-content-text-line-height: 1.5em !default;
           margin-bottom: $page-header-subtitle-margin-bottom
         )
       );
-
-      @include phone {
-        @include typography(
-          $page-header-subtitle-phone-typography
-        );
-      }
     }
   }
 

data/app/assets/stylesheets/pageflow/themes/default/page/anchors.scss

@@ -8,14 +8,10 @@ $page-anchor-color: #fff !default;
 /// Color of links inside the text on inverted pages
 $page-anchor-inverted-color: #000 !default;
 
-/// Typography settings of links in page content text
-$page-anchor-typography: () !default;
-
 .contentText a {
   @extend %anchor;
   color: $page-anchor-color;
   pointer-events: all;
-  @include typography($page-anchor-typography)
 }
 
 .invert .contentText a {

data/app/assets/stylesheets/pageflow/themes/default/slideshow.scss

@@ -1,4 +1,3 @@
 .slideshow {
   @extend %pageflow_widget_margin_top !optional;
-  @extend %pageflow_widget_margin_bottom !optional;
 }

data/app/controllers/concerns/pageflow/edit_locking.rb

@@ -5,7 +5,7 @@ module Pageflow
     included do
       rescue_from EditLock::NotHeldError, EditLock::HeldByOtherSessionError do |exception|
         respond_to do |format|
-          format.html { redirect_to :back, :alert => t('pageflow.edit_locks.required') }
+          format.html { redirect_back fallback_location: admin_root_path, :alert => t('pageflow.edit_locks.required') }
           format.json do
             render(:status => :conflict, :json => {
                      :error_message => exception.message,
@@ -17,7 +17,7 @@ module Pageflow
 
       rescue_from EditLock::HeldByOtherUserError do |exception|
         respond_to do |format|
-          format.html { redirect_to :back, :alert => t('pageflow.edit_locks.required_but_held_by_other_user') }
+          format.html { redirect_back fallback_location: admin_root_path, :alert => t('pageflow.edit_locks.required_but_held_by_other_user') }
           format.json do
             render(:status => :conflict, :json => {
                      :error_message => exception.message,

data/app/controllers/concerns/pageflow/public_https_mode.rb

@@ -2,16 +2,12 @@ module Pageflow
   module PublicHttpsMode
     protected
 
-    def redirect_according_to_public_https_mode
+    def check_public_https_mode
       if request.ssl? && Pageflow.config.public_https_mode == :prevent
         redirect_to("http://#{request.host}#{request.fullpath}", status: :moved_permanently)
-        true
       elsif !request.ssl? && Pageflow.config.public_https_mode == :enforce
         redirect_to("https://#{request.host}#{request.fullpath}", status: :moved_permanently)
-        true
       end
     end
-
-    alias_method :check_public_https_mode, :redirect_according_to_public_https_mode
   end
 end

data/app/controllers/concerns/pageflow/quota_verification.rb

@@ -6,7 +6,7 @@ module Pageflow
       rescue_from Quota::ExhaustedError do |exception|
         respond_to do |format|
           format.html do
-            redirect_to :back, :alert => t('pageflow.quotas.exhausted')
+            redirect_back fallback_location: admin_root_path, alert: t('pageflow.quotas.exhausted')
           end
           format.json do
             render(:status => :forbidden,

data/app/controllers/pageflow/application_controller.rb

@@ -5,7 +5,7 @@ module Pageflow
   class ApplicationController < ActionController::Base
     layout 'pageflow/application'
 
-    before_filter do
+    before_action do
       I18n.locale = current_user.try(:locale) || locale_from_accept_language_header || I18n.default_locale
     end
 
@@ -17,7 +17,7 @@ module Pageflow
 
     rescue_from ActionController::UnknownFormat do |exception|
       debug_log_with_backtrace(exception)
-      render(status: 404, text: 'Not found')
+      render(status: 404, plain: 'Not found')
     end
 
     rescue_from ActiveRecord::RecordNotFound do |exception|

data/app/controllers/pageflow/chapters_controller.rb

@@ -2,7 +2,7 @@ module Pageflow
   class ChaptersController < Pageflow::ApplicationController
     respond_to :json
 
-    before_filter :authenticate_user!
+    before_action :authenticate_user!
 
     def create
       storyline = Storyline.find(params[:storyline_id])
@@ -64,7 +64,7 @@ module Pageflow
     private
 
     def chapter_params
-      configuration = params.require(:chapter)[:configuration].try(:permit!)
+      configuration = params.require(:chapter)[:configuration].try(:permit!) || {}
 
       params.require(:chapter)
         .permit(:position, :title)

data/app/controllers/pageflow/edit_locks_controller.rb

@@ -1,6 +1,6 @@
 module Pageflow
   class EditLocksController < Pageflow::ApplicationController
-    before_filter :authenticate_user!
+    before_action :authenticate_user!
 
     respond_to :json
 

data/app/controllers/pageflow/editor/encoding_confirmations_controller.rb

@@ -3,7 +3,7 @@ module Pageflow
     class EncodingConfirmationsController < Pageflow::ApplicationController
       respond_to :json
 
-      before_filter :authenticate_user!
+      before_action :authenticate_user!
 
       def create
         entry = DraftEntry.find(params[:entry_id])

data/app/controllers/pageflow/editor/entries_controller.rb

@@ -3,7 +3,7 @@ module Pageflow
     class EntriesController < Pageflow::ApplicationController
       respond_to :json
 
-      before_filter :authenticate_user!
+      before_action :authenticate_user!
 
       def index
         @entries = DraftEntry.accessible_by(current_ability, :use_files)

data/app/controllers/pageflow/editor/entry_publications_controller.rb

@@ -3,7 +3,7 @@ module Pageflow
     class EntryPublicationsController < Pageflow::ApplicationController
       respond_to :json
 
-      before_filter :authenticate_user!
+      before_action :authenticate_user!
 
       def create
         entry = Entry.find(params[:entry_id])

data/app/controllers/pageflow/editor/files_controller.rb

@@ -3,7 +3,7 @@ module Pageflow
     class FilesController < Pageflow::ApplicationController
       respond_to :json
 
-      before_filter :authenticate_user!
+      before_action :authenticate_user!
 
       def index
         entry = DraftEntry.find(params[:entry_id])

data/app/controllers/pageflow/entries_controller.rb

@@ -3,7 +3,11 @@ module Pageflow
     include PublicHttpsMode
     include EntryPasswordProtection
 
-    before_filter :authenticate_user!, except: [:index, :show, :page]
+    before_action :authenticate_user!, except: [:index, :show, :page]
+
+    before_action :check_public_https_mode,
+                  only: [:index, :show],
+                  unless: lambda { |controller| controller.request.format.json? }
 
     after_action :allow_iframe_for_embed, only: :show
 
@@ -26,12 +30,6 @@ module Pageflow
           @entry = PublishedEntry.find(params[:id], entry_request_scope)
           I18n.locale = @entry.locale
 
-          if redirect_location = entry_redirect(@entry)
-            return redirect_to(redirect_location, status: :moved_permanently)
-          end
-
-          return if redirect_according_to_public_https_mode
-
           if !request.format.css?
             check_entry_password_protection(@entry)
           end
@@ -99,10 +97,6 @@ module Pageflow
       Pageflow.config.public_entry_request_scope.call(Entry, request)
     end
 
-    def entry_redirect(entry)
-      Pageflow.config.public_entry_redirect.call(entry, request)
-    end
-
     def allow_iframe_for_embed
       if params[:embed]
         response.headers.except! 'X-Frame-Options'

data/app/controllers/pageflow/files_controller.rb

@@ -3,7 +3,7 @@ module Pageflow
     include PublicHttpsMode
     include EntryPasswordProtection
 
-    before_filter :check_public_https_mode
+    before_action :check_public_https_mode
 
     def show
       respond_to do |format|

data/app/controllers/pageflow/pages_controller.rb

@@ -2,7 +2,7 @@ module Pageflow
   class PagesController < Pageflow::ApplicationController
     respond_to :json
 
-    before_filter :authenticate_user!
+    before_action :authenticate_user!
 
     def create
       chapter = Chapter.find(params[:chapter_id])
@@ -53,7 +53,7 @@ module Pageflow
     private
 
     def page_params
-      configuration = params.require(:page)[:configuration].try(:permit!)
+      configuration = params.require(:page)[:configuration].try(:permit!) || {}
       params.require(:page).permit(:template, :position, :title).merge(:configuration => configuration)
     end
   end

data/app/controllers/pageflow/revisions_controller.rb

@@ -2,7 +2,7 @@ module Pageflow
   class RevisionsController < Pageflow::ApplicationController
     include QuotaVerification
 
-    before_filter :authenticate_user!, :unless => lambda { |controller| controller.request.format.css? }
+    before_action :authenticate_user!, :unless => lambda { |controller| controller.request.format.css? }
 
     respond_to :json
 

data/app/controllers/pageflow/storylines_controller.rb

@@ -2,7 +2,7 @@ module Pageflow
   class StorylinesController < Pageflow::ApplicationController
     respond_to :json
 
-    before_filter :authenticate_user!
+    before_action :authenticate_user!
 
     def create
       entry = DraftEntry.find(params[:entry_id])
@@ -62,8 +62,7 @@ module Pageflow
     private
 
     def storyline_params
-      configuration = params.require(:storyline)[:configuration].try(:permit!)
-      params.require(:storyline).permit.merge(configuration: configuration)
+      {configuration: params.dig(:storyline, :configuration).try(:permit!)}
     end
   end
 end

data/app/helpers/pageflow/common_entry_seed_helper.rb

@@ -10,7 +10,6 @@ module Pageflow
       {
         locale: entry.locale,
         slug: entry.slug,
-        theming: entry.theming.as_json(only: [:privacy_link_url]),
         page_types: PageTypesSeed.new(config).as_json,
         file_url_templates: FileUrlTemplatesSeed.new(config).as_json,
         file_model_types: config.file_types

data/app/helpers/pageflow/entries_helper.rb

@@ -27,29 +27,11 @@ module Pageflow
 
     def entry_global_links(entry)
       links = []
-
       if entry.theming.imprint_link_label.present? && entry.theming.imprint_link_url.present?
-        links << link_to(raw(entry.theming.imprint_link_label),
-                         entry.theming.imprint_link_url,
-                         target: '_blank',
-                         tabindex: 2,
-                         class: 'legal')
+        links << link_to(raw(entry.theming.imprint_link_label), entry.theming.imprint_link_url, :target => '_blank', :tabindex => 2, :class => 'legal')
       end
-
       if entry.theming.copyright_link_label.present? && entry.theming.copyright_link_url.present?
-        links << link_to(raw(entry.theming.copyright_link_label),
-                         entry.theming.copyright_link_url,
-                         target: '_blank',
-                         tabindex: 2,
-                         class: 'copy')
-      end
-
-      if entry.theming.privacy_link_url.present?
-        links << link_to(I18n.t('pageflow.public.privacy_notice'),
-                         "#{entry.theming.privacy_link_url}?lang=#{entry.locale}",
-                         target: '_blank',
-                         tabindex: 2,
-                         class: 'privacy')
+        links << link_to(raw(entry.theming.copyright_link_label), entry.theming.copyright_link_url, :target => '_blank', :tabindex => 2, :class => 'copy')
       end
 
       if links.any?
@@ -71,22 +53,15 @@ module Pageflow
                              p: Pageflow::VERSION,
                              format: 'css')
 
-      # We cannot use stylesheet_link_tag here since that always uses
-      # the asset host. Entry stylesheet requests are subject to
-      # `Configuration#public_entry_request_scope` and
-      # `Configuration#public_entry_redirect` which might depend on
-      # the hostname.
-      tag(:link,
-          rel: 'stylesheet',
-          href: url,
-          media: 'all',
-          data: {name: 'entry'})
+      stylesheet_link_tag(url,
+                          media: 'all',
+                          data: {name: 'entry'})
     end
 
     def entry_mobile_navigation_pages(entry)
       entry.pages.displayed_in_navigation.tap do |pages|
         if entry.pages.any? && !entry.pages.first.display_in_navigation
-          pages.unshift(entry.pages.first)
+          [entry.pages.first, pages].flatten
         end
       end
     end

data/app/helpers/pageflow/entry_json_seed_helper.rb

@@ -11,7 +11,7 @@ module Pageflow
                                         entry: entry)).html_safe
     end
 
-    def entry_theme_seed(entry)
+    def entry_theming_seed(entry)
       theme = entry.theme
       {
         change_to_parent_page_at_storyline_boundary: theme.change_to_parent_page_at_storyline_boundary?,

data/app/helpers/pageflow/public_i18n_helper.rb

@@ -7,16 +7,11 @@ module Pageflow
     end
 
     def public_i18n_translations(entry)
-      merge_ignoring_nil = lambda do |_, fallback, value|
-        value.presence || fallback
-      end
-
       {
         pageflow: {
           public: I18n.t('pageflow.public', locale: I18n.default_locale)
                       .dup
-                      .deep_merge(I18n.t('pageflow.public', locale: entry.locale),
-                                  &merge_ignoring_nil)
+                      .deep_merge(I18n.t('pageflow.public', locale: entry.locale))
         }
       }
     end