pageflow 0.2.1 → 0.3.0

data/app/assets/javascripts/pageflow/editor/views/input_view.js

@@ -13,6 +13,9 @@ pageflow.inputView = {
     if (!this.inlineHelpText()) {
       this.ui.inlineHelp.hide();
     }
+
+    this.updateDisabled();
+    this.setupVisibleBinding();
   },
 
   localizedAttributeName: function() {
@@ -20,6 +23,41 @@ pageflow.inputView = {
   },
 
   inlineHelpText: function() {
-    return I18n.t('editor.inline_help.' + this.model.i18nKey + '.' + this.options.propertyName, {defaultValue: ''});
+    var key = 'editor.inline_help.' + this.model.i18nKey + '.' + this.options.propertyName;
+    var text = I18n.t(key, {defaultValue: ''});
+
+    if (this.options.disabled) {
+      text = I18n.t(key + '_disabled', {defaultValue: text});
+    }
+
+    return text;
+  },
+
+  updateDisabled: function() {
+    if (this.ui.input) {
+      this.updateDisabledAttribute(this.ui.input);
+    }
+  },
+
+  updateDisabledAttribute: function(element) {
+    if (this.options.disabled) {
+      element.attr('disabled', true);
+    }
+    else {
+      element.removeAttr('disabled');
+    }
+  },
+
+  setupVisibleBinding: function() {
+    var view = this;
+
+    if (this.options.visibleBinding) {
+      this.listenTo(this.model, 'change:' + this.options.visibleBinding, updateVisible);
+      updateVisible(this.model, this.model.get(this.options.visibleBinding));
+    }
+
+    function updateVisible(model, value) {
+      view.$el.toggle(!!value);
+    }
   }
 };

data/app/assets/javascripts/pageflow/editor/views/inputs/check_box_input_view.js

@@ -20,10 +20,21 @@ pageflow.CheckBoxInputView = Backbone.Marionette.ItemView.extend({
   },
 
   save: function() {
-    this.model.set(this.options.propertyName, this.ui.input.is(':checked'));
+    if (!this.options.disabled) {
+      this.model.set(this.options.propertyName, this.ui.input.is(':checked'));
+    }
   },
 
   load: function() {
-    this.ui.input.attr('checked', this.model.get(this.options.propertyName));
+    this.ui.input.attr('checked', this.displayValue());
+  },
+
+  displayValue: function() {
+    if (this.options.disabled && this.options.displayUncheckedIfDisabled) {
+      return false;
+    }
+    else {
+      return this.model.get(this.options.propertyName);
+    }
   }
 });

data/app/assets/javascripts/pageflow/editor/views/inputs/file_input_view.js

@@ -15,10 +15,15 @@ pageflow.FileInputView = Backbone.Marionette.ItemView.extend({
 
   events: {
     'click .choose': function() {
-      editor.navigate(
-        '/files/' + this.options.collection.name +'?page=' + this.model.page.id + '&attribute=' + this.options.propertyName,
-        {trigger: true}
+      pageflow.editor.selectFile(
+        this.options.collection.name,
+        this.options.fileSelectionHandler || 'pageConfiguration',
+        {
+          id: this.model.getRoutableId ? this.model.getRoutableId() : this.model.id,
+          attributeName: this.options.propertyName
+        }
       );
+
       return false;
     },
 
@@ -63,4 +68,4 @@ pageflow.FileInputView = Backbone.Marionette.ItemView.extend({
   _getFile: function() {
     return this.model.getReference(this.options.propertyName, this.options.collection);
   }
-});
+});

data/app/assets/javascripts/pageflow/editor/views/inputs/text_area_input_view.js

@@ -50,4 +50,17 @@ pageflow.TextAreaInputView = Backbone.Marionette.ItemView.extend({
   load: function() {
     this.ui.textarea.val(this.model.get(this.options.propertyName));
   }
-});
+});
+
+(function() {
+  var isIE11 = navigator.userAgent.indexOf("Trident") !== -1;
+  // This browser detections is copied from wysihtml5.
+  var isGecko = navigator.userAgent.indexOf("Gecko") !== -1 && navigator.userAgent.indexOf("KHTML") === -1;
+
+  wysihtml5.browser.insertsLineBreaksOnReturn = function() {
+    // Used to be only isGecko. Unfortunately IE 11 is detected as
+    // Gecko since it says "like Gecko" in its user agent. Make sure
+    // we really are not IE 11.
+    return isGecko && !isIE11;
+  };
+}());

data/app/assets/javascripts/pageflow/editor/views/inputs/text_input_view.js

@@ -12,6 +12,7 @@ pageflow.TextInputView = Backbone.Marionette.ItemView.extend({
   },
 
   onRender: function() {
+    this.updatePlaceholder();
     this.load();
     this.validate();
   },
@@ -46,5 +47,15 @@ pageflow.TextInputView = Backbone.Marionette.ItemView.extend({
   resetValidationError: function(message) {
     this.$el.removeClass('invalid');
     this.ui.input.attr('title', '');
+  },
+
+  updatePlaceholder: function() {
+    this.ui.input.attr('placeholder', this.placeholderText());
+  },
+
+  placeholderText: function() {
+    if (!this.options.disabled || !this.options.hidePlaceholderIfDisabled) {
+      return this.options.placeholder;
+    }
   }
 });

data/app/assets/javascripts/pageflow/editor/views/mixins/failure_indicating_view.js

@@ -1,11 +1,11 @@
 pageflow.failureIndicatingView = {
   modelEvents: {
-    'change:failed': 'updateFailIndicator',
+    'change:failed': 'updateFailIndicator'
   },
 
   events: {
     'click .retry': function() {
-      pageflow.failedRecords.retry();
+      pageflow.editor.failures.retry();
       return false;
     }
   },
@@ -18,4 +18,4 @@ pageflow.failureIndicatingView = {
     this.$el.toggleClass('failed', this.model.isFailed());
     this.$el.find('.failure .message').text(this.model.getFailureMessage());
   }
-};
+};

data/app/assets/javascripts/pageflow/editor/views/notifications_view.js

@@ -11,7 +11,7 @@ pageflow.NotificationsView = Backbone.Marionette.ItemView.extend({
 
   events: {
     'click .retry': function() {
-      pageflow.failedRecords.retry();
+      pageflow.editor.failures.retry();
     }
   },
 
@@ -19,19 +19,20 @@ pageflow.NotificationsView = Backbone.Marionette.ItemView.extend({
     this.listenTo(pageflow.entry, 'change:uploading_files_count', this.notifyUploadCount);
     this.listenTo(pageflow.entry, 'change:confirmable_files_count', this.notifyConfirmableFilesCount);
 
-    this.listenTo(pageflow.failedRecords, 'add', this.update);
-    this.listenTo(pageflow.failedRecords, 'remove', this.update);
     this.listenTo(pageflow.savingRecords, 'add', this.update);
     this.listenTo(pageflow.savingRecords, 'remove', this.update);
 
+    this.listenTo(pageflow.editor.failures, 'add', this.update);
+    this.listenTo(pageflow.editor.failures, 'remove', this.update);
+
     this.update();
     this.notifyConfirmableFilesCount();
   },
 
   update: function() {
-    this.$el.toggleClass('failed', !pageflow.failedRecords.isEmpty());
+    this.$el.toggleClass('failed', !pageflow.editor.failures.isEmpty());
     this.$el.toggleClass('saving', !pageflow.savingRecords.isEmpty());
-    this.ui.failedCount.text(pageflow.failedRecords.length);
+    this.ui.failedCount.text(pageflow.editor.failures.count());
   },
 
   notifyUploadCount: function(model, uploadCount) {
@@ -45,4 +46,4 @@ pageflow.NotificationsView = Backbone.Marionette.ItemView.extend({
     this.$el.toggleClass('has_confirmable_files', confirmableFilesCount > 0);
     this.ui.confirmableFilesCount.text(confirmableFilesCount);
   }
-});
+});

data/app/assets/javascripts/pageflow/editor/views/page_preview_view.js

@@ -56,6 +56,7 @@ pageflow.PagePreviewView = Backbone.Marionette.View.extend({
   update: function() {
     this.$el.removeClass(pageflow.Page.transitions.join(' ')).addClass(this.model.configuration.get('transition'));
     this.pageType().update(this.$el, this.model.configuration);
+    _.extend(this.$el.data('configuration'), this.model.configuration.attributes);
     this.refreshScroller();
   },
 
@@ -94,4 +95,4 @@ pageflow.PagePreviewView = Backbone.Marionette.View.extend({
   _unescape: function(text) {
     return $('<div/>').html(text).text();
   }
-});
+});

data/app/assets/javascripts/pageflow/page_types/audio.js

@@ -45,13 +45,18 @@ pageflow.pageType.register('audio', _.extend({
   activated: function(pageElement, configuration) {
     var that = this;
     if(!pageflow.features.has('mobile platform')) {
-      this.fadeInTimeout = setTimeout(function() {
-        that.audioPlayer.readyPromise.then(function() {
-          that.audioPlayer.volume(0);
-          that.audioPlayer.play();
-          that.fadeSound(that.audioPlayer, pageflow.settings.get('volume'), 1000);
-        });
-      }, 1000);
+
+      if (configuration.autoplay === false) {
+        that.audioPlayer.volume(pageflow.settings.get('volume'));
+      } else {
+        this.fadeInTimeout = setTimeout(function() {
+          that.audioPlayer.readyPromise.then(function() {
+            that.audioPlayer.volume(0);
+            that.audioPlayer.play();
+            that.fadeSound(that.audioPlayer, pageflow.settings.get('volume'), 1000);
+          });
+        }, 1000);
+      }
     }
   },
 
@@ -100,4 +105,4 @@ pageflow.pageType.register('audio', _.extend({
       player: this.audioPlayer
     });
   }
-}, pageflow.volumeFade, pageflow.infoBox, pageflow.commonPageCssClasses));
+}, pageflow.volumeFade, pageflow.infoBox, pageflow.commonPageCssClasses));

data/app/assets/javascripts/pageflow/page_types/video.js

@@ -56,11 +56,15 @@ pageflow.pageType.register('video', _.extend({
       videoPlayer.prebuffer().done(function() {
         videoPlayer.hidePosterImage();
 
-        that.fadeInTimeout = setTimeout(function() {
-          videoPlayer.volume(0);
-          videoPlayer.play();
-          that.fadeSound(videoPlayer, pageflow.settings.get('volume'), 1000);
-        }, 1000);
+        if (configuration.autoplay === false) {
+          videoPlayer.volume(pageflow.settings.get('volume'));
+        } else {
+          that.fadeInTimeout = setTimeout(function() {
+            videoPlayer.volume(0);
+            videoPlayer.play();
+            that.fadeSound(videoPlayer, pageflow.settings.get('volume'), 1000);
+          }, 1000);
+        }
       });
     }
   },

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

@@ -5,14 +5,15 @@
     _create: function() {
       var overlays = this.element.find('.navigation_site_detail'),
           that = this,
+          hasHomeButton = !!this.element.find('.navigation_home').length,
           toggleIndicators = function() {};
 
       this.element.addClass('js').append(overlays);
 
-      $('a.navigation_home', this.element).homeButton();
+      $('a.navigation_top', this.element).topButton();
 
       $('.navigation_bar_bottom', this.element)
-        .append($('.navigation_bar_top > li', this.element).slice(3));
+        .append($('.navigation_bar_top > li', this.element).slice(hasHomeButton ? 4 : 3));
 
       /* Volume */
 

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

@@ -21,8 +21,9 @@ jQuery.widget('pageflow.playerControls', {
 
     player.on('timeupdate', function (position, duration) {
       var percent = duration > 0 ? (player.position / player.duration) * 100 : 0;
-      if(!isNaN(position)) {
-        if(durationDisplay.html().length === 5 && durationDisplay.html().charAt(0) === "0") {
+
+      if (!isNaN(position)) {
+        if (player.duration < 600) {
           $(currentTimeDisplay).html(player.formatTime(position).substr(1));
           $(durationDisplay).html(player.formatTime(duration).substr(1));
         }

data/app/assets/javascripts/pageflow/widgets/{home_button.js → top_button.js}

@@ -1,5 +1,5 @@
 (function($) {
-  $.widget('pageflow.homeButton', {
+  $.widget('pageflow.topButton', {
     _create: function() {
       var element = this.element;
 
@@ -16,10 +16,10 @@
 
       function toggle(currentPage) {
         var currentPageId = currentPage.data('id');
-        var onHomePage = (currentPageId === element.data('link'));
+        var onFirstPage = (currentPageId === element.data('link'));
 
-        element.toggleClass('deactivated', onHomePage);
-        element.attr('tabindex', onHomePage ? '-1' : '2');
+        element.toggleClass('deactivated', onFirstPage);
+        element.attr('tabindex', onFirstPage ? '-1' : '2');
       }
     }
   });

data/app/assets/stylesheets/pageflow/editor/back_button_decorator.css.scss

@@ -0,0 +1,3 @@
+.back_button_decorator {
+  position: relative;
+}

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

@@ -61,6 +61,7 @@
   @import "./other_entry_item";
   @import "./select_button";
   @import "./quotas";
+  @import "./back_button_decorator";
 
   a.publish {
     @include eye-icon;

data/app/assets/stylesheets/pageflow/editor/tabs_view.css.scss

@@ -22,6 +22,7 @@
     padding: 10px;
     overflow: auto;
     height: 100%;
+    min-height: 110px;
   }
 
   > ul > li.spinner {

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

@@ -1,8 +1,3 @@
-.page .scroller {
-  /* IE 9 does not trigger mouse events on div without a background - duh */
-  background-image: url('.');
-}
-
 .slideshow section.page {
   &.animate-out-forwards,
   &.animate-out-backwards {
@@ -10,13 +5,19 @@
   }
 }
 
+/* IE 9 does not trigger mouse events on div without a background - duh */
+
+.page .scroller {
+  background-image: url('.');
+}
+
 /* Make sure controls are centered, since translateX(-50%) does not work. */
 
 .vjs-control-bar {
-  margin-left: -217px !important;
+  -ms-transform: translate(-50%, 0);
 }
 
 .js .add_info_box {
-  margin: 0 0 63px -214px;
+  -ms-transform: translate(-50%, 0);
   max-width: 434px;
 }

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

@@ -149,5 +149,5 @@
 }
 
 .js .page .close_button {
-  background-image: image-url('close_sprite_shadow_ie8.png') !important;
-}
+  background-image: image-url('pageflow/close_sprite_shadow_ie8.png') !important;
+}

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

@@ -46,7 +46,7 @@ $nav-color: #9c9c9c;
     border: none;
   }
 
-  a.navigation_main, a.navigation_home, a.navigation_index {
+  a.navigation_main, a.navigation_top, a.navigation_index {
     display: none;
   }
 
@@ -295,7 +295,7 @@ $nav-color: #9c9c9c;
       top: 0;
       height: 180px;
 
-      a.navigation_main, a.navigation_home, a.navigation_index {
+      a.navigation_main, a.navigation_top, a.navigation_index {
         display: block;
       }
 
@@ -344,6 +344,20 @@ $nav-color: #9c9c9c;
       }
     }
 
+    &.with_home_button {
+      .navigation_bar_top {
+        height: 224px;
+      }
+
+      .scroller {
+        top: 224px;
+      }
+
+      .scroll_indicator.top {
+        top: 189px;
+      }
+    }
+
     .navigation_bar_bottom {
       display: block;
       height: 268px;

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

@@ -37,9 +37,6 @@ $anchor-color: $main-color;
 
 .invert .contentText a {
   color: black;
-  &:before {
-    background-image: image-url('pageflow/anchor_black.png');
-  }
 }
 
 .overview_mobile .credits a,

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

@@ -55,6 +55,15 @@ $nav-bg-color-transparent: $basic-background-color-transparent;
 
   }
 
+  .navigation_bullet.navigation_top {
+    padding-top: 0;
+    .button {
+      border-bottom: 0;
+      font-weight: bold;
+
+      @include fa-arrow-circle-up-icon;
+    }
+  }
   .navigation_bullet.navigation_home {
     padding-top: 0;
     .button {
@@ -214,11 +223,11 @@ $nav-bg-color-transparent: $basic-background-color-transparent;
   top: 1px;
 }
 
-.navigation .navigation_home.deactivated .button {
+.navigation .navigation_top.deactivated .button {
   background-position: -155px -140px;
 }
 
-.navigation .navigation_home.deactivated {
+.navigation .navigation_top.deactivated {
   pointer-events: none;
 }
 
@@ -228,7 +237,7 @@ div.navigation > ul.navigation_bar_top > li:nth-child(1) {
 div.navigation .menu_li {
   display: none;
 }
-.navigation_bullet.navigation_home {
+.navigation_bullet.navigation_top {
   padding-top: 20px;
 }
 
@@ -244,7 +253,7 @@ div.navigation .menu_li {
   color: $nav-font;
 }
 
-.has_no_mobile_platform .navigation .navigation_home.deactivated .button:hover {
+.has_no_mobile_platform .navigation .navigation_top.deactivated .button:hover {
   background-position: -155px -140px;
 }