pageflow 13.0.0 → 13.1.0

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

@@ -21,20 +21,11 @@ $logo-watermark-variant-opacity: 0.3 !default;
   $height,
   $phone-height
 ) {
-  .header_logo {
-    @extend %pageflow_widget_margin_top !optional;
-    display: none;
-
-    @include hide-text;
+  %logo {
     position: absolute;
     width: $width;
     height: $height;
     top: $top;
-    z-index: 1;
-
-    pointer-events: none;
-    opacity: $logo-watermark-variant-opacity;
-    @include transition(opacity 500ms);
 
     @include phone {
       width: $phone-height * $width / $height;
@@ -43,6 +34,30 @@ $logo-watermark-variant-opacity: 0.3 !default;
     }
 
     @include logo-alignment;
+  }
+
+  %background_logo {
+    @extend %logo;
+    background-repeat: no-repeat;
+    background-size: 100% auto;
+    background-image: image-url("pageflow/themes/#{$theme-name}/logo_header.#{$logo-image-file-extension}");
+  }
+
+  .header {
+    @extend %pageflow_widget_margin_right !optional;
+    position: relative;
+  }
+
+  .header_logo {
+    @extend %pageflow_widget_margin_top !optional;
+    @extend %logo;
+    @include hide-text;
+
+    display: none;
+    z-index: 1;
+    pointer-events: none;
+    opacity: $logo-watermark-variant-opacity;
+    @include transition(opacity 500ms);
 
     .js & {
       display: block;

data/app/helpers/pageflow/common_entry_seed_helper.rb

@@ -9,7 +9,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,

data/app/helpers/pageflow/entry_json_seed_helper.rb

@@ -11,6 +11,13 @@ module Pageflow
                                         entry: entry)).html_safe
     end
 
+    def entry_attributes_seed(entry)
+      {
+        title: entry.title,
+        slug: entry.slug
+      }
+    end
+
     def entry_theme_seed(entry)
       theme = entry.theme
       {

data/app/models/pageflow/theming.rb

@@ -37,7 +37,8 @@ module Pageflow
         publisher: default_publisher.presence || Pageflow.config.default_publisher_meta_tag,
         keywords: default_keywords.presence || Pageflow.config.default_keywords_meta_tag,
         theme_name: theme_name,
-        home_button_enabled: home_button_enabled_by_default
+        home_button_enabled: home_button_enabled_by_default,
+        locale: default_locale
       )
     end
 

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

@@ -18,6 +18,13 @@
     <% end %>
 
     <%= f.inputs do %>
+      <%= theming.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,
         hint: t('pageflow.admin.themings.default_author_hint'),
         placeholder: Pageflow.config.default_author_meta_tag %>

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

@@ -5,6 +5,9 @@ extensible_attributes_table_for(account.default_theming,
   row :theme, class: 'theme' do
     account.default_theming.theme.name
   end
+  row :default_locale, class: 'default_locale' do
+    t('pageflow.public._language', locale: account.default_theming.default_locale)
+  end
   row :default_author, class: 'default_author'
   row :default_publisher, class: 'default_publisher'
   row :default_keywords, class: 'default_keywords'

data/app/views/pageflow/entries/_mobile_navigation.html.erb

@@ -7,9 +7,8 @@
       <span class="heading-1"><%= t('pageflow.public.overview') %></span>
       <div class="wrapper">
         <ul class="pages">
-          <%= render :partial => 'pageflow/entries/navigation/page',
-                     :collection => entry_mobile_navigation_pages(entry),
-                     :locals => {:image_style => :thumbnail_overview_mobile, :image_width => nil} %>
+          <%= render :partial => 'pageflow/entries/mobile_navigation/page',
+                     :collection => entry_mobile_navigation_pages(entry) %>
         </ul>
       </div>
   </div>

data/app/views/pageflow/entries/mobile_navigation/_page.html.erb

@@ -0,0 +1,5 @@
+<li class="<%= page_navigation_css_class(page) %>">
+  <%= link_to "##{page.perma_id}", data: {link: page.id, chapter_id: page.chapter_id} do %>
+    <%= image_tag('', data: {src: asset_path(page.thumbnail_url(:thumbnail_overview_mobile))}) %>
+  <% end %>
+</li>

data/app/views/pageflow/entries/navigation/_page.html.erb

@@ -4,6 +4,8 @@
   <% end %>
   <div class="navigation_site_detail">
     <%= page.title %>
-    <div class="thumbnail is_<%= page.template %>" style="background-image: url('<%= asset_path(page.thumbnail_url(:navigation_thumbnail_large)) %>')"></div>
+    <div class="thumbnail is_<%= page.template %>">
+      <%= image_tag('', data: {src: asset_path(page.thumbnail_url(:navigation_thumbnail_large))}) %>
+    </div>
   </div>
 </li>

data/app/views/pageflow/entries/overview/_page.html.erb

@@ -4,6 +4,6 @@
         <%= overview_page_description(page) %>
       </p>
     </div>
-    <%= image_tag("#{page.thumbnail_url(:thumbnail_overview_desktop)}") %>
+    <%= image_tag('', data: {src: asset_path(page.thumbnail_url(:thumbnail_overview_desktop))}) %>
     <div class="pictogram"></div>
 <% end %>

data/app/views/pageflow/entries/show.html.erb

@@ -18,7 +18,6 @@
 <%= cache [@entry, :body, @widget_scope] do %>
 
   <%= render 'pageflow/entries/ie8_hint' %>
-  <%= render 'pageflow/entries/loading_spinner' %>
   <%= render 'pageflow/entries/multimedia_alert' %>
   <%= render_widgets(@entry, scope: @widget_scope, insert_point: :before_entry) %>
   <%= render @entry, :widget_scope => @widget_scope %>

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

@@ -1,5 +1,6 @@
 json.merge! common_entry_seed(entry)
 
+json.entry entry_attributes_seed(entry)
 json.theme entry_theme_seed(entry)
 
 json.storylines entry_storylines_seed(entry)

data/app/views/pageflow/react/_widget.html.erb

@@ -1 +1,8 @@
-<%= content_tag(:div, '', data: {widget: name}) %>
+<%= content_tag(:div, '', data: {widget: name}) do -%>
+  <% if server_rendering -%>
+    <% concat React::ServerRendering.render(
+       'pageflow.react.ServerSideWidget',
+       %Q'{ "resolverSeed": #{@_pageflow_react_entry_seed ||= entry_json_seed(entry)}, "widgetTypeName": "#{name}" }',
+       true) %>
+  <% end %>
+<% end %>

data/config/locales/de.yml

@@ -263,6 +263,7 @@ de:
         copyright_link_url: Copyright-Link URL
         default_author: Standard Autor
         default_keywords: Standard Schlüsselwörter
+        default_locale: Standard Sprache
         default_publisher: Standard Herausgeber
         home_button_enabled_by_default: Home-Button in neuen Beiträgen anzeigen
         home_url: Redirect URL
@@ -837,6 +838,7 @@ de:
         cname_hint: Wird in Share Links verwendet.
         default_author_hint: Voreinstellung 'author' Meta-Feld für Eintrage
         default_keywords_hint: Voreinstellung 'keywords' Meta-Feld für Eintrage
+        default_locale_hint: Voreinstellung Sprache für Einträge
         default_publisher_hint: Voreinstellung 'publisher' Meta-Feld für Eintrage
         home_url_hint: Wird einer der obigen CNAMES ohne Pfad in der URL verwendet, wird zu dieser URL umgeleitet. Standard Link Ziel des Home Buttons.
         name: "%{account_name}"
@@ -958,6 +960,8 @@ de:
       page_type_name: Hintergrund Bild/Video
     chapter_hierachy:
       feature_name: Kapitel Hierachie
+    classic_loading_spinner:
+      widget_type_name: Klassisch
     common_page_attributes:
       background_type:
         inline_help: Im Hintergund der Seite kann entweder ein Bild oder ein Video-Loop angezeigt werden.
@@ -1020,6 +1024,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.
+      classic_loading_spinner:
+        widget_type_info_box_text: Dies ist eine Vorschau der klassischen Lade-Ansicht. Wird angezeigt, während der Beitrag lädt.
       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:
@@ -1305,6 +1311,8 @@ de:
         srclang_missing: "(Fehlt)"
       themes:
         header: Themes
+      title_loading_spinner:
+        widget_type_info_box_text: Dies ist eine Vorschau der 'Titel und Bild'-Lade-Ansicht. Die Animation läuft ab, während der Beitrag lädt.
       views:
         chapter_item_view:
           chapter: Kapitel
@@ -1357,6 +1365,18 @@ de:
         storylines_picker_view:
           label: Erzählstrang
           without_parent_page: Ohne übergeordnete Seite
+      widgets:
+        attributes:
+          title_loading_spinner:
+            custom_background_image_id:
+              inline_help: Standardmäßig wird das Hintergrundbild der ersten Seite verwendet.
+              label: Hintegrundbild
+            subtitle:
+              inline_help: Untertitel, der in der Lade-Ansicht gezeigt werden soll.
+              label: Untertitel
+            title:
+              inline_help: Titel, der in der Lade-Ansicht gezeigt werden soll. Standardmäßig wird der Beitragstitel verwendet.
+              label: Titel
     editor_emulation_mode:
       feature_name: Editor Phone Emulationsmodus
     entry:
@@ -1699,6 +1719,8 @@ de:
       scroll_over_from_left: Überlagern (von links)
       scroll_over_from_right: Überlagern (von rechts)
       scroll_right: Scrollen (von rechts)
+    phone_horizontal_slideshow_mode:
+      feature_name: Horizontales Wischen auf Phones
     quotas:
       exhausted: Quota verbraucht.
     selectable_themes:
@@ -1729,6 +1751,9 @@ de:
       feature_name: Erzählstränge
       main: Hauptstrang
       untitled: Unbenannter Erzählstrang
+    title_loading_spinner:
+      feature_name: "'Titel und Bild'-Lade-Ansicht"
+      widget_type_name: Titel und Bild
     ui:
       configuration_editor:
         tabs:
@@ -1736,6 +1761,7 @@ de:
           files: Dateien
           general: Allgemein
           links: Verweise
+          loading_spinner: Lade-Ansicht
           options: Optionen
           phone_horizontal_slideshow_mode: Horizontales Wischen auf Phones
           social: Social
@@ -1846,6 +1872,7 @@ de:
         analytics: Zählpixel
         background_media_control: Hintergrund-Media-Control
         cookie_notice: Cookie Hinweis
+        loading_spinner: Lade-Ansicht
         mobile_navigation: Mobile Navigation
         navigation: Navigationsleiste
         player_controls: Player Controls

data/config/locales/en.yml

@@ -263,6 +263,7 @@ en:
         copyright_link_url: Copyright link URL
         default_author: Default author
         default_keywords: Default keywords
+        default_locale: Default locale
         default_publisher: Default publisher
         home_button_enabled_by_default: "'Home'-Button enabled by default"
         home_url: Redirect URL
@@ -837,6 +838,7 @@ en:
         cname_hint: Used in public sharing URLs.
         default_author_hint: Default 'author' meta field for entries
         default_keywords_hint: Default 'keywords' meta field for entries
+        default_locale_hint: Default language for entries
         default_publisher_hint: Default 'publisher' meta field for entries
         home_url_hint: Used for requests to the root path with one of the above CNAMES. Default target location for the home button.
         name: "%{account_name}"
@@ -956,6 +958,8 @@ en:
       page_type_name: Background image/video
     chapter_hierachy:
       feature_name: Chapter Hierachy
+    classic_loading_spinner:
+      widget_type_name: Classic
     common_page_attributes:
       background_type:
         inline_help: The page background can either display an image or a video loop.
@@ -1020,6 +1024,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.
+      classic_loading_spinner:
+        widget_type_info_box_text: This is a preview of the classic loading spinner. It is displayed while the page is loading.
       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:
@@ -1305,6 +1311,8 @@ en:
         srclang_missing: "(Missing)"
       themes:
         header: Themes
+      title_loading_spinner:
+        widget_type_info_box_text: This is a preview of the 'Title and Image' loading view. The animation runs while the page is loading.
       views:
         chapter_item_view:
           chapter: Chapter
@@ -1357,6 +1365,18 @@ en:
         storylines_picker_view:
           label: Storyline
           without_parent_page: Without parent page
+      widgets:
+        attributes:
+          title_loading_spinner:
+            custom_background_image_id:
+              inline_help: By default the background image of the first page is used.
+              label: Background image
+            subtitle:
+              inline_help: Subtitle to display in loadiner view.
+              label: Subtitle
+            title:
+              inline_help: Title to display in loadiner view. Defaults to entry title.
+              label: Title
     editor_emulation_mode:
       feature_name: Editor phone emulation mode
     entry:
@@ -1671,6 +1691,8 @@ en:
       scroll_over_from_left: Scroll over from left
       scroll_over_from_right: Scroll over from right
       scroll_right: Scroll right
+    phone_horizontal_slideshow_mode:
+      feature_name: Horizontal swipe on phone
     quotas:
       exhausted: Quota exhausted
     selectable_themes:
@@ -1701,6 +1723,9 @@ en:
       feature_name: Storylines
       main: Main storyline
       untitled: Unnamed storyline
+    title_loading_spinner:
+      feature_name: "'Title and image' loading view"
+      widget_type_name: Title and Image
     ui:
       configuration_editor:
         tabs:
@@ -1708,6 +1733,7 @@ en:
           files: Files
           general: General
           links: Links
+          loading_spinner: Loading View
           options: Options
           phone_horizontal_slideshow_mode: Horizontal swipe on phone
           social: Social
@@ -1821,6 +1847,7 @@ en:
         analytics: Tracking
         background_media_control: Background media control
         cookie_notice: Cookie Notice
+        loading_spinner: Loading View
         mobile_navigation: Mobile navigation
         navigation: Navigation bar
         player_controls: Player Controls

data/db/migrate/20190109085744_add_default_locale_to_themings.rb

@@ -0,0 +1,6 @@
+class AddDefaultLocaleToThemings < ActiveRecord::Migration[5.2]
+  def change
+    add_column :pageflow_themings, :default_locale, :string,
+               after: 'default_publisher', default: 'de'
+  end
+end

data/lib/pageflow/built_in_widget_type.rb

@@ -47,5 +47,19 @@ module Pageflow
     def self.unmute_button
       Pageflow::React.create_widget_type('unmute_button', 'background_media_control')
     end
+
+    def self.classic_loading_spinner
+      Pageflow::React.create_widget_type('classic_loading_spinner',
+                                         'loading_spinner',
+                                         insert_point: :before_entry,
+                                         server_rendering: true)
+    end
+
+    def self.title_loading_spinner
+      Pageflow::React.create_widget_type('title_loading_spinner',
+                                         'loading_spinner',
+                                         insert_point: :before_entry,
+                                         server_rendering: true)
+    end
   end
 end

data/lib/pageflow/built_in_widget_types_plugin.rb

@@ -3,7 +3,18 @@ module Pageflow
     def configure(config)
       config.widget_types.register(Pageflow::BuiltInWidgetType.default_slideshow_mode,
                                    default: true)
-      config.widget_types.register(Pageflow::BuiltInWidgetType.phone_horizontal_slideshow_mode)
+
+      config.features.register('phone_horizontal_slideshow_mode') do |feature_config|
+        feature_config.widget_types.register(Pageflow::BuiltInWidgetType
+                                               .phone_horizontal_slideshow_mode)
+      end
+
+      config.widget_types.register(Pageflow::BuiltInWidgetType.classic_loading_spinner,
+                                   default: true)
+
+      config.features.register('title_loading_spinner') do |feature_config|
+        feature_config.widget_types.register(Pageflow::BuiltInWidgetType.title_loading_spinner)
+      end
 
       config.widget_types.register(Pageflow::BuiltInWidgetType.navigation, default: true)
       config.widget_types.register(Pageflow::BuiltInWidgetType.mobile_navigation, default: true)

data/lib/pageflow/react.rb

@@ -4,8 +4,8 @@ module Pageflow
       Pageflow::React::PageType.new(name, options)
     end
 
-    def self.create_widget_type(name, role)
-      Pageflow::React::WidgetType.new(name, role)
+    def self.create_widget_type(name, role, options = {})
+      Pageflow::React::WidgetType.new(name, role, options)
     end
   end
 end

data/lib/pageflow/react/widget_type.rb

@@ -17,8 +17,11 @@ module Pageflow
         @options[:insert_point] || super
       end
 
-      def render(template, _)
-        template.render(File.join('pageflow', 'react', 'widget'), name: name)
+      def render(template, entry)
+        template.render(File.join('pageflow', 'react', 'widget'),
+                        entry: entry,
+                        name: name,
+                        server_rendering: options[:server_rendering])
       end
     end
   end

data/lib/pageflow/version.rb

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