pageflow 0.8.2 → 0.9.0

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

@@ -0,0 +1,20 @@
+/* scroll transition to left*/
+
+section.scroll {
+  &.animate-in-forwards, &.animate-in-backwards {
+    z-index: 2;
+  }
+
+  &.animate-in-forwards {
+    @include animation(scroll-in-forwards forwards 1s 1);
+  }
+  &.animate-in-backwards {
+    @include animation(scroll-in-backwards forwards 1s 1);
+  }
+  &.animate-out-forwards {
+    @include animation(scroll-out-forwards forwards 1s 1);
+  }
+  &.animate-out-backwards {
+    @include animation(scroll-out-backwards forwards 1s 1);
+  }
+}

data/app/assets/stylesheets/pageflow/page_transitions/scroll_in.css.scss

@@ -0,0 +1,66 @@
+/* scroll in, no scroll out from bottom */
+
+section.scroll-in {
+  .blackLayer {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    opacity: 1;
+    display: none;
+    background-color: black;
+  }
+  &.invert .blackLayer {
+    background-color: white;
+  }
+  .content_and_background {
+    box-shadow: 0px 0px 50px black;
+    @include transition(1s ease);
+  }
+  &.active div.content_and_background {
+    @include transform(translate3d(0,0,0));
+  }
+
+  &.active .blackLayer {
+    opacity: 1;
+  }
+
+  &.animate-in-forwards {
+    .content_and_background {
+      @include transform(translate3d(0,105%,0));
+    }
+
+    .blackLayer {
+      opacity: 0;
+    }
+  }
+  &.animate-out-forwards {
+    .content_and_background {
+      @include transform(translate3d(0,0,0));
+
+      .backgroundArea {
+        opacity: 1;
+      }
+    }
+    .blackLayer {
+      opacity: 1;
+    }
+  }
+  &.animate-in-backwards {
+    .content_and_background {
+      @include transform(translate3d(0,0,0));
+    }
+    .blackLayer {
+      opacity: 1;
+    }
+  }
+  &.animate-out-backwards {
+    .content_and_background {
+      @include transform(translate3d(0,105%,0));
+    }
+    .blackLayer {
+      opacity: 0;
+    }
+  }
+}

data/app/assets/stylesheets/pageflow/page_transitions/scroll_in_right.css.scss

@@ -0,0 +1,68 @@
+/* scroll in, no scroll out from right */
+
+section.scroll-in-right {
+
+  .blackLayer {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    opacity: 1;
+    display: none;
+    background-color: black;
+  }
+  &.invert .blackLayer {
+    background-color: white;
+  }
+  .content_and_background {
+    overflow: hidden;
+    box-shadow: 0px 0px 50px black;
+    @include transition(1s ease);
+  }
+  &.active div.content_and_background {
+    @include transform(translate3d(0,0,0));
+  }
+
+  &.active .blackLayer {
+    opacity: 1;
+  }
+
+  &.animate-in-forwards {
+    .content_and_background {
+      @include transform(translate3d(105%,0,0));
+    }
+
+    .blackLayer {
+      opacity: 0;
+    }
+  }
+  &.animate-out-forwards {
+    .content_and_background {
+      @include transform(translate3d(0,0,0));
+
+      .backgroundArea {
+        opacity: 1;
+      }
+    }
+    .blackLayer {
+      opacity: 1;
+    }
+  }
+  &.animate-in-backwards {
+    .content_and_background {
+      @include transform(translate3d(0,0,0));
+    }
+    .blackLayer {
+      opacity: 1;
+    }
+  }
+  &.animate-out-backwards {
+    .content_and_background {
+      @include transform(translate3d(105%,0,0));
+    }
+    .blackLayer {
+      opacity: 0;
+    }
+  }
+}

data/app/assets/stylesheets/pageflow/page_transitions/scroll_left.css.scss

@@ -0,0 +1,20 @@
+/* scroll transition to left*/
+
+section.scroll_left {
+  &.animate-in-forwards, &.animate-in-backwards {
+    z-index: 2;
+  }
+
+  &.animate-in-forwards {
+    @include animation(scroll-in-left forwards 1s 1);
+  }
+  &.animate-in-backwards {
+    @include animation(scroll-in-right forwards 1s 1);
+  }
+  &.animate-out-forwards {
+    @include animation(scroll-out-right forwards 1s 1);
+  }
+  &.animate-out-backwards {
+    @include animation(scroll-out-left forwards 1s 1);
+  }
+}

data/app/assets/stylesheets/pageflow/page_transitions/scroll_right.css.scss

@@ -0,0 +1,20 @@
+/* scroll transition to left*/
+
+section.scroll_right {
+  &.animate-in-forwards, &.animate-in-backwards {
+    z-index: 2;
+  }
+
+  &.animate-in-forwards {
+    @include animation(scroll-in-right forwards 1s 1);
+  }
+  &.animate-in-backwards {
+    @include animation(scroll-in-left forwards 1s 1);
+  }
+  &.animate-out-forwards {
+    @include animation(scroll-out-left forwards 1s 1);
+  }
+  &.animate-out-backwards {
+    @include animation(scroll-out-right forwards 1s 1);
+  }
+}

data/app/assets/stylesheets/pageflow/page_types.css.scss

@@ -3,11 +3,9 @@
 @import "page_types/background-image";
 @import "page_types/background-video";
 @import "page_types/video";
-@import "page_types/internal_links";
 
 @include pageflow-page-type(audio);
 @include pageflow-page-type(audio_loop);
 @include pageflow-page-type(background_image);
 @include pageflow-page-type(background_video);
-@include pageflow-page-type(video);
-@include pageflow-page-type(internal_links);
+@include pageflow-page-type(video);

data/app/assets/stylesheets/pageflow/page_types/video.css.scss

@@ -48,10 +48,6 @@
   right: 0;
 }
 
-.page[data-template="video"] {
-  background-color: #000000;
-}
-
 .video-js {
   .vjs-big-play-button {
     display: none;

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

@@ -9,7 +9,6 @@
   .blackLayer,
   .backgroundArea {
     -webkit-backface-visibility: hidden;
-    @include transition (opacity 1s linear);
     position: relative;
   }
 
@@ -96,150 +95,6 @@
     @each $direction in forwards backwards {
       .animate-#{$io}-#{$direction} {
         display: block;
-
-        .content,
-        .content_and_background {
-          @include animation-duration(1s);
-          @include animation-timing-function(ease);
-          @include animation-iteration-count(1);
-        }
-
-        &.fade .content {
-        /*  @include animation-name(scroll-#{$io}-#{$direction}); */
-        }
-
-        &.scroll .content_and_background {
-          /* @include animation-name(scroll-#{$io}-#{$direction}); */
-        }
-      }
-    }
-  }
-
-  /* scroll transition */
-
-  section.scroll {
-    .blackLayer {
-      position: absolute;
-      top: 0;
-      left: 0;
-      width: 100%;
-      height: 100%;
-      opacity: 1;
-      display: none;
-      background-color: black;
-    }
-    &.invert .blackLayer {
-      background-color: white;
-    }
-    .content_and_background {
-      @include transition(1s ease);
-    /*  @include transform(translateY(-100%)); */
-    }
-    &.active div.content_and_background {
-      @include transform(translate3d(0,0,0));
-    }
-
-    &.active .blackLayer {
-      opacity: 1;
-    }
-
-    &.animate-in-forwards {
-      .content_and_background {
-        @include transform(translate3d(0,100%,0));
-      }
-
-      .blackLayer {
-        opacity: 0;
-      }
-    }
-    &.animate-out-forwards {
-      .content_and_background {
-        @include transform(translate3d(0,-100%,0));
-
-        .backgroundArea {
-          opacity: 1;
-        }
-      }
-      .blackLayer {
-        opacity: 1;
-      }
-    }
-    &.animate-in-backwards {
-      .content_and_background {
-        @include transform(translate3d(0,-100%,0));
-      }
-      .blackLayer {
-        opacity: 1;
-      }
-    }
-    &.animate-out-backwards {
-      .content_and_background {
-        @include transform(translate3d(0,100%,0));
-      }
-      .blackLayer {
-        opacity: 0;
-      }
-    }
-  }
-
-  section.fade {
-
-    .blackLayer {
-      display: none;
-    }
-    .backgroundArea {
-      background-color: black;
-      -webkit-backface-visibility: hidden;
-    }
-
-    &.invert .backgroundArea {
-      background-color: white;
-    }
-
-    &.active.animate-in-forwards .backgroundArea {
-      opacity: 1;
-    }
-
-    &.animate-in-forwards .backgroundArea {
-      opacity: 0;
-    }
-    &.animate-out-forwards .backgroundArea{
-      opacity: 1;
-    }
-    &.animate-in-backwards .backgroundArea{
-      opacity: 1;
-    }
-    &.animate-out-backwards .backgroundArea{
-      opacity: 0;
-    }
-
-    .content {
-      @include transition(1s ease);
-      -webkit-backface-visibility: hidden;
-    }
-
-    &.active div.content {
-      @include transform(translate3d(0,0,0));
-    }
-
-    &.animate-in-forwards {
-      .content {
-        @include transform(translate3d(0,100%,0));
-      }
-    }
-    &.animate-out-forwards {
-      .content {
-        @include transform(translate3d(0,-100%,0));
-      }
-    }
-    &.animate-in-backwards {
-      .content {
-        @include transform(translate3d(0,-100%,0));
-      }
-    }
-    &.animate-out-backwards {
-      .content {
-        @include transform(translate3d(0,100%,0));
       }
     }
   }

data/app/assets/stylesheets/pageflow/text_variants.css.scss

@@ -3,10 +3,6 @@
     margin-left: auto;
   }
 
-  .internal_links_page nav {
-    margin-left: auto;
-  }
-
   &.page {
     h1, h2 span.subtitle, h2 span.tagline, h3, p {
       margin-left: auto;

data/app/assets/stylesheets/pageflow/themes/default/navigation.css.scss

@@ -189,9 +189,6 @@ $nav-bg-color-transparent: $basic-background-color-transparent;
   .audio:after {
     background-image: image-url('pageflow/themes/#{$theme-name}/audio_sprite.png');
   }
-  .internal_links:after {
-    background-image: image-url('pageflow/themes/#{$theme-name}/internal_links_sprite.png');
-  }
   .audio_loop:after {
     background-image: image-url('pageflow/themes/#{$theme-name}/image_sprite.png');
   }

data/app/controllers/concerns/pageflow/public_https_mode.rb

@@ -0,0 +1,13 @@
+module Pageflow
+  module PublicHttpsMode
+    protected
+
+    def check_public_https_mode
+      if request.ssl? && Pageflow.config.public_https_mode == :prevent
+        redirect_to("http://#{request.host}#{request.fullpath}", status: :moved_permanently)
+      elsif !request.ssl? && Pageflow.config.public_https_mode == :enforce
+        redirect_to("https://#{request.host}#{request.fullpath}", status: :moved_permanently)
+      end
+    end
+  end
+end

data/app/controllers/pageflow/application_controller.rb

@@ -54,12 +54,6 @@ module Pageflow
       root_url(:protocol => 'http')
     end
 
-    def prevent_ssl
-      if request.ssl?
-        redirect_to("http://#{request.host}#{request.fullpath}", :status => :moved_permanently)
-      end
-    end
-
     def locale_from_accept_language_header
       http_accept_language.compatible_language_from(I18n.available_locales)
     end

data/app/controllers/pageflow/chapters_controller.rb

@@ -52,7 +52,8 @@ module Pageflow
     private
 
     def chapter_params
-      params.require(:chapter).permit(:position, :title)
+      configuration = params.require(:chapter)[:configuration].try(:permit!)
+      params.require(:chapter).permit(:position, :title).merge(:configuration => configuration)
     end
   end
 end