pageflow 0.11.4 → 12.0.0.rc1

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

@@ -32,7 +32,7 @@ pageflow.EditStorylineView = Backbone.Marionette.Layout.extend({
   updateDestroyButton: function() {
     var disabled = (this.model.chapters.length > 0);
 
-    this.ui.destroyButton.toggleClass('faded', disabled);
+    this.ui.destroyButton.toggleClass('disabled', disabled);
 
     if (disabled) {
       this.ui.destroyButton.attr('data-tooltip', 'pageflow.editor.views.edit_storyline_view.cannot_destroy');

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

@@ -9,6 +9,8 @@ pageflow.EntryPreviewView = Backbone.Marionette.ItemView.extend({
   },
 
   initialize: function() {
+    this.pages = this.model.pages.persisted();
+
     this.widgets = $();
     this.debouncedFetchWidgets = _.debounce(this.fetchWidgets, 200);
   },
@@ -16,7 +18,7 @@ pageflow.EntryPreviewView = Backbone.Marionette.ItemView.extend({
   onRender: function() {
     this.pageViews = this.subview(new pageflow.CollectionView({
       el: this.ui.entry,
-      collection: this.model.pages,
+      collection: this.pages,
       itemViewConstructor: pageflow.PagePreviewView,
       blankSlateViewConstructor: pageflow.BlankEntryView
     }));
@@ -46,15 +48,15 @@ pageflow.EntryPreviewView = Backbone.Marionette.ItemView.extend({
       simulateHistory: true
     });
 
-    this.listenTo(this.model.pages, 'add', function() {
+    this.listenTo(this.pages, 'add', function() {
       slideshow.update();
     });
 
-    this.listenTo(this.model.pages, 'remove', function() {
+    this.listenTo(this.pages, 'remove', function() {
       slideshow.update();
     });
 
-    this.listenTo(this.model.pages, 'edit', function(model) {
+    this.listenTo(this.pages, 'edit', function(model) {
       slideshow.goTo(this.pageViews.itemViews.findByModel(model).$el);
     });
 
@@ -119,10 +121,16 @@ pageflow.EntryPreviewView = Backbone.Marionette.ItemView.extend({
   updatePresentWidgetsCssClasses: function(newWidgets) {
     var previousClasses = this.widgetNames(this.widgets);
     var newClasses = this.widgetNames(newWidgets);
+    var removedClasses = _.difference(previousClasses, newClasses);
+    var addedClasses = _.difference(newClasses, previousClasses);
 
     this.$el.addClass('widgets_present');
-    this.$el.removeClass(_.difference(previousClasses, newClasses).join(' '));
-    this.$el.addClass(newClasses.join(' '));
+    this.$el.removeClass(removedClasses.join(' '));
+    this.$el.addClass(addedClasses.join(' '));
+
+    if (removedClasses.length || addedClasses.length) {
+      pageflow.events.trigger('widgets:update');
+    }
   },
 
   widgetNames: function(widgets) {
@@ -130,4 +138,4 @@ pageflow.EntryPreviewView = Backbone.Marionette.ItemView.extend({
       return 'widget_' + $(this).data('widget') + '_present';
     }).get();
   }
-});
+});

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

@@ -8,6 +8,7 @@ pageflow.FileItemView = Backbone.Marionette.ItemView.extend({
     fileName: '.file_name',
 
     selectButton: '.select',
+    settingsButton: '.settings',
     removeButton: '.remove',
     confirmButton: '.confirm',
     cancelButton: '.cancel',
@@ -16,7 +17,6 @@ pageflow.FileItemView = Backbone.Marionette.ItemView.extend({
     thumbnail: '.file_thumbnail',
     stageItems: '.file_stage_items',
 
-    rights: 'input.rights',
     metaData: 'tbody.attributes',
     downloads: 'tbody.downloads',
     downloadLink: 'a.original'
@@ -24,11 +24,22 @@ pageflow.FileItemView = Backbone.Marionette.ItemView.extend({
 
   events: {
     'click .select': function() {
-      this.options.selectionHandler.call(this.model);
-      pageflow.editor.navigate(this.options.selectionHandler.getReferer(), {trigger: true});
+      var result = this.options.selectionHandler.call(this.model);
+
+      if (result !== false) {
+        pageflow.editor.navigate(this.options.selectionHandler.getReferer(),
+                                 {trigger: true});
+      }
+
       return false;
     },
 
+    'click .settings': function() {
+      pageflow.FileSettingsDialogView.open({
+        model: this.model
+      });
+    },
+
     'click .cancel': 'cancel',
 
     'click .confirm': 'confirm',
@@ -37,9 +48,7 @@ pageflow.FileItemView = Backbone.Marionette.ItemView.extend({
 
     'click .retry': 'retry',
 
-    'click .file_thumbnail': 'toggleExpanded',
-
-    'change': 'save'
+    'click .file_thumbnail': 'toggleExpanded'
   },
 
   modelEvents: {
@@ -66,16 +75,18 @@ pageflow.FileItemView = Backbone.Marionette.ItemView.extend({
   },
 
   update: function() {
+    if (this.isClosed) {
+      return;
+    }
+
     this.$el.attr('data-id', this.model.id);
     this.ui.fileName.text(this.model.get('file_name') || '(Unbekannt)');
 
-    this.ui.rights.val(this.model.get('rights'));
-    this.ui.rights.attr('placeholder', pageflow.entry.get('default_file_rights'));
-
     this.ui.downloadLink.attr('href', this.model.get('original_url'));
-    this.ui.downloads.toggle(this.model.isUploaded());
+    this.ui.downloads.toggle(this.model.isUploaded() && !_.isEmpty(this.model.get('original_url')));
 
     this.ui.selectButton.toggle(!!this.options.selectionHandler);
+    this.ui.settingsButton.toggle(!this.model.isNew());
 
     this.ui.cancelButton.toggle(this.model.isUploading());
     this.ui.confirmButton.toggle(this.model.isConfirmable());
@@ -85,20 +96,20 @@ pageflow.FileItemView = Backbone.Marionette.ItemView.extend({
     this.updateToggleTitle();
   },
 
-  save: function() {
-    this.model.save({
-      rights: this.ui.rights.val()
-    });
-  },
-
   metaDataViews: function() {
     var model = this.model;
 
-    return _.map(this.options.metaDataAttributes, function(attribute) {
-      return new pageflow.FileMetaDataItemView({
-        model: model,
-        attribute: attribute
-      });
+    return _.map(this.options.metaDataAttributes, function(options) {
+      if (typeof options === 'string') {
+        options = {
+          name: options,
+          valueView: pageflow.TextFileMetaDataItemValueView
+        };
+      }
+
+      return new pageflow.FileMetaDataItemView(_.extend({
+        model: model
+      }, options));
     });
   },
 
@@ -113,7 +124,7 @@ pageflow.FileItemView = Backbone.Marionette.ItemView.extend({
 
   destroy: function() {
     if (confirm("Datei wirklich wirklich löschen?")) {
-      this.model.destroyUsage();
+      this.model.destroy();
     }
   },
 

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

@@ -0,0 +1,49 @@
+/**
+ * Base class for views used as `valueView` for file type meta data
+ * attributes.
+ *
+ * @param {string} [options.name]
+ *   Name of the meta data item used in translation keys.
+ *
+ * @param {string} [options.settingsDialogTabLink]
+ *   Dispaly a link to open the specified tab of the file settings
+ *   dialog.
+ *
+ * @since 12.0
+ *
+ * @class
+ * @memberof module:pageflow/editor
+ */
+pageflow.FileMetaDataItemValueView = Backbone.Marionette.ItemView.extend({
+  template: 'templates/file_meta_data_item_value_view',
+
+  ui: {
+    value: '.value',
+    editLink: '.edit'
+  },
+
+  events: {
+    'click .edit': function() {
+      pageflow.FileSettingsDialogView.open({
+        model: this.model,
+        tabName: this.options.settingsDialogTabLink
+      });
+    }
+  },
+
+  onRender: function() {
+    this.listenTo(this.model, 'change:' + this.options.name, this.update);
+    this.ui.editLink.toggle(!!this.options.settingsDialogTabLink);
+
+    this.update();
+  },
+
+  update: function() {
+    this.ui.value.text(this.getText() ||
+                       I18n.t('pageflow.editor.views.file_meta_data_item_value_view.blank'));
+  },
+
+  getText: function() {
+    throw new Error('Not implemented');
+  }
+});

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

@@ -8,12 +8,23 @@ pageflow.FileMetaDataItemView = Backbone.Marionette.ItemView.extend({
   },
 
   onRender: function() {
-    this.update();
-    this.listenTo(this.model, 'change:' + this.options.attribute, this.update);
+    this.subview(new this.options.valueView(_.extend({
+      el: this.ui.value,
+      model: this.model,
+      name: this.options.name
+    }, this.options.valueViewOptions || {})));
+
+    this.ui.label.text(this.labelText());
   },
 
-  update: function() {
-    this.ui.label.text(I18n.t('activerecord.attributes.' + this.model.i18nKey + '.' + this.options.attribute));
-    this.ui.value.text(this.model.get(this.options.attribute));
+  labelText: function() {
+    return pageflow.i18nUtils.attributeTranslation(this.options.name, 'label', {
+      prefixes: [
+        'pageflow.editor.files.attributes.' + this.model.fileType().collectionName,
+        'pageflow.editor.files.common_attributes'
+      ],
+      fallbackPrefix: 'activerecord.attributes',
+      fallbackModelI18nKey: this.model.i18nKey
+    });
   }
 });

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

@@ -0,0 +1,31 @@
+pageflow.FileSettingsDialogView = Backbone.Marionette.ItemView.extend({
+  template: 'templates/file_settings_dialog',
+  className: 'file_settings_dialog editor dialog',
+
+  mixins: [pageflow.dialogView],
+
+  ui: {
+    content: '.content'
+  },
+
+  onRender: function() {
+    this.tabsView = new pageflow.TabsView({
+      model: this.model,
+      i18n: 'pageflow.editor.files.settings_dialog_tabs',
+      defaultTab: this.options.tabName
+    });
+
+    _.each(this.model.fileType().settingsDialogTabs, function(options) {
+      this.tabsView.tab(options.name, _.bind(function() {
+        return this.subview(new options.view(
+          _.extend({model: this.model}, options.viewOptions)));
+      }, this));
+    }, this);
+
+    this.ui.content.append(this.subview(this.tabsView).el);
+  }
+});
+
+pageflow.FileSettingsDialogView.open = function(options) {
+  pageflow.app.dialogRegion.show(new pageflow.FileSettingsDialogView(options));
+};

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

@@ -13,7 +13,8 @@ pageflow.FilesExplorerView = Backbone.Marionette.ItemView.extend({
   events: {
     'click .ok': function() {
       if (this.options.callback) {
-        this.options.callback(this._selectedFile());
+        this.options.callback(this.selection.get('entry'),
+                              this.selection.get('file'));
       }
       this.close();
     }
@@ -27,7 +28,7 @@ pageflow.FilesExplorerView = Backbone.Marionette.ItemView.extend({
 
     // check if the OK button should be enabled.
     this.listenTo(this.selection, 'change', function(selection, options) {
-      this.ui.okButton.prop('disabled', !this._selectedFile());
+      this.ui.okButton.prop('disabled', !this.selection.get('file'));
     });
   },
 
@@ -44,7 +45,9 @@ pageflow.FilesExplorerView = Backbone.Marionette.ItemView.extend({
     });
 
     pageflow.editor.fileTypes.each(function(fileType) {
-      this.tab(fileType);
+      if (fileType.topLevelType) {
+        this.tab(fileType);
+      }
     }, this);
 
     this.ui.filesPanel.append(this.subview(this.tabsView).el);
@@ -88,10 +91,6 @@ pageflow.FilesExplorerView = Backbone.Marionette.ItemView.extend({
     return Backbone.Marionette.ItemView.extend({
       template: this.selection.get('entry') ? 'templates/files_gallery_blank_slate' : 'templates/files_explorer_blank_slate'
     });
-  },
-
-  _selectedFile: function() {
-    return this.selection.get('file');
   }
 });
 

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

@@ -20,7 +20,9 @@ pageflow.FilesView = Backbone.Marionette.ItemView.extend({
           label: I18n.t('pageflow.editor.views.files_view.reuse'),
           handler: function() {
             pageflow.FilesExplorerView.open({
-              callback: pageflow.entry.addFileUsage.bind(pageflow.entry)
+              callback: function(otherEntry, file) {
+                pageflow.entry.reuseFile(otherEntry, file);
+              }
             });
           }
         }
@@ -36,26 +38,23 @@ pageflow.FilesView = Backbone.Marionette.ItemView.extend({
     });
 
     pageflow.editor.fileTypes.each(function(fileType) {
-      this.tab(fileType);
+      if (fileType.topLevelType) {
+        this.tab(fileType);
+      }
     }, this);
 
     this.$el.append(this.subview(this.tabsView).el);
   },
 
   tab: function(fileType) {
+    var selectionMode = this.options.tabName === fileType.collectionName;
+
     this.tabsView.tab(fileType.collectionName, _.bind(function() {
-      return this.subview(new pageflow.CollectionView({
-        tagName: 'ul',
-        className: 'files expandable',
-        collection: pageflow.entry.getFileCollection(fileType),
-        itemViewConstructor: pageflow.FileItemView,
-        itemViewOptions: {
-          metaDataAttributes: fileType.metaDataAttributes,
-          selectionHandler: this.options.tabName === fileType.collectionName && this.options.selectionHandler
-        },
-        blankSlateViewConstructor: Backbone.Marionette.ItemView.extend({
-          template: 'templates/files_blank_slate'
-        })
+      return this.subview(new pageflow.FilteredFilesView({
+        entry: pageflow.entry,
+        fileType: fileType,
+        selectionHandler: selectionMode && this.options.selectionHandler,
+        filterName: selectionMode && this.options.filterName
       }));
     }, this));
 

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

@@ -0,0 +1,75 @@
+pageflow.FilteredFilesView = Backbone.Marionette.ItemView.extend({
+  template: 'templates/filtered_files',
+  className: 'filtered_files',
+
+  ui: {
+    banner: '.filtered_files-banner',
+    filterName: '.filtered_files-filter_name'
+  },
+
+  events: {
+    'click .filtered_files-reset_filter': function() {
+      pageflow.editor.navigate('/files/' + this.options.fileType.collectionName, {trigger: true});
+      return false;
+    }
+  },
+
+  onRender: function() {
+    var entry = this.options.entry;
+    var fileType = this.options.fileType;
+    var collection = entry.getFileCollection(fileType);
+    var blankSlateText = I18n.t('pageflow.editor.templates.files_blank_slate.no_files');
+
+    if (this.options.filterName) {
+      if (this.filteredCollection) {
+        this.filteredCollection.dispose();
+      }
+
+      collection = this.filteredCollection = collection.withFilter(this.options.filterName);
+      blankSlateText = this.filterTranslation('blank_slate');
+    }
+
+    this.appendSubview(new pageflow.CollectionView({
+      tagName: 'ul',
+      className: 'files expandable',
+      collection: collection,
+      itemViewConstructor: pageflow.FileItemView,
+      itemViewOptions: {
+        metaDataAttributes: fileType.metaDataAttributes,
+        selectionHandler: this.options.selectionHandler,
+      },
+      blankSlateViewConstructor: Backbone.Marionette.ItemView.extend({
+        template: 'templates/files_blank_slate',
+        serializeData: function(){
+          return {
+            text: blankSlateText
+          };
+        }
+      })
+    }));
+
+    this.ui.banner.toggle(!!this.options.filterName);
+
+    if (this.options.filterName) {
+      this.ui.filterName.text(this.filterTranslation('name'));
+    }
+  },
+
+  filterTranslation: function(keyName, options) {
+    var filterName = this.options.filterName;
+
+    return pageflow.i18nUtils.findTranslation([
+      'pageflow.editor.files.filters.' +
+        this.options.fileType.collectionName + '.' +
+        filterName + '.' +
+        keyName,
+      'pageflow.editor.files.common_filters.' + keyName
+    ], options);
+  },
+
+  onClose: function() {
+    if (this.filteredCollection) {
+      this.filteredCollection.dispose();
+    }
+  }
+});