pageflow 0.11.4 → 12.0.0.rc1

data/app/assets/javascripts/pageflow/editor/models/file_uploader.js

@@ -0,0 +1,69 @@
+pageflow.FileUploader = pageflow.Object.extend({
+  initialize: function(options) {
+    this.fileTypes = options.fileTypes;
+    this.entry = options.entry;
+
+    this.deferreds = [];
+  },
+
+  add: function(upload, options) {
+    options = options || {};
+    var editor = options.editor || pageflow.editor;
+    var fileType = this.fileTypes.findByUpload(upload);
+    var file = new fileType.model({
+      state: 'uploadable',
+      file_name: upload.name
+    }, {
+      fileType: fileType
+    });
+
+    var setTargetFile = editor.nextUploadTargetFile;
+
+    if (setTargetFile){
+      if (fileType.topLevelType ||
+          !setTargetFile.fileType().nestedFileTypes.contains(fileType)) {
+        throw(new pageflow.InvalidNestedTypeError(upload, {editor: editor,
+                                                           fileType: fileType}));
+      }
+      file.set({parent_file_id: setTargetFile.get('id'),
+                parent_file_model_type: setTargetFile.fileType().typeName});
+    }
+    else if (!fileType.topLevelType) {
+      throw(new pageflow.NestedTypeError(upload, {fileType: fileType,
+                                                  fileTypes: this.fileTypes}));
+    }
+
+    this.entry.getFileCollection(fileType).add(file);
+
+    var deferred = new $.Deferred();
+
+    if (setTargetFile) {
+      deferred.resolve();
+    }
+    else {
+      this.deferreds.push(deferred);
+      if (this.deferreds.length == 1) {
+        this.trigger('new:batch');
+      }
+    }
+
+    return deferred.promise().then(
+      function() {
+        file.set('state', 'uploading');
+        return file;
+      },
+      function() {
+        file.destroy();
+      });
+  },
+
+  submit: function() {
+    _(this.deferreds).invoke('resolve');
+    this.deferreds = [];
+  },
+
+  abort: function() {
+    _(this.deferreds).invoke('reject');
+    this.deferreds = [];
+  }
+});

data/app/assets/javascripts/pageflow/editor/models/mixins/retryable.js

@@ -11,6 +11,6 @@ pageflow.retryable = {
       model.trigger('error', model, resp, options);
     };
     options.url = this.url() + '/retry';
-    return this.sync('post', this, options);
+    return this.sync('create', this, options);
   }
 };

data/app/assets/javascripts/pageflow/editor/models/page.js

@@ -55,6 +55,10 @@ pageflow.Page = Backbone.Model.extend({
     var configuration = this.configuration;
 
     return _.reduce(this.pageType().thumbnailCandidates(), function(result, candidate) {
+      if (candidate.condition && !conditionMet(candidate.condition, configuration)) {
+        return result;
+      }
+
       return result || configuration.getReference(candidate.attribute, candidate.file_collection);
     }, null);
   },
@@ -78,6 +82,15 @@ pageflow.Page = Backbone.Model.extend({
   }
 });
 
+function conditionMet(condition, configuration) {
+  if (condition.negated) {
+    return configuration.get(condition.attribute) != condition.value;
+  }
+  else {
+    return configuration.get(condition.attribute) == condition.value;
+  }
+}
+
 pageflow.Page.linkedPagesLayouts = ['default', 'hero_top_left', 'hero_top_right'];
 pageflow.Page.textPositions = ['left', 'right'];
 

data/app/assets/javascripts/pageflow/editor/models/text_track_file.js

@@ -0,0 +1,48 @@
+pageflow.TextTrackFile = pageflow.HostedFile.extend({
+  defaults: {
+    configuration: {
+      kind: 'captions'
+    }
+  },
+
+  processingStages: [
+    {
+      name: 'processing',
+      activeStates: ['processing'],
+      failedStates: ['processing_failed']
+    }
+  ],
+
+  readyState: 'processed',
+
+  initialize: function(attributes, options) {
+    pageflow.UploadedFile.prototype.initialize.apply(this, arguments);
+
+    if (this.isNew() && !this.configuration.get('srclang')) {
+      this.configuration.set('srclang', this.extractLanguageCodeFromFilename());
+    }
+  },
+
+  displayLabel: function() {
+    return this.configuration.get('label') ||
+      this.inferredLabel() ||
+      I18n.t('pageflow.editor.text_track_files.label_missing');
+  },
+
+  inferredLabel: function() {
+    var srclang = this.configuration.get('srclang');
+
+    if (srclang) {
+      return I18n.t('pageflow.languages.' + srclang, {
+        defaultValue: ''
+      });
+    }
+  },
+
+  extractLanguageCodeFromFilename: function() {
+    var matches = /\S+\.([a-z]{2})_[A-Z]{2}\.[a-z]+/.exec(this.get('file_name'));
+    return matches && matches[1];
+  }
+});
+
+pageflow.TextTrackFile.displayLabelBinding = 'srclang';

data/app/assets/javascripts/pageflow/editor/models/uploaded_file.js

@@ -1,12 +1,48 @@
 pageflow.UploadedFile = Backbone.Model.extend({
   mixins: [pageflow.stageProvider, pageflow.retryable],
 
+  initialize: function(attributes, options) {
+    this.options = options || {};
+
+    this.configuration = new pageflow.FileConfiguration(
+      this.get('configuration') || {}
+    );
+
+    this.configuration.i18nKey = this.i18nKey;
+    this.configuration.parent = this;
+
+    this.listenTo(this.configuration, 'change', function() {
+      this.trigger('change:configuration', this);
+
+      _.chain(this.configuration.changed).keys().each(function(name) {
+        this.trigger('change:configuration:' + name, this, this.configuration.get(name));
+      }, this);
+
+      if (!this.isNew()) {
+        this.save();
+      }
+    });
+
+    this.listenTo(this, 'change:rights', function() {
+      if (!this.isNew()) {
+        this.save();
+      }
+    });
+
+    this.listenTo(this, 'change', function(model, options) {
+      if (options.applyConfigurationUpdaters) {
+        this.configuration.applyUpdaters(this.fileType().configurationUpdaters,
+                                         this.attributes.configuration);
+      }
+    });
+  },
+
   urlRoot: function() {
-    return this.isNew() ? this.collection.url() : '/editor/files/' + this.fileType().collectionName;
+    return this.collection.url();
   },
 
   fileType: function() {
-    return this.collection && this.collection.fileType;
+    return this.options.fileType;
   },
 
   title: function() {
@@ -17,6 +53,23 @@ pageflow.UploadedFile = Backbone.Model.extend({
     return this;
   },
 
+  nestedFiles: function(supersetCollection) {
+    if (typeof supersetCollection === 'function') {
+      supersetCollection = supersetCollection();
+    }
+
+    var collectionName = supersetCollection.fileType.collectionName;
+    this.nestedFilesCollections = this.nestedFilesCollections || {};
+
+    this.nestedFilesCollections[collectionName] = this.nestedFilesCollections[collectionName] ||
+      new pageflow.NestedFilesCollection({
+        parent: supersetCollection,
+        parentFile: this
+      });
+
+    return this.nestedFilesCollections[collectionName];
+  },
+
   isUploading: function() {
     return this.get('state') === 'uploading';
   },
@@ -49,6 +102,12 @@ pageflow.UploadedFile = Backbone.Model.extend({
     return false;
   },
 
+  toJSON: function() {
+    return _.extend(_.pick(this.attributes, 'rights', 'parent_file_id', 'parent_file_model_type'), {
+      configuration: this.configuration.toJSON()
+    });
+  },
+
   cancelUpload: function() {
     if (this.get('state') === 'uploading') {
       this.trigger('uploadCancelled');
@@ -61,13 +120,5 @@ pageflow.UploadedFile = Backbone.Model.extend({
     this.unset('uploading_progress');
 
     this.trigger('uploadFailed');
-  },
-
-  destroyUsage: function() {
-    var usage = new pageflow.FileUsage({id: this.get('usage_id')});
-
-    usage.destroy();
-
-    this.trigger('destroy', this, this.collection, {});
   }
-});
+});

data/app/assets/javascripts/pageflow/editor/routers/sidebar_router.js

@@ -6,6 +6,7 @@ pageflow.SidebarRouter = Backbone.Marionette.AppRouter.extend({
     'chapters/:id': 'chapter',
     'storylines/:id': 'storyline',
 
+    'files/:collectionName?handler=:handler&payload=:payload&filter=:filter': 'files',
     'files/:collectionName?handler=:handler&payload=:payload': 'files',
     'files/:collectionName': 'files',
     'files': 'files',

data/app/assets/javascripts/pageflow/editor/templates/confirm_upload.jst.ejs

@@ -0,0 +1,18 @@
+<div class="box">
+  <h1 class="dialog-header"><%= I18n.t('pageflow.editor.templates.confirm_upload.header') %></h1>
+  <p class="dialog-hint"><%= I18n.t('pageflow.editor.templates.confirm_upload.hint') %></p>
+
+  <div class="files_panel">
+  </div>
+
+  <div class="selected_file_panel">
+    <h2><%= I18n.t('pageflow.editor.templates.confirm_upload.edit_file_header') %></h2>
+    <div class="selected_file_region">
+    </div>
+  </div>
+
+  <div class="footer">
+    <button class="upload"><%= I18n.t('pageflow.editor.templates.confirm_upload.upload') %></button>
+    <button class="close"><%= I18n.t('pageflow.editor.templates.confirm_upload.close') %></button>
+  </div>
+</div>

data/app/assets/javascripts/pageflow/editor/templates/delete_row_table_cell.jst.ejs

@@ -0,0 +1 @@
+<a class="remove" title="<%= I18n.t('pageflow.editor.templates.row.destroy') %>"></a>

data/app/assets/javascripts/pageflow/editor/templates/drop_down_button.jst.ejs

@@ -1,6 +1,4 @@
 <button></button>
 
 <div class="drop_down_button_menu">
-  <ul class="drop_down_button_items" role="menu">
-  </ul>
 </div>

data/app/assets/javascripts/pageflow/editor/templates/drop_down_button_item.jst.ejs

@@ -1 +1,2 @@
+<div class="label"></div>
 <a href="#"></a>

data/app/assets/javascripts/pageflow/editor/templates/edit_entry.jst.ejs

@@ -1,5 +1,7 @@
 <a class="close" href="#"><%= I18n.t('pageflow.editor.templates.edit_entry.close') %></a>
-<a class="publish" href="#"><%= I18n.t('pageflow.editor.templates.edit_entry.publish') %></a>
+<a class="publish" href="#" data-tooltip-align="bottom right">
+  <%= I18n.t('pageflow.editor.templates.edit_entry.publish') %>
+</a>
 
 <ul class="menu">
   <li>

data/app/assets/javascripts/pageflow/editor/templates/file_item.jst.ejs

@@ -4,6 +4,7 @@
 <a class="select"><%= I18n.t('pageflow.editor.templates.file_item.select') %></a>
 
 <div class="actions">
+  <a class="settings" title="<%= I18n.t('pageflow.editor.templates.file_item.settings') %>"></a>
   <a class="confirm" title="<%= I18n.t('pageflow.editor.templates.file_item.confirm') %>"></a>
   <a class="retry" title="<%= I18n.t('pageflow.editor.templates.file_item.retry') %>"></a>
   <a class="remove" title="<%= I18n.t('pageflow.editor.templates.file_item.destroy') %>"></a>
@@ -15,12 +16,6 @@
 
   <div class="file_meta_data">
     <table cellpadding="0" cellspacing="0">
-      <tbody>
-        <tr>
-          <th><%= I18n.t('pageflow.editor.templates.file_item.credits') %></th>
-          <td><input type="text" class="rights"/></td>
-        </tr>
-      </tbody>
       <tbody class="attributes">
       </tbody>
       <tbody class="downloads">

data/app/assets/javascripts/pageflow/editor/templates/file_meta_data_item_value_view.jst.ejs

@@ -0,0 +1,3 @@
+<a class="edit" href="" title="<%= I18n.t('pageflow.editor.templates.file_meta_data_item_value_view.edit') %>">
+</a>
+<span class="value"></span>

data/app/assets/javascripts/pageflow/editor/templates/file_settings_dialog.jst.ejs

@@ -0,0 +1,10 @@
+<div class="box">
+  <div class="content">
+  </div>
+
+  <div class="footer">
+    <a href="" class="close">
+      <%= I18n.t('pageflow.editor.templates.file_settings_dialog.close') %>
+    </a>
+  </div>
+</div>

data/app/assets/javascripts/pageflow/editor/templates/files_blank_slate.jst.ejs

@@ -1 +1 @@
-<li class="blank_slate"><%= I18n.t('pageflow.editor.templates.files_blank_slate.no_files') %><li>
+<li class="blank_slate"><%= text %></li>

data/app/assets/javascripts/pageflow/editor/templates/filtered_files.jst.ejs

@@ -0,0 +1,10 @@
+<div class="filtered_files-banner">
+  <span class="filtered_files-banner_prefix">
+    <%= I18n.t('pageflow.editor.views.filtered_files_view.banner_prefix') %>
+  </span>
+  <span class="filtered_files-filter_name"></span>
+  <a href=""
+     class="filtered_files-reset_filter"
+     title="<%= I18n.t('pageflow.editor.views.filtered_files_view.reset_filter') %>">
+  </a>
+</div>

data/app/assets/javascripts/pageflow/{ui → editor}/templates/inputs/file_input.jst.ejs

@@ -4,6 +4,6 @@
 </label>
 <div class="file_thumbnail"></div>
 <div class="file_name"></div>
-<a href="" class="edit_positioning" title="<%= I18n.t('pageflow.ui.templates.inputs.file_input.adjust_positioning') %>"></a>
+
 <a href="" class="unset" title="<%= I18n.t('pageflow.ui.templates.inputs.file_input.reset') %>"></a>
 <a href="" class="choose" title="<%= I18n.t('pageflow.ui.templates.inputs.file_input.edit') %>"></a>

data/app/assets/javascripts/pageflow/editor/templates/inputs/reference.jst.ejs

@@ -3,5 +3,5 @@
   <span class="inline_help"></span>
 </label>
 <div class="title"></div>
-<a href="" class="unset" title="<%= I18n.t('pageflow.editor.templates.inputs.reference.reset') %>"></a>
-<a href="" class="choose" title="<%= I18n.t('pageflow.editor.templates.inputs.reference.edit') %>"></a>
+<button class="unset" title="<%= I18n.t('pageflow.editor.templates.inputs.reference.reset') %>"></button>
+<button class="choose" title="<%= I18n.t('pageflow.editor.templates.inputs.reference.edit') %>"></button>

data/app/assets/javascripts/pageflow/editor/templates/nested_files.jst.ejs

@@ -0,0 +1 @@
+<h2></h2>

data/app/assets/javascripts/pageflow/editor/templates/text_tracks.jst.ejs

@@ -0,0 +1,13 @@
+<div class="text_tracks_container">
+  <div class="files_upload_panel">
+    <div class="files_panel">
+    </div>
+    <a class="upload" href=""><%= I18n.t('pageflow.editor.templates.text_tracks.upload') %></a>
+  </div>
+
+  <div class="selected_file_panel">
+    <h2 class="selected_file_header"><%= I18n.t('pageflow.editor.templates.text_tracks.edit_file_header') %></h2>
+    <div class="selected_file_region">
+    </div>
+  </div>
+</div>

data/app/assets/javascripts/pageflow/editor/templates/uploadable_files.jst.ejs

@@ -0,0 +1 @@
+<h2></h2>

data/app/assets/javascripts/pageflow/editor/utils/form_data_utils.js

@@ -0,0 +1,19 @@
+pageflow.formDataUtils = {
+  fromModel: function(model) {
+    var object = {};
+    object[model.modelName] = model.toJSON();
+
+    return this.fromObject(object);
+  },
+
+  fromObject: function(object) {
+    var queryString = $.param(object).replace(/\+/g, '%20');
+
+    return _(queryString.split('&')).reduce(function(result, param) {
+      var pair = param.split('=');
+      result[decodeURIComponent(pair[0])] = decodeURIComponent(pair[1]);
+
+      return result;
+    }, {});
+  }
+};

data/app/assets/javascripts/pageflow/editor/views/configuration_editors/audio.js

@@ -8,8 +8,11 @@ pageflow.ConfigurationEditorView.register('audio', {
     });
 
     this.tab('files', function() {
-      this.input('audio_file_id', pageflow.FileInputView, {collection: pageflow.audioFiles});
-      this.input('background_image_id', pageflow.FileInputView, {collection: pageflow.imageFiles});
+      this.input('audio_file_id', pageflow.FileInputView, {
+        collection: pageflow.audioFiles,
+        defaultTextTrackFilePropertyName: 'default_text_track_file_id'
+      });
+      this.group('background');
       this.input('thumbnail_image_id', pageflow.FileInputView, {
         collection: pageflow.imageFiles,
         positioning: false