udongo 6.3.2 → 6.4.0

data/config/locales/nl_backend.yml

@@ -47,6 +47,8 @@ nl:
     general: Algemeen
     house_number: Huisnummer
     html_content: HTML inhoud
+    image_collection: Afbeeldingsgroep
+    image_collections: Afbeeldingsgroepen
     image: Afbeelding
     images: Afbeeldingen
     last_changed_at: Laatst gewijzigd op
@@ -81,6 +83,7 @@ nl:
     sent_at: Verzonden op
     settings: Instellingen
     size: Grootte
+    slideshow: Slideshow
     snippet: Snippet
     snippets: Snippets
     source: Bron
@@ -118,6 +121,7 @@ nl:
         form: Formulier
         image: Afbeelding (niet meer gebruiken!)
         picture: Foto
+        slideshow: Slideshow
         text: Tekst
         video: Video
       deleted: '%{actor} werd verwijderd.'
@@ -133,17 +137,14 @@ nl:
         align_vertical_bottom: Vertikaal onderaan uitlijnen
         align_vertical_center: Vertikaal centreren
         align_vertical_top: Vertikaal bovenaan uitlijnen
-        edit_column: Kolom bewerken
-        edit_form: Formulier bewerken
-        edit_image: Afbeelding bewerken
-        edit_picture: Foto bewerken
-        edit_text: Tekst bewerken
-        edit_video: Video bewerken
         explanation: Met deze module kan je flexibele, responsive inhoud toevoegen. Klik op onderstaande knop om een eerste rij toe te voegen.
         full_width: Volledige breedte
+        margin_explanation: Marge is de witruimte boven en onder je rij.
         no_form_present: Er werd nog geen formulier gelinkt.
         no_picture_present: Er werd nog geen foto geüpload of gelinkt.
+        no_slideshow_present: Er werd nog geen slideshow geconfigureerd.
         no_video_present: Er werd nog geen geldige URL voor een video opgegeven.
+        padding_explanation: Padding is de witruimte boven en onder binnenin je rij.
         width_explanation: Voor de flexibele inhoud wordt er gebruikt gemaakt van een grid layout. Deze werkt met rijen en kolommen. Iedere rij kan maximaal 12 kolommen bevatten. Daarom dat de breedte uitgedrukt is in een breuk op 12.
       forgot_password: Wachtwoord vergeten?
       form_fields:

data/config/locales/nl_forms.yml

@@ -24,6 +24,7 @@ nl:
         description: Beschrijving
         disabled: Uitgeschakeld
         email: E-mail
+        external_reference: Externe referentie
         extra: Extra
         field_type: Veldtype
         first_name: Voornaam
@@ -67,6 +68,18 @@ nl:
         width_lg: Breedte (large)
         width_xl: Breedte (extra large)
 
+      content_row:
+        background_color: Achtergrondkleur
+        margin_bottom: Marge onderaan
+        margin_top: Marge bovenaan
+        padding_bottom: Padding onderaan
+        padding_top: Padding bovenaan
+
+      content_slideshow:
+        autoplay: Automatisch afspelen
+        image_collection_id: Afbeeldingsgroep
+        slide_interval: Interval tussen slides
+
       email_template:
         from_email: E-mail adres afzender
         from_name: Naam afzender

data/config/routes.rb

@@ -41,6 +41,12 @@ Rails.application.routes.draw do
       end
     end
 
+    resources :image_collections do
+      resources :images, only: [:index], controller: 'image_collections/images' do
+        concerns :positionable
+      end
+    end
+
     resources :articles, except: [:show] do
       concerns :translatable
 
@@ -80,7 +86,7 @@ Rails.application.routes.draw do
     end
 
     namespace :content do
-      resources :rows, only: [:index, :new, :destroy] do
+      resources :rows, only: [:index, :new, :edit, :update, :destroy] do
         member do
           get :horizontal_alignment, :vertical_alignment, :toggle_full_width
         end

data/db/migrate/20170615113617_create_asset_collections.rb

@@ -0,0 +1,12 @@
+class CreateAssetCollections < ActiveRecord::Migration[5.0]
+  def change
+    create_table :asset_collections do |t|
+      t.string :identifier
+      t.text :description
+
+      t.timestamps
+    end
+
+    add_index :asset_collections, :identifier
+  end
+end

data/db/migrate/20170615120716_rename_asset_collection_to_image_collection.rb

@@ -0,0 +1,5 @@
+class RenameAssetCollectionToImageCollection < ActiveRecord::Migration[5.0]
+  def change
+    rename_table :asset_collections, :image_collections
+  end
+end

data/db/migrate/20170615131909_create_content_slideshows.rb

@@ -0,0 +1,11 @@
+class CreateContentSlideshows < ActiveRecord::Migration[5.0]
+  def change
+    create_table :content_slideshows do |t|
+      t.references :image_collection
+      t.boolean :autoplay
+      t.integer :slide_interval
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20170615184855_add_content_row_margin_padding_and_bg_color.rb

@@ -0,0 +1,9 @@
+class AddContentRowMarginPaddingAndBgColor < ActiveRecord::Migration[5.0]
+  def change
+    add_column :content_rows, :background_color, :string, after: 'vertical_alignment'
+    add_column :content_rows, :padding_top, :integer, after: 'background_color'
+    add_column :content_rows, :padding_bottom, :integer, after: 'padding_top'
+    add_column :content_rows, :margin_top, :integer, after: 'padding_bottom'
+    add_column :content_rows, :margin_bottom, :integer, after: 'margin_top'
+  end
+end

data/db/migrate/20170616114757_add_external_ref_to_form_field.rb

@@ -0,0 +1,6 @@
+class AddExternalRefToFormField < ActiveRecord::Migration[5.0]
+  def change
+    add_column :form_fields, :external_reference, :string, after: 'email'
+    add_index :form_fields, :external_reference
+  end
+end

data/lib/udongo/bogus_model.rb

@@ -0,0 +1,34 @@
+# This class was made to help test class agnostic engine functionality that
+# requires model interfaces to work.
+#
+# An example would be tests for polymorphic associations:
+#   foo = Udongo::BogusModel.new(id: 37, description: 'foobar', hidden?: false)
+#   create(:search_index, searchable: foo, locale: 'nl')
+class Udongo::BogusModel < OpenStruct
+  attr_reader :id
+
+  def self.base_class
+    self.class
+  end
+
+  def self.primary_key
+    :id
+  end
+
+  def _read_attribute(attribute)
+    nil
+  end
+
+  def id
+    @id = rand(1..1000) unless @id
+    @id
+  end
+
+  def destroyed?
+    false
+  end
+
+  def new_record?
+    false
+  end
+end

data/lib/udongo/configs/flexible_content.rb

@@ -6,7 +6,7 @@ module Udongo
       BREAKPOINTS = %w(xs sm md lg xl)
       DEFAULT_BREAKPOINT = 'md'
 
-      attribute :types, Array, default: %w(text picture video form image)
+      attribute :types, Array, default: %w(text picture video slideshow form image)
       attribute :picture_caption_editor, Axiom::Types::Boolean, default: false
 
       def picture_caption_editor?

data/lib/udongo/search/result_objects/base.rb

@@ -36,7 +36,7 @@ module Udongo
         end
 
         def hidden?
-          searchable.respond_to?(:visible) && searchable.hidden?
+          searchable.respond_to?(:visible?) && searchable.hidden?
         end
 
         def label

data/lib/udongo/version.rb

@@ -1,3 +1,3 @@
 module Udongo
-  VERSION = '6.3.2'
+  VERSION = '6.4.0'
 end

data/spec/factories/content_slideshows.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :content_slideshow do
+    image_collection
+  end
+end

data/spec/factories/image_collections.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :image_collection do
+    description 'foo'
+    sequence(:identifier) { |n| "foo-#{n}" }
+  end
+end

data/vendor/assets/javascripts/backend/lity.js

@@ -0,0 +1,637 @@
+/*! Lity - v2.2.2 - 2016-12-14
+* http://sorgalla.com/lity/
+* Copyright (c) 2015-2016 Jan Sorgalla; Licensed MIT */
+(function(window, factory) {
+    if (typeof define === 'function' && define.amd) {
+        define(['jquery'], function($) {
+            return factory(window, $);
+        });
+    } else if (typeof module === 'object' && typeof module.exports === 'object') {
+        module.exports = factory(window, require('jquery'));
+    } else {
+        window.lity = factory(window, window.jQuery || window.Zepto);
+    }
+}(typeof window !== "undefined" ? window : this, function(window, $) {
+    'use strict';
+
+    var document = window.document;
+
+    var _win = $(window);
+    var _deferred = $.Deferred;
+    var _html = $('html');
+    var _instances = [];
+
+    var _attrAriaHidden = 'aria-hidden';
+    var _dataAriaHidden = 'lity-' + _attrAriaHidden;
+
+    var _focusableElementsSelector = 'a[href],area[href],input:not([disabled]),select:not([disabled]),textarea:not([disabled]),button:not([disabled]),iframe,object,embed,[contenteditable],[tabindex]:not([tabindex^="-"])';
+
+    var _defaultOptions = {
+        handler: null,
+        handlers: {
+            image: imageHandler,
+            inline: inlineHandler,
+            youtube: youtubeHandler,
+            vimeo: vimeoHandler,
+            googlemaps: googlemapsHandler,
+            facebookvideo: facebookvideoHandler,
+            iframe: iframeHandler
+        },
+        template: '<div class="lity" role="dialog" aria-label="Dialog Window (Press escape to close)" tabindex="-1"><div class="lity-wrap" data-lity-close role="document"><div class="lity-loader" aria-hidden="true">Loading...</div><div class="lity-container"><div class="lity-content"></div><button class="lity-close" type="button" aria-label="Close (Press escape to close)" data-lity-close>&times;</button></div></div></div>'
+    };
+
+    var _imageRegexp = /(^data:image\/)|(\.(png|jpe?g|gif|svg|webp|bmp|ico|tiff?)(\?\S*)?$)/i;
+    var _youtubeRegex = /(youtube(-nocookie)?\.com|youtu\.be)\/(watch\?v=|v\/|u\/|embed\/?)?([\w-]{11})(.*)?/i;
+    var _vimeoRegex =  /(vimeo(pro)?.com)\/(?:[^\d]+)?(\d+)\??(.*)?$/;
+    var _googlemapsRegex = /((maps|www)\.)?google\.([^\/\?]+)\/?((maps\/?)?\?)(.*)/i;
+    var _facebookvideoRegex = /(facebook\.com)\/([a-z0-9_-]*)\/videos\/([0-9]*)(.*)?$/i;
+
+    var _transitionEndEvent = (function() {
+        var el = document.createElement('div');
+
+        var transEndEventNames = {
+            WebkitTransition: 'webkitTransitionEnd',
+            MozTransition: 'transitionend',
+            OTransition: 'oTransitionEnd otransitionend',
+            transition: 'transitionend'
+        };
+
+        for (var name in transEndEventNames) {
+            if (el.style[name] !== undefined) {
+                return transEndEventNames[name];
+            }
+        }
+
+        return false;
+    })();
+
+    function transitionEnd(element) {
+        var deferred = _deferred();
+
+        if (!_transitionEndEvent || !element.length) {
+            deferred.resolve();
+        } else {
+            element.one(_transitionEndEvent, deferred.resolve);
+            setTimeout(deferred.resolve, 500);
+        }
+
+        return deferred.promise();
+    }
+
+    function settings(currSettings, key, value) {
+        if (arguments.length === 1) {
+            return $.extend({}, currSettings);
+        }
+
+        if (typeof key === 'string') {
+            if (typeof value === 'undefined') {
+                return typeof currSettings[key] === 'undefined'
+                    ? null
+                    : currSettings[key];
+            }
+
+            currSettings[key] = value;
+        } else {
+            $.extend(currSettings, key);
+        }
+
+        return this;
+    }
+
+    function parseQueryParams(params) {
+        var pairs = decodeURI(params.split('#')[0]).split('&');
+        var obj = {}, p;
+
+        for (var i = 0, n = pairs.length; i < n; i++) {
+            if (!pairs[i]) {
+                continue;
+            }
+
+            p = pairs[i].split('=');
+            obj[p[0]] = p[1];
+        }
+
+        return obj;
+    }
+
+    function appendQueryParams(url, params) {
+        return url + (url.indexOf('?') > -1 ? '&' : '?') + $.param(params);
+    }
+
+    function transferHash(originalUrl, newUrl) {
+        var pos = originalUrl.indexOf('#');
+
+        if (-1 === pos) {
+            return newUrl;
+        }
+
+        if (pos > 0) {
+            originalUrl = originalUrl.substr(pos);
+        }
+
+        return newUrl + originalUrl;
+    }
+
+    function error(msg) {
+        return $('<span class="lity-error"/>').append(msg);
+    }
+
+    function imageHandler(target, instance) {
+        var desc = (instance.opener() && instance.opener().data('lity-desc')) || 'Image with no description';
+        var img = $('<img src="' + target + '" alt="' + desc + '"/>');
+        var deferred = _deferred();
+        var failed = function() {
+            deferred.reject(error('Failed loading image'));
+        };
+
+        img
+            .on('load', function() {
+                if (this.naturalWidth === 0) {
+                    return failed();
+                }
+
+                deferred.resolve(img);
+            })
+            .on('error', failed)
+        ;
+
+        return deferred.promise();
+    }
+
+    imageHandler.test = function(target) {
+        return _imageRegexp.test(target);
+    };
+
+    function inlineHandler(target, instance) {
+        var el, placeholder, hasHideClass;
+
+        try {
+            el = $(target);
+        } catch (e) {
+            return false;
+        }
+
+        if (!el.length) {
+            return false;
+        }
+
+        placeholder = $('<i style="display:none !important"/>');
+        hasHideClass = el.hasClass('lity-hide');
+
+        instance
+            .element()
+            .one('lity:remove', function() {
+                placeholder
+                    .before(el)
+                    .remove()
+                ;
+
+                if (hasHideClass && !el.closest('.lity-content').length) {
+                    el.addClass('lity-hide');
+                }
+            })
+        ;
+
+        return el
+            .removeClass('lity-hide')
+            .after(placeholder)
+        ;
+    }
+
+    function youtubeHandler(target) {
+        var matches = _youtubeRegex.exec(target);
+
+        if (!matches) {
+            return false;
+        }
+
+        return iframeHandler(
+            transferHash(
+                target,
+                appendQueryParams(
+                    'https://www.youtube' + (matches[2] || '') + '.com/embed/' + matches[4],
+                    $.extend(
+                        {
+                            autoplay: 1
+                        },
+                        parseQueryParams(matches[5] || '')
+                    )
+                )
+            )
+        );
+    }
+
+    function vimeoHandler(target) {
+        var matches = _vimeoRegex.exec(target);
+
+        if (!matches) {
+            return false;
+        }
+
+        return iframeHandler(
+            transferHash(
+                target,
+                appendQueryParams(
+                    'https://player.vimeo.com/video/' + matches[3],
+                    $.extend(
+                        {
+                            autoplay: 1
+                        },
+                        parseQueryParams(matches[4] || '')
+                    )
+                )
+            )
+        );
+    }
+
+    function facebookvideoHandler(target) {
+        var matches = _facebookvideoRegex.exec(target);
+
+        if (!matches) {
+            return false;
+        }
+
+        if (0 !== target.indexOf('http')) {
+            target = 'https:' + target;
+        }
+
+        return iframeHandler(
+            transferHash(
+                target,
+                appendQueryParams(
+                    'https://www.facebook.com/plugins/video.php?href=' + target,
+                    $.extend(
+                        {
+                            autoplay: 1
+                        },
+                        parseQueryParams(matches[4] || '')
+                    )
+                )
+            )
+        );
+    }
+
+    function googlemapsHandler(target) {
+        var matches = _googlemapsRegex.exec(target);
+
+        if (!matches) {
+            return false;
+        }
+
+        return iframeHandler(
+            transferHash(
+                target,
+                appendQueryParams(
+                    'https://www.google.' + matches[3] + '/maps?' + matches[6],
+                    {
+                        output: matches[6].indexOf('layer=c') > 0 ? 'svembed' : 'embed'
+                    }
+                )
+            )
+        );
+    }
+
+    function iframeHandler(target) {
+        return '<div class="lity-iframe-container"><iframe frameborder="0" allowfullscreen src="' + target + '"/></div>';
+    }
+
+    function winHeight() {
+        return document.documentElement.clientHeight
+            ? document.documentElement.clientHeight
+            : Math.round(_win.height());
+    }
+
+    function keydown(e) {
+        var current = currentInstance();
+
+        if (!current) {
+            return;
+        }
+
+        // ESC key
+        if (e.keyCode === 27) {
+            current.close();
+        }
+
+        // TAB key
+        if (e.keyCode === 9) {
+            handleTabKey(e, current);
+        }
+    }
+
+    function handleTabKey(e, instance) {
+        var focusableElements = instance.element().find(_focusableElementsSelector);
+        var focusedIndex = focusableElements.index(document.activeElement);
+
+        if (e.shiftKey && focusedIndex <= 0) {
+            focusableElements.get(focusableElements.length - 1).focus();
+            e.preventDefault();
+        } else if (!e.shiftKey && focusedIndex === focusableElements.length - 1) {
+            focusableElements.get(0).focus();
+            e.preventDefault();
+        }
+    }
+
+    function resize() {
+        $.each(_instances, function(i, instance) {
+            instance.resize();
+        });
+    }
+
+    function registerInstance(instanceToRegister) {
+        if (1 === _instances.unshift(instanceToRegister)) {
+            _html.addClass('lity-active');
+
+            _win
+                .on({
+                    resize: resize,
+                    keydown: keydown
+                })
+            ;
+        }
+
+        $('body > *').not(instanceToRegister.element())
+            .addClass('lity-hidden')
+            .each(function() {
+                var el = $(this);
+
+                if (undefined !== el.data(_dataAriaHidden)) {
+                    return;
+                }
+
+                el.data(_dataAriaHidden, el.attr(_attrAriaHidden) || null);
+            })
+            .attr(_attrAriaHidden, 'true')
+        ;
+    }
+
+    function removeInstance(instanceToRemove) {
+        var show;
+
+        instanceToRemove
+            .element()
+            .attr(_attrAriaHidden, 'true')
+        ;
+
+        if (1 === _instances.length) {
+            _html.removeClass('lity-active');
+
+            _win
+                .off({
+                    resize: resize,
+                    keydown: keydown
+                })
+            ;
+        }
+
+        _instances = $.grep(_instances, function(instance) {
+            return instanceToRemove !== instance;
+        });
+
+        if (!!_instances.length) {
+            show = _instances[0].element();
+        } else {
+            show = $('.lity-hidden');
+        }
+
+        show
+            .removeClass('lity-hidden')
+            .each(function() {
+                var el = $(this), oldAttr = el.data(_dataAriaHidden);
+
+                if (!oldAttr) {
+                    el.removeAttr(_attrAriaHidden);
+                } else {
+                    el.attr(_attrAriaHidden, oldAttr);
+                }
+
+                el.removeData(_dataAriaHidden);
+            })
+        ;
+    }
+
+    function currentInstance() {
+        if (0 === _instances.length) {
+            return null;
+        }
+
+        return _instances[0];
+    }
+
+    function factory(target, instance, handlers, preferredHandler) {
+        var handler = 'inline', content;
+
+        var currentHandlers = $.extend({}, handlers);
+
+        if (preferredHandler && currentHandlers[preferredHandler]) {
+            content = currentHandlers[preferredHandler](target, instance);
+            handler = preferredHandler;
+        } else {
+            // Run inline and iframe handlers after all other handlers
+            $.each(['inline', 'iframe'], function(i, name) {
+                delete currentHandlers[name];
+
+                currentHandlers[name] = handlers[name];
+            });
+
+            $.each(currentHandlers, function(name, currentHandler) {
+                // Handler might be "removed" by setting callback to null
+                if (!currentHandler) {
+                    return true;
+                }
+
+                if (
+                    currentHandler.test &&
+                    !currentHandler.test(target, instance)
+                ) {
+                    return true;
+                }
+
+                content = currentHandler(target, instance);
+
+                if (false !== content) {
+                    handler = name;
+                    return false;
+                }
+            });
+        }
+
+        return {handler: handler, content: content || ''};
+    }
+
+    function Lity(target, options, opener, activeElement) {
+        var self = this;
+        var result;
+        var isReady = false;
+        var isClosed = false;
+        var element;
+        var content;
+
+        options = $.extend(
+            {},
+            _defaultOptions,
+            options
+        );
+
+        element = $(options.template);
+
+        // -- API --
+
+        self.element = function() {
+            return element;
+        };
+
+        self.opener = function() {
+            return opener;
+        };
+
+        self.options  = $.proxy(settings, self, options);
+        self.handlers = $.proxy(settings, self, options.handlers);
+
+        self.resize = function() {
+            if (!isReady || isClosed) {
+                return;
+            }
+
+            content
+                .css('max-height', winHeight() + 'px')
+                .trigger('lity:resize', [self])
+            ;
+        };
+
+        self.close = function() {
+            if (!isReady || isClosed) {
+                return;
+            }
+
+            isClosed = true;
+
+            removeInstance(self);
+
+            var deferred = _deferred();
+
+            // We return focus only if the current focus is inside this instance
+            if (
+                activeElement &&
+                (
+                    document.activeElement === element[0] ||
+                    $.contains(element[0], document.activeElement)
+                )
+            ) {
+                try {
+                    activeElement.focus();
+                } catch (e) {
+                    // Ignore exceptions, eg. for SVG elements which can't be
+                    // focused in IE11
+                }
+            }
+
+            content.trigger('lity:close', [self]);
+
+            element
+                .removeClass('lity-opened')
+                .addClass('lity-closed')
+            ;
+
+            transitionEnd(content.add(element))
+                .always(function() {
+                    content.trigger('lity:remove', [self]);
+                    element.remove();
+                    element = undefined;
+                    deferred.resolve();
+                })
+            ;
+
+            return deferred.promise();
+        };
+
+        // -- Initialization --
+
+        result = factory(target, self, options.handlers, options.handler);
+
+        element
+            .attr(_attrAriaHidden, 'false')
+            .addClass('lity-loading lity-opened lity-' + result.handler)
+            .appendTo('body')
+            .focus()
+            .on('click', '[data-lity-close]', function(e) {
+                if ($(e.target).is('[data-lity-close]')) {
+                    self.close();
+                }
+            })
+            .trigger('lity:open', [self])
+        ;
+
+        registerInstance(self);
+
+        $.when(result.content)
+            .always(ready)
+        ;
+
+        function ready(result) {
+            content = $(result)
+                .css('max-height', winHeight() + 'px')
+            ;
+
+            element
+                .find('.lity-loader')
+                .each(function() {
+                    var loader = $(this);
+
+                    transitionEnd(loader)
+                        .always(function() {
+                            loader.remove();
+                        })
+                    ;
+                })
+            ;
+
+            element
+                .removeClass('lity-loading')
+                .find('.lity-content')
+                .empty()
+                .append(content)
+            ;
+
+            isReady = true;
+
+            content
+                .trigger('lity:ready', [self])
+            ;
+        }
+    }
+
+    function lity(target, options, opener) {
+        if (!target.preventDefault) {
+            opener = $(opener);
+        } else {
+            target.preventDefault();
+            opener = $(this);
+            target = opener.data('lity-target') || opener.attr('href') || opener.attr('src');
+        }
+
+        var instance = new Lity(
+            target,
+            $.extend(
+                {},
+                opener.data('lity-options') || opener.data('lity'),
+                options
+            ),
+            opener,
+            document.activeElement
+        );
+
+        if (!target.preventDefault) {
+            return instance;
+        }
+    }
+
+    lity.version  = '2.2.2';
+    lity.options  = $.proxy(settings, lity, _defaultOptions);
+    lity.handlers = $.proxy(settings, lity, _defaultOptions.handlers);
+    lity.current  = currentInstance;
+
+    $(document).on('click.lity', '[data-lity]', lity);
+
+    return lity;
+}));