pageflow 16.0.0 → 16.2.0

data/package/editor.js

@@ -1,12 +1,13 @@
 import Backbone from 'backbone';
 import _ from 'underscore';
-import { Object as Object$1, ConfigurationEditorTabView, TextInputView, UrlDisplayView, TabsView, ConfigurationEditorView, CollectionView, tooltipContainer, SelectInputView, inputView, TextAreaInputView, CheckBoxGroupInputView, i18nUtils, TableView, TextTableCellView, PresenceTableCellView, SortableCollectionView, DeleteRowTableCellView, CheckBoxInputView, SliderInputView, IconTableCellView } from 'pageflow/ui';
+import { Object as Object$1, TabsView, ConfigurationEditorView, CollectionView, tooltipContainer, SelectInputView, inputView, TextInputView, TextAreaInputView, CheckBoxGroupInputView, i18nUtils, ConfigurationEditorTabView, SeparatorView, UrlDisplayView, TableView, TextTableCellView, PresenceTableCellView, SortableCollectionView, attributeBinding, DeleteRowTableCellView, CheckBoxInputView, SliderInputView, IconTableCellView } from 'pageflow/ui';
 export * from 'pageflow/ui';
 import Cocktail from 'cocktail';
 import I18n$1 from 'i18n-js';
 import Marionette from 'backbone.marionette';
 import $ from 'jquery';
 import { browser, features, Audio, events } from 'pageflow/frontend';
+import 'jquery-ui';
 
 (function () {
   var sync = Backbone.sync;
@@ -234,7 +235,7 @@ var UnmatchedUploadError = UploadError.extend({
 });
 var validFileTypeTranslationList = {
   validFileTypeTranslations: function validFileTypeTranslations(validFileTypes) {
-    return _.map(validFileTypes, function (validFileType) {
+    return validFileTypes.map(function (validFileType) {
       return I18n$1.t('activerecord.models.' + validFileType.i18nKey + '.other');
     }).join(', ');
   }
@@ -264,7 +265,7 @@ var InvalidNestedTypeError = UploadError.extend({
   initialize: function initialize(upload, options) {
     var editor = options.editor;
     var fileType = options.fileType;
-    var validFileTypes = editor.nextUploadTargetFile.fileType().nestedFileTypes.fileTypes;
+    var validFileTypes = editor.nextUploadTargetFile.fileType().nestedFileTypes;
     var validFileTypeTranslations = this.validFileTypeTranslations(validFileTypes);
     var typeI18nKey = fileType.i18nKey;
     var typeSingularTranslation = I18n$1.t('activerecord.models.' + typeI18nKey + '.one');
@@ -314,58 +315,6 @@ _.each(['each', 'map', 'reduce', 'first', 'find', 'contains', 'filter'], functio
   };
 });
 
-var state = window.pageflow || {};
-
-function template(data) {
-var __p = '';
-__p += '';
-return __p
-}
-
-var EditFileView = Marionette.ItemView.extend({
-  template: template,
-  className: 'edit_file',
-  onRender: function onRender() {
-    var fileType = this.model.fileType();
-    var entry = this.options.entry || state.entry;
-    var tab = new ConfigurationEditorTabView({
-      model: this.model.configuration,
-      attributeTranslationKeyPrefixes: ['pageflow.editor.files.attributes.' + fileType.collectionName, 'pageflow.editor.files.common_attributes', 'pageflow.editor.nested_files.' + fileType.collectionName, 'pageflow.editor.nested_files.common_attributes']
-    });
-
-    if (this.options.displayFileName) {
-      tab.input('file_name', TextInputView, {
-        model: this.model,
-        disabled: true
-      });
-    }
-
-    tab.input('rights', TextInputView, {
-      model: this.model,
-      placeholder: entry.get('default_file_rights')
-    });
-
-    _(this.fileTypeInputs()).each(function (options) {
-      tab.input(options.name, options.inputView, options.inputViewOptions);
-    });
-
-    tab.input('original_url', UrlDisplayView, {
-      model: this.model
-    });
-    this.appendSubview(tab);
-  },
-  fileTypeInputs: function fileTypeInputs() {
-    var fileType = this.model.fileType();
-    return _.chain(fileType.configurationEditorInputs).map(function (inputs) {
-      if (_.isFunction(inputs)) {
-        return inputs(this.model);
-      } else {
-        return inputs;
-      }
-    }, this).flatten().value();
-  }
-});
-
 var app = new Marionette.Application();
 
 var dialogView = {
@@ -382,7 +331,7 @@ var dialogView = {
   }
 };
 
-function template$1(data) {
+function template(data) {
 var __t, __p = '';
 __p += '<div class="box">\n  <div class="content">\n    <h1 class="dialog-header"></h1>\n  </div>\n\n  <div class="footer">\n    <a href="" class="close">\n      ' +
 ((__t = ( I18n.t('pageflow.editor.templates.file_settings_dialog.close') )) == null ? '' : __t) +
@@ -391,7 +340,7 @@ return __p
 }
 
 var FileSettingsDialogView = Marionette.ItemView.extend({
-  template: template$1,
+  template: template,
   className: 'file_settings_dialog editor dialog',
   mixins: [dialogView],
   ui: {
@@ -422,11 +371,11 @@ FileSettingsDialogView.open = function (options) {
   app.dialogRegion.show(new FileSettingsDialogView(options));
 };
 
-function template$2(data) {
+function template$1(data) {
 var __t, __p = '';
-__p += '<a class="edit" href="" title="' +
+__p += '<span class="value"></span>\n<a class="edit" href="" title="' +
 ((__t = ( I18n.t('pageflow.editor.templates.file_meta_data_item_value_view.edit') )) == null ? '' : __t) +
-'">\n</a>\n<span class="value"></span>\n';
+'">\n</a>\n\n';
 return __p
 }
 
@@ -449,7 +398,8 @@ return __p
  */
 
 var FileMetaDataItemValueView = Marionette.ItemView.extend({
-  template: template$2,
+  template: template$1,
+  className: 'value_wrapper',
   ui: {
     value: '.value',
     editLink: '.edit'
@@ -491,7 +441,13 @@ var TextFileMetaDataItemValueView = FileMetaDataItemValueView.extend({
       model = this.model;
     }
 
-    return model.get(this.options.name);
+    var value = model.get(this.options.name);
+
+    if (value && this.options.formatValue) {
+      return this.options.formatValue(value);
+    }
+
+    return value;
   }
 });
 
@@ -504,6 +460,7 @@ var FileType = Object$1.extend({
     this.paramKey = options.paramKey;
     this.i18nKey = options.i18nKey;
     this.nestedFileTypes = [];
+    this.settingsDialogTabs = options.settingsDialogTabs || [];
     this.confirmUploadTableColumns = options.confirmUploadTableColumns || [];
     this.configurationEditorInputs = [].concat(options.configurationEditorInputs || []);
     this.configurationUpdaters = options.configurationUpdaters || [];
@@ -511,17 +468,8 @@ var FileType = Object$1.extend({
     this.nestedFilesOrder = options.nestedFilesOrder;
     this.skipUploadConfirmation = options.skipUploadConfirmation || false;
     this.filters = options.filters || [];
-    this.metaDataAttributes = [{
-      name: 'rights',
-      valueView: TextFileMetaDataItemValueView,
-      valueViewOptions: {
-        settingsDialogTabLink: 'general'
-      }
-    }].concat(options.metaDataAttributes || []);
-    this.settingsDialogTabs = [{
-      name: 'general',
-      view: EditFileView
-    }].concat(options.settingsDialogTabs || []);
+    this.noExtendedFileRights = options.noExtendedFileRights;
+    this.metaDataAttributes = options.metaDataAttributes || [];
 
     if (typeof options.matchUpload === 'function') {
       this.matchUpload = options.matchUpload;
@@ -561,6 +509,8 @@ var FileTypes = Object$1.extend({
   initialize: function initialize() {
     this.clientSideConfigs = [];
     this.clientSideConfigModifications = {};
+    this.commonSettingsDialogTabs = [];
+    this.commonMetaDataAttributes = [];
   },
   register: function register(name, config) {
     if (this._setup) {
@@ -578,22 +528,30 @@ var FileTypes = Object$1.extend({
     this.clientSideConfigModifications[name].push(config);
   },
   setup: function setup(serverSideConfigs) {
+    var _this = this;
+
     var clientSideConfigs = this.clientSideConfigs;
     this._setup = true;
-    this.collection = new FileTypesCollection(_.map(serverSideConfigs, function (serverSideConfig) {
+
+    var configs = _.chain(serverSideConfigs).map(function (serverSideConfig) {
       var clientSideConfig = clientSideConfigs[serverSideConfig.collectionName];
 
       if (!clientSideConfig) {
         throw 'Missing client side config for file type "' + serverSideConfig.collectionName + '"';
       }
 
-      _(this.clientSideConfigModifications[serverSideConfig.collectionName]).each(function (modification) {
-        this.lintModification(modification, serverSideConfig.collectionName);
-        this.applyModification(clientSideConfig, modification);
-      }, this);
+      _this.applyCommonConfig(clientSideConfig);
 
-      return new FileType(_.extend({}, serverSideConfig, clientSideConfig));
-    }, this));
+      _this.applyModifications(serverSideConfig, clientSideConfig);
+
+      return _.extend({}, serverSideConfig, clientSideConfig);
+    }).sortBy(function (config) {
+      return config.priority || 10;
+    }).value();
+
+    this.collection = new FileTypesCollection(_.map(configs, function (config) {
+      return new FileType(config);
+    }));
     var those = this;
 
     _.map(serverSideConfigs, function (serverSideConfig) {
@@ -603,6 +561,16 @@ var FileTypes = Object$1.extend({
       })));
     });
   },
+  applyCommonConfig: function applyCommonConfig(clientSideConfig) {
+    clientSideConfig.settingsDialogTabs = this.commonSettingsDialogTabs.concat(clientSideConfig.settingsDialogTabs || []);
+    clientSideConfig.metaDataAttributes = this.commonMetaDataAttributes.concat(clientSideConfig.metaDataAttributes || []);
+  },
+  applyModifications: function applyModifications(serverSideConfig, clientSideConfig) {
+    _(this.clientSideConfigModifications[serverSideConfig.collectionName]).each(function (modification) {
+      this.lintModification(modification, serverSideConfig.collectionName);
+      this.applyModification(clientSideConfig, modification);
+    }, this);
+  },
   lintModification: function lintModification(modification, collectionName) {
     var unmodifyableProperties = _.difference(_.keys(modification), this.modifyableProperties);
 
@@ -885,6 +853,8 @@ var WidgetTypes = Object$1.extend({
   }
 });
 
+var state = window.pageflow || {};
+
 /**
  * Interface for engines providing editor extensions.
  * @alias editor
@@ -895,6 +865,7 @@ var EditorApi = Object$1.extend(
 {
   initialize: function initialize(options) {
     this.router = options && options.router;
+    this.entryType = {};
     this.sideBarRoutings = [];
     this.mainMenuItems = [];
     this.initializers = [];
@@ -964,6 +935,9 @@ var EditorApi = Object$1.extend(
    *  Checks to see if the browser is supported.
    * @param {function} options.browserNotSupportedView
    *  Backbone view that will be rendered if the browser is not supported.
+   * @param {boolean} [options.supportsExtendedFileRights]
+   *  Offer additional inputs for files to specify source url, license and default
+   *  display location.
    */
   registerEntryType: function registerEntryType(name, options) {
     this.entryType = _objectSpread2({
@@ -1107,10 +1081,12 @@ var EditorApi = Object$1.extend(
    * Trigger selection of the given file type with the given
    * handler. Payload hash is passed to selection handler as options.
    *
-   * @param {string|{name: string, filter: string}} fileType
+   * @param {string|{name: string, filter: string}|{defaultTab: string, filter: string}} fileType
    *   Either collection name of a file type or and object containing
    *   the collection name a file type and a the name of a file type
-   *   filter.
+   *   filter or an object containingn a defaultTab property that controls
+   *   which tab will visible initially, while allowing selecting files of
+   *   any type.
    *
    * @param {string} handlerName
    *   The name of a handler registered via {@link
@@ -1136,7 +1112,7 @@ var EditorApi = Object$1.extend(
       };
     }
 
-    this.navigate('/files/' + fileType.name + '?handler=' + handlerName + '&payload=' + encodeURIComponent(JSON.stringify(payload)) + (fileType.filter ? '&filter=' + fileType.filter : ''), {
+    this.navigate('/files/' + (fileType.defaultTab ? "".concat(fileType.defaultTab, ":default") : fileType.name) + '?handler=' + handlerName + '&payload=' + encodeURIComponent(JSON.stringify(payload)) + (fileType.filter ? '&filter=' + fileType.filter : ''), {
       trigger: true
     });
   },
@@ -3352,7 +3328,7 @@ var Entry = Backbone.Model.extend({
   },
   parse: function parse(response, options) {
     if (response) {
-      this.set(_.pick(response, 'published', 'published_until', 'password_protected'));
+      this.set(_.pick(response, 'published', 'published_until', 'password_protected', 'last_published_with_noindex'));
 
       this._setFiles(response, {
         add: false,
@@ -3555,6 +3531,13 @@ var ForeignKeySubsetCollection = SubsetCollection.extend({
     var parent = options.parent;
     var parentModel = options.parentModel;
     this.autoConsolidatePositions = options.autoConsolidatePositions;
+    this.listenTo(this, 'add', function (model) {
+      if (options.parentReferenceAttribute) {
+        model[options.parentReferenceAttribute] = parentModel;
+      }
+
+      model.set(options.foreignKeyAttribute, parentModel.id);
+    });
     SubsetCollection.prototype.constructor.call(this, {
       parent: parent,
       parentModel: parentModel,
@@ -3565,13 +3548,6 @@ var ForeignKeySubsetCollection = SubsetCollection.extend({
         return item.get('position');
       }
     });
-    this.listenTo(this, 'add', function (model) {
-      if (options.parentReferenceAttribute) {
-        model[options.parentReferenceAttribute] = parentModel;
-      }
-
-      model.set(options.foreignKeyAttribute, parentModel.id);
-    });
     this.listenTo(parentModel, 'destroy dependentDestroy', function () {
       this.invoke('trigger', 'dependentDestroy');
       this.clear();
@@ -3824,7 +3800,65 @@ var SidebarRouter = Marionette.AppRouter.extend({
   }
 });
 
-function template$3(data) {
+function _arrayWithHoles(arr) {
+  if (Array.isArray(arr)) return arr;
+}
+
+function _iterableToArrayLimit(arr, i) {
+  if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return;
+  var _arr = [];
+  var _n = true;
+  var _d = false;
+  var _e = undefined;
+
+  try {
+    for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) {
+      _arr.push(_s.value);
+
+      if (i && _arr.length === i) break;
+    }
+  } catch (err) {
+    _d = true;
+    _e = err;
+  } finally {
+    try {
+      if (!_n && _i["return"] != null) _i["return"]();
+    } finally {
+      if (_d) throw _e;
+    }
+  }
+
+  return _arr;
+}
+
+function _arrayLikeToArray(arr, len) {
+  if (len == null || len > arr.length) len = arr.length;
+
+  for (var i = 0, arr2 = new Array(len); i < len; i++) {
+    arr2[i] = arr[i];
+  }
+
+  return arr2;
+}
+
+function _unsupportedIterableToArray(o, minLen) {
+  if (!o) return;
+  if (typeof o === "string") return _arrayLikeToArray(o, minLen);
+  var n = Object.prototype.toString.call(o).slice(8, -1);
+  if (n === "Object" && o.constructor) n = o.constructor.name;
+  if (n === "Map" || n === "Set") return Array.from(n);
+  if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
+}
+
+function _nonIterableRest() {
+  throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+
+function _slicedToArray(arr, i) {
+  return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
+}
+
+function template$2(data) {
 var __t, __p = '';
 __p += '<a class="back">' +
 ((__t = ( I18n.t('pageflow.editor.templates.back_button_decorator.outline') )) == null ? '' : __t) +
@@ -3833,7 +3867,7 @@ return __p
 }
 
 var BackButtonDecoratorView = Marionette.Layout.extend({
-  template: template$3,
+  template: template$2,
   className: 'back_button_decorator',
   events: {
     'click a.back': 'goBack'
@@ -3852,7 +3886,7 @@ var BackButtonDecoratorView = Marionette.Layout.extend({
   }
 });
 
-function template$4(data) {
+function template$3(data) {
 var __t, __p = '';
 __p += '<input type="checkbox">\n<label class="file_name"></label>\n<span class="duration"></span>\n\n<div class="actions">\n  <a class="remove" title="' +
 ((__t = ( I18n.t('pageflow.editor.templates.confirmable_file_item.remove') )) == null ? '' : __t) +
@@ -3862,7 +3896,7 @@ return __p
 
 var ConfirmableFileItemView = Marionette.ItemView.extend({
   tagName: 'li',
-  template: template$4,
+  template: template$3,
   ui: {
     fileName: '.file_name',
     duration: '.duration',
@@ -3895,7 +3929,7 @@ var ConfirmableFileItemView = Marionette.ItemView.extend({
   }
 });
 
-function template$5(data) {
+function template$4(data) {
 var __t, __p = '';
 __p += '<div class="blank_slate">\n  <p>\n      ' +
 ((__t = ( I18n.t('pageflow.editor.templates.confirm_encoding.all_released') )) == null ? '' : __t) +
@@ -3914,7 +3948,7 @@ return __p
 }
 
 var ConfirmEncodingView = Marionette.ItemView.extend({
-  template: template$5,
+  template: template$4,
   className: 'confirm_encoding',
   ui: {
     blankSlate: '.blank_slate',
@@ -4068,7 +4102,7 @@ var failureIndicatingView = modelLifecycleTrackingView({
   }
 });
 
-function template$6(data) {
+function template$5(data) {
 var __t, __p = '';
 __p += '<a class="close" href="#">' +
 ((__t = ( I18n.t('pageflow.editor.templates.edit_entry.close') )) == null ? '' : __t) +
@@ -4085,7 +4119,7 @@ return __p
 }
 
 var EditEntryView = Marionette.Layout.extend({
-  template: template$6,
+  template: template$5,
   mixins: [failureIndicatingView, tooltipContainer],
   ui: {
     publishButton: 'a.publish',
@@ -4167,7 +4201,7 @@ var EditEntryView = Marionette.Layout.extend({
   }
 });
 
-function template$7(data) {
+function template$6(data) {
 var __t, __p = '';
 __p += '<div class="widget_type">\n</div>\n<a class="settings" title="' +
 ((__t = ( I18n.t('pageflow.editor.templates.widget_item.settings') )) == null ? '' : __t) +
@@ -4176,7 +4210,7 @@ return __p
 }
 
 var WidgetItemView = Marionette.Layout.extend({
-  template: template$7,
+  template: template$6,
   tagName: 'li',
   className: 'widget_item',
   regions: {
@@ -4213,14 +4247,14 @@ var WidgetItemView = Marionette.Layout.extend({
   }
 });
 
-function template$8(data) {
+function template$7(data) {
 var __p = '';
 __p += '<ol class="widgets">\n</ol>\n';
 return __p
 }
 
 var EditWidgetsView = Marionette.Layout.extend({
-  template: template$8,
+  template: template$7,
   ui: {
     widgets: '.widgets'
   },
@@ -4236,14 +4270,14 @@ var EditWidgetsView = Marionette.Layout.extend({
   }
 });
 
-function template$9(data) {
+function template$8(data) {
 var __p = '';
 __p += '<div class="image"></div>\n<div class="label"></div>\n';
 return __p
 }
 
 var BackgroundPositioningPreviewView = Marionette.ItemView.extend({
-  template: template$9,
+  template: template$8,
   className: 'preview',
   modelEvents: {
     change: 'update'
@@ -4274,14 +4308,14 @@ var BackgroundPositioningPreviewView = Marionette.ItemView.extend({
   }
 });
 
-function template$a(data) {
+function template$9(data) {
 var __p = '';
 __p += '<div class="container">\n  <div class="slider horizontal">\n  </div>\n  <div class="slider vertical">\n  </div>\n  <div class="percent horizontal">\n    <input type="number" min="0" max="100">\n    %\n  </div>\n  <div class="percent vertical">\n    <input type="number" min="0" max="100">\n    %\n  </div>\n</div>\n';
 return __p
 }
 
 var BackgroundPositioningSlidersView = Marionette.ItemView.extend({
-  template: template$a,
+  template: template$9,
   className: '',
   ui: {
     container: '.container',
@@ -4362,7 +4396,7 @@ var BackgroundPositioningSlidersView = Marionette.ItemView.extend({
   }
 });
 
-function template$b(data) {
+function template$a(data) {
 var __t, __p = '';
 __p += '<div class="box">\n  <div class="content">\n    <h2 class="dialog-header">' +
 ((__t = ( I18n.t('pageflow.editor.templates.background_positioning.title') )) == null ? '' : __t) +
@@ -4379,7 +4413,7 @@ return __p
 }
 
 var BackgroundPositioningView = Marionette.ItemView.extend({
-  template: template$b,
+  template: template$a,
   className: 'background_positioning editor dialog',
   mixins: [dialogView],
   ui: {
@@ -4433,14 +4467,14 @@ BackgroundPositioningView.open = function (options) {
   app.dialogRegion.show(new BackgroundPositioningView(options));
 };
 
-function template$c(data) {
+function template$b(data) {
 var __p = '';
 __p += '<div class="label"></div>\n<a href="#"></a>\n';
 return __p
 }
 
 var DropDownButtonItemView = Marionette.ItemView.extend({
-  template: template$c,
+  template: template$b,
   tagName: 'li',
   className: 'drop_down_button_item',
   ui: {
@@ -4454,6 +4488,10 @@ var DropDownButtonItemView = Marionette.ItemView.extend({
       }
 
       event.preventDefault();
+
+      if (this.model.get('kind') === 'checkBox' || this.model.get('kind') === 'radio') {
+        event.stopPropagation();
+      }
     }
   },
   modelEvents: {
@@ -4473,7 +4511,11 @@ var DropDownButtonItemView = Marionette.ItemView.extend({
     this.ui.label.text(this.model.get('label'));
     this.$el.toggleClass('is_selectable', !!this.model.selected);
     this.$el.toggleClass('is_disabled', !!this.model.get('disabled'));
+    this.$el.toggleClass('is_hidden', !!this.model.get('hidden'));
+    this.$el.toggleClass('has_check_box', this.model.get('kind') === 'checkBox');
+    this.$el.toggleClass('has_radio', this.model.get('kind') === 'radio');
     this.$el.toggleClass('is_checked', !!this.model.get('checked'));
+    this.$el.toggleClass('separated', !!this.model.get('separated'));
     this.$el.data('name', this.model.get('name'));
   }
 });
@@ -4490,7 +4532,7 @@ var DropDownButtonItemListView = function DropDownButtonItemListView(options) {
   });
 };
 
-function template$d(data) {
+function template$c(data) {
 var __p = '';
 __p += '<button></button>\n\n<div class="drop_down_button_menu">\n</div>\n';
 return __p
@@ -4514,6 +4556,13 @@ return __p
  *   Require click to open menu. By default, menu opens on when the
  *   mouse enters the button.
  *
+ * @param {String} [options.alignMenu]
+ *   "right" to align menu on the right. Aligned on the left by
+ *   default.
+ *
+ * @param {String} [options.buttonClassName]
+ *   CSS class name for button element.
+ *
  * ## Item Models
  *
  * The following model attributes can be used to control the
@@ -4532,7 +4581,7 @@ return __p
  */
 
 var DropDownButtonView = Marionette.ItemView.extend({
-  template: template$d,
+  template: template$c,
   className: 'drop_down_button',
   ui: {
     button: '> button',
@@ -4553,7 +4602,9 @@ var DropDownButtonView = Marionette.ItemView.extend({
     this.$el.toggleClass('full_width', !!this.options.fullWidth);
     this.ui.button.toggleClass('has_icon_and_text', !!this.options.label);
     this.ui.button.toggleClass('has_icon_only', !this.options.label);
+    this.ui.button.toggleClass('ellipsis_icon', !!this.options.ellipsisIcon);
     this.ui.button.text(this.options.label);
+    this.ui.button.addClass(this.options.buttonClassName);
     this.ui.menu.append(this.subview(new DropDownButtonItemListView({
       items: this.options.items
     })).el);
@@ -4577,7 +4628,7 @@ var DropDownButtonView = Marionette.ItemView.extend({
     var offset = this.$el.offset();
     this.ui.menu.css({
       top: offset.top + this.$el.height(),
-      left: offset.left,
+      left: this.options.alignMenu === 'right' ? offset.left + this.$el.width() - this.ui.menu.outerWidth() : offset.left,
       width: this.options.fullWidth ? this.$el.width() : null
     });
   },
@@ -4607,7 +4658,7 @@ var DropDownButtonView = Marionette.ItemView.extend({
   }
 });
 
-function template$e(data) {
+function template$d(data) {
 var __p = '';
 __p += '<div class="pictogram"></div>\n';
 return __p
@@ -4615,7 +4666,7 @@ return __p
 
 var FileThumbnailView = Marionette.ItemView.extend({
   className: 'file_thumbnail',
-  template: template$e,
+  template: template$d,
   modelEvents: {
     'change:state': 'update'
   },
@@ -4712,6 +4763,7 @@ var FileInputView = Marionette.ItemView.extend({
     if (dropDownMenuItems.length) {
       this.appendSubview(new DropDownButtonView({
         items: dropDownMenuItems,
+        ellipsisIcon: true,
         openOnClick: true
       }));
     }
@@ -4756,15 +4808,7 @@ var FileInputView = Marionette.ItemView.extend({
 
     if (file) {
       _.each(this.options.dropDownMenuItems, function (item) {
-        items.add(new FileInputView.CustomMenuItem({
-          name: item.name,
-          label: item.label
-        }, {
-          inputModel: _this.model,
-          propertyName: _this.options.propertyName,
-          file: file,
-          selected: item.selected
-        }));
+        items.add(_this._createCustomMenuItem(file, item));
       });
 
       items.add(new FileInputView.EditFileSettingsMenuItem({
@@ -4777,6 +4821,31 @@ var FileInputView = Marionette.ItemView.extend({
 
     return items;
   },
+  _createCustomMenuItem: function _createCustomMenuItem(file, item) {
+    var _this2 = this;
+
+    var options = {
+      inputModel: this.model,
+      propertyName: this.options.propertyName,
+      file: file
+    };
+
+    if (typeof item === 'function') {
+      return new item({}, options);
+    } else {
+      return new FileInputView.CustomMenuItem({
+        name: item.name,
+        label: item.label,
+        checked: item.checked,
+        items: item.items && new Backbone.Collection(item.items.map(function (item) {
+          return _this2._createCustomMenuItem(file, item);
+        }))
+      }, _objectSpread2(_objectSpread2({}, options), {}, {
+        selected: item.selected,
+        items: item.items
+      }));
+    }
+  },
   _listenToNestedTextTrackFiles: function _listenToNestedTextTrackFiles(file) {
     if (this.textTrackFiles) {
       this.stopListening(this.textTrackFiles);
@@ -4851,6 +4920,7 @@ FileInputView.DefaultTextTrackFileMenuItem = Backbone.Model.extend({
     this.update();
   },
   update: function update() {
+    this.set('kind', 'radio');
     this.set('checked', this.options.textTrackFile == this.getDefaultTextTrackFile());
     this.set('name', this.options.textTrackFile ? null : 'no_default_text_track');
     this.set('label', this.options.textTrackFile ? this.options.textTrackFile.displayLabel() : this.options.textTrackFiles.length ? I18n$1.t('pageflow.editor.views.inputs.file_input.auto_default_text_track') : I18n$1.t('pageflow.editor.views.inputs.file_input.no_default_text_track'));
@@ -4867,14 +4937,14 @@ FileInputView.DefaultTextTrackFileMenuItem = Backbone.Model.extend({
   }
 });
 
-function template$f(data) {
+function template$e(data) {
 var __p = '';
 __p += '<div class="spinner">\n  <div class="rect1"></div>\n  <div class="rect2"></div>\n  <div class="rect3"></div>\n  <div class="rect4"></div>\n  <div class="rect5"></div>\n</div>\n';
 return __p
 }
 
 var LoadingView = Marionette.ItemView.extend({
-  template: template$f,
+  template: template$e,
   className: 'loading',
   tagName: 'li'
 });
@@ -4897,7 +4967,7 @@ var selectableView = {
   }
 };
 
-function template$g(data) {
+function template$f(data) {
 var __t, __p = '';
 __p += '<span class="theme_name"></span>\n<span class="button_or_checkmark">\n  <p class="theme_in_use"></p>\n  <a class="use_theme">' +
 ((__t = ( I18n.t('pageflow.editor.templates.theme.use') )) == null ? '' : __t) +
@@ -4907,7 +4977,7 @@ return __p
 
 var ThemeItemView = Marionette.ItemView.extend({
   tagName: 'li',
-  template: template$g,
+  template: template$f,
   className: 'theme_item',
   mixins: [selectableView],
   selectionAttribute: 'theme',
@@ -4938,7 +5008,7 @@ var ThemeItemView = Marionette.ItemView.extend({
   }
 });
 
-function template$h(data) {
+function template$g(data) {
 var __t, __p = '';
 __p += '<div class="box">\n  <h1 class="dialog-header">\n    ' +
 ((__t = ( I18n.t('pageflow.editor.templates.change_theme_dialog.header') )) == null ? '' : __t) +
@@ -4953,7 +5023,7 @@ return __p
 }
 
 var ChangeThemeDialogView = Marionette.ItemView.extend({
-  template: template$h,
+  template: template$g,
   className: 'change_theme dialog editor',
   mixins: [dialogView],
   ui: {
@@ -5021,14 +5091,14 @@ ChangeThemeDialogView.changeTheme = function (options) {
   }).promise();
 };
 
-function template$i(data) {
+function template$h(data) {
 var __p = '';
 __p += '\n';
 return __p
 }
 
 var StaticThumbnailView = Marionette.ItemView.extend({
-  template: template$i,
+  template: template$h,
   className: 'static_thumbnail',
   modelEvents: {
     'change:configuration': 'update'
@@ -5092,7 +5162,7 @@ var ModelThumbnailView = Marionette.View.extend({
   }
 });
 
-function template$j(data) {
+function template$i(data) {
 var __p = '';
 __p += '<label>\n  <span class="name"></span>\n  <span class="inline_help"></span>\n</label>\n<div class="title"></div>\n<button class="unset"></button>\n<button class="choose"></button>\n';
 return __p
@@ -5108,7 +5178,7 @@ var ReferenceInputView = Marionette.ItemView.extend(
 /** @lends ReferenceInputView.prototype */
 {
   mixins: [inputView],
-  template: template$j,
+  template: template$i,
   className: 'reference_input',
   ui: {
     title: '.title',
@@ -5207,7 +5277,7 @@ var ThemeInputView = ReferenceInputView.extend({
   }
 });
 
-function template$k(data) {
+function template$j(data) {
 var __t, __p = '';
 __p += '<a class="back">' +
 ((__t = ( I18n.t('pageflow.editor.templates.edit_meta_data.outline') )) == null ? '' : __t) +
@@ -5220,7 +5290,7 @@ return __p
 }
 
 var EditMetaDataView = Marionette.Layout.extend({
-  template: template$k,
+  template: template$j,
   className: 'edit_meta_data',
   mixins: [failureIndicatingView],
   regions: {
@@ -5320,7 +5390,7 @@ var EditMetaDataView = Marionette.Layout.extend({
   }
 });
 
-function template$l(data) {
+function template$k(data) {
 var __t, __p = '';
 __p += '<a class="back">' +
 ((__t = ( I18n.t('pageflow.editor.templates.edit_widget.back') )) == null ? '' : __t) +
@@ -5329,7 +5399,7 @@ return __p
 }
 
 var EditWidgetView = Marionette.ItemView.extend({
-  template: template$l,
+  template: template$k,
   className: 'edit_widget',
   events: {
     'click a.back': function clickABack() {
@@ -5361,7 +5431,7 @@ var loadable = modelLifecycleTrackingView({
   }
 });
 
-function template$m(data) {
+function template$l(data) {
 var __p = '';
 __p += '<span class="file_thumbnail"></span>\n\n<span class="file_name"></span>\n';
 return __p
@@ -5369,7 +5439,7 @@ return __p
 
 var ExplorerFileItemView = Marionette.ItemView.extend({
   tagName: 'li',
-  template: template$m,
+  template: template$l,
   mixins: [loadable, selectableView],
   selectionAttribute: 'file',
   ui: {
@@ -5406,14 +5476,14 @@ var ExplorerFileItemView = Marionette.ItemView.extend({
   }
 });
 
-function template$n(data) {
+function template$m(data) {
 var __p = '';
 __p += '<a href="">\n  <span class="title"></span>\n</a>\n';
 return __p
 }
 
 var OtherEntryItemView = Marionette.ItemView.extend({
-  template: template$n,
+  template: template$m,
   className: 'other_entry_item',
   tagName: 'li',
   mixins: [selectableView],
@@ -5428,7 +5498,7 @@ var OtherEntryItemView = Marionette.ItemView.extend({
   }
 });
 
-function template$o(data) {
+function template$n(data) {
 var __t, __p = '';
 __p +=
 ((__t = ( I18n.t('pageflow.editor.templates.other_entries_blank_slate.none_available') )) == null ? '' : __t) +
@@ -5454,7 +5524,7 @@ var OtherEntriesCollectionView = Marionette.View.extend({
         selection: this.options.selection
       },
       blankSlateViewConstructor: Marionette.ItemView.extend({
-        template: template$o,
+        template: template$n,
         tagName: 'li',
         className: 'blank_slate'
       }),
@@ -5465,7 +5535,7 @@ var OtherEntriesCollectionView = Marionette.View.extend({
   }
 });
 
-function template$p(data) {
+function template$o(data) {
 var __t, __p = '';
 __p += '<div class="box">\n  <h1 class="dialog-header">\n    ' +
 ((__t = ( I18n.t('pageflow.editor.templates.files_explorer.reuse_files') )) == null ? '' : __t) +
@@ -5494,7 +5564,7 @@ return __p
 }
 
 var FilesExplorerView = Marionette.ItemView.extend({
-  template: template$p,
+  template: template$o,
   className: 'files_explorer editor dialog',
   mixins: [dialogView],
   ui: {
@@ -5581,7 +5651,7 @@ FilesExplorerView.open = function (options) {
   app.dialogRegion.show(new FilesExplorerView(options));
 };
 
-function template$q(data) {
+function template$p(data) {
 var __p = '';
 __p += '<th></th>\n<td></td>';
 return __p
@@ -5589,17 +5659,18 @@ return __p
 
 var FileMetaDataItemView = Marionette.ItemView.extend({
   tagName: 'tr',
-  template: template$q,
+  template: template$p,
   ui: {
     label: 'th',
     value: 'td'
   },
   onRender: function onRender() {
-    this.subview(new this.options.valueView(_.extend({
-      el: this.ui.value,
+    this.appendSubview(new this.options.valueView(_.extend({
       model: this.model,
       name: this.options.name
-    }, this.options.valueViewOptions || {})));
+    }, this.options.valueViewOptions || {})), {
+      to: this.ui.value
+    });
     this.ui.label.text(this.labelText());
   },
   labelText: function labelText() {
@@ -5611,7 +5682,7 @@ var FileMetaDataItemView = Marionette.ItemView.extend({
   }
 });
 
-function template$r(data) {
+function template$q(data) {
 var __p = '';
 __p += '<p class="percent"></p>\n<p class="description"></p>\n<p class="error_message"></p>';
 return __p
@@ -5620,7 +5691,7 @@ return __p
 var FileStageItemView = Marionette.ItemView.extend({
   tagName: 'li',
   className: 'file_stage_item',
-  template: template$r,
+  template: template$q,
   ui: {
     description: '.description',
     percent: '.percent',
@@ -5661,7 +5732,7 @@ var FileStageItemView = Marionette.ItemView.extend({
   }
 });
 
-function template$s(data) {
+function template$r(data) {
 var __t, __p = '';
 __p += '<span class="file_thumbnail"></span>\n\n<span class="file_name"></span>\n<a class="select">' +
 ((__t = ( I18n.t('pageflow.editor.templates.file_item.select') )) == null ? '' : __t) +
@@ -5685,7 +5756,7 @@ return __p
 
 var FileItemView = Marionette.ItemView.extend({
   tagName: 'li',
-  template: template$s,
+  template: template$r,
   mixins: [loadable],
   ui: {
     fileName: '.file_name',
@@ -5800,7 +5871,7 @@ var FileItemView = Marionette.ItemView.extend({
   }
 });
 
-function template$t(data) {
+function template$s(data) {
 var __t, __p = '';
 __p += '<div class="filtered_files-banner">\n  <span class="filtered_files-banner_prefix">\n    ' +
 ((__t = ( I18n.t('pageflow.editor.views.filtered_files_view.banner_prefix') )) == null ? '' : __t) +
@@ -5819,7 +5890,7 @@ return __p
 }
 
 var FilteredFilesView = Marionette.ItemView.extend({
-  template: template$t,
+  template: template$s,
   className: 'filtered_files',
   ui: {
     banner: '.filtered_files-banner',
@@ -5883,7 +5954,7 @@ var FilteredFilesView = Marionette.ItemView.extend({
   }
 });
 
-function template$u(data) {
+function template$t(data) {
 var __t, __p = '';
 __p += '<div class="box choose_importer_box">\n  <h1 class="dialog-header">' +
 ((__t = ( I18n.t('pageflow.editor.views.files_view.importer.heading') )) == null ? '' : __t) +
@@ -5893,7 +5964,7 @@ __p += '<div class="box choose_importer_box">\n  <h1 class="dialog-header">' +
 return __p
 }
 
-function template$v(data) {
+function template$u(data) {
 var __t, __p = '';
 __p += '<button class=\'importer\' data-key=\'' +
 ((__t = ( data.fileImporter.key )) == null ? '' : __t) +
@@ -5908,7 +5979,7 @@ return __p
 }
 
 var ImporterSelectView = Marionette.ItemView.extend({
-  template: template$v,
+  template: template$u,
   className: 'importer_select',
   tagName: 'li',
   events: {
@@ -5925,7 +5996,7 @@ var ImporterSelectView = Marionette.ItemView.extend({
 });
 
 var ChooseImporterView = Marionette.ItemView.extend({
-  template: template$u,
+  template: template$t,
   className: 'choose_importer editor dialog',
   mixins: [dialogView],
   ui: {
@@ -5960,7 +6031,7 @@ ChooseImporterView.open = function (options) {
   app.dialogRegion.show(new ChooseImporterView(options).render());
 };
 
-function template$w(data) {
+function template$v(data) {
 var __t, __p = '';
 __p += '<div class="box file_importer_box">\n  <h1 class="dialog-header">' +
 ((__t = ( I18n.t('pageflow.editor.file_importers.'+data.importerKey+'.dialog_label') )) == null ? '' : __t) +
@@ -5974,7 +6045,7 @@ __p += '<div class="box file_importer_box">\n  <h1 class="dialog-header">' +
 return __p
 }
 
-function template$x(data) {
+function template$w(data) {
 var __t, __p = '';
 __p += '<div class="box">\n  <h1 class="dialog-header">' +
 ((__t = ( I18n.t('pageflow.editor.templates.confirm_upload.header') )) == null ? '' : __t) +
@@ -5990,6 +6061,73 @@ __p += '<div class="box">\n  <h1 class="dialog-header">' +
 return __p
 }
 
+function template$x(data) {
+var __p = '';
+__p += '';
+return __p
+}
+
+var EditFileView = Marionette.ItemView.extend({
+  template: template$x,
+  className: 'edit_file',
+  onRender: function onRender() {
+    var fileType = this.model.fileType();
+    var entry = this.options.entry || state.entry;
+    var tab = new ConfigurationEditorTabView({
+      model: this.model.configuration,
+      attributeTranslationKeyPrefixes: ['pageflow.editor.files.attributes.' + fileType.collectionName, 'pageflow.editor.files.common_attributes', 'pageflow.editor.nested_files.' + fileType.collectionName, 'pageflow.editor.nested_files.common_attributes']
+    });
+
+    if (this.options.displayFileName) {
+      tab.input('file_name', TextInputView, {
+        model: this.model,
+        disabled: true
+      });
+    }
+
+    tab.input('rights', TextInputView, {
+      model: this.model,
+      placeholder: entry.get('default_file_rights')
+    });
+
+    if (editor.entryType.supportsExtendedFileRights && !fileType.noExtendedFileRights) {
+      tab.input('source_url', TextInputView);
+      tab.input('license', SelectInputView, {
+        includeBlank: true,
+        blankTranslationKey: 'pageflow.editor.files.common_attributes.license.blank',
+        values: state.config.availableFileLicenses,
+        texts: state.config.availableFileLicenses.map(function (name) {
+          return I18n$1.t("pageflow.file_licenses.".concat(name, ".name"));
+        })
+      });
+      tab.input('rights_display', SelectInputView, {
+        values: ['credits', 'inline']
+      });
+    }
+
+    tab.view(SeparatorView);
+
+    _(this.fileTypeInputs()).each(function (options) {
+      tab.input(options.name, options.inputView, options.inputViewOptions);
+    });
+
+    tab.input('original_url', UrlDisplayView, {
+      model: this.model
+    });
+    this.appendSubview(tab);
+  },
+  fileTypeInputs: function fileTypeInputs() {
+    var fileType = this.model.fileType();
+    return _.chain(fileType.configurationEditorInputs).map(function (inputs) {
+      if (_.isFunction(inputs)) {
+        return inputs(this.model);
+      } else {
+        return inputs;
+      }
+    }, this).flatten().value();
+  }
+});
+
 var UploadableFilesView = Marionette.View.extend({
   className: 'uploadable_files',
   initialize: function initialize() {
@@ -6036,7 +6174,7 @@ var UploadableFilesView = Marionette.View.extend({
 });
 
 var ConfirmFileImportUploadView = Marionette.Layout.extend({
-  template: template$x,
+  template: template$w,
   className: 'confirm_upload editor dialog',
   mixins: [dialogView],
   regions: {
@@ -6106,7 +6244,7 @@ ConfirmFileImportUploadView.open = function (options) {
 };
 
 var FilesImporterView = Marionette.ItemView.extend({
-  template: template$w,
+  template: template$v,
   className: 'files_importer editor dialog',
   mixins: [dialogView],
   ui: {
@@ -6164,7 +6302,10 @@ var FilesImporterView = Marionette.ItemView.extend({
             content_type: file.type,
             file_size: -1,
             rights: file.rights,
-            source_url: file.url
+            source_url: file.url,
+            configuration: {
+              source_url: file.source_url
+            }
           }, {
             fileType: fileType
           });
@@ -6302,7 +6443,7 @@ var FilesView = Marionette.ItemView.extend({
     this.$el.append(this.subview(this.tabsView).el);
   },
   tab: function tab(fileType) {
-    var selectionMode = this.options.tabName === fileType.collectionName;
+    var selectionMode = this.options.allowSelectingAny || this.options.tabName === fileType.collectionName;
     this.tabsView.tab(fileType.collectionName, _.bind(function () {
       return this.subview(new FilteredFilesView({
         entry: state.entry,
@@ -6401,7 +6542,11 @@ __p += '<div class="files_pending notice">\n  <p>' +
 ((__t = ( I18n.t('pageflow.editor.templates.publish_entry.date') )) == null ? '' : __t) +
 '\n      <input type="text" name="publish_until">\n    </label>\n\n    <label>\n      ' +
 ((__t = ( I18n.t('pageflow.editor.templates.publish_entry.time') )) == null ? '' : __t) +
-'\n      <input type="text" name="publish_until_time" value="00:00">\n    </label>\n  </div>\n\n  <div class="check_box_input">\n    <input id="publish_password_protected" type="checkbox" name="password_protected" value="1">\n    <label for="publish_password_protected">\n      <span class="name">\n        ' +
+'\n      <input type="text" name="publish_until_time" value="00:00">\n    </label>\n  </div>\n\n  <div class="check_box_input">\n    <input id="publish_with_noindex" type="checkbox" name="noindex" value="1">\n    <label for="publish_with_noindex">\n      <span class="name">\n        ' +
+((__t = ( I18n.t('pageflow.editor.templates.publish_entry.noindex') )) == null ? '' : __t) +
+'\n      </span>\n      <span class="inline_help">\n        ' +
+((__t = ( I18n.t('pageflow.editor.templates.publish_entry.noindex_help') )) == null ? '' : __t) +
+'\n      </span>\n    </label>\n  </div>\n\n  <div class="check_box_input">\n    <input id="publish_password_protected" type="checkbox" name="password_protected" value="1">\n    <label for="publish_password_protected">\n      <span class="name">\n        ' +
 ((__t = ( I18n.t('pageflow.editor.templates.publish_entry.password_protected') )) == null ? '' : __t) +
 '\n      </span>\n      <span class="inline_help">\n        ' +
 ((__t = ( I18n.t('pageflow.editor.templates.publish_entry.password_help') )) == null ? '' : __t) +
@@ -6438,6 +6583,7 @@ var PublishEntryView = Marionette.ItemView.extend({
     passwordFields: '.password_fields',
     userNameField: 'input[name=user_name]',
     passwordField: 'input[name=password]',
+    noindexCheckBox: 'input[name=noindex]',
     alreadyPublishedWithPassword: '.already_published_with_password',
     previouslyPublishedWithPassword: '.previously_published_with_password',
     alreadyPublishedWithoutPassword: '.already_published_without_password',
@@ -6488,10 +6634,10 @@ var PublishEntryView = Marionette.ItemView.extend({
       this.ui.publishUntilField.datepicker('setDate', publishedUntil);
       this.ui.publishUntilTimeField.val(timeStr(publishedUntil));
     } else {
-      this.ui.publishUntilField.datepicker('setDate', oneYearFromNow());
+      this.ui.publishUntilField.datepicker('setDate', this.defaultPublishedUntilDate());
     }
 
-    this.ui.userNameField.val(state.account.get('name'));
+    this.ui.userNameField.val(this.options.account.get('name'));
 
     if (this.model.get('password_protected')) {
       this.ui.passwordProtectedCheckBox.prop('checked', true);
@@ -6500,6 +6646,7 @@ var PublishEntryView = Marionette.ItemView.extend({
       this.ui.passwordField.val(this.randomPassword());
     }
 
+    this.ui.noindexCheckBox.prop('checked', this.model.get('last_published_with_noindex'));
     this.ui.alreadyPublishedWithPassword.toggle(this.model.get('published') && this.model.get('password_protected'));
     this.ui.previouslyPublishedWithPassword.toggle(!this.model.get('published') && this.model.get('password_protected'));
     this.ui.alreadyPublishedWithoutPassword.toggle(this.model.get('published') && !this.model.get('password_protected')); // Helpers
@@ -6511,12 +6658,6 @@ var PublishEntryView = Marionette.ItemView.extend({
         return ("0" + val).slice(-2);
       }
     }
-
-    function oneYearFromNow() {
-      var date = new Date();
-      date.setFullYear(date.getFullYear() + 1);
-      return date;
-    }
   },
   save: function save() {
     var publishedUntil = null;
@@ -6546,7 +6687,8 @@ var PublishEntryView = Marionette.ItemView.extend({
     this.options.entryPublication.publish({
       published_until: publishedUntil,
       password_protected: this.ui.passwordProtectedCheckBox.is(':checked'),
-      password: this.ui.passwordField.val()
+      password: this.ui.passwordField.val(),
+      noindex: this.ui.noindexCheckBox.is(':checked')
     }).fail(function () {
       alert('Beim Veröffentlichen ist ein Fehler aufgetreten');
     }).always(function () {
@@ -6591,6 +6733,11 @@ var PublishEntryView = Marionette.ItemView.extend({
       return false;
     }
   },
+  defaultPublishedUntilDate: function defaultPublishedUntilDate() {
+    var date = new Date();
+    date.setMonth(date.getMonth() + this.options.config.defaultPublishedUntilDurationInMonths);
+    return date;
+  },
   enableSave: function enableSave() {
     this.ui.saveButton.removeAttr('disabled');
   },
@@ -6690,10 +6837,16 @@ var SidebarController = Marionette.Controller.extend({
     }));
   },
   files: function files(collectionName, handler, payload, filterName) {
+    var _split = (collectionName || '').split(':'),
+        _split2 = _slicedToArray(_split, 2),
+        tabName = _split2[0],
+        suffix = _split2[1];
+
     this.region.show(new FilesView({
       model: this.entry,
       selectionHandler: handler && editor.createFileSelectionHandler(handler, payload),
-      tabName: collectionName,
+      tabName: tabName,
+      allowSelectingAny: suffix === 'default',
       filterName: filterName
     }));
     editor.setDefaultHelpEntry('pageflow.help_entries.files');
@@ -6720,7 +6873,9 @@ var SidebarController = Marionette.Controller.extend({
   publish: function publish() {
     this.region.show(PublishEntryView.create({
       model: this.entry,
-      entryPublication: new EntryPublication()
+      account: state.account,
+      entryPublication: new EntryPublication(),
+      config: state.config
     }));
     editor.setDefaultHelpEntry('pageflow.help_entries.publish');
   },
@@ -7090,7 +7245,15 @@ var HelpImageView = Marionette.View.extend({
 
 var InfoBoxView = Marionette.View.extend({
   className: 'info_box',
+  mixins: [attributeBinding],
+  initialize: function initialize() {
+    this.setupBooleanAttributeBinding('visible', this.updateVisible);
+  },
+  updateVisible: function updateVisible() {
+    this.$el.toggleClass('hidden_via_binding', this.getBooleanAttributBoundOption('visible') === false);
+  },
   render: function render() {
+    this.$el.addClass(this.options.level);
     this.$el.html(this.options.text);
     return this;
   }
@@ -7706,7 +7869,7 @@ var ListView = Marionette.ItemView.extend({
 });
 
 var ConfirmUploadView = Marionette.Layout.extend({
-  template: template$x,
+  template: template$w,
   className: 'confirm_upload editor dialog',
   mixins: [dialogView],
   regions: {
@@ -8006,7 +8169,60 @@ app.addInitializer(function () {
   });
 });
 
+function _arrayWithoutHoles(arr) {
+  if (Array.isArray(arr)) return _arrayLikeToArray(arr);
+}
+
+function _iterableToArray(iter) {
+  if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter);
+}
+
+function _nonIterableSpread() {
+  throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+
+function _toConsumableArray(arr) {
+  return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
+}
+
+var OtherFile = UploadableFile.extend({
+  thumbnailPictogram: 'other'
+});
+
 app.addInitializer(function (options) {
+  editor.fileTypes.commonMetaDataAttributes = [{
+    name: 'rights',
+    valueView: TextFileMetaDataItemValueView,
+    valueViewOptions: {
+      settingsDialogTabLink: 'general'
+    }
+  }];
+
+  if (editor.entryType.supportsExtendedFileRights) {
+    editor.fileTypes.commonMetaDataAttributes = [].concat(_toConsumableArray(editor.fileTypes.commonMetaDataAttributes), [{
+      name: 'source_url',
+      valueView: TextFileMetaDataItemValueView,
+      valueViewOptions: {
+        fromConfiguration: true,
+        settingsDialogTabLink: 'general'
+      }
+    }, {
+      name: 'license',
+      valueView: TextFileMetaDataItemValueView,
+      valueViewOptions: {
+        fromConfiguration: true,
+        formatValue: function formatValue(value) {
+          return I18n$1.t("pageflow.file_licenses.".concat(value, ".name"));
+        },
+        settingsDialogTabLink: 'general'
+      }
+    }]);
+  }
+
+  editor.fileTypes.commonSettingsDialogTabs = [{
+    name: 'general',
+    view: EditFileView
+  }];
   var textTracksMetaDataAttribute = {
     name: 'text_tracks',
     valueView: TextTracksFileMetaDataItemValueView,
@@ -8066,6 +8282,7 @@ app.addInitializer(function (options) {
       return upload.name.match(/\.vtt$/) || upload.name.match(/\.srt$/);
     },
     skipUploadConfirmation: true,
+    noExtendedFileRights: true,
     configurationEditorInputs: [{
       name: 'label',
       inputView: TextInputView,
@@ -8115,6 +8332,18 @@ app.addInitializer(function (options) {
       binding: 'label'
     }
   });
+  editor.fileTypes.register('other_files', {
+    model: OtherFile,
+    metaDataAttributes: [altMetaDataAttribute],
+    matchUpload: function matchUpload() {
+      return true;
+    },
+    priority: 100,
+    configurationEditorInputs: [{
+      name: 'alt',
+      inputView: TextInputView
+    }]
+  });
   editor.fileTypes.setup(options.config.fileTypes);
 });