pageflow 13.2.0 → 13.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39d2ad78c808ad1b12c3dac0296f2520b28bf922c6821ce2e7155086c5521f63
-  data.tar.gz: 7d55879aed2fa2a21e3ad00c9469044ac272aaafbb7f06c6309749e01ea660e1
+  metadata.gz: c272f47847e7397fbfa1ba7b650ff70a4deeebf7c05f286cee3f45cb5033800d
+  data.tar.gz: '094a2a235ff2572be87cf3bda33fc716a6109df54c6e48570b4b51ef5da9c5ac'
 SHA512:
-  metadata.gz: df45520a225a7739d62d72b9efb4379dafe02b7153259dc63a71a21919379fb7e906cae55ca88476e5ef62988292ef4f8a60ca19a099bbc50aad64ee77b37fac
-  data.tar.gz: c5d7d6530f4f93132aad8ccdcad4711e42519253982f3f2f64fed5a22ba78931b7b465ba35c64f8582e60079d1c0a7b3fc454f87daad9d823370f94a66005e3c
+  metadata.gz: 0d9f5bfc05baa02e1b67ecf8b8cf0674df5409b25664acedf32473761803e27e024e664485803b9f5de40108c4c609dea25d076fb770f6567f08999fe00de504
+  data.tar.gz: 7610751681d8b0a24f7598cd6983dab4ea00df758c42da941ee2ba6c6d26980e870c40af01cbc4a7300b5a1fdac70f7386800bc5242039173a3aa06ed18f937f

data/CHANGELOG.md

@@ -1,26 +1,24 @@
 # CHANGELOG
 
-### Version 13.2.0
+### Version 13.3.0
 
-2019-01-28
+2019-02-20
 
-[Compare changes](https://github.com/codevise/pageflow/compare/13-1-stable...v13.2.0)
-
-- Waveform audio player controls
-  ([#1092](https://github.com/codevise/pageflow/pull/1092))
-- Do not use asset host in entry stylesheet link tags
-  ([#1107](https://github.com/codevise/pageflow/pull/1107))
-- Add theme vars for phone typography of tagline and subtitle
-  ([#1108](https://github.com/codevise/pageflow/pull/1108))
-  
-##### Internal
-- Add package-lock.json to version control
-  ([#1106](https://github.com/codevise/pageflow/pull/1106))
-- Upgrade to Semmy 1.1
-  ([#1113](https://github.com/codevise/pageflow/pull/1113))
-- Also release pageflow-support when running release task
-  ([#1115](https://github.com/codevise/pageflow/pull/1115))
+[Compare changes](https://github.com/codevise/pageflow/compare/13-2-stable...v13.3.0)
 
+- Lazy load navigation bar thumbnails
+  ([#1117](https://github.com/codevise/pageflow/pull/1117))
+- Ensure entries can be filtered by publication date
+  ([#1118](https://github.com/codevise/pageflow/pull/1118))
+- Add missing Active Admin translations for filters
+  ([#1119](https://github.com/codevise/pageflow/pull/1119))
+- Ignore storyline order error in js specs
+  ([#1120](https://github.com/codevise/pageflow/pull/1120))
+- Add typography theme vars for first page of chapter
+  ([#1121](https://github.com/codevise/pageflow/pull/1121))
+- Display text tracks at the top if waveform is present
+  ([#1122](https://github.com/codevise/pageflow/pull/1122))
+      
 See
-[13-1-stable branch](https://github.com/codevise/pageflow/blob/13-1-stable/CHANGELOG.md)
+[13-2-stable branch](https://github.com/codevise/pageflow/blob/13-2-stable/CHANGELOG.md)
 for previous changes.

data/app/assets/javascripts/pageflow/dist/react-client.js

@@ -25056,7 +25056,8 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	      muted: props.muted,
 	      playsInline: props.playsInline,
 	      defaultTextTrackFileId: props.defaultTextTrackFileId,
-	      textTracksEnabled: props.textTracksEnabled });
+	      textTracksEnabled: props.textTracksEnabled,
+	      textTrackPosition: props.textTrackPosition });
 	  } else if (props.preloadComponent && fileReady && props.pageIsPreloaded) {
 	    var Preload = props.preloadComponent;
 
@@ -25304,7 +25305,12 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	var slimPlayerControlsPresent = (0, _selectors5.widgetPresent)('slimPlayerControls');
 
 	function textTrackPosition(state, _ref2) {
-	  var playerState = _ref2.playerState;
+	  var playerState = _ref2.playerState,
+	      textTrackPosition = _ref2.textTrackPosition;
+
+	  if (textTrackPosition) {
+	    return textTrackPosition;
+	  }
 
 	  if (slimPlayerControlsPresent(state)) {
 	    // see pageflow.VideoPlayer#updateCueLineSettings for explanation of values.
@@ -30794,7 +30800,8 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	    React.createElement(_media.PageBackgroundAsset, null),
 	    React.createElement(_media.PageAudioFilePlayer, { file: props.audioFile,
 	      playerState: props.playerState,
-	      playerActions: props.playerActions })
+	      playerActions: props.playerActions,
+	      textTrackPosition: textTrackPosition(playerControlsVariant) })
 	  );
 	}
 
@@ -30806,6 +30813,12 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	  }
 	}
 
+	function textTrackPosition(variant) {
+	  if (variant == 'waveform') {
+	    return 'top';
+	  }
+	}
+
 	function register() {
 	  (0, _registerPageType2.default)('audio', {
 

data/app/assets/javascripts/pageflow/dist/react-server.js

@@ -25050,7 +25050,8 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	      muted: props.muted,
 	      playsInline: props.playsInline,
 	      defaultTextTrackFileId: props.defaultTextTrackFileId,
-	      textTracksEnabled: props.textTracksEnabled });
+	      textTracksEnabled: props.textTracksEnabled,
+	      textTrackPosition: props.textTrackPosition });
 	  } else if (props.preloadComponent && fileReady && props.pageIsPreloaded) {
 	    var Preload = props.preloadComponent;
 
@@ -25298,7 +25299,12 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	var slimPlayerControlsPresent = (0, _selectors5.widgetPresent)('slimPlayerControls');
 
 	function textTrackPosition(state, _ref2) {
-	  var playerState = _ref2.playerState;
+	  var playerState = _ref2.playerState,
+	      textTrackPosition = _ref2.textTrackPosition;
+
+	  if (textTrackPosition) {
+	    return textTrackPosition;
+	  }
 
 	  if (slimPlayerControlsPresent(state)) {
 	    // see pageflow.VideoPlayer#updateCueLineSettings for explanation of values.
@@ -30772,7 +30778,8 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	    React.createElement(_media.PageBackgroundAsset, null),
 	    React.createElement(_media.PageAudioFilePlayer, { file: props.audioFile,
 	      playerState: props.playerState,
-	      playerActions: props.playerActions })
+	      playerActions: props.playerActions,
+	      textTrackPosition: textTrackPosition(playerControlsVariant) })
 	  );
 	}
 
@@ -30784,6 +30791,12 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	  }
 	}
 
+	function textTrackPosition(variant) {
+	  if (variant == 'waveform') {
+	    return 'top';
+	  }
+	}
+
 	function register() {
 	  (0, _registerPageType2.default)('audio', {
 

data/app/assets/javascripts/pageflow/widgets/navigation.js

@@ -187,6 +187,7 @@
           scroller: scroller,
           scrollToActive: true,
           animationDuration: 500,
+          lazyLoadImages: true,
           onAnimationStart: function() {
             element.addClass('is_animating');
           },

data/app/assets/javascripts/pageflow/widgets/page_navigation_list.js

@@ -95,9 +95,14 @@
         return $.when(animation.enabled && animationDurationElapsed()).then(function() {
           links.each(function() {
             var link = $(this);
+            var pageIsVisible = visible(currentPagePermaId, link);
 
-            animation.finish(link.parent(), visible(currentPagePermaId, link));
-            link.parent().andSelf().toggleClass('filtered', !visible(currentPagePermaId, link));
+            animation.finish(link.parent(), pageIsVisible);
+            link.parent().andSelf().toggleClass('filtered', !pageIsVisible);
+
+            if (pageIsVisible && options.lazyLoadImages) {
+              link.loadLazyImages();
+            }
           });
 
           scroller.refresh();
@@ -130,4 +135,4 @@
       }
     }
   });
-}(jQuery));
+}(jQuery));

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

@@ -26,6 +26,12 @@ $page-header-first-page-title-typography: () !default;
 /// Typography for title on first page in phone layout.
 $page-header-first-page-title-phone-typography: () !default;
 
+/// Typography for title on first page of chapter.
+$page-header-chapter-beginning-title-typography: () !default;
+
+/// Typography for title on first page of chapter in phone layout.
+$page-header-chapter-beginning-title-phone-typography: () !default;
+
 /// Typography for header subtitle.
 $page-header-subtitle-typography: () !default;
 
@@ -241,3 +247,17 @@ $page-content-text-line-height: 1.5em !default;
     }
   }
 }
+
+.emphasize_chapter_beginning .page.chapter_beginning:nth-of-type(n+2) {
+  h2 .title {
+    @include typography(
+      $page-header-chapter-beginning-title-typography
+    );
+
+    @include phone {
+      @include typography(
+        $page-header-chapter-beginning-title-phone-typography
+      );
+    }
+  }
+}

data/app/models/pageflow/revision.rb

@@ -27,10 +27,31 @@ module Pageflow
     has_many :audio_files, -> { extending WithFileUsageExtension },
     :through => :file_usages, :source => :file, :source_type => 'Pageflow::AudioFile'
 
-    scope :published, -> do
-      where([':now >= published_at AND (published_until IS NULL OR :now < published_until)',
-              {:now => Time.now}])
-    end
+    scope(:published,
+          lambda do
+            # The following query would be much easier expressed as
+            #
+            #   where.not(published_at: nil)
+            #     .where(['(published_until IS NULL OR published_until > :now)',
+            #            {now: Time.now}])
+            #
+            # But referencing `published_until` without qualifying it
+            # with a table name or alias makes it ambiguous when the
+            # revisions table is joined multiple times in a query.
+            #
+            # The hash syntax makes sure the correct dynamically
+            # generated table alias is used.
+
+            published_indefinitely =
+              where.not(published_at: nil).where(published_until: nil)
+
+            published_until_gt_now = {published_until: 1.second.from_now..DateTime::Infinity.new}
+
+            published_and_not_yet_depublished =
+              where.not(published_at: nil).where(published_until_gt_now)
+
+            published_indefinitely.or(published_and_not_yet_depublished)
+          end)
 
     scope(:with_password_protection, -> { where('password_protected IS TRUE') })
     scope(:without_password_protection, -> { where('password_protected IS NOT TRUE') })

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

@@ -5,8 +5,7 @@
   <div class="scroller">
     <ul class="navigation_thumbnails">
       <%= render :partial => 'pageflow/entries/navigation/page',
-                 :collection => entry.pages.displayed_in_navigation,
-                 :locals => {:image_style => :navigation_thumbnail_small, :image_width => 85} %>
+                 :collection => entry.pages.displayed_in_navigation %>
     </ul>
   </div>
   <%= render 'pageflow/entries/navigation/bar_bottom', :entry => entry %>

data/app/views/pageflow/entries/navigation/_page.html.erb

@@ -1,6 +1,6 @@
 <li class="<%= page_navigation_css_class(page) %>">
   <%= link_to "##{page.perma_id}", :data => {:link => page.id, :chapter_id => page.chapter_id} do %>
-      <%= image_tag(page.thumbnail_url(image_style), :width => image_width) %>
+      <%= image_tag('', data: {src: asset_path(page.thumbnail_url(:navigation_thumbnail_small))}, width: 85, height: 47) %>
   <% end %>
   <div class="navigation_site_detail">
     <%= page.title %>

data/config/locales/de.yml

@@ -93,9 +93,13 @@ de:
         contains: Enthält
         ends_with: Endet mit
         equals: Ist gleich
+        from: Von
         greater_than: Größer als
+        gteq_datetime: Größer gleich
         less_than: Kleiner als
+        lteq_datetime: Kleiner gleich
         starts_with: Beginnt mit
+        to: Bis
     greater_than: Größer als
     has_many_delete: Löschen
     has_many_new: "%{model} hinzufügen"

data/config/locales/en.yml

@@ -93,9 +93,13 @@ en:
         contains: Contains
         ends_with: Ends with
         equals: Equals
+        from: From
         greater_than: Greater than
+        gteq_datetime: Greater or equal to
         less_than: Less than
+        lteq_datetime: Lesser or equal to
         starts_with: Starts with
+        to: To
     greater_than: Greater than
     has_many_delete: Delete
     has_many_new: Add New %{model}

data/lib/pageflow/version.rb

@@ -1,3 +1,3 @@
 module Pageflow
-  VERSION = '13.2.0'.freeze
+  VERSION = '13.3.0'.freeze
 end

data/spec/factories/revisions.rb

@@ -13,6 +13,11 @@ module Pageflow
         published_at { 1.day.ago }
       end
 
+      trait :not_yet_depublished do
+        published
+        published_until { 1.day.from_now }
+      end
+
       trait :depublished do
         published
         published_until { 1.day.ago }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pageflow
 version: !ruby/object:Gem::Version
-  version: 13.2.0
+  version: 13.3.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-28 00:00:00.000000000 Z
+date: 2019-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails