pageflow 13.0.0.beta7 → 13.0.0.rc1

data/app/assets/stylesheets/pageflow/page_types/background-image.scss

@@ -10,7 +10,7 @@
     background-position: center center;
     background-repeat:  no-repeat;
     background-attachment: fixed;
-    @include background-size(cover);
+    background-size: cover;
   }
 }
 

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

@@ -1,3 +1,7 @@
+/// 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;
 
@@ -25,5 +29,6 @@
     top: 7px;
     width: 10px;
     height: 12px;
+    color: $anchor-icon-color;
   }
 }

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

@@ -1,14 +1,16 @@
-$background-media-unmute-button-color: rgba(53, 53, 53, 0.9);
+$background-media-unmute-button-color: rgba(53, 53, 53, 0.9) !default;
 
-$background-media-unmute-button-shadow-color: #ccc;
+$background-media-unmute-button-shadow-color: #ccc !default;
 
-$background-media-unmute-button-icon-color: #ddd;
+$background-media-unmute-button-icon-color: #ddd !default;
 
-$background-media-unmute-button-icon-size: 24px;
+$background-media-unmute-button-icon-size: 24px !default;
 
-$background-media-unmute-button-size: 34px;
+$background-media-unmute-button-size: 34px !default;
 
-$background-media-unmute-button-margin: 10px;
+$background-media-unmute-button-margin: 10px !default;
+
+$background-media-unmute-button-custom-image: false !default;
 
 .background_media_unmute_button {
   position: absolute;
@@ -25,22 +27,20 @@ $background-media-unmute-button-margin: 10px;
     right: 11px;
   }
 
-  &:before {
-    z-index: 2;
-  }
-
-  &:after {
-    content: "";
-    display: block;
-    position: absolute;
-    top: 6px;
-    left: 6px;
-    width: $background-media-unmute-button-size;
-    height: $background-media-unmute-button-size;
-    border-radius: $background-media-unmute-button-size / 2;
-    background-color: $background-media-unmute-button-color;
-    @include box-shadow(0 0 7px $background-media-unmute-button-shadow-color);
-    z-index: 1;
+  @if not $background-media-unmute-button-custom-image {
+    &:after {
+      content: "";
+      display: block;
+      position: absolute;
+      top: 6px;
+      left: 6px;
+      width: $background-media-unmute-button-size;
+      height: $background-media-unmute-button-size;
+      border-radius: $background-media-unmute-button-size / 2;
+      background-color: $background-media-unmute-button-color;
+      box-shadow: 0 0 7px $background-media-unmute-button-shadow-color;
+      z-index: 1;
+    }
   }
 
   a {
@@ -48,21 +48,30 @@ $background-media-unmute-button-margin: 10px;
     width: 100%;
     height: 100%;
     z-index: 2;
-    position: relative;
-    @include background-icon-center($color: $background-media-unmute-button-icon-color,
-                                    $font-size: $background-media-unmute-button-icon-size);
-    @include fa-volume-down-icon;
 
-    &:after {
-      content: "";
-      display: block;
-      position: absolute;
-      width: 25px;
-      left: 22px;
-      top: 22px;
-      border-top: solid 2px $background-media-unmute-button-icon-color;
-      border-bottom: solid 1px $background-media-unmute-button-color;
-      @include transform(translate(-50%, -50%) rotate(45deg));
+    @if $background-media-unmute-button-custom-image {
+      background-image: image-url("pageflow/themes/#{$theme-name}/background_media_unmute_button.svg");
+      background-size: $background-media-unmute-button-size
+                         $background-media-unmute-button-size;
+      background-repeat: no-repeat;
+      background-position: 50% 50%;
+    } @else {
+      position: relative;
+      @include background-icon-center($color: $background-media-unmute-button-icon-color,
+                                      $font-size: $background-media-unmute-button-icon-size);
+      @include fa-volume-down-icon;
+
+      &:after {
+        content: "";
+        display: block;
+        position: absolute;
+        width: 25px;
+        left: 22px;
+        top: 22px;
+        border-top: solid 2px $background-media-unmute-button-icon-color;
+        border-bottom: solid 1px $background-media-unmute-button-color;
+        @include transform(translate(-50%, -50%) rotate(45deg));
+      }
     }
   }
 }

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

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

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

@@ -8,10 +8,14 @@ $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/controllers/concerns/pageflow/public_https_mode.rb

@@ -2,12 +2,16 @@ module Pageflow
   module PublicHttpsMode
     protected
 
-    def check_public_https_mode
+    def redirect_according_to_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/pageflow/entries_controller.rb

@@ -5,10 +5,6 @@ module Pageflow
 
     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
 
     helper_method :render_to_string
@@ -30,6 +26,12 @@ 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
@@ -97,6 +99,10 @@ 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/jobs/pageflow/upload_file_to_s3_job.rb

@@ -10,7 +10,7 @@ module Pageflow
           file.attachment_on_s3 = file.attachment_on_filesystem
           file.save!
 
-          file.attachment_on_filesystem.destroy unless file.keep_on_filesystem_after_upload_to_s3?
+          file.attachment_on_filesystem.destroy
           :ok
         else
           logger.info "#{file.class.name} #{file.id} not yet transfered to instance."

data/app/models/concerns/pageflow/hosted_file.rb

@@ -47,10 +47,6 @@ module Pageflow
       self.attachment_on_filesystem = value
     end
 
-    def keep_on_filesystem_after_upload_to_s3?
-      false
-    end
-
     def retryable?
       can_retry?
     end
@@ -73,27 +69,6 @@ module Pageflow
       url
     end
 
-    # @deprecated Write a migration instead
-    def self.columns(t)
-      t.belongs_to(:entry, index: true)
-      t.belongs_to(:uploader, index: true)
-
-      t.string(:state)
-      t.string(:rights)
-
-      t.string(:attachment_on_filesystem_file_name)
-      t.string(:attachment_on_filesystem_content_type)
-      t.integer(:attachment_on_filesystem_file_size, limit: 8)
-      t.datetime(:attachment_on_filesystem_updated_at)
-
-      t.string(:attachment_on_s3_file_name)
-      t.string(:attachment_on_s3_content_type)
-      t.integer(:attachment_on_s3_file_size, limit: 8)
-      t.datetime(:attachment_on_s3_updated_at)
-
-      t.timestamps
-    end
-
     module ClassMethods
       def processing_state_machine(&block)
         state_machine do

data/app/models/pageflow/widget.rb

@@ -14,14 +14,9 @@ module Pageflow
       record.save!
     end
 
-    def enabled?(options)
-      if options[:scope] == :editor
-        widget_type.enabled_in_editor?
-      elsif options[:scope] == :preview
-        widget_type.enabled_in_preview?
-      else
-        true
-      end
+    def matches?(options)
+      enabled_for_scope?(options[:scope]) &&
+        for_insert_point?(options.fetch(:insert_point, :any))
     end
 
     def self.copy_all_to(subject)
@@ -40,10 +35,26 @@ module Pageflow
       Resolver.new(config, options).result
     end
 
+    private
+
+    def enabled_for_scope?(scope)
+      if scope == :editor
+        widget_type.enabled_in_editor?
+      elsif scope == :preview
+        widget_type.enabled_in_preview?
+      else
+        true
+      end
+    end
+
+    def for_insert_point?(insert_point)
+      insert_point == :any || widget_type.insert_point == insert_point
+    end
+
     Resolver = Struct.new(:config, :options) do
       def result
         assign_widget_types(all).select do |widget|
-          widget.enabled?(options)
+          widget.matches?(options)
         end
       end
 

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

@@ -41,7 +41,7 @@ module Pageflow
               text_node(link_to(t('pageflow.admin.entries.show'), pageflow.revision_path(revision), :class => 'show'))
               if authorized?(:restore, entry)
                 text_node(link_to(t('pageflow.admin.entries.restore'),
-                                  restore_admin_revision_path(revision),
+                                  restore_admin_revision_path(revision, params.permit(:tab)),
                                   method: :post,
                                   class: 'restore',
                                   data: {
@@ -58,7 +58,7 @@ module Pageflow
 
         if authorized?(:snapshot, entry)
           text_node(button_to(t('pageflow.admin.entries.snapshot'),
-                              snapshot_admin_entry_path(entry),
+                              snapshot_admin_entry_path(entry, params.permit(:tab)),
                               method: :post))
         end
       end

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

@@ -26,7 +26,7 @@ module Pageflow
       end
 
       def build_tab_list
-        ul(class: 'tabs') do
+        ul(class: 'admin_tabs_view-tabs') do
           tabs.each do |tab|
             build_tab_item(tab)
           end
@@ -66,8 +66,8 @@ module Pageflow
 
       def tab_container_class(tab_name)
         [
-          'tab_container',
-          "#{tab_name}_tab_container",
+          'admin_tabs_view-container',
+          "admin_tabs_view-#{tab_name}_container",
           current_tab?(tab_name) ? 'active' : nil
         ].compact.join(' ')
       end

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

@@ -17,5 +17,5 @@
 
   <%= render 'pageflow/entries/header', :entry => entry %>
   <%= render 'pageflow/entries/overview', :entry => entry %>
-  <%= render_widgets(entry, :scope => widget_scope) %>
+  <%= render_widgets(entry, scope: widget_scope, insert_point: :bottom_of_entry) %>
 <% end %>

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

@@ -20,6 +20,7 @@
   <%= 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 %>
 
   <script>

data/config/locales/de.yml

@@ -831,6 +831,7 @@ de:
         users: Benutzer
       revisions:
         published_until_hint: Freilassen, um Beitrag unbegrenzt zu veröffentlichen.
+        restored: Revision wiederhergestellt
       themings:
         additional_cnames_hint: Kommaseparierte Liste von weiteren CNAMES. Ausschließlich zur Auswahl der Redirect URL genutzt.
         cname_hint: Wird in Share Links verwendet.
@@ -1811,6 +1812,7 @@ de:
             none: "(Kein)"
             placeholder: Standard (%{text})
           text_input_view:
+            max_characters_exceeded: Maximale Zeichenanzahl überschritten (%{max_length})
             required_field: Muss ausgefüllt werden
           url_input_view:
             required_field: Muss ausgefüllt werden

data/config/locales/en.yml

@@ -831,6 +831,7 @@ en:
         users: User
       revisions:
         published_until_hint: Leave blank to publish indefinitely.
+        restored: Version restored
       themings:
         additional_cnames_hint: Comma separated list of additional CNAMES. Used only to select the correct redirect URL.
         cname_hint: Used in public sharing URLs.
@@ -1786,6 +1787,7 @@ en:
             none: "(none)"
             placeholder: Default (%{text})
           text_input_view:
+            max_characters_exceeded: Maximum number of characters exceeded (%{max_length})
             required_field: Required field
           url_input_view:
             required_field: Required field

data/lib/pageflow/configuration.rb

@@ -162,6 +162,15 @@ module Pageflow
     #     end
     attr_accessor :public_entry_request_scope
 
+    # Either a lambda or an object with a `call` method taking an
+    # {Entry} record and an {ActionDispatch::Request} object and
+    # returning `nil` or a path to redirect to. Can be used in
+    # conjuction with {PrimaryDomainEntryRedirect} to make sure
+    # entries are accessed via their account's configured cname.
+    #
+    # @since 12.4
+    attr_accessor :public_entry_redirect
+
     # Either a lambda or an object with a `call` method taking a
     # {Theming} as paramater and returing a hash of options used to
     # construct the url of a published entry.
@@ -326,6 +335,7 @@ module Pageflow
 
       @theming_request_scope = CnameThemingRequestScope.new
       @public_entry_request_scope = lambda { |entries, request| entries }
+      @public_entry_redirect = ->(_entry, _request) { nil }
       @public_entry_url_options = Pageflow::ThemingsHelper::DEFAULT_PUBLIC_ENTRY_OPTIONS
       @entry_embed_url_options = {protocol: 'https'}
 

data/lib/pageflow/primary_domain_entry_redirect.rb

@@ -0,0 +1,25 @@
+module Pageflow
+  # Use as {Configuration#public_entry_redirect} to make sure entries
+  # are accessed via their account's configured cname.
+  #
+  # @since 12.4
+  class PrimaryDomainEntryRedirect
+    def call(entry, request)
+      theming = entry.theming
+
+      if theming.cname.present? &&
+         !known_domains(theming).include?(request.host)
+        [request.protocol, theming.cname, request.fullpath].join
+      end
+    end
+
+    private
+
+    def known_domains(theming)
+      [
+        theming.cname,
+        (theming.additional_cnames || '').split(',').map(&:strip)
+      ].flatten
+    end
+  end
+end

data/lib/pageflow/react/widget_type.rb

@@ -1,17 +1,22 @@
 module Pageflow
   module React
     class WidgetType < Pageflow::WidgetType
-      attr_reader :name, :role
+      attr_reader :name, :role, :options
 
-      def initialize(name, role)
+      def initialize(name, role, options = {})
         @name = name
         @role = role
+        @options = options
       end
 
       def roles
         [role]
       end
 
+      def insert_point
+        @options[:insert_point] || super
+      end
+
       def render(template, _)
         template.render(File.join('pageflow', 'react', 'widget'), name: name)
       end