pageflow 15.6.1 → 15.7.1

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

@@ -0,0 +1,50 @@
+<%= admin_form_for([:admin, resource]) do |f| %>
+  <%= f.inputs do %>
+    <%= f.input :title, hint: I18n.t('pageflow.admin.entries.title_hint') %>
+
+    <% if authorized?(:update_account_on, resource) &&
+          account_policy_scope.entry_creatable.many? %>
+      <%= f.input(:account,
+                  as: :searchable_select,
+                  include_blank: false,
+                  ajax: {
+                    resource: Pageflow::Entry,
+                    collection_name: :eligible_accounts
+                  },
+                  input_html: {class: 'entry_account_input'}) %>
+    <%end %>
+
+    <% if authorized?(:update_theming_on, resource) && !resource.new_record? %>
+      <%= f.input(:theming,
+                  as: :searchable_select,
+                  ajax: {
+                    resource: Pageflow::Entry,
+                    collection_name: :eligible_themings,
+                    params: {
+                      entry_id: resource.id
+                    }
+                  },
+                  include_blank: false) %>
+    <% end %>
+
+    <% if resource.new_record? %>
+      <%= render('pageflow/admin/entries/entry_type_name_input',
+                 form: f,
+                 entry_types: Pageflow.config_for(resource.account).entry_types) %>
+    <% end %>
+
+    <% if authorized?(:configure_folder_for, resource) %>
+      <% folder_collection = collection_for_folders(resource.account, resource.folder) %>
+      <%= f.input(:folder,
+                  collection: folder_collection,
+                  include_blank: true) unless folder_collection.empty? %>
+    <% end %>
+
+    <% entry_config = Pageflow.config_for(resource) %>
+    <% entry_config.admin_form_inputs.find_all_for(:entry).each do |form_input| %>
+      <%= form_input.build(f) %>
+    <% end %>
+  <% end %>
+
+  <%= f.actions :submit, :cancel %>
+<% end %>

data/app/views/admin/entries/entry_type_name_input.html.erb

@@ -0,0 +1,5 @@
+<%= fields_for(:entry, @entry, builder: ActiveAdmin::FormBuilder) do |form| %>
+  <%= render('pageflow/admin/entries/entry_type_name_input',
+             form: form,
+             entry_types: Pageflow.config_for(@entry.account).entry_types) %>
+<% end %>

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

@@ -3,7 +3,7 @@
 
   <%= f.inputs do %>
     <% Pageflow.config_for(resource).features.each do |feature| %>
-      <li>
+      <li class="input">
         <%= label_tag(feature_state_input_name(resource, feature.name),
                       t(feature.name_translation_key)) %>
         <%= feature_state_select_tag(resource, feature.name) %>

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

@@ -6,12 +6,11 @@
     <%= f.hidden_field :entity_type, value: entity_type %>
   <% end %>
   <%= f.inputs do %>
-    <%= render partial: 'admin/memberships/role_hint',
-               locals: {entity_type: entity_type
-                                      .gsub('Pageflow::', '').downcase} %>
     <%= f.input :role,
                 collection: membership_roles_collection(entity_type),
                 include_blank: false %>
+    <%= render 'admin/memberships/role_hint',
+               entity_type: entity_type.gsub('Pageflow::', '').downcase %>
   <% end %>
   <%= f.actions do %>
     <%= f.action(:submit) %>

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

@@ -9,5 +9,5 @@
                 collection: available_locales_collection %>
     <%= f.input :admin if authorized?(:set_admin, current_user) %>
   <% end %>
-  <%= f.actions %>
+  <%= f.actions :submit, :cancel %>
 <% end %>

data/app/views/admin/users/invitation.html.erb

@@ -39,8 +39,8 @@
 
         <%= m.input :role,
                     collection: membership_roles_collection('Pageflow::Account'),
-                    include_blank: false,
-                    hint: t('pageflow.admin.memberships.on_account.role.hint_html') %>
+                    include_blank: false %>
+        <%= render 'admin/memberships/role_hint', entity_type: 'account' %>
         <%= u.input :admin if authorized?(:set_admin, current_user) %>
       <% end %>
     <% end %>

data/app/views/components/pageflow/admin/entry_user_badge_list.rb

@@ -15,17 +15,18 @@ module Pageflow
 
       def build_badge(membership)
         li do
-          span(user_initials(membership.user), class: 'abbreviation')
-          div class: 'tooltip' do
+          if authorized?(:read, membership.user)
+            text_node link_to(user_initials(membership.user),
+                              admin_user_path(membership.user),
+                              class: 'abbreviation')
+          else
+            span(user_initials(membership.user), class: 'abbreviation')
+          end
+
+          div class: 'tooltip_bubble' do
             role_string =
               " (#{I18n.t(membership.role, scope: 'activerecord.values.pageflow/membership.role')})"
-            if authorized?(:read, membership.user)
-              link_to(membership.user.full_name, admin_user_path(membership.user)) + role_string
-            else
-              span class: 'name' do
-                membership.user.full_name + role_string
-              end
-            end
+            membership.user.full_name + role_string
           end
         end
       end

data/app/views/components/pageflow/admin/members_tab.rb

@@ -45,7 +45,11 @@ module Pageflow
             end
           end
         end
-        para text_node I18n.t('pageflow.admin.resource_tabs.account_editor_hint')
+
+        div class: 'side_hint' do
+          para text_node I18n.t('pageflow.admin.resource_tabs.account_editor_hint')
+        end
+
         if authorized?(:add_member_to, entry)
           add_membership_button(current_user, entry, 'entry')
         end

data/app/views/components/pageflow/admin/revisions_tab.rb

@@ -30,11 +30,21 @@ module Pageflow
               end
             end
             column :created_with do |revision|
-              span(I18n.t(revision.created_with, :scope => 'pageflow.admin.entries.revision_created_with'),
-                   :title => I18n.t(revision.created_with, :scope => 'pageflow.admin.entries.revision_created_with_hint'))
+              span(class: 'tooltip_clue') do
+                text_node t(revision.created_with,
+                            scope: 'pageflow.admin.entries.revision_created_with')
+                span class: 'tooltip_bubble' do
+                  t(revision.created_with,
+                    scope: 'pageflow.admin.entries.revision_created_with_hint')
+                end
+              end
 
               if revision.password_protected?
-                span('', :class => 'password_protected', :title => t('pageflow.admin.entries.password_protected'))
+                span(class: 'publication_state_indicator published_with_password_protection') do
+                  span(class: 'tooltip_bubble') do
+                    t('pageflow.admin.entries.password_protected')
+                  end
+                end
               end
             end
             column do |revision|

data/app/views/components/pageflow/admin/timestamp.rb

@@ -0,0 +1,20 @@
+module Pageflow
+  module Admin
+    class Timestamp < ViewComponent
+      builder_method :timestamp
+
+      def build(time)
+        if time
+          span class: 'tooltip_clue' do
+            text_node(l(time, format: time.today? ? :time_today : :date))
+            span(l(time, format: :long), class: 'tooltip_bubble')
+          end
+        end
+      end
+
+      def tag_name
+        'span'
+      end
+    end
+  end
+end

data/app/views/components/pageflow/admin/user_account_badge_list.rb

@@ -20,12 +20,11 @@ module Pageflow
       def build_badge(membership)
         li do
           if authorized?(:read, membership.entity)
-            account_name_display = span(link_to(membership.entity.name,
-                                                main_app.admin_account_path(membership.entity)),
-                                        class: 'abbreviation')
-            div class: 'tooltip' do
-              account_name_display +
-                " (#{I18n.t(membership.role, scope: 'activerecord.values.pageflow/membership.role')})"
+            text_node link_to(membership.entity.name,
+                              main_app.admin_account_path(membership.entity),
+                              class: 'abbreviation')
+            div class: 'tooltip_bubble' do
+              I18n.t(membership.role, scope: 'activerecord.values.pageflow/membership.role')
             end
           else
             span(membership.entity.name, class: 'abbreviation')

data/app/views/pageflow/admin/entries/_cannot_add_user.html.erb

@@ -1,5 +1,9 @@
-<% if quota.exhausted? %>
-  <%= t("pageflow.admin.entry.user_quota_exhausted") %>
-<% else %>
-    <%= t("pageflow.admin.entry.entry_membership_hint") %>
-<% end %>
+<div class="side_hint">
+  <p>
+    <% if quota.exhausted? %>
+      <%= t("pageflow.admin.entry.user_quota_exhausted") %>
+    <% else %>
+      <%= t("pageflow.admin.entry.entry_membership_hint") %>
+    <% end %>
+  </p>
+</div>

data/app/views/pageflow/admin/entries/_entry_type_name_input.html.erb

@@ -0,0 +1,7 @@
+<%= form.input(:type_name,
+               as: :select,
+               include_blank: false,
+               collection: entry_type_collection(entry_types),
+               wrapper_html: {
+                 style: ('display: none' if entry_types.one?)
+               }) %>

data/app/views/pageflow/audio_files/_audio_file.json.jbuilder

@@ -1,2 +1,15 @@
 json.call(audio_file, :duration_in_ms)
 json.created_at audio_file.created_at.try(:utc).try(:iso8601, 0)
+
+variants = [
+  :m4a,
+  :mp3,
+  :ogg,
+  audio_file.peak_data.present? ? :peak_data : nil
+].compact
+
+# Use JBuilder's private _key method to use format variants according
+# to current key format (camel case/underscored). This ensures
+# variants are consistent with the keys generated by
+# ConfigHelper#config_file_url_templates_seed.
+json.variants(variants.map { |varaint| json.__send__(:_key, varaint) })

data/app/views/pageflow/editor/encoding_confirmations/check.json.jbuilder

@@ -1,3 +1,15 @@
 json.exceeding(@encoding_confirmation.exceeding?)
-json.summary_html(render_html_partial('pageflow/editor/encoding_confirmations/summary',
-                                      encoding_confirmation: @encoding_confirmation))
+
+json.intro_html(
+  render_html_partial(
+    'pageflow/editor/encoding_confirmations/intro',
+    encoding_confirmation: @encoding_confirmation
+  )
+)
+
+json.summary_html(
+  render_html_partial(
+    'pageflow/editor/encoding_confirmations/summary',
+    encoding_confirmation: @encoding_confirmation
+  )
+)

data/config/initializers/paperclip.rb

@@ -20,8 +20,23 @@ Paperclip.interpolates(:pageflow_attachments_version) do |attachment, style|
   Pageflow::PaperclipInterpolations::Support.pageflow_attachments_version(attachment, style)
 end
 
+Paperclip.interpolates(:pageflow_hls_qualities) do |attachment, _style|
+  # Placeholder :pageflow_hls_qualities is included here to let
+  # VideoFileUrlTemplates preserve the palceholder in url templates.
+  %w[:pageflow_hls_qualities low medium high fullhd 4k].select { |quality|
+    attachment.instance.output_presences[quality]
+  }.join(',')
+end
+
 Paperclip.configure do |config|
-  config.register_processor(:pageflow_vtt, Pageflow::PaperclipProcessors::Vtt)
+  config.register_processor(:pageflow_vtt,
+                            Pageflow::PaperclipProcessors::Vtt)
+
+  config.register_processor(:pageflow_audio_waveform,
+                            Pageflow::PaperclipProcessors::AudioWaveform)
+
+  config.register_processor(:noop,
+                            Pageflow::PaperclipProcessors::Noop)
 end
 
 Paperclip::UriAdapter.register

data/config/locales/de.yml

@@ -178,16 +178,16 @@ de:
       pageflow/entry:
         account: Konto
         author: Autor
-        created_at: Erstellt am
+        created_at: Erstellt
         credits: Credits
-        edited_at: Geändert am
+        edited_at: Geändert
         embed_code: Einbetten
         first_published_at: Erstmals veröffentlicht am
         keywords: Schlüsselwörter
         locale: Sprache
         own_role: Rolle
         published?: Veröffentlichungstatus
-        published_at: Veröffentlicht seit
+        published_at: Veröffentlicht
         published_revision_published_at: Veröffentlicht am
         publisher: Herausgeber
         share_image_id: Social Sharing Bild
@@ -732,6 +732,12 @@ de:
       create: "%{model} erstellen"
       submit: "%{model} speichern"
       update: "%{model} aktualisieren"
+  i18n:
+    transliterate:
+      rule:
+        ä: ae
+        ö: oe
+        ü: ue
   language: Deutsch
   number:
     currency:
@@ -1026,8 +1032,11 @@ de:
         captions: Ton-Ersatz-Textspur
         descriptions: Bild-Ersatz-Textspur
         subtitles: Übersetzungs-Textspur
+    consent_bar:
+      feature_name: Consent-Leiste
+      widget_type_name: Consent-Leiste
     cookie_notice_bar:
-      widget_type_name: Leiste am unteren Seitenrand
+      widget_type_name: Cookie-Hinweis
     default_theme:
       name: Standard
     delayed_text_fade_in:
@@ -1064,6 +1073,11 @@ de:
         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.
+      consent_bar:
+        widget_type_info_box_text: |-
+          Die Leiste wird beim ersten Öffnen von Beiträgen angezeigt,
+          wenn Integrationen von Drittanbietern (z.B. Website Tracking
+          oder Embeds) verwendet werden.
       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:
@@ -1541,29 +1555,7 @@ de:
       meta_data:
         general:
           menu_item: Allgemein
-          text: |
-            # Allgemein
-
-            ## Titel des Pageflows
-
-            Hier kannst Du Deinem Pageflow einen Titel geben, der in der
-            Titelleiste des Browserfensters angezeigt wird. Unter diesem
-            Titel wird Dein Pageflow nach der Veröffentlichung auch in
-            Suchmaschinen indiziert werden.
-
-            ## Sprache
-
-            Wähle hier, in welcher Sprache Dein Pageflow ausgespielt
-            wird. Hierbei geht es um die Frontend-Elemente wie
-            z.B. Scroll-Hinweise, die Mouse-over-Texte der Navigation
-            und das Impressum.
-
-            ## Credits
-
-            Hier kannst Du Deine Impressums-Information im Freitext
-            eingeben. Zudem können für alle Dateien unter „Dateien
-            verwalten“ auch Bildrechte vergeben werden, die dann
-            automatisch im Impressum angezeigt werden.
+          text: "# Allgemein\n\n## Titel des Pageflows\n\nHier kannst Du Deinem Pageflow einen Titel geben, der in der\nTitelleiste des Browserfensters angezeigt wird. Unter diesem\nTitel wird Dein Pageflow nach der Veröffentlichung auch in\nSuchmaschinen indiziert werden.\n\n## Sprache\n\nWähle hier, in welcher Sprache Dein Pageflow ausgespielt\nwird. Hierbei geht es um die Frontend-Elemente wie das \nImpressum und die Datenschutz-Einstellung.\n\n## Credits\n\nHier kannst Du Deine Impressums-Information im Freitext\neingeben. Zudem können für alle Dateien unter „Dateien\nverwalten“ auch Bildrechte vergeben werden, die dann\nautomatisch im Impressum angezeigt werden."
         menu_item: Titel und Optionen
         social:
           menu_item: Social
@@ -1695,6 +1687,8 @@ de:
       entries:
         global_links: Globale Links
         image_rights: Bildrechte
+    highdef_background_images:
+      feature_name: Hochaufgelöste Hintergrundbilder
     highdef_video_encoding:
       feature_name: Full HD und 4K Videos
     initial_password:
@@ -1787,6 +1781,7 @@ de:
     ui:
       configuration_editor:
         tabs:
+          consent_bar: Consent-Leiste
           cookie_notice_bar: Cookie Hinweis
           files: Dateien
           general: Allgemein
@@ -1908,7 +1903,7 @@ de:
       roles:
         analytics: Zählpixel
         background_media_control: Hintergrund-Media-Control
-        cookie_notice: Cookie Hinweis
+        cookie_notice: Privatsphäre-Einstellungen
         loading_spinner: Lade-Ansicht
         mobile_navigation: Mobile Navigation
         navigation: Navigationsleiste
@@ -1933,6 +1928,7 @@ de:
       default: "%d.%m.%Y, %H:%M"
       long: "%d.%m.%Y, %H:%M"
       short: "%d. %B %Y, %H:%M Uhr"
+      time_today: Heute, %H:%M
     pm: nachmittags
   views:
     pagination:

data/config/locales/en.yml

@@ -178,16 +178,16 @@ en:
       pageflow/entry:
         account: Account
         author: Author
-        created_at: Created at
+        created_at: Created
         credits: Credits
-        edited_at: Updated at
+        edited_at: Edited
         embed_code: Embed
         first_published_at: First published at
         keywords: Keywords
         locale: Language
         own_role: Role
         published?: Publication state
-        published_at: Published since
+        published_at: Published
         published_revision_published_at: Published since
         publisher: Publisher
         share_image_id: Social Sharing Image
@@ -1026,8 +1026,11 @@ en:
         captions: Audio Replacement Text Track
         descriptions: Image Description Text Track
         subtitles: Translation Text Track
+    consent_bar:
+      feature_name: Consent bar
+      widget_type_name: Consent bar
     cookie_notice_bar:
-      widget_type_name: Bar at lower page margin
+      widget_type_name: Cookied notice
     default_theme:
       name: Default
     delayed_text_fade_in:
@@ -1066,6 +1069,10 @@ en:
         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.
+      consent_bar:
+        widget_type_info_box_text: |-
+          The bar is displayed when first viewing an entry that uses
+          third party integrations (e.g., website tracking or embeds).
       cookie_notice_bar:
         widget_type_info_box_text: The notice is displayed when visiting a story that uses Cookies. Cookies are set, if an analytics integration is active or the 'Emphasize new pages' feature has been enabled.
       entries:
@@ -1528,7 +1535,7 @@ en:
       meta_data:
         general:
           menu_item: General
-          text: |
+          text: |-
             # General
 
             ## Title of the Pageflow
@@ -1540,7 +1547,7 @@ en:
 
             ## Language
 
-            Decide in which language your Pageflow should be displayed. This refers to the frontend text such as multimedia tips, scroll-indicators, the overview and the legal notice.
+            Decide in which language your Pageflow should be displayed. This refers to the frontend text such as the legal notice and privacy settings.
 
             ## Credits
             Here you can enter your imprint information in free text. In addition, image rights can be assigned for all files under "Manage files", which are then automatically displayed in the imprint.
@@ -1670,6 +1677,8 @@ en:
       entries:
         global_links: Global links
         image_rights: Credits
+    highdef_background_images:
+      feature_name: High resolution background images
     highdef_video_encoding:
       feature_name: Full HD and 4K videos
     initial_password:
@@ -1762,6 +1771,7 @@ en:
     ui:
       configuration_editor:
         tabs:
+          consent_bar: Consent bar
           cookie_notice_bar: Cookie Notice
           files: Files
           general: General
@@ -1804,9 +1814,7 @@ en:
             The text-block can be formatted with the buttons underneath the input field. [B= bold / I=italic / U=underlined / infinity symbol= Link/URL to an external website]
 
             All changes are visible in the left front-end-view as soon as you leave the appropriate input field in the editor.
-          thumbnail_image_id: 'The thumbnail replaces the automatically generated preview-picture in the navigation and overview.
-
-'
+          thumbnail_image_id: 'The thumbnail replaces the automatically generated preview-picture in the navigation and overview.'
           transition: Choose the animation, that will be used when users scroll to this page.
       templates:
         inputs:
@@ -1886,7 +1894,7 @@ en:
       roles:
         analytics: Tracking
         background_media_control: Background media control
-        cookie_notice: Cookie Notice
+        cookie_notice: Privacy settings
         loading_spinner: Loading View
         mobile_navigation: Mobile navigation
         navigation: Navigation bar
@@ -1911,6 +1919,7 @@ en:
       default: "%a, %d %b %Y %H:%M:%S %z"
       long: "%B %d, %Y %H:%M"
       short: "%d %b %H:%M"
+      time_today: Today, %H:%M
     pm: pm
   views:
     pagination:

data/db/migrate/20210528073122_create_pageflow_theme_customizations.rb

@@ -0,0 +1,11 @@
+class CreatePageflowThemeCustomizations < ActiveRecord::Migration[5.2]
+  def change
+    create_table :pageflow_theme_customizations do |t|
+      t.references :account
+      t.string :entry_type_name
+      t.text :overrides
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20210531090654_create_pageflow_theme_customization_files.rb

@@ -0,0 +1,15 @@
+class CreatePageflowThemeCustomizationFiles < ActiveRecord::Migration[5.2]
+  def change
+    create_table :pageflow_theme_customization_files do |t|
+      t.references :theme_customization,
+                   index: {name: 'index_pageflow_theme_customization_files_on_customization'}
+      t.string :type_name
+      t.string :attachment_file_name
+      t.string :attachment_content_type
+      t.integer :attachment_file_size
+      t.datetime :attachment_updated_at
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20210531102228_add_selected_file_ids_to_theme_customizations.rb

@@ -0,0 +1,5 @@
+class AddSelectedFileIdsToThemeCustomizations < ActiveRecord::Migration[5.2]
+  def change
+    add_column :pageflow_theme_customizations, :selected_file_ids, :text
+  end
+end

data/db/migrate/20211020085902_add_canonical_entry_url_prefix_to_themings.rb

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

data/db/migrate/20220503150010_add_peak_data_to_audio_files.rb

@@ -0,0 +1,5 @@
+class AddPeakDataToAudioFiles < ActiveRecord::Migration[5.2]
+  def change
+    add_column :pageflow_audio_files, :peak_data_file_name, :string
+  end
+end

data/db/migrate/20220705084830_add_trailing_slash_in_canonical_urls_to_themings.rb

@@ -0,0 +1,5 @@
+class AddTrailingSlashInCanonicalUrlsToThemings < ActiveRecord::Migration[5.2]
+  def change
+    add_column :pageflow_themings, :trailing_slash_in_canonical_urls, :boolean
+  end
+end