pageflow 15.1.0 → 15.2.2

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

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

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

@@ -2,16 +2,4 @@ extensible_attributes_table_for(account.default_theming,
                                 Pageflow.config_for(account)
                                   .admin_attributes_table_rows.for(:theming)) do
   row :cname, class: 'cname'
-  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'
-  row :default_share_providers, class: 'default_share_providers' do
-    account.default_theming.default_share_providers.keys.map(&:camelize).join(', ')
-  end
 end

data/app/views/pageflow/themes/_theme.json.jbuilder

@@ -11,3 +11,4 @@ json.hide_text_on_swipe theme.hide_text_on_swipe?
 json.emphasized_pages theme.supports_emphasized_pages?
 json.scroll_indicator_modes theme.supports_scroll_indicator_modes?
 json.change_to_parent_page_at_storyline_boundary theme.change_to_parent_page_at_storyline_boundary?
+json.hide_logo_option theme.supports_hide_logo_on_pages?

data/config/locales/de.yml

@@ -198,6 +198,16 @@ de:
         updated_at: Geändert am
         url: Permalink
         with_publication_state: Veröffentlichungsstatus
+      pageflow/entry_template:
+        configuration:
+          group_label: Konfiguration
+          home_button_enabled: Home-Button in neuen Beiträgen anzeigen
+        default_author: Standard-Autor
+        default_keywords: Standard-Schlüsselwörter
+        default_locale: Standard-Sprache
+        default_publisher: Standard-Herausgeber
+        default_share_providers: Standard-Share-Links
+        theme_name: Theme
       pageflow/folder:
         account: Konto
         name: Name
@@ -226,6 +236,7 @@ de:
         display_in_navigation: In Navigationsleiste anzeigen
         emphasize_in_navigation: In Navigationsleiste hervorheben
         gradient_opacity: Intensität der Abblendung
+        hide_logo: Logo ausblenden
         hide_title: Titel ausblenden
         invert: Farben invertieren
         linked_page_ids: Seiten verknüpfen
@@ -260,18 +271,11 @@ de:
         cname: CNAME
         copyright_link_label: Copyright-Link Text
         copyright_link_url: Copyright-Link URL
-        default_author: Standard Autor
-        default_keywords: Standard Schlüsselwörter
-        default_locale: Standard Sprache
-        default_publisher: Standard Herausgeber
-        default_share_providers: Standard Share Links
-        home_button_enabled_by_default: Home-Button in neuen Beiträgen anzeigen
         home_url: Redirect URL
         imprint_link_label: Impressum-Link Text
         imprint_link_url: Impressum-Link URL
         privacy_link_url: Datenschutz-Link URL
         share_providers: Standard Share Links
-        theme_name: Theme
       pageflow/video_file:
         dimensions: Maße
         duration: Länge
@@ -1884,6 +1888,7 @@ de:
             Die Intensität des Farbverlaufs dient der Lesbarkeit von Texten auf Videos oder Bildern.
 
             Durch den Schieberegler kann der Bildhintergrund so stark abgedunkelt bzw. aufgehellt werden, bis der Kontrast zwischen Bild und Text ausreichend ist.
+          hide_logo: Logo auf dieser Seite ausblenden
           invert: "Beim Invertieren werden „hell“ und „dunkel“ vertauscht, die sonst weiße Schrift ändert sich dabei automatisch in schwarz. \n\nGrundsätzlich gilt: Helle Schrift für dunkle Bilder, dunkle Schrift für helle Bilder."
           mobile_poster_image_id: Dieses Bild wird in der Mobilvariante der Seite als Posterbild gezeigt.
           text: |-

data/config/locales/en.yml

@@ -198,6 +198,16 @@ en:
         updated_at: Updated at
         url: Permalink
         with_publication_state: Publication state
+      pageflow/entry_template:
+        configuration:
+          group_label: Configuration
+          home_button_enabled: "'Home'-Button enabled by default"
+        default_author: Default author
+        default_keywords: Default keywords
+        default_locale: Default locale
+        default_publisher: Default publisher
+        default_share_providers: Default share links
+        theme_name: Theme
       pageflow/folder:
         account: Account
         name: Name
@@ -226,6 +236,7 @@ en:
         display_in_navigation: Show in navigationbar
         emphasize_in_navigation: Emphasize in navigationbar
         gradient_opacity: Gradient opacity
+        hide_logo: Hide logo
         hide_title: Hide titles
         invert: Invert colors
         linked_page_ids: Link pages
@@ -260,18 +271,11 @@ en:
         cname: CNAME
         copyright_link_label: Copyright link Text
         copyright_link_url: Copyright link URL
-        default_author: Default author
-        default_keywords: Default keywords
-        default_locale: Default locale
-        default_publisher: Default publisher
-        default_share_providers: Default Share Links
-        home_button_enabled_by_default: "'Home'-Button enabled by default"
         home_url: Redirect URL
         imprint_link_label: Legal notice link label
         imprint_link_url: Legal notice link URL
         privacy_link_url: Privacy link URL
         share_providers: Default Share Links
-        theme_name: Theme
       pageflow/video_file:
         dimensions: Dimensions
         duration: Duration
@@ -1854,6 +1858,7 @@ en:
             The opacity of the gradient improves the legibility of the text on background-videos or pictures.
 
             You can use the slider to darken or lighten up the background until the contrast between text and background is optimal.
+          hide_logo: Hide logo on current page
           invert: |-
             If you invert the colors, „bright“ and „dark“ are interchanged. Thus the normally white font changes into black.
 

data/db/migrate/20200122115400_create_pageflow_entry_templates.rb

@@ -0,0 +1,75 @@
+# Create entry templates, which hold template data for new
+# entries. Data can be entry type-specific
+class CreatePageflowEntryTemplates < ActiveRecord::Migration[5.2]
+  def up
+    create_table :pageflow_entry_templates do |t|
+      t.references :account
+      t.string :entry_type
+      t.string :theme_name, default: 'default'
+      t.string :default_author
+      t.string :default_publisher
+      t.string :default_keywords
+      t.string :default_locale, default: 'de'
+      t.text :default_share_providers
+      t.text :configuration
+    end
+
+    execute('INSERT INTO pageflow_entry_templates '\
+              '(account_id, entry_type, theme_name, default_author, default_publisher, '\
+              'default_keywords, default_locale, default_share_providers, configuration) '\
+            "SELECT account_id, 'paged', theme_name, default_author, default_publisher, "\
+              'default_keywords, default_locale, default_share_providers, '\
+              "CONCAT('{\"home_button_enabled\":', "\
+              "home_button_enabled_by_default, '}') "\
+            'FROM pageflow_themings;')
+
+    execute('UPDATE pageflow_widgets w, pageflow_entry_templates et, pageflow_themings t '\
+            "SET w.subject_type='Pageflow::EntryTemplate', w.subject_id = et.id "\
+            "WHERE et.account_id = t.account_id and et.entry_type = 'paged' "\
+              "and w.subject_id = t.id and w.subject_type = 'Pageflow::Theming';")
+
+    remove_column :pageflow_themings, :theme_name
+    remove_column :pageflow_themings, :default_author
+    remove_column :pageflow_themings, :default_publisher
+    remove_column :pageflow_themings, :default_keywords
+    remove_column :pageflow_themings, :default_locale
+    remove_column :pageflow_themings, :default_share_providers
+    remove_column :pageflow_themings, :home_button_enabled_by_default
+  end
+
+  def down
+    add_column :pageflow_themings, :theme_name, :string
+    add_column :pageflow_themings, :default_author, :string
+    add_column :pageflow_themings, :default_publisher, :string
+    add_column :pageflow_themings, :default_keywords, :string
+    add_column :pageflow_themings, :default_locale, :string, default: 'de'
+    add_column :pageflow_themings, :default_share_providers, :text
+    add_column :pageflow_themings, :home_button_enabled_by_default, :boolean, default: true
+
+    execute('UPDATE pageflow_themings t, pageflow_entry_templates et '\
+            'SET t.theme_name = et.theme_name, t.default_author = et.default_author, '\
+              't.default_publisher = et.default_publisher, '\
+              't.default_keywords = et.default_keywords, '\
+              't.default_locale = et.default_locale, '\
+              't.default_share_providers = et.default_share_providers, '\
+              't.home_button_enabled_by_default = et.configuration '\
+                "REGEXP 'home_button_enabled\":1' "\
+                "WHERE et.entry_type='paged' and t.account_id = et.account_id;")
+
+    execute('UPDATE pageflow_themings SET home_button_enabled_by_default = 0 '\
+            'WHERE home_button_enabled_by_default IS NULL;')
+
+    change_column :pageflow_themings,
+                  :home_button_enabled_by_default,
+                  :boolean,
+                  null: false,
+                  default: true
+
+    execute('UPDATE pageflow_widgets w, pageflow_entry_templates et, pageflow_themings t '\
+            "SET w.subject_type='Pageflow::Theming', w.subject_id = t.id "\
+            "WHERE et.account_id = t.account_id and et.entry_type = 'paged' "\
+              "and w.subject_id = et.id and w.subject_type = 'Pageflow::EntryTemplate';")
+
+    drop_table :pageflow_entry_templates
+  end
+end

data/db/migrate/20200206134400_convert_legacy_scrolled_content_element_types.rb

@@ -0,0 +1,48 @@
+class ConvertLegacyScrolledContentElementTypes < ActiveRecord::Migration[5.2]
+  def up
+    lorem_ipsum1 = 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam ' \
+                    'nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam ' \
+                    'erat, sed diam voluptua. '
+
+    lorem_ipsum2 = 'At vero eos et accusam et justo duo dolores et ea rebum. Stet clita ' \
+                   'kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. ' \
+                   'Lorem ipsum dolor sit amet, consetetur sadipscing elitr. Sed diam nonumy ' \
+                   'eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam ' \
+                   'voluptua. At vero eos et accusam et justo duo dolores et ea rebum. ' \
+                   'Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum ' \
+                   'dolor sit amet. Lorem ipsum dolor sit amet.'
+
+    lorem_ipsum3 = 'Consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ' \
+                   'ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero ' \
+                   'eos et accusam et justo duo dolores et ea rebum. Stet clita kasd  ' \
+                   'gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. '\
+                   'Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse ' \
+                   'molestie consequat, vel illum dolore eu feugiat nulla facilisis at ' \
+                   'vero eros et accumsan et iusto odio dignissim qui blandit praesent ' \
+                   'luptatum zzril delenit augue duis dolore te feugait nulla facilisi.'
+
+    execute(<<-SQL)
+      UPDATE pageflow_scrolled_content_elements
+      SET type_name = "inlineImage"
+      WHERE type_name = "stickyImage";
+    SQL
+
+    execute(<<-SQL)
+      UPDATE pageflow_scrolled_content_elements
+      SET type_name = "textBlock", configuration = '{"children": "#{lorem_ipsum1}", "dummy": true}'
+      WHERE type_name = "loremIpsum1";
+    SQL
+
+    execute(<<-SQL)
+      UPDATE pageflow_scrolled_content_elements
+      SET type_name = "textBlock", configuration = '{"children": "#{lorem_ipsum2}", "dummy": true}'
+      WHERE type_name = "loremIpsum2";
+    SQL
+
+    execute(<<-SQL)
+      UPDATE pageflow_scrolled_content_elements
+      SET type_name = "textBlock", configuration = '{"children": "#{lorem_ipsum3}", "dummy": true}'
+      WHERE type_name = "loremIpsum3";
+    SQL
+  end
+end

data/entry_types/paged/app/assets/javascripts/pageflow_paged/dist/editor.js

@@ -1141,6 +1141,7 @@ var pageflow_paged = (function (exports, Backbone, _$1, Marionette, $, I18n$1, C
 
   var inputView = {
     ui: {
+      label: 'label',
       labelText: 'label .name',
       inlineHelp: 'label .inline_help'
     },
@@ -1186,6 +1187,7 @@ var pageflow_paged = (function (exports, Backbone, _$1, Marionette, $, I18n$1, C
         this.ui.inlineHelp.hide();
       }
 
+      this.setLabelFor();
       this.updateDisabled();
       this.setupVisibleBinding();
     },
@@ -1221,6 +1223,13 @@ var pageflow_paged = (function (exports, Backbone, _$1, Marionette, $, I18n$1, C
         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);
@@ -3917,7 +3926,9 @@ var pageflow_paged = (function (exports, Backbone, _$1, Marionette, $, I18n$1, C
       }
 
       var payloadJson = JSON.parse(decodeURIComponent(encodedPayload));
-      return new this.fileSelectionHandlers[handlerName](payloadJson);
+      return new this.fileSelectionHandlers[handlerName](_objectSpread({}, payloadJson, {
+        entry: state.entry
+      }));
     },
     createPageConfigurationEditorView: function createPageConfigurationEditorView(page, options) {
       var view = this.pageTypes.findByPage(page).createConfigurationEditorView(_$1.extend(options, {
@@ -3930,6 +3941,13 @@ var pageflow_paged = (function (exports, Backbone, _$1, Marionette, $, I18n$1, C
   var editor$1 = new EditorApi();
 
   var startEditor = function startEditor(options) {
+    // In Webpack builds, I18n object from the i18n-js module is not
+    // identical to window.I18n which is provided by the i18n-js gem via
+    // the asset pipeline. Make translations provided via the asset
+    // pipeline available in Webpack bundle.
+    I18n$1.defaultLocale = window.I18n.defaultLocale;
+    I18n$1.locale = window.I18n.locale;
+    I18n$1.translations = window.I18n.translations;
     $(function () {
       $.when($.getJSON('/editor/entries/' + options.entryId + '/seed'), pageflow.browser.detectFeatures()).done(function (result) {
         app.start(result[0]);
@@ -5038,6 +5056,9 @@ var pageflow_paged = (function (exports, Backbone, _$1, Marionette, $, I18n$1, C
     },
     supportsScrollIndicatorModes: function supportsScrollIndicatorModes() {
       return this.get('scroll_indicator_modes');
+    },
+    supportsHideLogoOnPages: function supportsHideLogoOnPages() {
+      return this.get('hide_logo_option');
     }
   });
   var WidgetConfiguration = Configuration.extend({
@@ -6048,7 +6069,16 @@ var pageflow_paged = (function (exports, Backbone, _$1, Marionette, $, I18n$1, C
     initialize: function initialize(attributes, options) {
       options = options || {};
       this.metadata = new EntryMetadata(this.get('metadata') || {});
-      this.metadata.parent = this;
+      this.metadata.parent = this; // In 15.1 `entry.configuration` was turned into a new `Metadata`
+      // model. Some of the entry type specific data (like
+      // `home_button_enabled`) was extraced into
+      // `entry.metadata.configuration`. Attributes like `title` or `locale`
+      // which used to live in `entry.configuration` now live in
+      // entry.metadata. Since some plugins (e.g. `pageflow-vr`) depend on
+      // reading the locale from `entry.configuration`, this `configuration`
+      // keeps backwards compatibility.
+
+      this.configuration = this.metadata;
       this.themes = options.themes || state.themes;
       this.files = options.files || state.files;
       this.fileTypes = options.fileTypes || editor$1.fileTypes;
@@ -6631,6 +6661,7 @@ var pageflow_paged = (function (exports, Backbone, _$1, Marionette, $, I18n$1, C
       this.outlet.show(this.options.view);
     },
     goBack: function goBack() {
+      this.options.view.onGoBack && this.options.view.onGoBack();
       editor$1.navigate('/', {
         trigger: true
       });
@@ -8152,6 +8183,8 @@ var pageflow_paged = (function (exports, Backbone, _$1, Marionette, $, I18n$1, C
       'change:template': 'load'
     },
     onRender: function onRender() {
+      var _this = this;
+
       this.pageTypeContainer.show(new ExtendedSelectInputView({
         model: this.model,
         propertyName: 'template',
@@ -8162,7 +8195,8 @@ var pageflow_paged = (function (exports, Backbone, _$1, Marionette, $, I18n$1, C
         descriptionTranslationKeyProperty: 'description_translation_key',
         pictogramClass: 'type_pictogram',
         helpLinkClicked: function helpLinkClicked(value) {
-          var pageType = this.options.api.pageTypes.findByName(value);
+          var pageType = _this.options.api.pageTypes.findByName(value);
+
           app.trigger('toggle-help', pageType.seed.help_entry_translation_key);
         }
       }));
@@ -10635,7 +10669,7 @@ var pageflow_paged = (function (exports, Backbone, _$1, Marionette, $, I18n$1, C
           typeName: this.options.itemTypeName,
           typeDescription: this.options.itemTypeDescription,
           isInvalid: this.options.itemIsInvalid
-        }, _$1(this.options).pick('onEdit', 'onDelete', 'highlight')),
+        }, _$1(this.options).pick('onEdit', 'onRemove', 'highlight')),
         blankSlateViewConstructor: Marionette.ItemView.extend({
           tagName: 'li',
           className: 'list_blank_slate',
@@ -11011,6 +11045,10 @@ var pageflow_paged = (function (exports, Backbone, _$1, Marionette, $, I18n$1, C
       collection: state.audioFiles
     });
 
+    if (theme.supportsHideLogoOnPages()) {
+      this.input('hide_logo', CheckBoxInputView);
+    }
+
     if (options.canPauseAtmo) {
       this.input('atmo_during_playback', SelectInputView, {
         values: pageflow.Atmo.duringPlaybackModes

data/entry_types/scrolled/app/controllers/pageflow_scrolled/editor/content_elements_controller.rb

@@ -53,6 +53,7 @@ module PageflowScrolled
       def content_element_params
         configuration = params.require(:content_element)[:configuration].try(:permit!) || {}
         params.require(:content_element)
+              .transform_keys(&:underscore)
               .permit(:type_name, :position)
               .merge(configuration: configuration)
       end

data/entry_types/scrolled/app/helpers/pageflow_scrolled/editor/seed_html_helper.rb

@@ -8,7 +8,10 @@ module PageflowScrolled
         html = render(template: 'pageflow_scrolled/entries/show',
                       locals: {
                         :@entry => entry,
-                        :@seed_options => {skip_collections: true}
+                        :@seed_options => {
+                          skip_collections: true,
+                          translations: {include_inline_editing: true}
+                        }
                       })
 
         content_tag(:script,

data/entry_types/scrolled/app/helpers/pageflow_scrolled/entry_json_seed_helper.rb

@@ -8,6 +8,7 @@ module PageflowScrolled
     include Pageflow::FilesHelper
     include Pageflow::EntriesHelper
     include Pageflow::SocialShareLinksHelper
+    include PageflowScrolled::I18nHelper
 
     def scrolled_entry_json_seed_script_tag(scrolled_entry, options = {})
       seed_json = render_json do |json|
@@ -15,7 +16,7 @@ module PageflowScrolled
       end
 
       content_tag(:script, <<-JS.html_safe)
-        var pageflowScrolledSeed = #{sanitize_json(seed_json)};
+        pageflowScrolledRender(#{sanitize_json(seed_json)});
       JS
     end
 

data/entry_types/scrolled/app/helpers/pageflow_scrolled/i18n_helper.rb

@@ -0,0 +1,35 @@
+module PageflowScrolled
+  # @api private
+  module I18nHelper
+    def scrolled_i18n_translations(entry, include_inline_editing: false)
+      result = scrolled_i18n_public_translations(entry)
+
+      return result unless include_inline_editing
+
+      result.deep_merge(I18n.locale.to_s => {
+                          pageflow_scrolled: {
+                            inline_editing: I18n.t('pageflow_scrolled.inline_editing')
+                          }
+                        })
+    end
+
+    private
+
+    MERGE_IGNORING_NIL = lambda do |_, fallback, value|
+      value.presence || fallback
+    end
+
+    def scrolled_i18n_public_translations(entry)
+      translations =
+        I18n.t('pageflow_scrolled.public', locale: I18n.default_locale, default: {})
+            .deep_merge(I18n.t('pageflow_scrolled.public', locale: entry.locale, default: {}),
+                        &MERGE_IGNORING_NIL)
+
+      {
+        entry.locale => {
+          pageflow_scrolled: {public: translations}
+        }
+      }
+    end
+  end
+end