pageflow 0.3.0 → 0.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjhlOGVhOTIyNDNiMDdkM2ViMjUwODE4NDUzM2M3NmZkOGEzOGU5ZQ==
+    NTViZDg2ZGZlMzdjYTU0M2E4NzI2YjM4NzU1YWU2NDY1ZTQ3ODA1Zg==
   data.tar.gz: !binary |-
-    ZWE2YTAzZDFkZTZlODk3OGM0ZWY1ODIwMTBjYzJlNmEwNWQwY2ZkYQ==
+    ZTgwZjI4ZTQ1M2I1MTUwNDc1ZDEzMWQ2Mjk4N2E1NGY5MDE5OTUzOQ==
 SHA512:
   metadata.gz: !binary |-
-    ZWYxZjhmNDk0ODZmMGNiMDc1NGE1ODc5OWVlNzMyZjg2MDk3OWE2MmNmNGVj
-    NmViNTgzYTgwODYxZTJiNTQ5MjQxNGY0N2I0MzIxNTM2OWNhMDM4YzA1YzAz
-    OTllNzVmZDMzN2E5YzQ3ODA2ZTAzYmNiOTMzZDM5ZTZiYTFlYTE=
+    Yzk4MWEwMWNiOGFiMmJjNjM1NGQ5YmRmZWZkNmE0OGQyNTIzMjk1OTRhZTVh
+    Yjc4NGJmNjljOTJiMTc5ZmFmZTU5YWJjNDk4NGIyNzMyYjcxNDVmMDA4MmU5
+    ZmQyMmFmZDIwOTliMjQzM2RiODdmMjQwMGRhOWQ4MzhjMmM2MDQ=
   data.tar.gz: !binary |-
-    MjdmYmY5MTA3MGQ5MzM0MGE4M2FkMDI4Yjk4OTM0ZmFhNDJiODBiZWUzMjk5
-    NTZkODFmNjg4MmY0MDAzZmY3ZjVjN2RmOGJiMmY0NTQ0YjhmZGUzOWFjZWIy
-    ODRjY2E4MTA5OWQ5NGM1YmI4ZWEyNDQ1NWZlN2NlNzYxYmFmOTM=
+    MTAzOGJlNTRkMDViODVhODg1ZGYzMTVmNmViMzhlMjczYmVjZmE2OTEzMGEz
+    M2VmYjdlOGM3ZjZmZjBmZGMyNDMyZDM0NzdlMWQxNTcxZWMwYzIwOTc0OWI2
+    N2Q1OWVhYTc3ZmQ0MmYwODQ0M2QxZDU3ZTc1NTc3ZDdmZTcwOGU=

data/admins/pageflow/membership.rb

@@ -10,8 +10,7 @@ module Pageflow
       belongs_to :entry, :parent_class => Pageflow::Entry, :polymorphic => true
       belongs_to :user, :parent_class => User, :polymorphic => true
 
-      helper Pageflow::UsersHelper
-      helper Pageflow::EntriesHelper
+      helper Pageflow::Admin::MembershipsHelper
 
       def permitted_params
         params.permit(:membership => [:user_id, :entry_id])

data/admins/pageflow/user.rb

@@ -141,7 +141,7 @@ module Pageflow
     controller do
       include Pageflow::QuotaVerification
 
-      helper Pageflow::UsersHelper
+      helper Pageflow::Admin::UsersHelper
       helper Pageflow::QuotaHelper
 
       def build_new_resource

data/app/assets/javascripts/pageflow/editor/base.js

@@ -26,6 +26,7 @@
 //= require_tree ./models
 //= require_tree ./collections/mixins
 //= require ./collections/multi_collection
+//= require ./collections/subset_collection
 //= require_tree ./collections
 //= require_tree ./routers
 //= require_tree ./controllers

data/app/assets/javascripts/pageflow/editor/collections/chapter_pages_collection.js

@@ -0,0 +1,36 @@
+pageflow.ChapterPagesCollection = pageflow.SubsetCollection.extend({
+  mixins: [pageflow.orderedCollection],
+
+  constructor: function(options) {
+    var chapter = options.chapter;
+
+    pageflow.SubsetCollection.prototype.constructor.call(this, {
+      parent: options.pages,
+      parentModel: chapter,
+
+      filter: function(item) {
+        return item.get('chapter_id') === chapter.id;
+      },
+
+      comparator: function(item) {
+        return item.get('position');
+      }
+    });
+
+    this.each(function(page) {
+      page.chapter = chapter;
+    });
+
+    this.listenTo(this, 'add', function(model) {
+      model.chapter = chapter;
+    });
+
+    this.listenTo(this, 'remove', function(model) {
+      model.chapter = null;
+    });
+
+    this.listenTo(chapter, 'destroy', function() {
+      this.clear();
+    });
+  }
+});

data/app/assets/javascripts/pageflow/editor/collections/mixins/files_collection.js

@@ -7,7 +7,8 @@ pageflow.filesCollection = {
   },
 
   comparator: function(file) {
-    return file.get('file_name');
+    var fileName = file.get('file_name');
+    return fileName.toLowerCase ? fileName.toLowerCase() : fileName;
   },
 
   url: function() {

data/app/assets/javascripts/pageflow/editor/collections/mixins/ordered_collection.js

@@ -1,8 +1,25 @@
 pageflow.orderedCollection = {
+  initialize: function() {
+    this.listenTo(this, 'remove', function() {
+      this.consolidatePositions();
+      this.saveOrder();
+    });
+  },
+
+  consolidatePositions: function() {
+    this.each(function(item, index) {
+      item.set('position', index);
+    });
+  },
+
   saveOrder: function() {
     var parentModel = this.parentModel;
     var collection = this;
 
+    if (collection.isEmpty()) {
+      return $.Deferred().resolve().promise();
+    }
+
     return Backbone.sync('patch', parentModel, {
       url: collection.url() + '/order',
       attrs: {ids: collection.pluck('id')},

data/app/assets/javascripts/pageflow/editor/collections/subset_collection.js

@@ -1,6 +1,4 @@
 pageflow.SubsetCollection = Backbone.Collection.extend({
-  mixins: [pageflow.orderedCollection],
-
   constructor: function(options) {
     var adding = false;
 

data/app/assets/javascripts/pageflow/editor/controllers/sidebar_controller.js

@@ -30,9 +30,12 @@ pageflow.SidebarController = Backbone.Marionette.Controller.extend({
     }));
   },
 
-  confirmableFiles: function() {
+  confirmableFiles: function(preselectedFileType, preselectedFileId) {
     this.region.show(pageflow.ConfirmEncodingView.create({
-      model: new pageflow.EncodingConfirmation()
+      model: pageflow.EncodingConfirmation.createWithPreselection({
+        fileType: preselectedFileType,
+        fileId: preselectedFileId
+      })
     }));
   },
 

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

@@ -6,37 +6,15 @@ pageflow.Chapter = Backbone.Model.extend({
   mixins: [pageflow.failureTracking, pageflow.delayedDestroying],
 
   initialize: function(attributes, options) {
-    this.pages = new pageflow.SubsetCollection({
-      parent: pageflow.pages,
-      parentModel: this,
-
-      filter: function(item) {
-        return item.get('chapter_id') === attributes.id;
-      },
-
-      comparator: function(item) {
-        return item.get('position');
-      }
+    this.pages = new pageflow.ChapterPagesCollection({
+      pages: options.pages || pageflow.pages,
+      chapter: this
     });
 
-    this.pages.each(function(page) { page.chapter = this; }, this);
-
     this.listenTo(this, 'change:title', function() {
       this.save();
     });
 
-    this.listenTo(this.pages, 'add', function(model) {
-      model.chapter = this;
-    });
-
-    this.listenTo(this.pages, 'remove', function(model) {
-      model.chapter = null;
-    });
-
-    this.listenTo(this, 'destroy', function() {
-      this.pages.clear();
-    });
-
     return attributes;
   },
 

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

@@ -5,6 +5,7 @@ pageflow.EncodingConfirmation = Backbone.Model.extend({
     this.videoFiles = new Backbone.Collection();
     this.audioFiles = new Backbone.Collection();
 
+    this.updateEmpty();
     this.watchCollections();
   },
 
@@ -12,17 +13,18 @@ pageflow.EncodingConfirmation = Backbone.Model.extend({
     this.listenTo(this.videoFiles, 'add remove', this.check);
     this.listenTo(this.audioFiles, 'add remove', this.check);
 
-    this.check();
+    this.listenTo(this.videoFiles, 'reset', this.updateEmpty);
+    this.listenTo(this.audioFiles, 'reset', this.updateEmpty);
   },
 
   check: function() {
     var model = this;
 
-    this.set('empty', this.videoFiles.length === 0 && this.audioFiles.length === 0);
-    this.set('checking', true);
+    model.updateEmpty();
+    model.set('checking', true);
 
-    this.save({}, {
-      url: this.url() + '/check',
+    model.save({}, {
+      url: model.url() + '/check',
       success: function() {
         model.set('checking', false);
       },
@@ -32,6 +34,23 @@ pageflow.EncodingConfirmation = Backbone.Model.extend({
     });
   },
 
+  saveAndReset: function() {
+    var model = this;
+
+    model.save({}, {
+      success: function() {
+        model.set('summary_html', '');
+
+        model.videoFiles.reset();
+        model.audioFiles.reset();
+      }
+    });
+  },
+
+  updateEmpty: function() {
+    this.set('empty', this.videoFiles.length === 0 && this.audioFiles.length === 0);
+  },
+
   url: function() {
     return '/editor/entries/' + pageflow.entry.get('id') + '/encoding_confirmations';
   },
@@ -42,4 +61,19 @@ pageflow.EncodingConfirmation = Backbone.Model.extend({
       audio_file_ids: this.audioFiles.pluck('id'),
     };
   }
-});
+});
+
+pageflow.EncodingConfirmation.createWithPreselection = function(options) {
+  var model = new pageflow.EncodingConfirmation();
+
+  if (options.fileId) {
+    if (options.fileType === 'video_file') {
+      model.videoFiles.add(pageflow.videoFiles.get(options.fileId));
+    }
+    else {
+      model.audioFiles.add(pageflow.audioFiles.get(options.fileId));
+    }
+  }
+
+  return model;
+};

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

@@ -3,11 +3,13 @@ pageflow.Page = Backbone.Model.extend({
   paramRoot: 'page',
   i18nKey: 'pageflow/page',
 
-  defaults: {
-    template: 'background_image',
-    configuration: {},
-    active: false,
-    perma_id: ''
+  defaults: function() {
+    return {
+      template: 'background_image',
+      configuration: {},
+      active: false,
+      perma_id: ''
+    };
   },
 
   mixins: [pageflow.failureTracking, pageflow.delayedDestroying],

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

@@ -15,6 +15,7 @@ pageflow.SidebarRouter = Backbone.Marionette.AppRouter.extend({
     'files?page=:page_id&attribute=:attribute': 'files',
     'files': 'files',
 
+    'confirmable_files?type=:type&id=:id': 'confirmableFiles',
     'confirmable_files': 'confirmableFiles',
 
     'meta_data': 'metaData',

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

@@ -0,0 +1,8 @@
+<h2><%= I18n.t('editor.blank_entry.header') %></h2>
+<p><%= I18n.t('editor.blank_entry.intro') %></p>
+<ol>
+  <li><%= I18n.t('editor.blank_entry.create_chapter') %></li>
+  <li><%= I18n.t('editor.blank_entry.create_page') %></li>
+  <li><%= I18n.t('editor.blank_entry.edit_page') %></li>
+</ol>
+<p><%= I18n.t('editor.blank_entry.outro') %></p>

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

@@ -1,5 +1,11 @@
 <div class="blank_slate">
-  Keine Dateien freizugeben.
+  <p>
+    Alle Dateien wurden zur Transcodierung freigegeben.
+  </p>
+  <p>
+    Auf der <a href="#/files/video_files">'Dateien verwalten'-Seite</a> wird der Fortschritt
+    der Verarbeitung angezeigt.
+  </p>
 </div>
 
 <div class="video_files_panel">
@@ -12,4 +18,4 @@
 
 <div class="summary">
 </div>
-<button class="confirm_encoding">Ausgewählte Dateien transcodieren</button>
+<button class="confirm">Ausgewählte Dateien transcodieren</button>

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

@@ -4,6 +4,7 @@
 <a class="select">Auswählen</a>
 
 <div class="actions">
+  <a class="confirm" title="Überprüfen und bestätigen"></a>
   <a class="retry" title="Erneut versuchen"></a>
   <a class="remove" title="Löschen"></a>
   <a class="cancel" title="Abbrechen"></a>

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

@@ -37,3 +37,9 @@
 
   <button class="save" disabled>Veröffentlichen</a>
 </div>
+
+<div class="success notice">
+  <p>Der Beitrag wurde erfolgreich veröffentlicht.</p>
+  <p>Er kann nun unter folgender URL erreicht werden:</p>
+  <p><a href="" target="_blank"></a></p>
+</div>

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

@@ -0,0 +1,4 @@
+pageflow.BlankEntryView = Backbone.Marionette.ItemView.extend({
+  template: 'templates/blank_entry',
+  className: 'blank_entry'
+});

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

@@ -1,5 +1,6 @@
 pageflow.ConfirmEncodingView = Backbone.Marionette.ItemView.extend({
   template: 'templates/confirm_encoding',
+  className: 'confirm_encoding',
 
   ui: {
     blankSlate: '.blank_slate',
@@ -12,7 +13,7 @@ pageflow.ConfirmEncodingView = Backbone.Marionette.ItemView.extend({
 
   events: {
     'click button': function() {
-      this.model.save();
+      this.model.saveAndReset();
     }
   },
 
@@ -22,10 +23,10 @@ pageflow.ConfirmEncodingView = Backbone.Marionette.ItemView.extend({
   },
 
   onRender: function() {
-    this.listenTo(this.model, 'change:empty change:exceeding change:checking', this.updateSummary);
+    this.listenTo(this.model, 'change', this.updateSummary);
 
-    this.listenTo(this.confirmableAudioFiles, 'add remove', this.update);
-    this.listenTo(this.confirmableVideoFiles, 'add remove', this.update);
+    this.listenTo(this.confirmableAudioFiles, 'add remove', this.updateBlankSlate);
+    this.listenTo(this.confirmableVideoFiles, 'add remove', this.updateBlankSlate);
 
     this.ui.videoFilesPanel.append(this.subview(new pageflow.CollectionView({
       tagName: 'ul',
@@ -51,6 +52,11 @@ pageflow.ConfirmEncodingView = Backbone.Marionette.ItemView.extend({
   },
 
   update: function() {
+    this.updateBlankSlate();
+    this.updateSummary();
+  },
+
+  updateBlankSlate: function() {
     this.ui.blankSlate.toggle(!this.confirmableVideoFiles.length && !this.confirmableAudioFiles.length);
     this.ui.videoFilesPanel.toggle(!!this.confirmableVideoFiles.length);
     this.ui.audioFilesPanel.toggle(!!this.confirmableAudioFiles.length);

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

@@ -20,6 +20,7 @@ pageflow.ConfirmableFileItemView = Backbone.Marionette.ItemView.extend({
   onRender: function() {
     this.ui.label.attr('for', this.cid);
     this.ui.checkBox.attr('id', this.cid);
+    this.ui.checkBox.prop('checked', this.options.selectedFiles.contains(this.model));
 
     this.ui.fileName.text(this.model.get('file_name') || '(Unbekannt)');
     this.ui.duration.text(this.model.get('duration') || '-');

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

@@ -14,7 +14,8 @@ pageflow.EntryPreviewView = Backbone.Marionette.ItemView.extend({
     this.pageViews = this.subview(new pageflow.CollectionView({
       el: this.ui.entry,
       collection: this.model.pages,
-      itemViewConstructor: pageflow.PagePreviewView
+      itemViewConstructor: pageflow.PagePreviewView,
+      blankSlateViewConstructor: pageflow.BlankEntryView
     }));
 
     this.ui.entry.append($('<div class="scroll_indicator indicator">Scrollen, um weiterzulesen</div>'));

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

@@ -9,6 +9,7 @@ pageflow.FileItemView = Backbone.Marionette.ItemView.extend({
 
     selectButton: '.select',
     removeButton: '.remove',
+    confirmButton: '.confirm',
     cancelButton: '.cancel',
     retryButton: '.retry',
 
@@ -30,6 +31,8 @@ pageflow.FileItemView = Backbone.Marionette.ItemView.extend({
 
     'click .cancel': 'cancel',
 
+    'click .confirm': 'confirm',
+
     'click .remove': 'destroy',
 
     'click .retry': 'retry',
@@ -75,6 +78,7 @@ pageflow.FileItemView = Backbone.Marionette.ItemView.extend({
     this.ui.selectButton.toggle(!!this.options.selectionHandler);
 
     this.ui.cancelButton.toggle(this.model.isUploading());
+    this.ui.confirmButton.toggle(this.model.isConfirmable());
     this.ui.removeButton.toggle(!this.model.isUploading());
     this.ui.retryButton.toggle(this.model.isRetryable());
 
@@ -110,6 +114,10 @@ pageflow.FileItemView = Backbone.Marionette.ItemView.extend({
     this.model.cancelUpload();
   },
 
+  confirm: function() {
+    pageflow.editor.navigate('/confirmable_files?type=' + this.model.modelName + '&id=' + this.model.id, {trigger: true});
+  },
+
   retry: function() {
     this.model.retry();
   }