pageflow 15.8.0 → 16.1.0

data/admins/pageflow/sites.rb

@@ -0,0 +1,53 @@
+module Pageflow
+  ActiveAdmin.register Site, as: 'Site' do
+    belongs_to :account
+
+    menu false
+    actions :index, :show, :new, :edit, :create, :update
+
+    show do
+      render 'attributes_table', site: site
+
+      tabs_view(Pageflow.config.admin_resource_tabs.find_by_resource(site),
+                i18n: 'pageflow.admin.resource_tabs',
+                authorize: :see_site_admin_tab,
+                build_args: [site])
+    end
+
+    form partial: 'form'
+
+    permit_params do
+      [
+        :name,
+        :title,
+        :cname,
+        :additional_cnames,
+        :feeds_enabled,
+        :sitemap_enabled,
+        :imprint_link_url,
+        :imprint_link_label,
+        :copyright_link_url,
+        :copyright_link_label,
+        :privacy_link_url,
+        :home_url
+      ] + permitted_admin_form_input_params
+    end
+
+    controller do
+      helper Pageflow::Admin::FormHelper
+
+      def index
+        redirect_to admin_account_path(parent, tab: 'sites')
+      end
+
+      private
+
+      def permitted_admin_form_input_params
+        Pageflow
+          .config_for(parent)
+          .admin_form_inputs
+          .permitted_attributes_for(:site)
+      end
+    end
+  end
+end

data/app/assets/javascripts/pageflow/admin/entries.js

@@ -88,17 +88,26 @@ jQuery(function($) {
 
   $('.admin_entries form.pageflow_entry').each(function() {
     var accountSelect = $('#entry_account_id', this);
-    var themingSelect = $('#entry_theming_id', this);
+    var siteSelect = $('#entry_site_id', this);
     var titleInput = $('#entry_title', this);
 
-    function updateEntryTypeInput() {
+    function updateSiteAndEntryTypeInput() {
       var selectedAccountId = accountSelect.val();
 
-      $.get('/admin/entries/entry_type_name_input' +
+      $.get('/admin/entries/entry_site_and_type_name_input' +
             '?account_id=' + selectedAccountId +
             '&entry_type_name=' + $('[name="entry[type_name]"]').val())
        .done(function(response) {
-         $('#entry_type_name_input').replaceWith(response);
+         $('#entry_type_name_input').replaceWith($(response).filter('#entry_type_name_input'));
+         $('#entry_site_input').replaceWith($(response).filter('#entry_site_input'));
+
+         // Set up searchable select
+         $(document).trigger('page:load');
+
+         siteSelect = $('#entry_site_id');
+         siteSelect.on('change', updatePermalinkInput);
+
+         updatePermalinkInput();
        });
     }
 
@@ -119,15 +128,15 @@ jQuery(function($) {
     function fetchPermalinkInput(callback) {
       $.get('/admin/entries/permalink_inputs' +
             '?entry[account_id]=' + accountSelect.val() +
-                   (themingSelect.val() ? '&entry[theming_id]=' + themingSelect.val() : '') +
+                   (siteSelect.val() ? '&entry[site_id]=' + siteSelect.val() : '') +
             '&entry[title]=' + encodeURIComponent(titleInput.val()))
        .done(callback);
     }
 
-    accountSelect.on('change', updateEntryTypeInput);
+    accountSelect.on('change', updateSiteAndEntryTypeInput);
 
     accountSelect.on('change', updatePermalinkInput);
-    themingSelect.on('change', updatePermalinkInput);
+    siteSelect.on('change', updatePermalinkInput);
 
     titleInput.on('change keyup', debounce(updateSlugPlaceholder, 300));
   });

data/app/assets/javascripts/pageflow/dist/ui.js

@@ -1,5 +1,5 @@
 this.pageflow = this.pageflow || {};
-this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, Backbone, ChildViewContainer, IScroll, jquery_minicolors, wysihtml5, Cocktail) {
+this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, Backbone, ChildViewContainer, IScroll, jquery_minicolors, wysihtml5, jqueryUi, Cocktail) {
   'use strict';
 
   Marionette = Marionette && Marionette.hasOwnProperty('default') ? Marionette['default'] : Marionette;
@@ -1067,6 +1067,107 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
     }
   });
 
+  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.
@@ -1196,7 +1297,7 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
    * @mixin
    */
 
-  var inputView = {
+  var inputView = _objectSpread2(_objectSpread2({}, attributeBinding), {}, {
     ui: {
       label: 'label',
       labelText: 'label .name',
@@ -1240,8 +1341,8 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
       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);
     },
 
     /**
@@ -1290,7 +1391,7 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
       }
     },
     isDisabled: function isDisabled() {
-      return this.getAttributeBoundOption('disabled');
+      return this.getBooleanAttributBoundOption('disabled');
     },
     updateDisabled: function updateDisabled() {
       this.$el.toggleClass('input-disabled', !!this.isDisabled());
@@ -1308,46 +1409,9 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
       }
     },
     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 = '';
@@ -1466,6 +1530,125 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
     }
   });
 
+  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.
    *
@@ -1676,11 +1859,15 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
       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);
@@ -1709,7 +1896,10 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
       }
     },
     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() {
@@ -2292,21 +2482,6 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
     }
   });
 
-  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';
@@ -2573,6 +2748,25 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
    *
    * @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
    */
 
@@ -2585,15 +2779,27 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
       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);
@@ -2604,11 +2810,15 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
         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;
@@ -2619,7 +2829,18 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
         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);
     }
   });
 
@@ -3013,7 +3234,10 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
       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) {
@@ -3082,6 +3306,7 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
   exports.IconTableCellView = IconTableCellView;
   exports.JsonInputView = JsonInputView;
   exports.LabelOnlyView = LabelOnlyView;
+  exports.NumberInputView = NumberInputView;
   exports.Object = BaseObject;
   exports.PresenceTableCellView = PresenceTableCellView;
   exports.ProxyUrlInputView = ProxyUrlInputView;
@@ -3100,6 +3325,7 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
   exports.TooltipView = TooltipView;
   exports.UrlDisplayView = UrlDisplayView;
   exports.UrlInputView = UrlInputView;
+  exports.attributeBinding = attributeBinding;
   exports.cssModulesUtils = cssModulesUtils;
   exports.i18nUtils = i18nUtils;
   exports.inputView = inputView;
@@ -3111,4 +3337,4 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
 
   return exports;
 
-}({}, Backbone.Marionette, _, jQuery, I18n, Backbone, Backbone.ChildViewContainer, IScroll, jQuery, wysihtml5, Cocktail));
+}({}, Backbone.Marionette, _, jQuery, I18n, Backbone, Backbone.ChildViewContainer, IScroll, jQuery, wysihtml5, jQuery, Cocktail));

data/app/assets/stylesheets/pageflow/admin/permalink_input.scss

@@ -62,4 +62,14 @@ $pageflow-permalink-input-directory-background-position: null !default;
     padding-left: 0;
     flex: 1;
   }
+
+  &.no_directories {
+    select {
+      display: none;
+    }
+
+    input {
+      padding-left: $pageflow-permalink-input-directory-padding-left;
+    }
+  }
 }

data/app/assets/stylesheets/pageflow/editor/drop_down_button.scss

@@ -10,6 +10,11 @@
     @include icon-only-button;
   }
 
+  > button.ellipsis_icon {
+    @include fa-ellipsis-v-icon;
+    width: 31px;
+  }
+
   &.full_width {
     width: 100%;
 
@@ -26,7 +31,7 @@
   @include transition(visibility 100ms, opacity 100ms);
 
   position: absolute;
-  z-index: 1;
+  z-index: 6;
   padding: 1px;
   border: solid 1px var(--ui-on-surface-color-lighter);
   border-radius: rounded(sm);

data/app/assets/stylesheets/pageflow/editor/file_thumbnails.scss

@@ -15,6 +15,10 @@
       @include note-icon;
     }
 
+    &.other {
+      @include fa-cloud-download-icon;
+    }
+
     &.uploading {
       @include up-bold-icon;
     }

data/app/assets/stylesheets/pageflow/editor/help.scss

@@ -162,11 +162,11 @@
 }
 
 .editor .help_button {
-  @include background-icon-right($color: var(--ui-primary-color),
-                                 $font-size: 16px, $right: 5px, $top: 5px);
+  @include background-icon-left($color: var(--ui-primary-color),
+                                $font-size: 16px, $left: 5px, $top: 50%);
   @include help-circled-icon;
 
-  padding: 7px 30px 0 5px;
+  padding: 7px 5px 0 28px;
   float: right;
   height: 20px;
   cursor: pointer;

data/app/assets/stylesheets/pageflow/editor/info_box.scss

@@ -3,6 +3,13 @@
     margin-bottom: 1em;
   }
 
+  &.error {
+    color: var(--ui-on-error-surface-color);
+    background-color: var(--ui-error-surface-color);
+    border-radius: rounded();
+    padding: space(3);
+  }
+
   .shortcuts {
     dt {
       display: block;

data/app/assets/stylesheets/pageflow/editor/inputs/file_input.scss

@@ -38,11 +38,6 @@
   }
 
   .drop_down_button {
-    button {
-      @include fa-ellipsis-v-icon;
-      width: 31px;
-    }
-
     position: absolute;
     bottom: 0;
     left: 70px;