pageflow 0.11.4 → 12.0.0.rc1

data/app/assets/javascripts/pageflow/video_player/dash.js

@@ -0,0 +1,3 @@
+videojs.Html5DashJS.hook('beforeinitialize', function(player, mediaPlayer) {
+  mediaPlayer.getDebug().setLogToBrowserConsole(false);
+});

data/app/assets/javascripts/pageflow/video_player/filter_sources.js

@@ -1,5 +1,5 @@
 pageflow.VideoPlayer.filterSources = function(playerElement) {
-  if (pageflow.browser.has('mp4 support only')) {
+  if ($(playerElement).is('video') && pageflow.browser.has('mp4 support only')) {
     // keep only mp4 source
     $(playerElement).find('source').not('source[type="video/mp4"]').remove();
 

data/app/assets/javascripts/pageflow/video_player/lazy.js

@@ -1,6 +1,4 @@
-/**
- * A proxy which lazily initializes the real video player.
- */
+// A proxy which lazily initializes the real video player.
 pageflow.VideoPlayer.Lazy = function(template, options) {
   var placeholder = $('<span class="video_placeholder" />'),
       that = this,
@@ -56,7 +54,7 @@ pageflow.VideoPlayer.Lazy = function(template, options) {
     }
   };
 
-  /** proxied methods */
+  // proxied methods
 
   this.ready = function(callback) {
     readyCallbacks.add(callback);
@@ -82,10 +80,6 @@ pageflow.VideoPlayer.Lazy = function(template, options) {
     return videoPlayer && videoPlayer.posterImage.unlockShowing();
   };
 
-  this.srcFromOptions = function() {
-    return videoPlayer ? videoPlayer.srcFromOptions() : null;
-  };
-
   _.each(['play', 'playAndFadeIn', 'pause', 'fadeOutAndPause', 'prebuffer', 'src', 'on', 'load', 'currentTime'], function(method) {
     that[method] = function(/* args */) {
       var args = arguments;
@@ -129,4 +123,4 @@ pageflow.VideoPlayer.Lazy = function(template, options) {
 
     return element;
   }
-};
+};

data/app/assets/javascripts/pageflow/video_player/prebuffering.js

@@ -32,14 +32,18 @@ pageflow.VideoPlayer.prebuffering = function(player) {
 
     if (pageflow.browser.has('prebuffering support')) {
       if (!player.isBufferedAhead(delta) && !player.prebufferDeferred) {
-        pageflow.log('prebuffering video ' + player.srcFromOptions());
+        pageflow.log('prebuffering video ' + player.src());
 
         timeout = function() {
           setTimeout(function() {
+            if (!player.prebufferDeferred) {
+              return;
+            }
+
             count++;
 
             if (player.isBufferedAhead(delta) || count > maxCount) {
-              pageflow.log('finished prebuffering video ' + player.srcFromOptions());
+              pageflow.log('finished prebuffering video ' + player.src());
               deferred.resolve();
               player.prebufferDeferred = null;
             }
@@ -67,8 +71,13 @@ pageflow.VideoPlayer.prebuffering = function(player) {
   };
 
   var originalPause = player.pause;
+
   player.pause = function() {
     player.abortPrebuffering();
     return originalPause.apply(this, arguments);
   };
+
+  player.one('dispose', function() {
+    player.abortPrebuffering();
+  });
 };

data/app/assets/javascripts/pageflow/video_player/use_slim_controls_during_phone_playback.js

@@ -0,0 +1,16 @@
+pageflow.mediaPlayer.useSlimPlayerControlsDuringPhonePlayback = function(player) {
+  var originalPlay = player.play;
+
+  player.play = function() {
+    if (pageflow.browser.has('phone platform') &&
+        !pageflow.browser.has('native video player')) {
+      pageflow.widgets.use({
+        name: 'slim_player_controls', insteadOf: 'classic_player_controls'
+      }, function(restoreWidgets) {
+        player.one('pause', restoreWidgets);
+      });
+    }
+
+    originalPlay.apply(this, arguments);
+  };
+};

data/app/assets/javascripts/pageflow/videojs.js

@@ -0,0 +1,6 @@
+//= require_self
+//= require videojs
+//= require dash.all.min
+//= require videojs-dash
+
+window.VIDEOJS_NO_DYNAMIC_STYLE = true;

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

@@ -1,9 +1,43 @@
-pageflow.widgets = {
-  isPresent: function(name) {
-    return !!$('div.widget_' + name + '_present').length;
-  },
+pageflow.widgets = (function() {
+  return {
+    isPresent: function(name) {
+      return !!$('div.' + className(name)).length;
+    },
 
-  areLoaded: function() {
-    return !!$('div.widgets_present').length;
+    areLoaded: function() {
+      return !!$('div.widgets_present').length;
+    },
+
+    use: function(options, callback) {
+      var original = options.insteadOf;
+
+      var originalClassName = className(original);
+      var replacementClassNames =
+        className(options.name) + ' ' +
+        className(original, 'replaced');
+
+      if (this.isPresent(original)) {
+        replace(originalClassName, replacementClassNames);
+
+        callback(function() {
+          replace(replacementClassNames, originalClassName);
+        });
+      }
+      else {
+        callback(function() {});
+      }
+    }
+  };
+
+  function replace(original, replacement) {
+    $('div.widgets_present')
+      .removeClass(original)
+      .addClass(replacement);
+
+    pageflow.events.trigger('widgets:update');
+  }
+
+  function className(name, state) {
+    return 'widget_' + name + '_' + (state || 'present');
   }
-};
+}());

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

@@ -1,17 +1,20 @@
 @import "pageflow/mixins";
 
+@import "pageflow/admin/badge_list";
 @import "pageflow/admin/columns";
+@import "pageflow/admin/embed_code";
 @import "pageflow/admin/embedded_index_table";
 @import "pageflow/admin/entries";
-@import "pageflow/admin/forms";
 @import "pageflow/admin/features";
 @import "pageflow/admin/filters";
+@import "pageflow/admin/forms";
+@import "pageflow/admin/hint";
+@import "pageflow/admin/icon_button";
+@import "pageflow/admin/icon_link";
+@import "pageflow/admin/publication_state_indicator";
 @import "pageflow/admin/quotas";
 @import "pageflow/admin/tabs_view";
 @import "pageflow/admin/tooltip_bubble";
-@import "pageflow/admin/icon_link";
-@import "pageflow/admin/icon_button";
-@import "pageflow/admin/publication_state_indicator";
 
 #wrapper {
   overflow: hidden;

data/app/assets/stylesheets/pageflow/admin/{entries/user_badge_list.scss → badge_list.scss}

@@ -1,6 +1,4 @@
-.user_badge_list {
-  $size: 22px;
-
+.badge_list {
   margin: -4px 0;
   padding: 0;
 
@@ -9,10 +7,9 @@
     position: relative;
     list-style: none;
 
-    width: $size;
-    height: $size;
     margin: 1px;
-    line-height: $size;
+    line-height: 22px;
+    padding: 0 5px;
 
     background-color: #fff;
     border: solid 1px #aaa;
@@ -23,7 +20,7 @@
     }
   }
 
-  .initials {
+  .abbreviation, .name {
     font-size: 11px;
     font-weight: bold;
     color: #555;
@@ -33,7 +30,6 @@
     position: absolute;
     top: -1px;
     left: -1px;
-    height: $size;
     padding: 0 5px;
 
     white-space: nowrap;
@@ -46,5 +42,6 @@
 
   a {
     text-decoration: none;
+    font-weight: bold;
   }
-}
+}

data/app/assets/stylesheets/pageflow/admin/embed_code.scss

@@ -0,0 +1,13 @@
+.embed_code {
+  $hint-color: #9c9c9c;
+
+  input {
+    width: 100%;
+  }
+
+  p {
+    margin: 5px 0 0 0;
+    color: $hint-color;
+    font-style: italic;
+  }
+}

data/app/assets/stylesheets/pageflow/admin/entries.scss

@@ -65,5 +65,4 @@
 
   @import "./entries/index_table";
   @import "./entries/folders";
-  @import "./entries/user_badge_list";
-}
+}

data/app/assets/stylesheets/pageflow/admin/hint.scss

@@ -0,0 +1,20 @@
+$hint-text-color: #777777 !default;
+$hint-icon-color: #8aa5da !default;
+$background-color: #fbfbfb !default;
+
+.side_hint {
+  background-color: $background-color;
+  margin: 0 10px;
+  padding: 10px 0;
+  color: $hint-text-color;
+
+  p {
+    @include background-icon-left($font-size: 20px,
+                                  $color: $hint-icon-color,
+                                  $top: 10px,
+                                  $left: -30px);
+    @include fa-info-circle-icon;
+
+    margin-left: 20%;
+  }
+}

data/app/assets/stylesheets/pageflow/admin/tooltip_bubble.scss

@@ -28,3 +28,37 @@ $tooltip-bubble-text-color: #fff;
     display: block;
   }
 }
+
+.tooltip_clue {
+  position: relative;
+  border-bottom: 1px dotted;
+}
+
+[data-tooltip] {
+  position: relative;
+
+  &:after {
+    position: absolute;
+    display: none;
+    background-color: $tooltip-bubble-background-color;
+    color: $tooltip-bubble-text-color;
+    padding: 5px 10px;
+    top: -33px;
+    white-space: nowrap;
+    border-radius: 2px;
+    content: attr(data-tooltip);
+    pointer-events: none;
+  }
+
+  &:hover:before {
+    content: "";
+    position: absolute;
+    top: -6px;
+    left: 8px;
+    @include triangle(10px, $tooltip-bubble-background-color, down);
+  }
+
+  &:hover:after {
+    display: block;
+  }
+}

data/app/assets/stylesheets/pageflow/editor/base.scss

@@ -57,13 +57,17 @@
   @import "./failures";
   @import "./menu";
   @import "./inputs";
+  @import "./confirm_upload";
   @import "./manage_files";
   @import "./files";
   @import "./confirm_encoding";
   @import "./files_gallery";
+  @import "./filtered_files";
   @import "./file_meta_data";
   @import "./file_stages";
   @import "./file_thumbnails";
+  @import "./file_settings_dialog";
+  @import "./text_tracks";
   @import "./wysihtml5";
   @import "./notifications";
   @import "./publish_entry";
@@ -102,10 +106,6 @@
     @include icon-button(#d00);
     @include trash-icon;
     float: right;
-
-    &.faded {
-      opacity: 0.3;
-    }
   }
 
   a.upload {

data/app/assets/stylesheets/pageflow/editor/confirm_upload.scss

@@ -0,0 +1,66 @@
+&.confirm_upload {
+  .box {
+    position: absolute;
+    top: 20px;
+    left: 20px;
+    bottom: 20px;
+    right: 20px;
+    max-width: 1100px;
+    background-color: #eee;
+  }
+
+  .uploadable_files {
+    margin-right: 10px;
+
+    &.is_empty {
+      display: none;
+    }
+  }
+
+  .files_panel,
+  .selected_file_panel {
+    position: absolute;
+    top: 80px;
+  }
+
+  .files_panel {
+    right: 370px;
+    bottom: 50px;
+    left: 20px;
+    overflow: auto;
+  }
+
+  .selected_file_panel {
+    position: absolute;
+    right: 20px;
+    width: 330px;
+  }
+
+  .configuration_editor {
+    border: solid 1px #ddd;
+    background-color: #fff;
+    padding: 10px 10px 20px 12px;
+    margin: 0;
+  }
+
+  .table_view {
+    width: 100%;
+  }
+
+  .footer {
+    position: absolute;
+    right: 20px;
+    bottom: 10px;
+    left: 20px;
+  }
+
+  .upload {
+    @include icon-button;
+    @include up-icon;
+  }
+
+  .close {
+    @include icon-button(#888);
+    @include cancel-icon;
+  }
+}

data/app/assets/stylesheets/pageflow/editor/dialogs.scss

@@ -5,6 +5,7 @@
   width: 100%;
   height: 100%;
   z-index: 5;
+  background: transparent;
 
   &:before {
     content: " ";
@@ -25,7 +26,14 @@
     background-color: #fff;
   }
 
-  h2, h3 {
+  h2,
+  h3 {
+    margin: 0 0 10px 0;
+  }
+
+  .dialog-header {
+    font-size: 17px;
+    font-weight: bold;
     margin: 0 0 10px 0;
   }
 

data/app/assets/stylesheets/pageflow/editor/drop_down_button.scss

@@ -1,23 +1,19 @@
+$drop-down-button-menu-background-color: #eee !default;
+$drop-down-button-menu-active-item-background-color: #ddd !default;
+$drop-down-button-menu-disabled-item-text-color: #ddd !default;
+$drop-down-button-menu-border-color: #aaa !default;
+
 .drop_down_button {
   display: inline-block;
   position: relative;
 
-  > button {
+  > button.has_icon_and_text {
     @include icon-button;
   }
-}
-
-.drop_down_button_menu.is_visible {
-  @include transition(visibility 0ms, opacity 100ms);
-  visibility: visible;
-  pointer-events: all;
-  opacity: 1;
-}
 
-.drop_down_button_list {
-  position: relative;
-  background-color: #eee;
-  border: 1px solid #ccc;
+  > button.has_icon_only {
+    @include icon-only-button;
+  }
 }
 
 .drop_down_button_menu {
@@ -29,26 +25,66 @@
   position: absolute;
   z-index: 1;
   padding: 1px;
-  border: solid 1px #aaa;
-  background-color: #eee;
+  border: solid 1px $drop-down-button-menu-border-color;
+  background-color: $drop-down-button-menu-background-color;
+
+  &.is_visible {
+    @include transition(visibility 0ms, opacity 100ms);
+    visibility: visible;
+    pointer-events: all;
+    opacity: 1;
+  }
 }
 
 .drop_down_button_item {
-  a {
-    display: block;
+  a,
+  .label {
     padding: 7px 15px;
+  }
+
+  a {
+    display: none;
     cursor: pointer;
 
     &:hover {
-      background-color: #ddd;
+      background-color: $drop-down-button-menu-active-item-background-color;
+    }
+  }
+
+  .label {
+    cursor: default;
+  }
+
+  &.is_selectable {
+    a {
+      display: block;
+    }
+
+    .label {
+      display: none;
     }
   }
 
   &.is_disabled a {
-    color: #ddd;
+    color: $drop-down-button-menu-disabled-item-text-color;
 
     &:hover {
       background-color: inherit;
     }
   }
-}
+
+  &.is_checked a {
+    @include background-icon-left($left: 15px, $font-size: 15px);
+    @include fa-check-icon;
+  }
+
+  .drop_down_button_item a {
+    padding-left: 39px;
+  }
+
+  ul {
+    border-bottom: solid 1px $drop-down-button-menu-border-color;
+    padding-bottom: 1px;
+    margin-bottom: 1px;
+  }
+}