pageflow 13.0.0.beta5 → 13.0.0.beta6

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

@@ -0,0 +1,15 @@
+.videoPage .background_image {
+  display: none;
+}
+
+.has_phone_platform {
+  // Show mobile poster only on phone platform
+  .videoPage .background_image {
+    display: block;
+  }
+
+  // But not while playing inline (e.g. on Android)
+  &.has_no_native_video_player .videoPage.should_play .background_image {
+    display: none;
+  }
+}

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

@@ -16,6 +16,7 @@
 
 @import "./built_in_page_types";
 @import "./anchors";
+@import "./cookie_notice_bar";
 @import "./loading_spinner";
 @import "./logo";
 @import "./page";

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

@@ -0,0 +1,57 @@
+/// Color of the cookie notice bar
+$cookie-notice-bar-background-color: rgba(20, 20, 20, 0.9);
+
+/// Color of the text inside cookie notice bar
+$cookie-notice-bar-text-color: #fff;
+
+$cookie-notice-bar-link-text-color: $main-color;
+
+$cookie-notice-bar-typography: ();
+
+$cookie-notice-bar-dismiss-button-background-color: $main-color-dark;
+
+$cookie-notice-bar-dismiss-button-text-color: #fff;
+
+.cookie_notice_bar {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background-color: $cookie-notice-bar-background-color;
+  color: $cookie-notice-bar-text-color;
+  padding: 10px 20px;
+  z-index: 2;
+
+  @include standard-typography(
+    $cookie-notice-bar-typography
+  );
+
+  &-content {
+    @extend %pageflow_widget_margin_right_max !optional;
+  }
+
+  &-text {
+    margin-top: 10px;
+    margin-bottom: 10px;
+    display: inline-block;
+
+    a {
+      color: $cookie-notice-bar-link-text-color;
+    }
+  }
+
+  &-dismiss {
+    background-color: $cookie-notice-bar-dismiss-button-background-color;
+    color: $cookie-notice-bar-dismiss-button-text-color;
+    border-radius: 3px;
+    float: right;
+    margin-top: 5px;
+    padding: 5px 10px;
+  }
+}
+
+@include pageflow-widget-margin("cookie_notice_bar_visible", "bottom") {
+  @include desktop {
+    margin-bottom: 60px;
+  }
+}

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

@@ -84,6 +84,7 @@ $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";

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

@@ -0,0 +1,24 @@
+/// Let browser break words in header.
+///
+/// - `"narrow"`: Only allow hyphenating words when header is narrow,
+///   i.e. in portrait phone layout.
+///
+/// - `"always"`: Always break words
+///
+/// - `"never"`: Never break words
+$page-hyphenate-header: "narrow" !default;
+
+.page {
+  h2 {
+    @if $page-hyphenate-header == "always" {
+
+      hyphens: auto;
+
+    } @else if $page-hyphenate-header == "narrow" {
+
+      @include phone_portrait {
+        hyphens: auto;
+      }
+    }
+  }
+}

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

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

data/app/controllers/pageflow/admin/initial_passwords_controller.rb

@@ -0,0 +1,8 @@
+module Pageflow
+  module Admin
+    class InitialPasswordsController < Devise::PasswordsController
+      layout 'active_admin_logged_out'
+      helper ActiveAdmin::ViewHelpers
+    end
+  end
+end

data/app/helpers/pageflow/common_entry_seed_helper.rb

@@ -10,6 +10,7 @@ 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,11 +27,29 @@ 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')
+        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')
       end
 
       if links.any?

data/app/helpers/pageflow/entry_json_seed_helper.rb

@@ -11,7 +11,7 @@ module Pageflow
                                         entry: entry)).html_safe
     end
 
-    def entry_theming_seed(entry)
+    def entry_theme_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,11 +7,16 @@ 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))
+                      .deep_merge(I18n.t('pageflow.public', locale: entry.locale),
+                                  &merge_ignoring_nil)
         }
       }
     end

data/app/models/pageflow/published_entry.rb

@@ -59,8 +59,21 @@ module Pageflow
       PublishedEntry.new(scope.published.find(id))
     end
 
+    def cache_key
+      [
+        self.class.model_name.cache_key,
+        entry.cache_key,
+        revision.cache_key,
+        theming.cache_key
+      ].compact.join('-')
+    end
+
     def cache_version
-      "#{entry.cache_version}-#{revision.cache_version}-#{theming.cache_version}"
+      [
+        entry.cache_version,
+        revision.cache_version,
+        theming.cache_version
+      ].compact.join('-').presence
     end
 
     def home_button

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

@@ -34,6 +34,7 @@
       <%= 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) %>

data/app/views/pageflow/admin/initial_passwords/edit.html.erb

@@ -0,0 +1,16 @@
+<div id="login">
+  <h2><%= render_or_call_method_or_proc_on(self, active_admin_application.site_title) %> - <%= title t('pageflow.initial_password.title') %></h2>
+
+  <%= devise_error_messages! %>
+  <%= active_admin_form_for(resource, as: resource_name, url: admin_initial_password_path, html: { method: :put }) do |f|
+    f.inputs do
+      f.input :password
+      f.input :password_confirmation
+      f.input :reset_password_token, as: :hidden, input_html: { value: resource.reset_password_token }
+    end
+    f.actions do
+      f.action :submit, label: t('pageflow.initial_password.submit'), button_html: { value: t('pageflow.initial_password.submit') }
+    end
+  end
+  %>
+</div>

data/app/views/pageflow/entry_json_seed/_entry.json.jbuilder

@@ -1,6 +1,6 @@
 json.merge! common_entry_seed(entry)
 
-json.theming entry_theming_seed(entry)
+json.theme entry_theme_seed(entry)
 
 json.storylines entry_storylines_seed(entry)
 json.chapters entry_chapters_seed(entry)

data/app/views/pageflow/user_mailer/invitation.html.erb

@@ -2,8 +2,8 @@
 
 <p><%= t('.instruction') %></p>
 
-<p><%= link_to main_app.edit_user_password_url(@user, reset_password_token: @password_token),
-               main_app.edit_user_password_url(@user, reset_password_token: @password_token) %></p>
+<p><%= link_to edit_admin_initial_password_url(reset_password_token: @password_token),
+               edit_admin_initial_password_url(reset_password_token: @password_token) %></p>
 
 <p><%= t('.ending') %></p>
 

data/app/views/pageflow/user_mailer/invitation.text.erb

@@ -2,7 +2,7 @@
 
 <%= t('.instruction') %>
 
-<%= main_app.edit_user_password_url(@user, reset_password_token: @password_token) %>
+<%= edit_admin_initial_password_url(reset_password_token: @password_token) %>
 
 <%= t('.ending') %>
 

data/config/locales/de.yml

@@ -268,6 +268,7 @@ de:
         home_url: Redirect URL
         imprint_link_label: Impressum-Link Text
         imprint_link_url: Impressum-Link URL
+        privacy_link_url: Datenschutz-Link URL
         theme_name: Theme
       pageflow/video_file:
         dimensions: Maße
@@ -983,6 +984,8 @@ de:
         captions: Ton-Ersatz-Textspur
         descriptions: Bild-Ersatz-Textspur
         subtitles: Übersetzungs-Textspur
+    cookie_notice_bar:
+      widget_type_name: Leiste am unteren Seitenrand
     default_theme:
       name: Standard
     delayed_text_fade_in:
@@ -1017,6 +1020,8 @@ de:
         header: Dies ist ein leerer Pageflow
         intro: Pageflows bestehen aus Kapiteln und Seiten. In der Seitenleiste rechts findest Du die Gliederung.
         outro: Hier siehst Du dann eine Vorschau deines Pageflows.
+      cookie_notice_bar:
+        widget_type_info_box_text: Der Hinweis wird beim ersten Öffnen von Beiträgen, die Cookies verwenden, am unteren Seitenrand angezeigt. Cookies werden gesetzt, falls ein Dienst zur Erhebnung von Nutzungsdaten (z.B. Google Analytics) verwendet wird oder wenn die Funktion 'Neue Seiten hervorheben' aktiv ist.
       entries:
         unsupported_browser_hint:
           message: Die Version Ihres Browsers wird vom Pageflow Editor nicht unterstützt. Bitte benutzen Sie einen aktuellen Browser.
@@ -1652,6 +1657,9 @@ de:
         image_rights: Bildrechte
     highdef_video_encoding:
       feature_name: Full HD und 4K Videos
+    initial_password:
+      submit: Speichern und anmelden
+      title: Passwort festlegen
     invalid_transition: Der gewünschte Statuswechsel ist nicht erlaubt.
     languages:
       ar: Arabisch
@@ -1718,6 +1726,7 @@ de:
     ui:
       configuration_editor:
         tabs:
+          cookie_notice_bar: Cookie Hinweis
           files: Dateien
           general: Allgemein
           links: Verweise
@@ -1763,7 +1772,7 @@ de:
 
             Alle Änderungen sind in der linken Frontend-Ansicht sichtbar, sobald das entsprechende Texteingabefeld im Editierbereich verlassen wurde.
           thumbnail_image_id: Das Thumbnail ersetzt das ansonsten automatisch generierte Vorschaubild in der Navigation und in der Übersicht.
-          transition: Wähle hier den Effekt, der beim Erreichen dieser der Seite benutzt werden soll.
+          transition: Wähle hier den Effekt, der beim Erreichen dieser Seite benutzt werden soll.
       templates:
         inputs:
           file_input:
@@ -1825,6 +1834,7 @@ de:
       none: "(Kein)"
       roles:
         analytics: Zählpixel
+        cookie_notice: Cookie Hinweis
         mobile_navigation: Mobile Navigation
         navigation: Navigationsleiste
         player_controls: Player Controls

data/config/locales/en.yml

@@ -268,6 +268,7 @@ en:
         home_url: Redirect URL
         imprint_link_label: Legal notice link label
         imprint_link_url: Legal notice link URL
+        privacy_link_url: Privacy link URL
         theme_name: Theme
       pageflow/video_file:
         dimensions: Dimensions
@@ -981,6 +982,8 @@ en:
         captions: Audio Replacement Text Track
         descriptions: Image Description Text Track
         subtitles: Translation Text Track
+    cookie_notice_bar:
+      widget_type_name: Bar at lower page margin
     default_theme:
       name: Default
     delayed_text_fade_in:
@@ -1017,6 +1020,8 @@ en:
         header: This is an empty Pageflow
         intro: Each Pageflow consist of chapters and pages. The editor panel to your right shows the outline of your story.
         outro: In this area, a live preview will be shown.
+      cookie_notice_bar:
+        widget_type_info_box_text: The notice is displayed when visiting an entry that uses Cookies. Cookies are set, if an analytics integration is active or the 'Emphasize new pages' feature has been enabled.
       entries:
         unsupported_browser_hint:
           message: The Pageflow editor does not support the browser version you are using. We recommend upgrading your browser to the most recent version.
@@ -1624,6 +1629,9 @@ en:
         image_rights: Credits
     highdef_video_encoding:
       feature_name: Full HD and 4K videos
+    initial_password:
+      submit: Save and sign in
+      title: Set your password
     invalid_transition: Invalid transition
     languages:
       ar: Arabic
@@ -1690,6 +1698,7 @@ en:
     ui:
       configuration_editor:
         tabs:
+          cookie_notice_bar: Cookie Notice
           files: Files
           general: General
           links: Links
@@ -1800,6 +1809,7 @@ en:
       none: "(none)"
       roles:
         analytics: Tracking
+        cookie_notice: Cookie Notice
         mobile_navigation: Mobile navigation
         navigation: Navigation bar
         player_controls: Player Controls

data/config/routes.rb

@@ -30,6 +30,12 @@ Pageflow::Engine.routes.draw do
       resource :edit_lock
     end
 
+    namespace :admin do
+      devise_scope :user do
+        resource :initial_password, only: [:edit, :update]
+      end
+    end
+
     namespace :editor do
       resources :entries, :only => :index, :shallow => true do
         get :seed, :on => :member

data/db/migrate/20180528144334_add_privacy_link_url_to_themings.rb

@@ -0,0 +1,5 @@
+class AddPrivacyLinkUrlToThemings < ActiveRecord::Migration[5.2]
+  def change
+    add_column :pageflow_themings, :privacy_link_url, :string
+  end
+end

data/lib/pageflow/built_in_widget_type.rb

@@ -31,5 +31,9 @@ module Pageflow
     def self.slim_player_controls
       new('slim_player_controls', ['player_controls'], 'pageflow/widgets/placeholder')
     end
+
+    def self.cookie_notice_bar
+      Pageflow::React.create_widget_type('cookie_notice_bar', 'cookie_notice')
+    end
   end
 end

data/lib/pageflow/built_in_widget_types_plugin.rb

@@ -5,6 +5,7 @@ module Pageflow
       config.widget_types.register(Pageflow::BuiltInWidgetType.mobile_navigation, default: true)
       config.widget_types.register(Pageflow::BuiltInWidgetType.slim_player_controls)
       config.widget_types.register(Pageflow::BuiltInWidgetType.classic_player_controls, default: true)
+      config.widget_types.register(Pageflow::BuiltInWidgetType.cookie_notice_bar)
     end
   end
 end

data/lib/pageflow/version.rb

@@ -1,3 +1,3 @@
 module Pageflow
-  VERSION = '13.0.0.beta5'.freeze
+  VERSION = '13.0.0.beta6'.freeze
 end