pageflow 13.0.0.beta6 → 13.0.0.beta7

data/app/assets/stylesheets/pageflow/page_transitions/scroll.scss

@@ -1,20 +1,105 @@
 /* scroll transition to left*/
 
 section.scroll {
-  &.animate-in-forwards, &.animate-in-backwards {
-    z-index: 2;
+  @include animation-duration(1s);
+  @include animation-fill-mode(forwards);
+
+  &-fast {
+    @include animation-duration(0.5s);
   }
 
-  &.animate-in-forwards {
-    @include animation(scroll-in-forwards forwards 1s 1);
+  &-in {
+    &.animate-in-forwards,
+    &.animate-in-backwards {
+      z-index: 2;
+    }
   }
-  &.animate-in-backwards {
-    @include animation(scroll-in-backwards forwards 1s 1);
+
+  &-over {
+    &.animate-in-forwards,
+    &.animate-out-backwards {
+      z-index: 2;
+    }
   }
-  &.animate-out-forwards {
-    @include animation(scroll-out-forwards forwards 1s 1);
+
+  &-from_right {
+    &.animate-in-forwards {
+      @include animation-name(scroll-in-right);
+    }
+
+    &.animate-out-backwards {
+      @include animation-name(scroll-out-right);
+    }
+
+    &.scroll-in {
+      &.animate-in-backwards {
+        @include animation-name(scroll-in-left);
+      }
+
+      &.animate-out-forwards {
+        @include animation-name(scroll-out-left);
+      }
+    }
+  }
+
+  &-from_left {
+    &.animate-in-forwards {
+      @include animation-name(scroll-in-left);
+    }
+
+    &.animate-out-backwards {
+      @include animation-name(scroll-out-left);
+    }
+
+    &.scroll-in {
+      &.animate-in-backwards {
+        @include animation-name(scroll-in-right);
+      }
+
+      &.animate-out-forwards {
+        @include animation-name(scroll-out-right);
+      }
+    }
   }
-  &.animate-out-backwards {
-    @include animation(scroll-out-backwards forwards 1s 1);
+
+
+  &-from_bottom {
+    &.animate-in-forwards {
+      @include animation-name(scroll-in-forwards);
+    }
+
+    &.animate-out-backwards {
+      @include animation-name(scroll-out-backwards);
+    }
+
+    &.scroll-in {
+      &.animate-in-backwards {
+        @include animation-name(scroll-in-backwards);
+      }
+
+      &.animate-out-forwards {
+        @include animation-name(scroll-out-forwards);
+      }
+    }
+  }
+
+  &-from_top {
+    &.animate-in-forwards {
+      @include animation-name(scroll-in-backwards);
+    }
+
+    &.animate-out-backwards {
+      @include animation-name(scroll-out-forwards);
+    }
+
+    &.scroll-in {
+      &.animate-in-backwards {
+        @include animation-name(scroll-in-forwards);
+      }
+
+      &.animate-out-forwards {
+        @include animation-name(scroll-out-backwards);
+      }
+    }
   }
-}
+}

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

@@ -49,10 +49,6 @@
     background-color: white;
   }
 
-  section.scroll .content_and_background {
-    z-index: 4; /* bring scrolling content always to front */
-  }
-
   .content {
     position: absolute;
     top: 0;

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

@@ -0,0 +1,68 @@
+$background-media-unmute-button-color: rgba(53, 53, 53, 0.9);
+
+$background-media-unmute-button-shadow-color: #ccc;
+
+$background-media-unmute-button-icon-color: #ddd;
+
+$background-media-unmute-button-icon-size: 24px;
+
+$background-media-unmute-button-size: 34px;
+
+$background-media-unmute-button-margin: 10px;
+
+.background_media_unmute_button {
+  position: absolute;
+  top: 26px;
+  right: 25px;
+  width: $background-media-unmute-button-size + $background-media-unmute-button-margin;
+  height: $background-media-unmute-button-size + $background-media-unmute-button-margin;
+
+  @extend %pageflow_widget_margin_right_max !optional;
+  @extend %pageflow_widget_margin_top !optional;
+
+  @include mobile {
+    top: 70px;
+    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;
+  }
+
+  a {
+    display: block;
+    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));
+    }
+  }
+}

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

@@ -23,6 +23,7 @@
 @import "./indicators";
 @import "./navigation";
 @import "./mobile_navigation";
+@import "./background_media_unmute_button";
 @import "./multimedia_alert";
 @import "./overview";
 @import "./player_controls";

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

@@ -12,6 +12,7 @@
         font-weight: bold;
         vertical-align: middle;
         padding-left: 15px;
+        height: 33px;
 
         @include phone {
           padding-left: 10px;
@@ -22,5 +23,11 @@
     > .scroll_next_indicator {
       @include fa-angle-down-icon($position: "after");
     }
+
+    .widget_phone_horizontal_slideshow_mode_present & > .scroll_next_indicator {
+      @include phone {
+        @include fa-angle-right-icon($position: "after");
+      }
+    }
   }
 }

data/app/assets/stylesheets/pageflow/ui/forms.scss

@@ -221,3 +221,7 @@ textarea.short {
 .configuration_editor a {
   text-decoration: underline;
 }
+
+.input-hidden_via_binding {
+  display: none;
+}

data/app/controllers/pageflow/editor/files_controller.rb

@@ -19,10 +19,13 @@ module Pageflow
         authorize!(:edit, entry.to_model)
         verify_edit_lock!(entry)
 
-        @file = entry.create_file(file_type.model, create_params)
+        @file = entry.create_file!(file_type.model, create_params)
         @file.publish!
 
         respond_with(:editor, @file)
+      rescue ActiveRecord::RecordInvalid => e
+        debug_log_with_backtrace(e)
+        head :unprocessable_entity
       end
 
       def reuse
@@ -81,6 +84,7 @@ module Pageflow
         file_attachment_params
           .merge(file_configuration_params)
           .merge(file_parent_file_params)
+          .merge(file_custom_params)
       end
 
       def file_reuse_params
@@ -109,6 +113,10 @@ module Pageflow
         file_params.permit(:parent_file_id, :parent_file_model_type)
       end
 
+      def file_custom_params
+        file_params.permit(file_type.custom_attributes)
+      end
+
       def file_params
         params.require(file_type.param_key)
       end

data/app/helpers/pageflow/asset_urls_helper.rb

@@ -0,0 +1,9 @@
+module Pageflow
+  module AssetUrlsHelper
+    include RenderJsonHelper
+
+    def editor_asset_urls
+      render_json_partial('pageflow/editor/asset_urls/asset_urls')
+    end
+  end
+end

data/app/helpers/pageflow/background_image_helper.rb

@@ -22,11 +22,6 @@ module Pageflow
     end
 
     class Div
-      FILE_TYPE_CSS_CLASS_PREFIXES = {
-        'image_file' => 'image',
-        'video_file' => 'video_poster',
-      }
-
       attr_reader :configuration, :property_base_name, :options
 
       delegate :content_tag, :to => :@template
@@ -67,13 +62,18 @@ module Pageflow
       end
 
       def image_css_class_prefix
-        FILE_TYPE_CSS_CLASS_PREFIXES.fetch(options.fetch(:file_type, 'image_file'))
+        file_type.css_background_image_class_prefix
       end
 
       def background_position(coord)
         property_name = "#{property_base_name}_#{coord}"
         configuration.key?(property_name) ? "#{configuration[property_name]}%" : "50%"
       end
+
+      def file_type
+        collection_name = options.fetch(:file_type, 'image_file').pluralize
+        Pageflow.config.file_types.find_by_collection_name!(collection_name)
+      end
     end
 
     class DivWithSizeAttributes < Div
@@ -111,10 +111,6 @@ module Pageflow
       def find_file
         file_type.model.find_by_id(file_id)
       end
-
-      def file_type
-        Pageflow.config.file_types.find_by_collection_name!(options.fetch(:file_type, 'image_file').pluralize)
-      end
     end
   end
 end

data/app/helpers/pageflow/file_background_images_helper.rb

@@ -0,0 +1,78 @@
+module Pageflow
+  # @api private
+  module FileBackgroundImagesHelper
+    include BackgroundImageHelper
+
+    ALLOWED_BREAKPOINTS = [:mobile, :desktop].freeze
+
+    def file_background_images_css(entry, breakpoint_name)
+      render(partial: 'pageflow/file_background_images/rule',
+             collection: Rules.new(Pageflow.config.file_types.with_css_background_image_support,
+                                   entry,
+                                   breakpoint_name).to_a)
+    end
+
+    # @api private
+    class Rules
+      def initialize(file_types, entry, breakpoint_name)
+        @file_types = file_types
+        @entry = entry
+        @breakpoint_name = breakpoint_name
+      end
+
+      def to_a
+        file_types.flat_map do |file_type|
+          rules_for_file_type(file_type)
+        end
+      end
+
+      private
+
+      attr_reader :entry, :file_types, :breakpoint_name
+
+      def rules_for_file_type(file_type)
+        entry.find_files(file_type.model).flat_map do |file|
+          exclude_rules_with_blank_url(rules_for_file(file_type, file))
+        end
+      end
+
+      def rules_for_file(file_type, file)
+        file_type.css_background_image_urls.call(file).map do |name, url|
+          {
+            prefix: rule_prefix(file_type, name),
+            file: file,
+            url: url_for_breakpoint(file_type, url)
+          }
+        end
+      end
+
+      def url_for_breakpoint(file_type, url)
+        if url.is_a?(Hash)
+          unknown_breakpoint_names = url.keys - ALLOWED_BREAKPOINTS
+
+          if unknown_breakpoint_names.any?
+            raise("Unknown breakpoints #{unknown_breakpoint_names.join(', ')} used in " \
+                  "css_background_image_urls of file type #{file_type.collection_name}.")
+          end
+
+          url[breakpoint_name]
+        else
+          url
+        end
+      end
+
+      def rule_prefix(file_type, name)
+        [
+          file_type.css_background_image_class_prefix,
+          name == :default ? nil : name
+        ].compact.join('_')
+      end
+
+      def exclude_rules_with_blank_url(rules)
+        rules.reject do |rule|
+          rule[:url].blank?
+        end
+      end
+    end
+  end
+end

data/app/helpers/pageflow/pages_helper.rb

@@ -50,8 +50,8 @@ module Pageflow
 
     def page_media_breakpoints
       {
-        :large => :default,
-        :medium => 'max-width: 900px'
+        desktop: :default,
+        mobile: 'max-width: 900px'
       }
     end
 

data/app/helpers/pageflow/render_json_helper.rb

@@ -23,10 +23,11 @@ module Pageflow
 
     ESCAPED_CHARS = {
       "\u2028" => '\u2028',
-      "\u2029" => '\u2029'
+      "\u2029" => '\u2029',
+      '</' => '<\/'
     }
 
-    ESCAPED_CHARS_REGEX = /[\u2028\u2029]/u
+    ESCAPED_CHARS_REGEX = %r{</|[\u2028\u2029]}u
 
     def sanitize_json(json)
       json.gsub(ESCAPED_CHARS_REGEX, ESCAPED_CHARS)

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

@@ -7,6 +7,8 @@ module Pageflow
       has_attached_file(:attachment_on_filesystem, Pageflow.config.paperclip_filesystem_default_options)
       has_attached_file(:attachment_on_s3, Pageflow.config.paperclip_s3_default_options)
 
+      validates :attachment, presence: true
+
       do_not_validate_attachment_file_type(:attachment_on_filesystem)
       do_not_validate_attachment_file_type(:attachment_on_s3)
 
@@ -71,15 +73,6 @@ module Pageflow
       url
     end
 
-    def cache_key
-      # Ensure the cache key changes when the state changes. There are
-      # cases during processing where the state is updated multiple
-      # times in a single second. Since `cache_key` relies on
-      # `updated_at`, which only is acurate to the second, we need to
-      # prevent caching outdated information.
-      "#{super}-#{state}"
-    end
-
     # @deprecated Write a migration instead
     def self.columns(t)
       t.belongs_to(:entry, index: true)