pageflow 0.4.0 → 0.5.0

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

@@ -2,15 +2,16 @@ pageflow.FileStage = Backbone.Model.extend({
   initialize: function(attributes,  options) {
     this.file = options.file;
 
-    this.activeStates = options.activeStates;
-    this.finishedStates = options.finishedStates;
-    this.failedStates = options.failedStates;
+    this.activeStates = options.activeStates || [];
+    this.finishedStates = options.finishedStates || [];
+    this.failedStates = options.failedStates || [];
     this.actionRequiredStates = options.actionRequiredStates || [];
 
+    this.nonFinishedStates = this.activeStates.concat(this.failedStates, this.actionRequiredStates);
+
     this.update();
     this.listenTo(this.file, 'change:state', this.update);
-    this.listenTo(this.file, 'change:encoding_progress', this.update);
-    this.listenTo(this.file, 'change:uploading_progress', this.update);
+    this.listenTo(this.file, 'change:' + this.get('name') + '_progress', this.update);
   },
 
   update: function() {
@@ -49,7 +50,7 @@ pageflow.FileStage = Backbone.Model.extend({
   },
 
   updateErrorMessage: function() {
-    var errorMessageAttribute = this.get('name').replace('_failed', '') + '_error_message';
+    var errorMessageAttribute = this.get('name') + '_error_message';
     this.set('error_message', this.file.get(errorMessageAttribute));
   },
 

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

@@ -0,0 +1,20 @@
+pageflow.HostedFile = pageflow.UploadedFile.extend({
+  stages: function() {
+    return [
+      {
+        name: 'uploading',
+        activeStates: ['uploading'],
+        failedStates: ['upload_failed']
+      },
+      {
+        name: 'uploading_to_s3',
+        activeStates: ['uploading_to_s3'],
+        failedStates: ['uploading_to_s3_failed']
+      }
+    ].concat(_.result(this, 'processingStages'));
+  },
+
+  processingStages: [],
+
+  readyState: 'uploaded_to_s3'
+});

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

@@ -1,42 +1,19 @@
-pageflow.ImageFile = Backbone.Model.extend({
-  modelName: 'image_file',
-  paramRoot: 'image_file',
-  i18nKey: 'pageflow/image_file',
-
-  mixins: [pageflow.file, pageflow.stageProvider, pageflow.retryable],
-
-  stageMapping: {
-    uploading: {
+pageflow.ImageFile = pageflow.UploadedFile.extend({
+  stages: [
+    {
+      name: 'uploading',
       activeStates: ['uploading'],
-      finishedStates: ['processing', 'processed', 'processing_failed'],
       failedStates: ['upload_failed']
     },
-    processing: {
+    {
+      name: 'processing',
       activeStates: ['processing'],
       finishedStates: ['processed'],
       failedStates: ['processing_failed']
     }
-  },
-
-  urlRoot: function() {
-    return this.isNew() ? this.collection.url() : '/editor/image_files';
-  },
-
-  isReady: function() {
-    return this.get('state') === 'processed';
-  },
-
-  isPending: function() {
-    return this.get('state') === 'processing';
-  },
-
-  isRetryable: function() {
-    return this.get('state') === 'processing_failed';
-  },
+  ],
 
-  isConfirmable: function() {
-    return false;
-  },
+  readyState: 'processed',
 
   isPositionable: function() {
     return this.isReady();

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

@@ -0,0 +1,3 @@
+pageflow.fileWithType = {
+
+};

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

@@ -1,12 +1,18 @@
 pageflow.stageProvider = {
   initialize: function() {
-    this.stages = new Backbone.Collection(_.chain(this).result('stageMapping').pairs().map(function (pair) {
-      var name = pair[0];
-      var options = pair[1];
+    var finishedStates = [this.readyState];
+
+    this.stages = new Backbone.Collection(_.chain(this).result('stages').slice().reverse().map(function (options) {
+      var name = options.name;
 
       options.file = this;
-      return new pageflow.FileStage({name: name}, options);
-    }, this).value());
+      options.finishedStates = finishedStates;
+
+      var fileStage = new pageflow.FileStage({name: name}, options);
+      finishedStates = finishedStates.concat(fileStage.nonFinishedStates);
+
+      return fileStage;
+    }, this).reverse().value());
   },
 
   currentStage: function() {

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

@@ -5,6 +5,11 @@ pageflow.transientReferences = {
   },
 
   getReference: function(attribute, collection) {
+    if (typeof collection === 'string') {
+      var fileType = pageflow.editor.fileTypes.findByCollectionName(collection);
+      collection = pageflow.entry.getFileCollection(fileType);
+    }
+
     return this.transientReferences[attribute] ||
       collection.get(this.get(attribute));
   },

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

@@ -5,9 +5,15 @@ pageflow.OtherEntry = Backbone.Model.extend({
   i18nKey: 'pageflow/entry',
 
   initialize: function() {
-    this.imageFiles = new pageflow.ImageFilesCollection([], {entry: this});
-    this.videoFiles = new pageflow.VideoFilesCollection([], {entry: this});
-    this.audioFiles = new pageflow.AudioFilesCollection([], {entry: this});
+    this.files = {};
+  },
+
+  getFileCollection: function(fileType) {
+    if (!this.files[fileType.collectionName]) {
+      this.files[fileType.collectionName] = pageflow.FilesCollection.createForFileType(fileType, [], {entry: this});
+    }
+
+    return this.files[fileType.collectionName];
   },
 
   titleOrSlug: function () {

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

@@ -48,17 +48,15 @@ pageflow.Page = Backbone.Model.extend({
   },
 
   thumbnailFile: function() {
-    if (_.contains(['video', 'background_video'], this.get('template'))) {
-      if (this.configuration.get('poster_image_id')) {
-        return this.configuration.getImageFile('poster_image_id');
-      }
-      else {
-        return this.configuration.getVideoFile('video_file_id');
-      }
-    }
-    else {
-      return this.configuration.getImageFile('background_image_id');
-    }
+    var configuration = this.configuration;
+
+    return _.reduce(this.pageType().thumbnail_candidates, function(result, candidate) {
+      return result || configuration.getReference(candidate.attribute, candidate.file_collection);
+    }, null);
+  },
+
+  pageType: function() {
+    return pageflow.Page.typesByName[this.get('template')];
   },
 
   toJSON: function() {

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

@@ -0,0 +1,65 @@
+pageflow.UploadedFile = Backbone.Model.extend({
+  mixins: [pageflow.stageProvider, pageflow.retryable],
+
+  urlRoot: function() {
+    return this.isNew() ? this.collection.url() : '/editor/files/' + this.fileType().collectionName;
+  },
+
+  fileType: function() {
+    return this.collection && this.collection.fileType;
+  },
+
+  isUploading: function() {
+    return this.get('state') === 'uploading';
+  },
+
+  isUploaded: function() {
+    return this.get('state') !== 'uploading' && this.get('state') !== 'upload_failed';
+  },
+
+  isPending: function() {
+    return !this.isReady() && !this.isFailed();
+  },
+
+  isReady: function() {
+    return this.get('state') === this.readyState;
+  },
+
+  isFailed: function() {
+    return this.get('state') && !!this.get('state').match(/_failed$/);
+  },
+
+  isRetryable: function() {
+    return !!this.get('retryable');
+  },
+
+  isConfirmable: function() {
+    return false;
+  },
+
+  isPositionable: function() {
+    return false;
+  },
+
+  cancelUpload: function() {
+    if (this.get('state') === 'uploading') {
+      this.trigger('uploadCancelled');
+      this.destroy();
+    }
+  },
+
+  uploadFailed: function() {
+    this.set('state', 'upload_failed');
+    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/models/video_file.js

@@ -1,15 +1,2 @@
-pageflow.VideoFile = Backbone.Model.extend({
-  modelName: 'video_file',
-  paramRoot: 'video_file',
-  i18nKey: 'pageflow/video_file',
-
-  mixins: [pageflow.file, pageflow.encodedFile, pageflow.stageProvider, pageflow.retryable],
-
-  urlRoot: function() {
-    return this.isNew() ? this.collection.url() : '/editor/video_files';
-  },
-
-  isPositionable: function() {
-    return false;
-  }
+pageflow.VideoFile = pageflow.EncodedFile.extend({
 });

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

@@ -4,15 +4,8 @@ pageflow.SidebarRouter = Backbone.Marionette.AppRouter.extend({
     'pages/:id/:tab': 'page',
     'chapters/:id': 'chapter',
 
-    'files/image_files?handler=:handler&payload=:payload': 'imageFiles',
-    'files/video_files?handler=:handler&payload=:payload': 'videoFiles',
-    'files/audio_files?handler=:handler&payload=:payload': 'audioFiles',
-
-    'files/image_files': 'imageFiles',
-    'files/video_files': 'videoFiles',
-    'files/audio_files': 'audioFiles',
-
-    'files?page=:page_id&attribute=:attribute': 'files',
+    'files/:collectionName?handler=:handler&payload=:payload': 'files',
+    'files/:collectionName': 'files',
     'files': 'files',
 
     'confirmable_files?type=:type&id=:id': 'confirmableFiles',

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

@@ -26,7 +26,7 @@
       <tbody class="downloads">
         <tr>
           <th>Original</th>
-          <td><a class="original" href="#" target="_blank">Herunterladen</a></td>
+          <td><a class="original" href="#" download target="_blank">Herunterladen</a></td>
         </tr>
       <tbody>
     </table>

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

@@ -10,6 +10,10 @@ 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('thumbnail_image_id', pageflow.FileInputView, {
+        collection: pageflow.imageFiles,
+        imagePositioning: false
+      });
     });
 
     this.tab('options', function() {

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

@@ -0,0 +1,23 @@
+pageflow.ConfigurationEditorView.register('audio_loop', {
+  configure: function() {
+    this.tab('general', function() {
+      this.group('general');
+
+      this.input('additional_title', pageflow.TextInputView);
+      this.input('additional_description', pageflow.TextAreaInputView, {size: 'short'});
+    });
+
+    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('thumbnail_image_id', pageflow.FileInputView, {
+        collection: pageflow.imageFiles,
+        imagePositioning: false
+      });
+    });
+
+    this.tab('options', function() {
+      this.group('options');
+    });
+  }
+});

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

@@ -6,6 +6,10 @@ pageflow.ConfigurationEditorView.register('background_image', {
 
     this.tab('files', function() {
       this.input('background_image_id', pageflow.FileInputView, {collection: pageflow.imageFiles});
+      this.input('thumbnail_image_id', pageflow.FileInputView, {
+        collection: pageflow.imageFiles,
+        imagePositioning: false
+      });
     });
 
     this.tab('options', function() {

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

@@ -10,6 +10,10 @@ pageflow.ConfigurationEditorView.register('background_video', {
         collection: pageflow.imageFiles,
         imagePositioning: false
       });
+      this.input('thumbnail_image_id', pageflow.FileInputView, {
+        collection: pageflow.imageFiles,
+        imagePositioning: false
+      });
     });
 
     this.tab('options', function() {

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

@@ -6,6 +6,10 @@ pageflow.ConfigurationEditorView.register('internal_links', {
 
     this.tab('files', function() {
       this.input('background_image_id', pageflow.FileInputView, {collection: pageflow.imageFiles});
+      this.input('thumbnail_image_id', pageflow.FileInputView, {
+        collection: pageflow.imageFiles,
+        imagePositioning: false
+      });
     });
 
     this.tab('links', function() {

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

@@ -13,6 +13,10 @@ pageflow.ConfigurationEditorView.register('video', {
         collection: pageflow.imageFiles,
         imagePositioning: false
       });
+      this.input('thumbnail_image_id', pageflow.FileInputView, {
+        collection: pageflow.imageFiles,
+        imagePositioning: false
+      });
     });
 
     this.tab('options', function() {

data/app/assets/javascripts/pageflow/editor/views/embedded/page_link_embedded_view.js

@@ -108,7 +108,7 @@ pageflow.PageLinkEmbeddedView = Backbone.Marionette.ItemView.extend({
   updateTitle: function() {
     var linkedPage = this.linkedPage();
 
-    this.ui.title.text(linkedPage ? linkedPage.configuration.get('description') : '');
+    this.ui.title.html(linkedPage ? linkedPage.configuration.get('description') : '');
   },
 
   updateThumbnailView: function() {

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

@@ -4,6 +4,8 @@ pageflow.ExplorerFileItemView = Backbone.Marionette.ItemView.extend({
 
   mixins: [pageflow.loadable, pageflow.selectableView],
 
+  selectionAttribute: 'file',
+
   ui: {
     fileName: '.file_name',
 

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

@@ -92,7 +92,14 @@ pageflow.FileItemView = Backbone.Marionette.ItemView.extend({
   },
 
   metaDataViews: function() {
-    return [];
+    var model = this.model;
+
+    return _.map(this.options.metaDataAttributes, function(attribute) {
+      return new pageflow.FileMetaDataItemView({
+        model: model,
+        attribute: attribute
+      });
+    });
   },
 
   toggleExpanded: function() {

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

@@ -31,11 +31,18 @@ pageflow.FileStageItemView = Backbone.Marionette.ItemView.extend({
 
     this.ui.errorMessage
       .toggle(!!this.model.get('error_message'))
-      .text(this.model.get('error_message'));
+      .text(this._translatedErrorMessage());
 
     this.$el.toggleClass('active', this.model.get('active'));
     this.$el.toggleClass('finished', this.model.get('finished'));
     this.$el.toggleClass('failed', this.model.get('failed'));
     this.$el.toggleClass('action_required', this.model.get('action_required'));
+  },
+
+  _translatedErrorMessage: function() {
+    return this.model.get('error_message') &&
+      I18n.t(this.model.get('error_message'), {
+        defaultValue: this.model.get('error_message')
+      });
   }
 });