pageflow 16.0.0 → 16.2.0

data/entry_types/paged/app/assets/javascripts/pageflow_paged/dist/editor.js

@@ -1,4 +1,4 @@
-var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, ChildViewContainer, IScroll, jquery_minicolors, wysihtml5, Cocktail, frontend, frontend$1) {
+var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, ChildViewContainer, IScroll, jquery_minicolors, wysihtml5, jqueryUi, Cocktail, frontend, frontend$1) {
   'use strict';
 
   Backbone = Backbone && Backbone.hasOwnProperty('default') ? Backbone['default'] : Backbone;
@@ -1062,6 +1062,107 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
       }, this), 200);
     }
   });
+
+  function _defineProperty(obj, key, value) {
+    if (key in obj) {
+      Object.defineProperty(obj, key, {
+        value: value,
+        enumerable: true,
+        configurable: true,
+        writable: true
+      });
+    } else {
+      obj[key] = value;
+    }
+
+    return obj;
+  }
+
+  function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+
+    if (Object.getOwnPropertySymbols) {
+      var symbols = Object.getOwnPropertySymbols(object);
+      if (enumerableOnly) symbols = symbols.filter(function (sym) {
+        return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+      });
+      keys.push.apply(keys, symbols);
+    }
+
+    return keys;
+  }
+
+  function _objectSpread2(target) {
+    for (var i = 1; i < arguments.length; i++) {
+      var source = arguments[i] != null ? arguments[i] : {};
+
+      if (i % 2) {
+        ownKeys(Object(source), true).forEach(function (key) {
+          _defineProperty(target, key, source[key]);
+        });
+      } else if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+      } else {
+        ownKeys(Object(source)).forEach(function (key) {
+          Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+      }
+    }
+
+    return target;
+  }
+
+  var attributeBinding = {
+    setupBooleanAttributeBinding: function setupBooleanAttributeBinding(optionName, updateMethod) {
+      this.setupAttributeBinding(optionName, updateMethod, Boolean);
+    },
+    getBooleanAttributBoundOption: function getBooleanAttributBoundOption(optionName) {
+      return this.getAttributeBoundOption(optionName, Boolean);
+    },
+    setupAttributeBinding: function setupAttributeBinding(optionName, updateMethod) {
+      var _this = this;
+
+      var normalize = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : function (value) {
+        return value;
+      };
+      var binding = this.options["".concat(optionName, "Binding")];
+      var view = this;
+
+      if (binding) {
+        _.flatten([binding]).forEach(function (attribute) {
+          _this.listenTo(_this.model, 'change:' + attribute, update);
+        });
+      }
+
+      update();
+
+      function update() {
+        updateMethod.call(view, view.getAttributeBoundOption(optionName, normalize));
+      }
+    },
+    getAttributeBoundOption: function getAttributeBoundOption(optionName) {
+      var _this2 = this;
+
+      var normalize = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : function (value) {
+        return value;
+      };
+      var binding = this.options["".concat(optionName, "Binding")];
+      var bindingValueOptionName = "".concat(optionName, "BindingValue");
+      var value = Array.isArray(binding) ? binding.map(function (attribute) {
+        return _this2.model.get(attribute);
+      }) : this.model.get(binding);
+
+      if (bindingValueOptionName in this.options) {
+        return value === this.options[bindingValueOptionName];
+      } else if (typeof this.options[optionName] === 'function') {
+        return normalize(this.options[optionName](value));
+      } else if (optionName in this.options) {
+        return normalize(this.options[optionName]);
+      } else if (binding) {
+        return normalize(value);
+      }
+    }
+  };
   /**
    * Mixin for input views handling common concerns like labels,
    * inline help, visiblity and disabling.
@@ -1191,7 +1292,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
    * @mixin
    */
 
-  var inputView = {
+  var inputView = _objectSpread2(_objectSpread2({}, attributeBinding), {}, {
     ui: {
       label: 'label',
       labelText: 'label .name',
@@ -1235,8 +1336,8 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
       this.ui.labelText.text(this.labelText());
       this.updateInlineHelp();
       this.setLabelFor();
-      this.setupAttributeBinding('disabled', this.updateDisabled);
-      this.setupAttributeBinding('visible', this.updateVisible);
+      this.setupBooleanAttributeBinding('disabled', this.updateDisabled);
+      this.setupBooleanAttributeBinding('visible', this.updateVisible);
     },
 
     /**
@@ -1285,7 +1386,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
       }
     },
     isDisabled: function isDisabled() {
-      return this.getAttributeBoundOption('disabled');
+      return this.getBooleanAttributBoundOption('disabled');
     },
     updateDisabled: function updateDisabled() {
       this.$el.toggleClass('input-disabled', !!this.isDisabled());
@@ -1303,46 +1404,9 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
       }
     },
     updateVisible: function updateVisible() {
-      this.$el.toggleClass('input-hidden_via_binding', this.getAttributeBoundOption('visible') === false);
-    },
-    setupAttributeBinding: function setupAttributeBinding(optionName, updateMethod) {
-      var _this = this;
-
-      var binding = this.options["".concat(optionName, "Binding")];
-      var view = this;
-
-      if (binding) {
-        _.flatten([binding]).forEach(function (attribute) {
-          _this.listenTo(_this.model, 'change:' + attribute, update);
-        });
-      }
-
-      update();
-
-      function update() {
-        updateMethod.call(view, view.getAttributeBoundOption(optionName));
-      }
-    },
-    getAttributeBoundOption: function getAttributeBoundOption(optionName) {
-      var _this2 = this;
-
-      var binding = this.options["".concat(optionName, "Binding")];
-      var bindingValueOptionName = "".concat(optionName, "BindingValue");
-      var value = Array.isArray(binding) ? binding.map(function (attribute) {
-        return _this2.model.get(attribute);
-      }) : this.model.get(binding);
-
-      if (bindingValueOptionName in this.options) {
-        return value === this.options[bindingValueOptionName];
-      } else if (typeof this.options[optionName] === 'function') {
-        return !!this.options[optionName](value);
-      } else if (optionName in this.options) {
-        return !!this.options[optionName];
-      } else if (binding) {
-        return !!value;
-      }
+      this.$el.toggleClass('hidden_via_binding', this.getBooleanAttributBoundOption('visible') === false);
     }
-  };
+  });
 
   function template$4(data) {
     var __p = '';
@@ -1460,6 +1524,125 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
       this.ui.link.attr('href', url);
     }
   });
+
+  function _classCallCheck(instance, Constructor) {
+    if (!(instance instanceof Constructor)) {
+      throw new TypeError("Cannot call a class as a function");
+    }
+  }
+
+  function _defineProperties(target, props) {
+    for (var i = 0; i < props.length; i++) {
+      var descriptor = props[i];
+      descriptor.enumerable = descriptor.enumerable || false;
+      descriptor.configurable = true;
+      if ("value" in descriptor) descriptor.writable = true;
+      Object.defineProperty(target, descriptor.key, descriptor);
+    }
+  }
+
+  function _createClass(Constructor, protoProps, staticProps) {
+    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+    if (staticProps) _defineProperties(Constructor, staticProps);
+    return Constructor;
+  }
+  /**
+   * Input view for a number.
+   *
+   * See {@link inputView} for further options.
+   *
+   * @param {Object} [options]
+   *
+   * @param {string} [options.locale]
+   * Locale used to fomat and parse numbers.
+   *
+   * @class
+   */
+
+
+  var NumberInputView = Marionette.ItemView.extend({
+    mixins: [inputView],
+    template: function template() {
+      return "\n    <label>\n      <span class=\"name\"></span>\n      <span class=\"inline_help\"></span>\n    </label>\n    <input type=\"text\" dir=\"auto\" />\n  ";
+    },
+    ui: {
+      input: 'input'
+    },
+    events: {
+      'change': 'onChange'
+    },
+    initialize: function initialize() {
+      this.parser = new NumberParser(this.options.locale);
+    },
+    onRender: function onRender() {
+      this.load();
+      this.listenTo(this.model, 'change:' + this.options.propertyName, this.load);
+    },
+    onChange: function onChange() {
+      this.save();
+      this.load();
+    },
+    onClose: function onClose() {
+      this.save();
+    },
+    save: function save() {
+      var inputValue = this.ui.input.val();
+      this.model.set(this.options.propertyName, this.parser.parse(inputValue) || 0);
+    },
+    load: function load() {
+      var input = this.ui.input;
+      var value = this.model.get(this.options.propertyName) || 0;
+      input.val(value.toLocaleString(this.options.locale, {
+        useGrouping: false
+      }));
+    },
+    displayValidationError: function displayValidationError(message) {
+      this.$el.addClass('invalid');
+      this.ui.input.attr('title', message);
+    },
+    resetValidationError: function resetValidationError(message) {
+      this.$el.removeClass('invalid');
+      this.ui.input.attr('title', '');
+    }
+  });
+
+  var NumberParser = /*#__PURE__*/function () {
+    function NumberParser(locale) {
+      _classCallCheck(this, NumberParser);
+
+      var format = new Intl.NumberFormat(locale);
+      var parts = format.formatToParts(12345.6);
+      var numerals = Array.from({
+        length: 10
+      }).map(function (_, i) {
+        return format.format(i);
+      });
+      var index = new Map(numerals.map(function (d, i) {
+        return [d, i];
+      }));
+      this._group = new RegExp("[".concat(parts.find(function (d) {
+        return d.type === "group";
+      }).value, "]"), "g");
+      this._decimal = new RegExp("[".concat(parts.find(function (d) {
+        return d.type === "decimal";
+      }).value, "]"));
+      this._numeral = new RegExp("[".concat(numerals.join(""), "]"), "g");
+
+      this._index = function (d) {
+        return index.get(d);
+      };
+    }
+
+    _createClass(NumberParser, [{
+      key: "parse",
+      value: function parse(string) {
+        string = string.trim().replace(this._group, "").replace(this._decimal, ".").replace(this._numeral, this._index);
+        return string ? +string : NaN;
+      }
+    }]);
+
+    return NumberParser;
+  }();
   /**
    * Text based input view that can display a placeholder.
    *
@@ -1482,6 +1665,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
    *   inside a given model.
    */
 
+
   var inputWithPlaceholderText = {
     onRender: function onRender() {
       this.updatePlaceholder();
@@ -1669,11 +1853,15 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
       this.ui.input.minicolors({
         changeDelay: 200,
         change: _.bind(function (color) {
+          this._saving = true;
+
           if (color === this.defaultValue()) {
             this.model.unset(this.options.propertyName);
           } else {
             this.model.set(this.options.propertyName, color);
           }
+
+          this._saving = false;
         }, this)
       });
       this.listenTo(this.model, 'change:' + this.options.propertyName, this.load);
@@ -1702,7 +1890,10 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
       }
     },
     load: function load() {
-      this.ui.input.minicolors('value', this.model.get(this.options.propertyName) || this.defaultValue());
+      if (!this._saving) {
+        this.ui.input.minicolors('value', this.model.get(this.options.propertyName) || this.defaultValue());
+      }
+
       this.$el.toggleClass('is_default', !this.model.has(this.options.propertyName));
     },
     refreshPicker: function refreshPicker() {
@@ -2082,6 +2273,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
   var TextAreaInputView = Marionette.ItemView.extend({
     mixins: [inputView, inputWithPlaceholderText],
     template: template$8,
+    className: 'text_area_input',
     ui: {
       input: 'textarea',
       toolbar: '.toolbar',
@@ -2258,21 +2450,6 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     }
   });
 
-  function _defineProperty(obj, key, value) {
-    if (key in obj) {
-      Object.defineProperty(obj, key, {
-        value: value,
-        enumerable: true,
-        configurable: true,
-        writable: true
-      });
-    } else {
-      obj[key] = value;
-    }
-
-    return obj;
-  }
-
   function template$9(data) {
     var __p = '';
     __p += '<label>\n  <span class="name"></span>\n  <span class="inline_help"></span>\n</label>\n<input type="text" />\n<div class="validation"></div>\n';
@@ -2537,6 +2714,25 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
    *
    * @param {Object} [options]
    *
+   * @param {number} [options.defaultValue]
+   *   Defaults value to display if property is not set.
+   *
+   * @param {number} [options.minValue=0]
+   *   Value when dragging slider to the very left.
+   *
+   * @param {number} [options.maxValue=100]
+   *   Value when dragging slider to the very right.
+   *
+   * @param {string} [options.unit="%"]
+   *   Unit to display after value.
+   *
+   * @param {function} [options.displayText]
+   *   Function that receives value and returns custom text to display as value.
+   *
+   * @param {boolean} [options.saveOnSlide]
+   *   Already update the model while dragging the handle - not only after
+   *   handle has been released.
+   *
    * @class
    */
 
@@ -2550,15 +2746,27 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
       value: '.value'
     },
     events: {
-      'slidechange': 'save'
+      'slidechange': 'save',
+      'slide': 'handleSlide'
     },
     onRender: function onRender() {
+      var _this = this;
+
       this.ui.widget.slider({
-        animate: 'fast',
-        min: 'minValue' in this.options ? this.options.minValue : 0,
-        max: 'maxValue' in this.options ? this.options.maxValue : 100
+        animate: 'fast'
+      });
+      this.setupAttributeBinding('minValue', function (value) {
+        return _this.updateSliderOption('min', value || 0);
+      });
+      this.setupAttributeBinding('maxValue', function (value) {
+        return _this.updateSliderOption('max', value || 100);
       });
       this.load();
+      this.listenTo(this.model, 'change:' + this.options.propertyName, this.load);
+    },
+    updateSliderOption: function updateSliderOption(name, value) {
+      this.ui.widget.slider('option', name, value);
+      this.updateText(this.ui.widget.slider('value'));
     },
     updateDisabled: function updateDisabled(disabled) {
       this.$el.toggleClass('disabled', !!disabled);
@@ -2569,11 +2777,15 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
         this.ui.widget.slider('enable');
       }
     },
-    save: function save() {
-      var value = this.ui.widget.slider('option', 'value');
-      var unit = 'unit' in this.options ? this.options.unit : '%';
-      this.ui.value.text(value + unit);
-      this.model.set(this.options.propertyName, value);
+    handleSlide: function handleSlide(event, ui) {
+      this.updateText(ui.value);
+
+      if (this.options.saveOnSlide) {
+        this.save(event, ui);
+      }
+    },
+    save: function save(event, ui) {
+      this.model.set(this.options.propertyName, ui.value);
     },
     load: function load() {
       var value;
@@ -2584,7 +2796,18 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
         value = 'defaultValue' in this.options ? this.options.defaultValue : 0;
       }
 
-      this.ui.widget.slider('option', 'value', value);
+      this.ui.widget.slider('option', 'value', this.clampValue(value));
+      this.updateText(value);
+    },
+    clampValue: function clampValue(value) {
+      var min = this.ui.widget.slider('option', 'min');
+      var max = this.ui.widget.slider('option', 'max');
+      return Math.min(max, Math.max(min, value));
+    },
+    updateText: function updateText(value) {
+      var unit = 'unit' in this.options ? this.options.unit : '%';
+      var text = 'displayText' in this.options ? this.options.displayText(value) : value + unit;
+      this.ui.value.text(text);
     }
   });
 
@@ -2971,7 +3194,10 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
       return view;
     },
     appendSubview: function appendSubview(view) {
-      return this.$el.append(this.subview(view).el);
+      var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+          to = _ref.to;
+
+      return (to || this.$el).append(this.subview(view).el);
     },
     onClose: function onClose() {
       if (this.subviews) {
@@ -3056,7 +3282,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     return obj;
   }
 
-  function ownKeys(object, enumerableOnly) {
+  function ownKeys$1(object, enumerableOnly) {
     var keys = Object.keys(object);
 
     if (Object.getOwnPropertySymbols) {
@@ -3070,18 +3296,18 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     return keys;
   }
 
-  function _objectSpread2(target) {
+  function _objectSpread2$1(target) {
     for (var i = 1; i < arguments.length; i++) {
       var source = arguments[i] != null ? arguments[i] : {};
 
       if (i % 2) {
-        ownKeys(Object(source), true).forEach(function (key) {
+        ownKeys$1(Object(source), true).forEach(function (key) {
           _defineProperty$1(target, key, source[key]);
         });
       } else if (Object.getOwnPropertyDescriptors) {
         Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
       } else {
-        ownKeys(Object(source)).forEach(function (key) {
+        ownKeys$1(Object(source)).forEach(function (key) {
           Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
         });
       }
@@ -3252,7 +3478,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
   });
   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(', ');
     }
@@ -3282,7 +3508,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     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');
@@ -3331,57 +3557,6 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     };
   });
 
-  var state = window.pageflow || {};
-
-  function template$e(data) {
-    var __p = '';
-    __p += '';
-    return __p;
-  }
-
-  var EditFileView = Marionette.ItemView.extend({
-    template: template$e,
-    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 = {
     events: {
@@ -3397,7 +3572,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     }
   };
 
-  function template$1$1(data) {
+  function template$e(data) {
     var __t,
         __p = '';
 
@@ -3406,7 +3581,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
   }
 
   var FileSettingsDialogView = Marionette.ItemView.extend({
-    template: template$1$1,
+    template: template$e,
     className: 'file_settings_dialog editor dialog',
     mixins: [dialogView],
     ui: {
@@ -3437,11 +3612,11 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     app.dialogRegion.show(new FileSettingsDialogView(options));
   };
 
-  function template$2$1(data) {
+  function template$1$1(data) {
     var __t,
         __p = '';
 
-    __p += '<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';
+    __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\n';
     return __p;
   }
   /**
@@ -3464,7 +3639,8 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
 
 
   var FileMetaDataItemValueView = Marionette.ItemView.extend({
-    template: template$2$1,
+    template: template$1$1,
+    className: 'value_wrapper',
     ui: {
       value: '.value',
       editLink: '.edit'
@@ -3505,7 +3681,13 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
         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;
     }
   });
   var FileType = BaseObject.extend({
@@ -3517,6 +3699,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
       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 || [];
@@ -3524,17 +3707,8 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
       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;
@@ -3573,6 +3747,8 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     initialize: function initialize() {
       this.clientSideConfigs = [];
       this.clientSideConfigModifications = {};
+      this.commonSettingsDialogTabs = [];
+      this.commonMetaDataAttributes = [];
     },
     register: function register(name, config) {
       if (this._setup) {
@@ -3590,22 +3766,30 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
       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) {
@@ -3615,6 +3799,16 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
         })));
       });
     },
+    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);
 
@@ -3889,6 +4083,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
       return !!this._optionalRoles[role];
     }
   });
+  var state = window.pageflow || {};
   /**
    * Interface for engines providing editor extensions.
    * @alias editor
@@ -3899,6 +4094,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
   {
     initialize: function initialize(options) {
       this.router = options && options.router;
+      this.entryType = {};
       this.sideBarRoutings = [];
       this.mainMenuItems = [];
       this.initializers = [];
@@ -3968,9 +4164,12 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
      *  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({
+      this.entryType = _objectSpread2$1({
         name: name
       }, options);
     },
@@ -4111,10 +4310,12 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
      * 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
@@ -4140,7 +4341,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
         };
       }
 
-      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
       });
     },
@@ -4154,7 +4355,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
      *   whether the page is a valid selection
      */
     selectPage: function selectPage(options) {
-      return this.pageSelectionView.selectPage(_objectSpread2(_objectSpread2({}, options), {}, {
+      return this.pageSelectionView.selectPage(_objectSpread2$1(_objectSpread2$1({}, options), {}, {
         entry: state.entry
       }));
     },
@@ -4164,7 +4365,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
       }
 
       var payloadJson = JSON.parse(decodeURIComponent(encodedPayload));
-      return new this.fileSelectionHandlers[handlerName](_objectSpread2(_objectSpread2({}, payloadJson), {}, {
+      return new this.fileSelectionHandlers[handlerName](_objectSpread2$1(_objectSpread2$1({}, payloadJson), {}, {
         entry: state.entry
       }));
     },
@@ -6316,7 +6517,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     },
     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,
@@ -6465,7 +6666,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
         attrs: {
           collection: collectionName,
           files: selections.toJSON().map(function (item, index) {
-            return _objectSpread2(_objectSpread2({}, item), {}, {
+            return _objectSpread2$1(_objectSpread2$1({}, item), {}, {
               url: selections.at(index).get('source_url')
             });
           })
@@ -6515,6 +6716,13 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
       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,
@@ -6525,13 +6733,6 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
           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();
@@ -6773,9 +6974,67 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
       '?storyline=:id': 'index',
       '.*': 'index'
     }
-  });
+  });
+
+  function _arrayWithHoles$1(arr) {
+    if (Array.isArray(arr)) return arr;
+  }
+
+  function _iterableToArrayLimit$1(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$1(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];
+    }
 
-  function template$3$1(data) {
+    return arr2;
+  }
+
+  function _unsupportedIterableToArray$1(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _arrayLikeToArray$1(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$1(o, minLen);
+  }
+
+  function _nonIterableRest$1() {
+    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$1(arr, i) {
+    return _arrayWithHoles$1(arr) || _iterableToArrayLimit$1(arr, i) || _unsupportedIterableToArray$1(arr, i) || _nonIterableRest$1();
+  }
+
+  function template$2$1(data) {
     var __t,
         __p = '';
 
@@ -6784,7 +7043,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
   }
 
   var BackButtonDecoratorView = Marionette.Layout.extend({
-    template: template$3$1,
+    template: template$2$1,
     className: 'back_button_decorator',
     events: {
       'click a.back': 'goBack'
@@ -6803,7 +7062,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     }
   });
 
-  function template$4$1(data) {
+  function template$3$1(data) {
     var __t,
         __p = '';
 
@@ -6813,7 +7072,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
 
   var ConfirmableFileItemView = Marionette.ItemView.extend({
     tagName: 'li',
-    template: template$4$1,
+    template: template$3$1,
     ui: {
       fileName: '.file_name',
       duration: '.duration',
@@ -6846,7 +7105,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     }
   });
 
-  function template$5$1(data) {
+  function template$4$1(data) {
     var __t,
         __p = '';
 
@@ -6857,7 +7116,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
   }
 
   var ConfirmEncodingView = Marionette.ItemView.extend({
-    template: template$5$1,
+    template: template$4$1,
     className: 'confirm_encoding',
     ui: {
       blankSlate: '.blank_slate',
@@ -7011,7 +7270,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     }
   });
 
-  function template$6$1(data) {
+  function template$5$1(data) {
     var __t,
         __p = '';
 
@@ -7020,7 +7279,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
   }
 
   var EditEntryView = Marionette.Layout.extend({
-    template: template$6$1,
+    template: template$5$1,
     mixins: [failureIndicatingView, tooltipContainer],
     ui: {
       publishButton: 'a.publish',
@@ -7102,7 +7361,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     }
   });
 
-  function template$7$1(data) {
+  function template$6$1(data) {
     var __t,
         __p = '';
 
@@ -7111,7 +7370,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
   }
 
   var WidgetItemView = Marionette.Layout.extend({
-    template: template$7$1,
+    template: template$6$1,
     tagName: 'li',
     className: 'widget_item',
     regions: {
@@ -7148,14 +7407,14 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     }
   });
 
-  function template$8$1(data) {
+  function template$7$1(data) {
     var __p = '';
     __p += '<ol class="widgets">\n</ol>\n';
     return __p;
   }
 
   var EditWidgetsView = Marionette.Layout.extend({
-    template: template$8$1,
+    template: template$7$1,
     ui: {
       widgets: '.widgets'
     },
@@ -7171,14 +7430,14 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     }
   });
 
-  function template$9$1(data) {
+  function template$8$1(data) {
     var __p = '';
     __p += '<div class="image"></div>\n<div class="label"></div>\n';
     return __p;
   }
 
   var BackgroundPositioningPreviewView = Marionette.ItemView.extend({
-    template: template$9$1,
+    template: template$8$1,
     className: 'preview',
     modelEvents: {
       change: 'update'
@@ -7209,14 +7468,14 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     }
   });
 
-  function template$a$1(data) {
+  function template$9$1(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$1,
+    template: template$9$1,
     className: '',
     ui: {
       container: '.container',
@@ -7297,7 +7556,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     }
   });
 
-  function template$b$1(data) {
+  function template$a$1(data) {
     var __t,
         __p = '';
 
@@ -7306,7 +7565,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
   }
 
   var BackgroundPositioningView = Marionette.ItemView.extend({
-    template: template$b$1,
+    template: template$a$1,
     className: 'background_positioning editor dialog',
     mixins: [dialogView],
     ui: {
@@ -7360,14 +7619,14 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     app.dialogRegion.show(new BackgroundPositioningView(options));
   };
 
-  function template$c$1(data) {
+  function template$b$1(data) {
     var __p = '';
     __p += '<div class="label"></div>\n<a href="#"></a>\n';
     return __p;
   }
 
   var DropDownButtonItemView = Marionette.ItemView.extend({
-    template: template$c$1,
+    template: template$b$1,
     tagName: 'li',
     className: 'drop_down_button_item',
     ui: {
@@ -7381,6 +7640,10 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
         }
 
         event.preventDefault();
+
+        if (this.model.get('kind') === 'checkBox' || this.model.get('kind') === 'radio') {
+          event.stopPropagation();
+        }
       }
     },
     modelEvents: {
@@ -7400,7 +7663,11 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
       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'));
     }
   });
@@ -7417,7 +7684,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     });
   };
 
-  function template$d$1(data) {
+  function template$c$1(data) {
     var __p = '';
     __p += '<button></button>\n\n<div class="drop_down_button_menu">\n</div>\n';
     return __p;
@@ -7440,6 +7707,13 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
    *   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
@@ -7459,7 +7733,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
 
 
   var DropDownButtonView = Marionette.ItemView.extend({
-    template: template$d$1,
+    template: template$c$1,
     className: 'drop_down_button',
     ui: {
       button: '> button',
@@ -7480,7 +7754,9 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
       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);
@@ -7504,7 +7780,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
       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
       });
     },
@@ -7534,7 +7810,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     }
   });
 
-  function template$e$1(data) {
+  function template$d$1(data) {
     var __p = '';
     __p += '<div class="pictogram"></div>\n';
     return __p;
@@ -7542,7 +7818,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
 
   var FileThumbnailView = Marionette.ItemView.extend({
     className: 'file_thumbnail',
-    template: template$e$1,
+    template: template$d$1,
     modelEvents: {
       'change:state': 'update'
     },
@@ -7638,6 +7914,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
       if (dropDownMenuItems.length) {
         this.appendSubview(new DropDownButtonView({
           items: dropDownMenuItems,
+          ellipsisIcon: true,
           openOnClick: true
         }));
       }
@@ -7682,15 +7959,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
 
       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({
@@ -7703,6 +7972,31 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
 
       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$1(_objectSpread2$1({}, options), {}, {
+          selected: item.selected,
+          items: item.items
+        }));
+      }
+    },
     _listenToNestedTextTrackFiles: function _listenToNestedTextTrackFiles(file) {
       if (this.textTrackFiles) {
         this.stopListening(this.textTrackFiles);
@@ -7777,6 +8071,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
       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'));
@@ -7793,14 +8088,14 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     }
   });
 
-  function template$f(data) {
+  function template$e$1(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$1,
     className: 'loading',
     tagName: 'li'
   });
@@ -7822,7 +8117,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     }
   };
 
-  function template$g(data) {
+  function template$f(data) {
     var __t,
         __p = '';
 
@@ -7832,7 +8127,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
 
   var ThemeItemView = Marionette.ItemView.extend({
     tagName: 'li',
-    template: template$g,
+    template: template$f,
     className: 'theme_item',
     mixins: [selectableView],
     selectionAttribute: 'theme',
@@ -7863,7 +8158,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     }
   });
 
-  function template$h(data) {
+  function template$g(data) {
     var __t,
         __p = '';
 
@@ -7872,7 +8167,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
   }
 
   var ChangeThemeDialogView = Marionette.ItemView.extend({
-    template: template$h,
+    template: template$g,
     className: 'change_theme dialog editor',
     mixins: [dialogView],
     ui: {
@@ -7940,14 +8235,14 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     }).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'
@@ -8010,7 +8305,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     }
   });
 
-  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;
@@ -8026,7 +8321,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
   /** @lends ReferenceInputView.prototype */
   {
     mixins: [inputView],
-    template: template$j,
+    template: template$i,
     className: 'reference_input',
     ui: {
       title: '.title',
@@ -8124,7 +8419,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     }
   });
 
-  function template$k(data) {
+  function template$j(data) {
     var __t,
         __p = '';
 
@@ -8133,7 +8428,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
   }
 
   var EditMetaDataView = Marionette.Layout.extend({
-    template: template$k,
+    template: template$j,
     className: 'edit_meta_data',
     mixins: [failureIndicatingView],
     regions: {
@@ -8233,7 +8528,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     }
   });
 
-  function template$l(data) {
+  function template$k(data) {
     var __t,
         __p = '';
 
@@ -8242,7 +8537,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
   }
 
   var EditWidgetView = Marionette.ItemView.extend({
-    template: template$l,
+    template: template$k,
     className: 'edit_widget',
     events: {
       'click a.back': function clickABack() {
@@ -8273,7 +8568,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     }
   });
 
-  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;
@@ -8281,7 +8576,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
 
   var ExplorerFileItemView = Marionette.ItemView.extend({
     tagName: 'li',
-    template: template$m,
+    template: template$l,
     mixins: [loadable, selectableView],
     selectionAttribute: 'file',
     ui: {
@@ -8318,14 +8613,14 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     }
   });
 
-  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],
@@ -8340,7 +8635,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     }
   });
 
-  function template$o(data) {
+  function template$n(data) {
     var __t,
         __p = '';
 
@@ -8366,7 +8661,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
           selection: this.options.selection
         },
         blankSlateViewConstructor: Marionette.ItemView.extend({
-          template: template$o,
+          template: template$n,
           tagName: 'li',
           className: 'blank_slate'
         }),
@@ -8377,7 +8672,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     }
   });
 
-  function template$p(data) {
+  function template$o(data) {
     var __t,
         __p = '';
 
@@ -8402,7 +8697,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
   }
 
   var FilesExplorerView = Marionette.ItemView.extend({
-    template: template$p,
+    template: template$o,
     className: 'files_explorer editor dialog',
     mixins: [dialogView],
     ui: {
@@ -8489,7 +8784,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     app.dialogRegion.show(new FilesExplorerView(options));
   };
 
-  function template$q(data) {
+  function template$p(data) {
     var __p = '';
     __p += '<th></th>\n<td></td>';
     return __p;
@@ -8497,17 +8792,18 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
 
   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() {
@@ -8519,7 +8815,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     }
   });
 
-  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;
@@ -8528,7 +8824,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
   var FileStageItemView = Marionette.ItemView.extend({
     tagName: 'li',
     className: 'file_stage_item',
-    template: template$r,
+    template: template$q,
     ui: {
       description: '.description',
       percent: '.percent',
@@ -8569,7 +8865,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     }
   });
 
-  function template$s(data) {
+  function template$r(data) {
     var __t,
         __p = '';
 
@@ -8579,7 +8875,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
 
   var FileItemView = Marionette.ItemView.extend({
     tagName: 'li',
-    template: template$s,
+    template: template$r,
     mixins: [loadable],
     ui: {
       fileName: '.file_name',
@@ -8694,7 +8990,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     }
   });
 
-  function template$t(data) {
+  function template$s(data) {
     var __t,
         __p = '';
 
@@ -8711,7 +9007,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
   }
 
   var FilteredFilesView = Marionette.ItemView.extend({
-    template: template$t,
+    template: template$s,
     className: 'filtered_files',
     ui: {
       banner: '.filtered_files-banner',
@@ -8775,7 +9071,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     }
   });
 
-  function template$u(data) {
+  function template$t(data) {
     var __t,
         __p = '';
 
@@ -8783,7 +9079,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     return __p;
   }
 
-  function template$v(data) {
+  function template$u(data) {
     var __t,
         __p = '';
 
@@ -8792,7 +9088,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
   }
 
   var ImporterSelectView = Marionette.ItemView.extend({
-    template: template$v,
+    template: template$u,
     className: 'importer_select',
     tagName: 'li',
     events: {
@@ -8808,7 +9104,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     }
   });
   var ChooseImporterView = Marionette.ItemView.extend({
-    template: template$u,
+    template: template$t,
     className: 'choose_importer editor dialog',
     mixins: [dialogView],
     ui: {
@@ -8843,7 +9139,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     app.dialogRegion.show(new ChooseImporterView(options).render());
   };
 
-  function template$w(data) {
+  function template$v(data) {
     var __t,
         __p = '';
 
@@ -8851,7 +9147,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     return __p;
   }
 
-  function template$x(data) {
+  function template$w(data) {
     var __t,
         __p = '';
 
@@ -8859,6 +9155,72 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     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() {
@@ -8904,7 +9266,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     }
   });
   var ConfirmFileImportUploadView = Marionette.Layout.extend({
-    template: template$x,
+    template: template$w,
     className: 'confirm_upload editor dialog',
     mixins: [dialogView],
     regions: {
@@ -8974,7 +9336,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
   };
 
   var FilesImporterView = Marionette.ItemView.extend({
-    template: template$w,
+    template: template$v,
     className: 'files_importer editor dialog',
     mixins: [dialogView],
     ui: {
@@ -9032,7 +9394,10 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
               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
             });
@@ -9170,7 +9535,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
       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,
@@ -9251,7 +9616,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     var __t,
         __p = '';
 
-    __p += '<div class="files_pending notice">\n  <p>' + ((__t = I18n.t('pageflow.editor.templates.publish_entry.files_pending_notice')) == null ? '' : __t) + '</p>\n  <p><a href="#files">' + ((__t = I18n.t('pageflow.editor.templates.publish_entry.show_files')) == null ? '' : __t) + '</a></p>\n</div>\n\n<div>\n  <div class="published notice">\n    <p>' + ((__t = I18n.t('pageflow.editor.templates.publish_entry.published_notice')) == null ? '' : __t) + '</p>\n    <p><a href="" target="_blank">' + ((__t = I18n.t('pageflow.editor.templates.publish_entry.view_revisions')) == null ? '' : __t) + '</a></p>\n  </div>\n\n  <div class="not_published notice">\n      ' + ((__t = I18n.t('pageflow.editor.templates.publish_entry.not_published_notice')) == null ? '' : __t) + '\n  </div>\n\n  <h2 class="sidebar-header">\n    ' + ((__t = I18n.t('pageflow.editor.templates.publish_entry.publish_current')) == null ? '' : __t) + '\n  </h2>\n\n  <div class="radio_input">\n    <input id="publish_entry_forever" type="radio" name="mode" value="publish_forever">\n    <label for="publish_entry_forever">' + ((__t = I18n.t('pageflow.editor.templates.publish_entry.unlimited')) == null ? '' : __t) + '</label>\n  </div>\n\n  <div class="radio_input">\n    <input id="publish_entry_until" type="radio" name="mode" value="publish_until">\n    <label for="publish_entry_until">' + ((__t = I18n.t('pageflow.editor.templates.publish_entry.until_including')) == null ? '' : __t) + '</label>\n  </div>\n\n  <div class="publish_until_fields disabled">\n    <label>\n      ' + ((__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        ' + ((__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) + '\n      </span>\n    </label>\n  </div>\n\n  <div class="password_fields disabled">\n    <label>\n      ' + ((__t = I18n.t('pageflow.editor.templates.publish_entry.user_name')) == null ? '' : __t) + '\n      <input type="text" name="user_name" disabled>\n    </label>\n\n    <label>\n      ' + ((__t = I18n.t('pageflow.editor.templates.publish_entry.password')) == null ? '' : __t) + '\n      <input type="text" name="password">\n    </label>\n\n    <p class="already_published_with_password">\n      ' + ((__t = I18n.t('pageflow.editor.templates.publish_entry.already_published_with_password_help')) == null ? '' : __t) + '\n    </p>\n    <p class="previously_published_with_password">\n      ' + ((__t = I18n.t('pageflow.editor.templates.publish_entry.previously_published_with_password_help')) == null ? '' : __t) + '\n    </p>\n    <p class="already_published_without_password">\n      ' + ((__t = I18n.t('pageflow.editor.templates.publish_entry.already_published_without_password_help')) == null ? '' : __t) + '\n    </p>\n  </div>\n\n  <button class="save" disabled>' + ((__t = I18n.t('pageflow.editor.templates.publish_entry.publish')) == null ? '' : __t) + '</a>\n</div>\n\n<div class="success notice">\n  <p>' + ((__t = I18n.t('pageflow.editor.templates.publish_entry.publish_success')) == null ? '' : __t) + '</p>\n  <p>' + ((__t = I18n.t('pageflow.editor.templates.publish_entry.published_url_hint')) == null ? '' : __t) + '</p>\n  <p><a href="" target="_blank"></a></p>\n</div>\n';
+    __p += '<div class="files_pending notice">\n  <p>' + ((__t = I18n.t('pageflow.editor.templates.publish_entry.files_pending_notice')) == null ? '' : __t) + '</p>\n  <p><a href="#files">' + ((__t = I18n.t('pageflow.editor.templates.publish_entry.show_files')) == null ? '' : __t) + '</a></p>\n</div>\n\n<div>\n  <div class="published notice">\n    <p>' + ((__t = I18n.t('pageflow.editor.templates.publish_entry.published_notice')) == null ? '' : __t) + '</p>\n    <p><a href="" target="_blank">' + ((__t = I18n.t('pageflow.editor.templates.publish_entry.view_revisions')) == null ? '' : __t) + '</a></p>\n  </div>\n\n  <div class="not_published notice">\n      ' + ((__t = I18n.t('pageflow.editor.templates.publish_entry.not_published_notice')) == null ? '' : __t) + '\n  </div>\n\n  <h2 class="sidebar-header">\n    ' + ((__t = I18n.t('pageflow.editor.templates.publish_entry.publish_current')) == null ? '' : __t) + '\n  </h2>\n\n  <div class="radio_input">\n    <input id="publish_entry_forever" type="radio" name="mode" value="publish_forever">\n    <label for="publish_entry_forever">' + ((__t = I18n.t('pageflow.editor.templates.publish_entry.unlimited')) == null ? '' : __t) + '</label>\n  </div>\n\n  <div class="radio_input">\n    <input id="publish_entry_until" type="radio" name="mode" value="publish_until">\n    <label for="publish_entry_until">' + ((__t = I18n.t('pageflow.editor.templates.publish_entry.until_including')) == null ? '' : __t) + '</label>\n  </div>\n\n  <div class="publish_until_fields disabled">\n    <label>\n      ' + ((__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_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) + '\n      </span>\n    </label>\n  </div>\n\n  <div class="password_fields disabled">\n    <label>\n      ' + ((__t = I18n.t('pageflow.editor.templates.publish_entry.user_name')) == null ? '' : __t) + '\n      <input type="text" name="user_name" disabled>\n    </label>\n\n    <label>\n      ' + ((__t = I18n.t('pageflow.editor.templates.publish_entry.password')) == null ? '' : __t) + '\n      <input type="text" name="password">\n    </label>\n\n    <p class="already_published_with_password">\n      ' + ((__t = I18n.t('pageflow.editor.templates.publish_entry.already_published_with_password_help')) == null ? '' : __t) + '\n    </p>\n    <p class="previously_published_with_password">\n      ' + ((__t = I18n.t('pageflow.editor.templates.publish_entry.previously_published_with_password_help')) == null ? '' : __t) + '\n    </p>\n    <p class="already_published_without_password">\n      ' + ((__t = I18n.t('pageflow.editor.templates.publish_entry.already_published_without_password_help')) == null ? '' : __t) + '\n    </p>\n  </div>\n\n  <button class="save" disabled>' + ((__t = I18n.t('pageflow.editor.templates.publish_entry.publish')) == null ? '' : __t) + '</a>\n</div>\n\n<div class="success notice">\n  <p>' + ((__t = I18n.t('pageflow.editor.templates.publish_entry.publish_success')) == null ? '' : __t) + '</p>\n  <p>' + ((__t = I18n.t('pageflow.editor.templates.publish_entry.published_url_hint')) == null ? '' : __t) + '</p>\n  <p><a href="" target="_blank"></a></p>\n</div>\n';
     return __p;
   }
 
@@ -9268,6 +9633,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
       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',
@@ -9318,10 +9684,10 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
         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);
@@ -9330,6 +9696,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
         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
@@ -9341,12 +9708,6 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
           return ("0" + val).slice(-2);
         }
       }
-
-      function oneYearFromNow() {
-        var date = new Date();
-        date.setFullYear(date.getFullYear() + 1);
-        return date;
-      }
     },
     save: function save() {
       var publishedUntil = null;
@@ -9376,7 +9737,8 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
       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 () {
@@ -9421,6 +9783,11 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
         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');
     },
@@ -9520,10 +9887,16 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
       }));
     },
     files: function files(collectionName, handler, payload, filterName) {
+      var _split = (collectionName || '').split(':'),
+          _split2 = _slicedToArray$1(_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');
@@ -9550,7 +9923,9 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     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');
     },
@@ -9909,7 +10284,15 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
   });
   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;
     }
@@ -10498,7 +10881,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     }
   });
   var ConfirmUploadView = Marionette.Layout.extend({
-    template: template$x,
+    template: template$w,
     className: 'confirm_upload editor dialog',
     mixins: [dialogView],
     regions: {
@@ -10785,7 +11168,60 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
       editor.applyDefaultHelpEntry();
     });
   });
+
+  function _arrayWithoutHoles(arr) {
+    if (Array.isArray(arr)) return _arrayLikeToArray$1(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$1(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,
@@ -10845,6 +11281,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
         return upload.name.match(/\.vtt$/) || upload.name.match(/\.srt$/);
       },
       skipUploadConfirmation: true,
+      noExtendedFileRights: true,
       configurationEditorInputs: [{
         name: 'label',
         inputView: TextInputView,
@@ -10894,6 +11331,18 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
         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);
   });
   app.addInitializer(function (options) {
@@ -12485,6 +12934,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
   exports.NestedFilesView = NestedFilesView;
   exports.NestedTypeError = NestedTypeError;
   exports.NotificationsView = NotificationsView;
+  exports.NumberInputView = NumberInputView;
   exports.Object = BaseObject;
   exports.OrderedPageLinksCollection = OrderedPageLinksCollection;
   exports.OtherEntriesCollection = OtherEntriesCollection;
@@ -12561,6 +13011,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
   exports.WidgetsCollection = WidgetsCollection;
   exports.addAndReturnModel = addAndReturnModel;
   exports.app = app;
+  exports.attributeBinding = attributeBinding;
   exports.authenticationProvider = authenticationProvider;
   exports.configurationContainer = configurationContainer;
   exports.cssModulesUtils = cssModulesUtils;
@@ -12596,4 +13047,4 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
 
   return exports;
 
-}({}, Backbone, _, Backbone.Marionette, jQuery, I18n, Backbone.ChildViewContainer, IScroll, jQuery, wysihtml5, Cocktail, pageflow, pageflow));
+}({}, Backbone, _, Backbone.Marionette, jQuery, I18n, Backbone.ChildViewContainer, IScroll, jQuery, wysihtml5, jQuery, Cocktail, pageflow, pageflow));