mignified assets for prod

new colors
date is now good
2018-04-24 13:53:09 +02:00 · 2018-04-24 13:52:16 +02:00 · 2018-04-24 13:49:46 +02:00 · 2018-04-23 23:35:26 +02:00 · 2018-04-23 22:38:02 +02:00 · 2018-04-23 21:33:41 +02:00
116 changed files with 2818 additions and 8784 deletions
@@ -554,16 +554,16 @@
        },
        {
            "name": "consolidation/robo",
-            "version": "1.2.2",
+            "version": "1.2.3",
            "source": {
                "type": "git",
                "url": "https://github.com/consolidation/Robo.git",
-                "reference": "9ef2724f72feb017517a755564516dbde99e15e4"
+                "reference": "54a13e268917b92576d75e10dca8227b95a574d9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/Robo/zipball/9ef2724f72feb017517a755564516dbde99e15e4",
-                "reference": "9ef2724f72feb017517a755564516dbde99e15e4",
+                "url": "https://api.github.com/repos/consolidation/Robo/zipball/54a13e268917b92576d75e10dca8227b95a574d9",
+                "reference": "54a13e268917b92576d75e10dca8227b95a574d9",
                "shasum": ""
            },
            "require": {
@@ -587,9 +587,11 @@
                "codeception/aspect-mock": "^1|^2.1.1",
                "codeception/base": "^2.3.7",
                "codeception/verify": "^0.3.2",
+                "g-1-a/composer-test-scenarios": "^2",
                "goaop/framework": "~2.1.2",
-                "greg-1-anderson/composer-test-scenarios": "^1",
+                "goaop/parser-reflection": "^1.1.0",
                "natxet/cssmin": "3.0.4",
+                "nikic/php-parser": "^3.1.5",
                "patchwork/jsqueeze": "~2",
                "pear/archive_tar": "^1.4.2",
                "phpunit/php-code-coverage": "~2|~4",
@@ -628,7 +630,7 @@
                }
            ],
            "description": "Modern task runner",
-            "time": "2018-02-28T01:03:54+00:00"
+            "time": "2018-04-06T05:27:37+00:00"
        },
        {
            "name": "container-interop/container-interop",
@@ -1522,16 +1524,16 @@
        },
        {
            "name": "drupal/core",
-            "version": "8.5.1",
+            "version": "8.5.2",
            "source": {
                "type": "git",
                "url": "https://github.com/drupal/core.git",
-                "reference": "2aeca7dfa2661296602ac16bf9fd6085f0a121be"
+                "reference": "bc21760d4be4ad117851809183c8d18880ab275a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core/zipball/2aeca7dfa2661296602ac16bf9fd6085f0a121be",
-                "reference": "2aeca7dfa2661296602ac16bf9fd6085f0a121be",
+                "url": "https://api.github.com/repos/drupal/core/zipball/bc21760d4be4ad117851809183c8d18880ab275a",
+                "reference": "bc21760d4be4ad117851809183c8d18880ab275a",
                "shasum": ""
            },
            "require": {
@@ -1753,7 +1755,7 @@
                "GPL-2.0-or-later"
            ],
            "description": "Drupal is an open source content management platform powering millions of websites and applications.",
-            "time": "2018-03-27T09:58:42+00:00"
+            "time": "2018-04-18T17:00:56+00:00"
        },
        {
            "name": "drush/drush",
@@ -2067,16 +2069,16 @@
        },
        {
            "name": "guzzlehttp/guzzle",
-            "version": "6.3.2",
+            "version": "6.3.3",
            "source": {
                "type": "git",
                "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "68d0ea14d5a3f42a20e87632a5f84931e2709c90"
+                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/68d0ea14d5a3f42a20e87632a5f84931e2709c90",
-                "reference": "68d0ea14d5a3f42a20e87632a5f84931e2709c90",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
+                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
                "shasum": ""
            },
            "require": {
@@ -2086,7 +2088,7 @@
            },
            "require-dev": {
                "ext-curl": "*",
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4",
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
                "psr/log": "^1.0"
            },
            "suggest": {
@@ -2128,7 +2130,7 @@
                "rest",
                "web service"
            ],
-            "time": "2018-03-26T16:33:04+00:00"
+            "time": "2018-04-22T15:46:56+00:00"
        },
        {
            "name": "guzzlehttp/promises",
@@ -2465,24 +2467,24 @@
        },
        {
            "name": "nikic/php-parser",
-            "version": "v3.1.5",
+            "version": "v4.0.1",
            "source": {
                "type": "git",
                "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "bb87e28e7d7b8d9a7fda231d37457c9210faf6ce"
+                "reference": "e4a54fa90a5cd8e8dd3fb4099942681731c5cdd3"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/bb87e28e7d7b8d9a7fda231d37457c9210faf6ce",
-                "reference": "bb87e28e7d7b8d9a7fda231d37457c9210faf6ce",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/e4a54fa90a5cd8e8dd3fb4099942681731c5cdd3",
+                "reference": "e4a54fa90a5cd8e8dd3fb4099942681731c5cdd3",
                "shasum": ""
            },
            "require": {
                "ext-tokenizer": "*",
-                "php": ">=5.5"
+                "php": ">=7.0"
            },
            "require-dev": {
-                "phpunit/phpunit": "~4.0|~5.0"
+                "phpunit/phpunit": "^6.5 || ^7.0"
            },
            "bin": [
                "bin/php-parse"
@@ -2490,7 +2492,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "4.0-dev"
                }
            },
            "autoload": {
@@ -2512,20 +2514,20 @@
                "parser",
                "php"
            ],
-            "time": "2018-02-28T20:30:58+00:00"
+            "time": "2018-03-25T17:35:16+00:00"
        },
        {
            "name": "paragonie/random_compat",
-            "version": "v2.0.11",
+            "version": "v2.0.12",
            "source": {
                "type": "git",
                "url": "https://github.com/paragonie/random_compat.git",
-                "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8"
+                "reference": "258c89a6b97de7dfaf5b8c7607d0478e236b04fb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/5da4d3c796c275c55f057af5a643ae297d96b4d8",
-                "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/258c89a6b97de7dfaf5b8c7607d0478e236b04fb",
+                "reference": "258c89a6b97de7dfaf5b8c7607d0478e236b04fb",
                "shasum": ""
            },
            "require": {
@@ -2560,7 +2562,7 @@
                "pseudorandom",
                "random"
            ],
-            "time": "2017-09-27T21:40:39+00:00"
+            "time": "2018-04-04T21:24:14+00:00"
        },
        {
            "name": "psr/container",
@@ -2710,29 +2712,29 @@
        },
        {
            "name": "psy/psysh",
-            "version": "v0.8.18",
+            "version": "v0.9.3",
            "source": {
                "type": "git",
                "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "5357b1cffc8fb375d6a9e3c86d5c82dd38a40834"
+                "reference": "79c280013cf0b30fa23f3ba8bd3649218075adf4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/5357b1cffc8fb375d6a9e3c86d5c82dd38a40834",
-                "reference": "5357b1cffc8fb375d6a9e3c86d5c82dd38a40834",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/79c280013cf0b30fa23f3ba8bd3649218075adf4",
+                "reference": "79c280013cf0b30fa23f3ba8bd3649218075adf4",
                "shasum": ""
            },
            "require": {
                "dnoegel/php-xdg-base-dir": "0.1",
                "jakub-onderka/php-console-highlighter": "0.3.*",
-                "nikic/php-parser": "~1.3|~2.0|~3.0",
-                "php": ">=5.3.9",
+                "nikic/php-parser": "~1.3|~2.0|~3.0|~4.0",
+                "php": ">=5.4.0",
                "symfony/console": "~2.3.10|^2.4.2|~3.0|~4.0",
                "symfony/var-dumper": "~2.7|~3.0|~4.0"
            },
            "require-dev": {
-                "hoa/console": "~3.16|~1.14",
-                "phpunit/phpunit": "^4.8.35|^5.4.3",
+                "hoa/console": "~2.15|~3.16",
+                "phpunit/phpunit": "~4.8.35|~5.0|~6.0|~7.0",
                "symfony/finder": "~2.1|~3.0|~4.0"
            },
            "suggest": {
@@ -2748,15 +2750,15 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-develop": "0.8.x-dev"
+                    "dev-develop": "0.9.x-dev"
                }
            },
            "autoload": {
                "files": [
-                    "src/Psy/functions.php"
+                    "src/functions.php"
                ],
                "psr-4": {
-                    "Psy\\": "src/Psy/"
+                    "Psy\\": "src/"
                }
            },
            "notification-url": "https://packagist.org/downloads/",
@@ -2778,7 +2780,7 @@
                "interactive",
                "shell"
            ],
-            "time": "2018-04-02T05:41:44+00:00"
+            "time": "2018-04-18T12:32:50+00:00"
        },
        {
            "name": "sebastian/version",
@@ -2978,7 +2980,7 @@
        },
        {
            "name": "symfony/class-loader",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/class-loader.git",
@@ -3034,7 +3036,7 @@
        },
        {
            "name": "symfony/config",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/config.git",
@@ -3097,7 +3099,7 @@
        },
        {
            "name": "symfony/console",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
@@ -3166,7 +3168,7 @@
        },
        {
            "name": "symfony/css-selector",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/css-selector.git",
@@ -3219,7 +3221,7 @@
        },
        {
            "name": "symfony/debug",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/debug.git",
@@ -3275,7 +3277,7 @@
        },
        {
            "name": "symfony/dependency-injection",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/dependency-injection.git",
@@ -3346,7 +3348,7 @@
        },
        {
            "name": "symfony/dom-crawler",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/dom-crawler.git",
@@ -3402,16 +3404,16 @@
        },
        {
            "name": "symfony/event-dispatcher",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "58990682ac3fdc1f563b7e705452921372aad11d"
+                "reference": "fdd5abcebd1061ec647089c6c41a07ed60af09f8"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/58990682ac3fdc1f563b7e705452921372aad11d",
-                "reference": "58990682ac3fdc1f563b7e705452921372aad11d",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/fdd5abcebd1061ec647089c6c41a07ed60af09f8",
+                "reference": "fdd5abcebd1061ec647089c6c41a07ed60af09f8",
                "shasum": ""
            },
            "require": {
@@ -3461,11 +3463,11 @@
            ],
            "description": "Symfony EventDispatcher Component",
            "homepage": "https://symfony.com",
-            "time": "2018-02-14T10:03:57+00:00"
+            "time": "2018-04-06T07:35:25+00:00"
        },
        {
            "name": "symfony/filesystem",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/filesystem.git",
@@ -3514,16 +3516,16 @@
        },
        {
            "name": "symfony/finder",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/finder.git",
-                "reference": "7a2e1299cc0c4162996f18e347b6356729a55317"
+                "reference": "bd14efe8b1fabc4de82bf50dce62f05f9a102433"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/7a2e1299cc0c4162996f18e347b6356729a55317",
-                "reference": "7a2e1299cc0c4162996f18e347b6356729a55317",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/bd14efe8b1fabc4de82bf50dce62f05f9a102433",
+                "reference": "bd14efe8b1fabc4de82bf50dce62f05f9a102433",
                "shasum": ""
            },
            "require": {
@@ -3559,11 +3561,11 @@
            ],
            "description": "Symfony Finder Component",
            "homepage": "https://symfony.com",
-            "time": "2018-03-28T18:23:39+00:00"
+            "time": "2018-04-04T05:07:11+00:00"
        },
        {
            "name": "symfony/http-foundation",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-foundation.git",
@@ -3617,16 +3619,16 @@
        },
        {
            "name": "symfony/http-kernel",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "43cfdad2ca1dba608662db0699c1bbb715d08191"
+                "reference": "3cc2d4374aa9590c09277ad68657671cf49dbbf4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/43cfdad2ca1dba608662db0699c1bbb715d08191",
-                "reference": "43cfdad2ca1dba608662db0699c1bbb715d08191",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/3cc2d4374aa9590c09277ad68657671cf49dbbf4",
+                "reference": "3cc2d4374aa9590c09277ad68657671cf49dbbf4",
                "shasum": ""
            },
            "require": {
@@ -3701,7 +3703,7 @@
            ],
            "description": "Symfony HttpKernel Component",
            "homepage": "https://symfony.com",
-            "time": "2018-04-03T05:49:44+00:00"
+            "time": "2018-04-06T15:19:48+00:00"
        },
        {
            "name": "symfony/polyfill-iconv",
@@ -3882,7 +3884,7 @@
        },
        {
            "name": "symfony/process",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/process.git",
@@ -3991,16 +3993,16 @@
        },
        {
            "name": "symfony/routing",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/routing.git",
-                "reference": "5f90733adbf19ea71468a5761fb8f5a043d424dd"
+                "reference": "50f333b707bef9f6972ad04e6df3ec8875c9a67c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/5f90733adbf19ea71468a5761fb8f5a043d424dd",
-                "reference": "5f90733adbf19ea71468a5761fb8f5a043d424dd",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/50f333b707bef9f6972ad04e6df3ec8875c9a67c",
+                "reference": "50f333b707bef9f6972ad04e6df3ec8875c9a67c",
                "shasum": ""
            },
            "require": {
@@ -4065,11 +4067,11 @@
                "uri",
                "url"
            ],
-            "time": "2018-03-23T08:14:09+00:00"
+            "time": "2018-04-04T13:22:16+00:00"
        },
        {
            "name": "symfony/serializer",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/serializer.git",
@@ -4147,7 +4149,7 @@
        },
        {
            "name": "symfony/translation",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/translation.git",
@@ -4215,16 +4217,16 @@
        },
        {
            "name": "symfony/validator",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/validator.git",
-                "reference": "4342b66102171b417776f0e4f8f00b20a1eddb0f"
+                "reference": "6fa41262dcbd50eedb1e841cfd97f5a1956cf2e7"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/validator/zipball/4342b66102171b417776f0e4f8f00b20a1eddb0f",
-                "reference": "4342b66102171b417776f0e4f8f00b20a1eddb0f",
+                "url": "https://api.github.com/repos/symfony/validator/zipball/6fa41262dcbd50eedb1e841cfd97f5a1956cf2e7",
+                "reference": "6fa41262dcbd50eedb1e841cfd97f5a1956cf2e7",
                "shasum": ""
            },
            "require": {
@@ -4295,20 +4297,20 @@
            ],
            "description": "Symfony Validator Component",
            "homepage": "https://symfony.com",
-            "time": "2018-04-02T09:38:44+00:00"
+            "time": "2018-04-06T07:35:25+00:00"
        },
        {
            "name": "symfony/var-dumper",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "6f502127b1bb85f7f30f8bc1fb60570a10431863"
+                "reference": "951643091b39a6fd40fce56cd16e21e12bef3feb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/6f502127b1bb85f7f30f8bc1fb60570a10431863",
-                "reference": "6f502127b1bb85f7f30f8bc1fb60570a10431863",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/951643091b39a6fd40fce56cd16e21e12bef3feb",
+                "reference": "951643091b39a6fd40fce56cd16e21e12bef3feb",
                "shasum": ""
            },
            "require": {
@@ -4364,11 +4366,11 @@
                "debug",
                "dump"
            ],
-            "time": "2018-04-03T05:22:50+00:00"
+            "time": "2018-04-03T20:34:11+00:00"
        },
        {
            "name": "symfony/yaml",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/yaml.git",
@@ -4830,16 +4832,16 @@
        },
        {
            "name": "zendframework/zend-stdlib",
-            "version": "3.1.0",
+            "version": "3.1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/zendframework/zend-stdlib.git",
-                "reference": "debedcfc373a293f9250cc9aa03cf121428c8e78"
+                "reference": "10ef03144902d1955f935fff5346ed52f7d99bcc"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/debedcfc373a293f9250cc9aa03cf121428c8e78",
-                "reference": "debedcfc373a293f9250cc9aa03cf121428c8e78",
+                "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/10ef03144902d1955f935fff5346ed52f7d99bcc",
+                "reference": "10ef03144902d1955f935fff5346ed52f7d99bcc",
                "shasum": ""
            },
            "require": {
@@ -4848,7 +4850,7 @@
            "require-dev": {
                "athletic/athletic": "~0.1",
                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "^2.6.2"
+                "zendframework/zend-coding-standard": "~1.0.0"
            },
            "type": "library",
            "extra": {
@@ -4871,7 +4873,7 @@
                "stdlib",
                "zf2"
            ],
-            "time": "2016-09-13T14:38:50+00:00"
+            "time": "2018-04-12T16:05:42+00:00"
        }
    ],
    "packages-dev": [
@@ -5766,23 +5768,23 @@
        },
        {
            "name": "phpspec/prophecy",
-            "version": "1.7.5",
+            "version": "1.7.6",
            "source": {
                "type": "git",
                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401"
+                "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/dfd6be44111a7c41c2e884a336cc4f461b3b2401",
-                "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
+                "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
                "shasum": ""
            },
            "require": {
                "doctrine/instantiator": "^1.0.2",
                "php": "^5.3|^7.0",
                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
-                "sebastian/comparator": "^1.1|^2.0",
+                "sebastian/comparator": "^1.1|^2.0|^3.0",
                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
            },
            "require-dev": {
@@ -5825,20 +5827,20 @@
                "spy",
                "stub"
            ],
-            "time": "2018-02-19T10:16:54+00:00"
+            "time": "2018-04-18T13:57:24+00:00"
        },
        {
            "name": "phpunit/php-code-coverage",
-            "version": "5.3.0",
+            "version": "5.3.2",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1"
+                "reference": "c89677919c5dd6d3b3852f230a663118762218ac"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/661f34d0bd3f1a7225ef491a70a020ad23a057a1",
-                "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c89677919c5dd6d3b3852f230a663118762218ac",
+                "reference": "c89677919c5dd6d3b3852f230a663118762218ac",
                "shasum": ""
            },
            "require": {
@@ -5888,7 +5890,7 @@
                "testing",
                "xunit"
            ],
-            "time": "2017-12-06T09:29:45+00:00"
+            "time": "2018-04-06T15:36:58+00:00"
        },
        {
            "name": "phpunit/php-file-iterator",
@@ -6078,16 +6080,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "6.5.7",
+            "version": "6.5.8",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "6bd77b57707c236833d2b57b968e403df060c9d9"
+                "reference": "4f21a3c6b97c42952fd5c2837bb354ec0199b97b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6bd77b57707c236833d2b57b968e403df060c9d9",
-                "reference": "6bd77b57707c236833d2b57b968e403df060c9d9",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4f21a3c6b97c42952fd5c2837bb354ec0199b97b",
+                "reference": "4f21a3c6b97c42952fd5c2837bb354ec0199b97b",
                "shasum": ""
            },
            "require": {
@@ -6158,7 +6160,7 @@
                "testing",
                "xunit"
            ],
-            "time": "2018-02-26T07:01:09+00:00"
+            "time": "2018-04-10T11:38:34+00:00"
        },
        {
            "name": "phpunit/phpunit-mock-objects",
@@ -6815,7 +6817,7 @@
        },
        {
            "name": "symfony/browser-kit",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/browser-kit.git",
@@ -6872,16 +6874,16 @@
        },
        {
            "name": "symfony/phpunit-bridge",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/phpunit-bridge.git",
-                "reference": "e4b72beb8961340764367a804f21044e83fc19a8"
+                "reference": "48c669ec1a2b0425d4a82c7ad4bce2f5b947b95e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/e4b72beb8961340764367a804f21044e83fc19a8",
-                "reference": "e4b72beb8961340764367a804f21044e83fc19a8",
+                "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/48c669ec1a2b0425d4a82c7ad4bce2f5b947b95e",
+                "reference": "48c669ec1a2b0425d4a82c7ad4bce2f5b947b95e",
                "shasum": ""
            },
            "require": {
@@ -6934,7 +6936,7 @@
            ],
            "description": "Symfony PHPUnit Bridge",
            "homepage": "https://symfony.com",
-            "time": "2018-03-20T23:37:33+00:00"
+            "time": "2018-04-04T15:02:59+00:00"
        },
        {
            "name": "theseer/tokenizer",
@@ -24,7 +24,7 @@ classList:

 ckeditor:
  remote: https://github.com/ckeditor/ckeditor-dev
-  version: "4.8.0"
+  version: "4.8.0+2018-04-18-security-patch"
  license:
    name: GNU-GPL-2.0-or-later
    url: https://github.com/ckeditor/ckeditor-dev/blob/4.8.0/LICENSE.md
@@ -82,7 +82,7 @@ class Drupal {
  /**
   * The current system version.
   */
-  const VERSION = '8.5.1';
+  const VERSION = '8.5.2';

  /**
   * Core API compatibility.
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
@@ -0,0 +1,12 @@
+name: 'Date range formatter'
+type: module
+description: 'Formats date ranges.'
+package: Date/Time
+# core: 8.x
+dependencies:
+  - datetime_range
+# Information added by Drupal.org packaging script on 2017-08-11
+version: '8.x-3.1'
+core: '8.x'
+project: 'date_range_formatter'
+datestamp: 1502454546
@@ -0,0 +1 @@
+<?php
@@ -0,0 +1,150 @@
+<?php
+
+namespace Drupal\date_range_formatter\Plugin\Field\FieldFormatter;
+
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\datetime\Plugin\Field\FieldFormatter\DateTimeCustomFormatter;
+use Drupal\datetime_range\DateTimeRangeTrait;
+
+/**
+ * Plugin implementation of the 'Custom' formatter for 'daterange' fields.
+ *
+ * This formatter renders the data range as plain text, with a fully
+ * configurable date format using the PHP date syntax and separator.
+ *
+ * @FieldFormatter(
+ *   id = "date_range_without_time",
+ *   label = @Translation("Date range (without time)"),
+ *   field_types = {
+ *     "daterange"
+ *   }
+ * )
+ */
+class DateRangeFormatterRangeFormatter extends DateTimeCustomFormatter {
+
+  use DateTimeRangeTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function defaultSettings() {
+    return [
+      'separator' => '-',
+      'single' => 'd F Y',
+      'single_all_day' => 'd F Y',
+      'one_day' => 'd F Y',
+      'one_month' => 'd - {d} F Y',
+      'several_months' => 'd F - {d} {F} Y',
+      'several_years' => 'd F Y - {d} {F} {Y}',
+    ] + parent::defaultSettings();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function viewElements(FieldItemListInterface $items, $langcode) {
+    $elements = [];
+
+    foreach ($items as $delta => $item) {
+      if (!empty($item->start_date) && !empty($item->end_date)) {
+        /** @var \Drupal\Core\Datetime\DrupalDateTime $start_date */
+        $start_date = $item->start_date->getTimestamp();
+        /** @var \Drupal\Core\Datetime\DrupalDateTime $end_date */
+        $end_date = $item->end_date->getTimestamp();
+        if ($start_date !== $end_date) {
+          $format = $this->getSetting('several_years');
+          if (date('Y', $start_date) === date('Y', $end_date)) {
+            $format = $this->getSetting('several_months');
+          }
+          if (date('m.Y', $start_date) === date('m.Y', $end_date)) {
+            $format = $this->getSetting('one_month');
+          }
+          if (date('d.m.Y', $start_date) === date('d.m.Y', $end_date)) {
+            $format = $this->getSetting('one_day');
+          }
+
+          $date_str = format_date($start_date, 'custom', preg_replace('/\{([a-zA-Z])\}/', '{\\\$1}', t($format)));
+          $matches = array();
+          if (preg_match_all('/\{([a-zA-Z])\}/', $date_str, $matches)) {
+            foreach ($matches[1] as $match) {
+              $date_str = preg_replace('/\{' . $match . '\}/', format_date($end_date, 'custom', $match), $date_str);
+            }
+          }
+          $elements[$delta] = ['#markup' => '<span class="date-display-range">' . $date_str . '</span>',];
+
+        }
+        else {
+          $elements[$delta] = ['#markup' => date($this->getSetting('one_day'), $start_date)];
+        }
+      }
+    }
+    return $elements;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function settingsForm(array $form, FormStateInterface $form_state) {
+    $form = parent::settingsForm($form, $form_state);
+    unset($form['date_format']);
+    $form['single'] = [
+      '#type' => 'textfield',
+      '#title' => t('Date format for single date'),
+      '#default_value' => $this->getSetting('single') ? : 'd F Y',
+    ];
+    $form['single_all_day'] = [
+      '#type' => 'textfield',
+      '#title' => t('Date format for the single date if the date is "all day"'),
+      '#default_value' => $this->getSetting('single_all_day') ? : 'd F Y',
+    ];
+    $form['one_day'] = [
+      '#type' => 'textfield',
+      '#title' => t('Date format for the single day date range'),
+      '#default_value' => $this->getSetting('one_day') ? : 'd F Y',
+    ];
+    $form['one_month'] = [
+      '#type' => 'textfield',
+      '#title' => t('Date format for the single month date range'),
+      '#default_value' => $this->getSetting('one_month') ? : 'd - {d} F Y',
+    ];
+    $form['several_months'] = [
+      '#type' => 'textfield',
+      '#title' => t('Date format for the single year date range'),
+      '#default_value' => $this->getSetting('several_months') ? : 'd F - {d} {F} Y',
+    ];
+    $form['several_years'] = [
+      '#type' => 'textfield',
+      '#title' => t('Date format for multiple years date range'),
+      '#default_value' => $this->getSetting('several_years') ? : 'd F Y - {d} {F} {Y}',
+    ];
+    $form['help'] = [
+      '#type' => 'markup',
+      '#markup' => t('A user-defined date format. See the <a href="@url">PHP manual</a> for available options.', ['@url' => 'http://php.net/manual/function.date.php']) .
+        '<br />' . t('Use letters in braces for end date elements, for example, {d} means the day of the end date.') .
+        '<br />' . t('These format values are translated, for example, t("d F Y") instead of "d F Y" will be used as the actual date format.'),
+    ];
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function settingsSummary() {
+    $summary = parent::settingsSummary();
+    $summary[] = $this->t('Display date range using formats: @single, @single_all_day, @one_day, @one_month, @several_months, @several_years',
+        array(
+          '@single' => $this->getSetting('single') ? : 'd F Y',
+          '@single_all_day' => $this->getSetting('single_all_day') ? : 'd F Y',
+          '@one_day' => $this->getSetting('one_day') ? : 'd F Y',
+          '@one_month' => $this->getSetting('one_month') ? : 'd - {d} F Y',
+          '@several_months' => $this->getSetting('several_months') ? : 'd F - {d} {F} Y',
+          '@several_years' => $this->getSetting('several_years') ? : 'd F Y - {d} {F} {Y}',
+        )
+      );
+
+    return $summary;
+  }
+
+}
@@ -176,7 +176,9 @@ class EdlpAjaxController extends ControllerBase {
      'rendered'=> $rendered,
    ];

-    // if content type page (productions) get the menu items and linked dates
+    // if content type page (productions) :
+    // -- get the menu items and linked dates
+    // -- get the linked documents for corpus map
    if($this->bundle == "page"){
      $menuLinkManager = \Drupal::service('plugin.manager.menu.link');
      $links = $menuLinkManager->loadLinksByRoute('entity.node.canonical', array('node' => $this->id), 'productions');
@@ -195,6 +197,15 @@ class EdlpAjaxController extends ControllerBase {
        }
      }
      $data['menu_parents'] = $menu_parents;
+
+      // Documents liés
+      $documents_lies = $this->entity->get('field_documents_lies')->getValue();
+      if(count($documents_lies)){
+        foreach ($documents_lies as $key => $field) {
+          $data['documents_lies'][] = $field['target_id'];
+        }
+      }
+
    }

    // translations links
@@ -0,0 +1,125 @@
+<?php
+
+namespace Drupal\edlp_ajax\Plugin\Field\FieldFormatter;
+
+use Drupal\Component\Utility\Html;
+use Drupal\Core\Field\FieldItemInterface;
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\Field\FormatterBase;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Field\Plugin\Field\FieldFormatter\EntityReferenceLabelFormatter;
+/**
+ * Plugin implementation of the 'entity_reference_label_formatter_ajax' formatter.
+ *
+ * @FieldFormatter(
+ *   id = "entity_reference_label_formatter_ajax",
+ *   label = @Translation("Label link ajax ready"),
+ *   field_types = {
+ *     "entity_reference"
+ *   }
+ * )
+ */
+class EntityReferenceLabelFormatterAjax extends EntityReferenceLabelFormatter {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function defaultSettings() {
+    return [
+      // Implement default settings.
+    ] + parent::defaultSettings();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function settingsForm(array $form, FormStateInterface $form_state) {
+    return [
+      // Implement settings form.
+    ] + parent::settingsForm($form, $form_state);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  // public function settingsSummary() {
+  //   $summary = [];
+  //   // Implement settings summary.
+  //
+  //   return $summary;
+  // }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function viewElements(FieldItemListInterface $items, $langcode) {
+    $elements = [];
+    $output_as_link = $this->getSetting('link');
+
+    foreach ($this->getEntitiesToView($items, $langcode) as $delta => $entity) {
+      $label = $entity->label();
+      // If the link is to be displayed and the entity has a uri, display a
+      // link.
+      if ($output_as_link && !$entity->isNew()) {
+        try {
+          $uri = $entity->urlInfo();
+          $options = $uri->getOptions();
+          $options += array(
+            'attributes' => array(
+              'class' => ['ajax-link'],
+              'nid'=>$entity->id(),
+              'data-drupal-link-system-path' => $uri->getInternalPath()
+            )
+          );
+          $uri->setOptions($options);
+        }
+        catch (UndefinedLinkTemplateException $e) {
+          // This exception is thrown by \Drupal\Core\Entity\Entity::urlInfo()
+          // and it means that the entity type doesn't have a link template nor
+          // a valid "uri_callback", so don't bother trying to output a link for
+          // the rest of the referenced entities.
+          $output_as_link = FALSE;
+        }
+      }
+
+      if ($output_as_link && isset($uri) && !$entity->isNew()) {
+        $elements[$delta] = [
+          '#type' => 'link',
+          '#title' => $label,
+          '#url' => $uri,
+          '#options' => $uri->getOptions(),
+        ];
+
+        if (!empty($items[$delta]->_attributes)) {
+          $elements[$delta]['#options'] += ['attributes' => []];
+          $elements[$delta]['#options']['attributes'] += $items[$delta]->_attributes;
+          // Unset field item attributes since they have been included in the
+          // formatter output and shouldn't be rendered in the field template.
+          unset($items[$delta]->_attributes);
+        }
+      }
+      else {
+        $elements[$delta] = ['#plain_text' => $label];
+      }
+      $elements[$delta]['#cache']['tags'] = $entity->getCacheTags();
+    }
+
+    return $elements;
+  }
+
+  /**
+   * Generate the output appropriate for one field item.
+   *
+   * @param \Drupal\Core\Field\FieldItemInterface $item
+   *   One field item.
+   *
+   * @return string
+   *   The textual output generated.
+   */
+  protected function viewValue(FieldItemInterface $item) {
+    // The text value has no text format assigned to it, so the user input
+    // should equal the output, including newlines.
+    return nl2br(Html::escape($item->value));
+  }
+
+}
@@ -1,71 +1 @@
-canvas#corpus-map {
-  position: absolute;
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-  top: 0;
-  left: 0;
-  z-index: 0; }
-  canvas#corpus-map.de-activated {
-    background-color: #f4f4f4; }
-
-div.node-popup {
-  z-index: 10;
-  position: absolute;
-  -webkit-box-sizing: content-box;
-  box-sizing: content-box;
-  width: 300px;
-  min-height: 30px;
-  pointer-events: none;
-  top: 60%;
-  left: 30%;
-  pointer-events: none; }
-  div.node-popup .inner {
-    padding: 0.6em;
-    outline: 1px solid red;
-    background-color: white; }
-  div.node-popup:before {
-    content: "";
-    position: absolute;
-    width: 60px;
-    height: 0;
-    border-top: 1px solid red; }
-  div.node-popup[pos="bottom-right"] {
-    -webkit-transform: translateY(42px) translateX(42px);
-    transform: translateY(42px) translateX(42px); }
-    div.node-popup[pos="bottom-right"]:before {
-      top: -1px;
-      left: -61px;
-      -webkit-transform-origin: bottom right;
-      transform-origin: bottom right;
-      -webkit-transform: rotateZ(45deg);
-      transform: rotateZ(45deg); }
-  div.node-popup[pos="bottom-left"] {
-    -webkit-transform: translateX(-100%) translateY(42px) translateX(-42px);
-    transform: translateX(-100%) translateY(42px) translateX(-42px); }
-    div.node-popup[pos="bottom-left"]:before {
-      top: calc(100% +1px);
-      left: 100%;
-      -webkit-transform-origin: top left;
-      transform-origin: top left;
-      -webkit-transform: rotateZ(-45deg);
-      transform: rotateZ(-45deg); }
-  div.node-popup[pos="top-left"] {
-    -webkit-transform: translateY(-100%) translateX(-100%) translateY(-42px) translateX(-42px);
-    transform: translateY(-100%) translateX(-100%) translateY(-42px) translateX(-42px); }
-    div.node-popup[pos="top-left"]:before {
-      bottom: 0;
-      left: 100%;
-      -webkit-transform-origin: top left;
-      transform-origin: top left;
-      -webkit-transform: rotateZ(45deg);
-      transform: rotateZ(45deg); }
-  div.node-popup[pos="top-right"] {
-    -webkit-transform: translateY(-100%) translateY(-42px) translateX(42px);
-    transform: translateY(-100%) translateY(-42px) translateX(42px); }
-    div.node-popup[pos="top-right"]:before {
-      top: calc(100% + 1px);
-      left: -61px;
-      -webkit-transform-origin: top right;
-      transform-origin: top right;
-      -webkit-transform: rotateZ(-45deg);
-      transform: rotateZ(-45deg); }
+canvas#corpus-map{position:absolute;-webkit-box-sizing:border-box;box-sizing:border-box;top:0;left:0;z-index:0}canvas#corpus-map.de-activated{background-color:#f4f4f4}div.node-popup{z-index:10;position:absolute;-webkit-box-sizing:content-box;box-sizing:content-box;width:300px;min-height:30px;top:60%;left:30%;pointer-events:none}div.node-popup .inner{padding:.6em;outline:red solid 1px;background-color:#fff}div.node-popup:before{content:"";position:absolute;width:60px;height:0;border-top:1px solid red}div.node-popup[pos=bottom-right]{-webkit-transform:translateY(42px) translateX(42px);transform:translateY(42px) translateX(42px)}div.node-popup[pos=bottom-right]:before{top:-1px;left:-61px;-webkit-transform-origin:bottom right;transform-origin:bottom right;-webkit-transform:rotateZ(45deg);transform:rotateZ(45deg)}div.node-popup[pos=bottom-left]{-webkit-transform:translateX(-100%) translateY(42px) translateX(-42px);transform:translateX(-100%) translateY(42px) translateX(-42px)}div.node-popup[pos=bottom-left]:before{top:calc(100% +1px);left:100%;-webkit-transform-origin:top left;transform-origin:top left;-webkit-transform:rotateZ(-45deg);transform:rotateZ(-45deg)}div.node-popup[pos=top-left]{-webkit-transform:translateY(-100%) translateX(-100%) translateY(-42px) translateX(-42px);transform:translateY(-100%) translateX(-100%) translateY(-42px) translateX(-42px)}div.node-popup[pos=top-left]:before{bottom:0;left:100%;-webkit-transform-origin:top left;transform-origin:top left;-webkit-transform:rotateZ(45deg);transform:rotateZ(45deg)}div.node-popup[pos=top-right]{-webkit-transform:translateY(-100%) translateY(-42px) translateX(42px);transform:translateY(-100%) translateY(-42px) translateX(42px)}div.node-popup[pos=top-right]:before{top:calc(100% + 1px);left:-61px;-webkit-transform-origin:top right;transform-origin:top right;-webkit-transform:rotateZ(-45deg);transform:rotateZ(-45deg)}
@@ -26,16 +26,22 @@
    var _ctx = _canvas.getContext('2d');
    var _dpi = window.devicePixelRatio;
    var _scene_props = {
-      width:0,
-      height:0,
+      width:window.innerWidth,
+      height:window.innerHeight,
      // 'margin_top':90, // with red border on head
-      // 'margin_top':75, // without red border on head
-      'margin_top':0,
+      'margin_top':75, // without red border on head
+      // 'margin_top':0,
      'margin_right':0,
-      // 'margin_bottom':65,
-      'margin_bottom':0,
+      'margin_bottom':65,
+      // 'margin_bottom':0,
      'margin_left':0
    };
+    var _evolution_zone = {
+      left:_scene_props.width/4,
+      right:_scene_props.width - _scene_props.width/4,
+      center:_scene_props.width/2,
+    };
+
    var _physics = new Physics();
    var _nodes = [];
    var _articles_nodes = [];
@@ -47,6 +53,8 @@
    var _nodes_centered = [];
    var _nodes_centered_attractions = [];

+    var _loaded = false;
+
    var _playlist = [];

    var _p_velocity_factor = 0.5;
@@ -63,15 +71,9 @@
    var _ecolors = _settings.colors;
    // Physics
    var _attracter;
-        // _repulser_top,
-        // _repulser_center,
-        // _repulser_bottom,
-        // _scrambler_TL,
-        // _scrambler_TR,
-        // _scrambler_BR,
-        // _scrambler_BL,
-        // _scrambler_CL,
-        // _scrambler_CR;
+
+    var check_parts_colid_frq = 2;
+    var check_parts_colid_tick = 1;

    //     ____      _ __
    //    /  _/___  (_) /______
@@ -106,14 +108,17 @@
      _canvas.height = _scene_props.height*_dpi;
      _ctx.scale(_dpi, _dpi);

+      moveEvolutionZone();

-      if(_nodes.length){
+      if(_loaded){
        for (var i = 0; i < _nodes.length; i++) {
          _nodes[i].onResizeCanvas();
        }
-        // move _attracter and _repulser to the center again
-        resizePhysics();
+        // move _attracter and _repulser to their right places again
+        // moveEvolutionZone() will trigger resizePhysics()
+        // resizePhysics();
      }
+
    };

    //   ___
@@ -149,6 +154,7 @@
      initEvents();
      checkPreOpenedEntry();
      startAnime();
+      _loaded = true;
    };

    //  ___ _           _
@@ -164,7 +170,9 @@
    };
    function resizePhysics(){
      // attracters
-      _attracter.position = {x:_scene_props.width/2, y:_scene_props.height/2};
+      if(typeof _attracter != 'undefined'){
+        _attracter.position = {x:_evolution_zone.center, y:_scene_props.height/2};
+      }
    };

    //  _  _         _
@@ -230,13 +238,14 @@

      this.e_color = 'e_col_'+this.entrees[Math.floor(Math.random(this.entrees.length))];

+      // pre-rendering node virtual canvas
      this.canvas = document.createElement('canvas');
      this.canvas_ctx = this.canvas.getContext('2d');
-
-      this.line_width = 1.5;
-      this.canvas_w = this.r*2+this.line_width*2;
-      this.canvas.width = this.canvas_w;
-      this.canvas.height = this.canvas_w;
+      this.line_width = 1;
+      this.w = this.r*2+this.line_width*2;
+      this.w_2 = this.w/2;
+      this.canvas.width = this.w;
+      this.canvas.height = this.w;
      this.canvas_ctx.fillStyle = 'rgb(255,255,255)';
      this.canvas_ctx.lineWidth = this.line_width;

@@ -250,8 +259,6 @@
      this.aside = false;
      this.scrambling = false;

-      // this.n_repulses = {};
-
      // prototypes
      if (typeof Node.initialized == "undefined") {

@@ -264,43 +271,42 @@
          this.ori_pos = {x:this.x,y:this.y};
          // TODO: don't forget to move ori_pos on window resize

-          this.draw();
+          //this.drawSprite();
          this.initPhysics();
-
        };

-        Node.prototype.draw = function(){
-          _ctx.clearRect(0, 0, this.canvas_w, this.canvas_w);
-
-          this.canvas_ctx.beginPath();
-          // white background
-          this.canvas_ctx.fillRect(0,0,this.canvas_w,this.canvas_w);
-
-          this.canvas_ctx.globalAlpha = this.faded ? 0.15 : 1;
-
-          if(this.opened){
-            // carre plein
-            // this.canvas_ctx.lineWidth = '1px';
-            // this.canvas_ctx.strokeStyle = 'rgb(255,0,0)';
-            // this.canvas_ctx.strokeRect(this.x - this.r-3,this.y - this.r-3,this.r*2+6,this.r*2+6);
-            // ou carre contour
-            this.canvas_ctx.save(); // save the normal context state (fill white)
-            this.canvas_ctx.fillStyle = _ecolors[this.e_color];
-            this.canvas_ctx.fillRect(this.line_width,this.line_width,this.d,this.d);
-            this.canvas_ctx.restore(); // restore the normal context state (fill white)
-          }
-          // else{
-          //   // carre plein
-          //   // this.canvas_ctx.fillStyle = _ecolors[this.e_color];
-          //   // this.canvas_ctx.fillRect(this.x - this.r,this.y - this.r,this.d,this.d);
-          //   // ou carre contour
-          //   this.canvas_ctx.fillRect(this.line_width,this.line_width,this.d,this.d);
-          // }
-          this.canvas_ctx.strokeStyle = _ecolors[this.e_color];
-          this.canvas_ctx.strokeRect(this.line_width,this.line_width,this.d,this.d);
-          // this.canvas_ctx.globalAlpha = 1;
-          this.canvas_ctx.closePath();
-        };
+        // Node.prototype.drawSprite = function(){
+        //   _ctx.clearRect(0, 0, this.w, this.w);
+        //
+        //   this.canvas_ctx.beginPath();
+        //   // white background
+        //   this.canvas_ctx.fillRect(0,0,this.w,this.w);
+        //
+        //   this.canvas_ctx.globalAlpha = this.faded ? 0.15 : 1;
+        //
+        //   if(this.opened){
+        //     // carre plein
+        //     // this.canvas_ctx.lineWidth = '1px';
+        //     // this.canvas_ctx.strokeStyle = 'rgb(255,0,0)';
+        //     // this.canvas_ctx.strokeRect(this.x - this.r-3,this.y - this.r-3,this.r*2+6,this.r*2+6);
+        //     // ou carre contour
+        //     this.canvas_ctx.save(); // save the normal context state (fill white)
+        //     this.canvas_ctx.fillStyle = _ecolors[this.e_color];
+        //     this.canvas_ctx.fillRect(this.line_width,this.line_width,this.d,this.d);
+        //     this.canvas_ctx.restore(); // restore the normal context state (fill white)
+        //   }
+        //   // else{
+        //   //   // carre plein
+        //   //   // this.canvas_ctx.fillStyle = _ecolors[this.e_color];
+        //   //   // this.canvas_ctx.fillRect(this.x - this.r,this.y - this.r,this.d,this.d);
+        //   //   // ou carre contour
+        //   //   this.canvas_ctx.fillRect(this.line_width,this.line_width,this.d,this.d);
+        //   // }
+        //   this.canvas_ctx.strokeStyle = _ecolors[this.e_color];
+        //   this.canvas_ctx.strokeRect(this.line_width,this.line_width,this.d,this.d);
+        //   // this.canvas_ctx.globalAlpha = 1;
+        //   this.canvas_ctx.closePath();
+        // };

        Node.prototype.initPhysics = function(){
          // particule
@@ -328,8 +334,8 @@

        Node.prototype.onResizeCanvas = function(){
          this.calcWallLimits();
+          // TODO: scramble only if not aside or centered
          this.shuffleOriP();
-          // TODO: when canvas is smaller what about nodes hors champs, they are coming back alone but it's too long
        };

        Node.prototype.shuffleOriP = function(){
@@ -345,26 +351,25 @@
            this.p.fixed = true;
          }else{
            this.p.fixed = false;
-          }

-          if(this.center)
+            if(this.center)
            this.limitEvolutionZone();

-          if(!this.p.resting()){
+            // if(!this.p.resting()){
            // this.checkVelocityThreshold();
            this.checkWallBouncing();
            this.updatePos();
            if(this.scrambling){
              this.checkOriPDist();
            }
+            // }
          }

          if(_mouse_in && !this.aside && !this.faded)
            this.checkMouse();

-          // if(this.debug)
-          //   console.log("Node pos: ", {x:this.x, y:this.y});
-          this.move();
+          // this.move();
+          this.redraw();
        };

        Node.prototype.checkVelocityThreshold = function(){
@@ -442,20 +447,20 @@
        Node.prototype.open = function(){
          this.opened = true;
          _node_opened_id = this.id;
-          this.draw();
+          //this.drawSprite();
        };
        Node.prototype.close = function(){
          this.opened = false;
-          this.draw();
+          //this.drawSprite();
        };

        Node.prototype.fade = function(){
          this.faded = true;
-          this.draw();
+          //this.drawSprite();
        };
        Node.prototype.unFade = function(){
          this.faded = false;
-          this.draw();
+          //this.drawSprite();
        };

        Node.prototype.setCenteredOnEntree = function(tid){
@@ -468,7 +473,7 @@
          this.stopScrambling();
          this.unsetAside();
          this.attract.on = true;
-          this.draw();
+          //this.drawSprite();
        }
        Node.prototype.unsetCentered = function(){
          this.center = false;
@@ -482,11 +487,14 @@
          this.dist_to_attracter = this.p.distanceTo(_attracter);
          if( this.dist_to_attracter < _scene_props.width/4){
            if( this.p.velocity.length() > 0.4 ){
-              this.p.velocity.multiplyScalar(0.995);
+              this.p.velocity.multiplyScalar(0.99); // 0.995
            }
          }
-          if( Math.abs(_attracter.position.x - this.x) > _scene_props.width/3
-              || Math.abs(_attracter.position.y - this.y) > _scene_props.height/3){
+          // limit evolution zone
+          // if( Math.abs(_attracter.position.x - this.x) > _scene_props.width/4
+          //     || Math.abs(_attracter.position.y - this.y) > _scene_props.height/4){
+          if( this.x < _evolution_zone.left || this.x > _evolution_zone.right
+              || Math.abs(_attracter.position.y - this.y) > _scene_props.height/4){
            this.attract.on = true;
          }else{
            this.attract.on = false;
@@ -503,7 +511,7 @@
          this.wall_bouncing_elasticity = 0.15;
        }
        Node.prototype.unsetAside = function(){
-          console.log('unsetAside');
+          // console.log('unsetAside');
          this.aside = false;
          this.ori_p_attract.on = false;
          this.ori_p.position.x = this.ori_pos.x;
@@ -511,6 +519,18 @@
          // this.unFade();
        }

+        Node.prototype.resolveNormalPos = function(){
+          // console.log("resolveNormalPos");
+          switch(true){
+            case this.center:
+              this.unsetCentered();
+              break;
+            case this.aside:
+              this.unsetAside();
+              break;
+          }
+        };
+
        Node.prototype.scramble = function(){
          this.scrambling = true;
          this.unsetCentered();
@@ -537,7 +557,39 @@

        Node.prototype.move = function(){
          // just draw the virtual node canvas into the main scene canvas at the right position
-          _ctx.drawImage(this.canvas, this.x-this.r, this.y-this.r);
+          _ctx.drawImage(this.canvas, this.x-this.w_2, this.y-this.w_2);
+        };
+
+        Node.prototype.redraw = function(){
+          _ctx.beginPath();
+          // white background
+          _ctx.fillStyle = 'rgb(255,255,255)';
+          _ctx.fillRect(this.x-this.r,this.y-this.r,this.d,this.d);
+
+          _ctx.globalAlpha = this.faded ? 0.15 : 1;
+
+          if(this.opened){
+            // carre plein
+            // _ctx.lineWidth = '1px';
+            // _ctx.strokeStyle = 'rgb(255,0,0)';
+            // _ctx.strokeRect(this.x - this.r-3,this.y - this.r-3,this.r*2+6,this.r*2+6);
+            // ou carre contour
+            // _ctx.save(); // save the normal context state (fill white)
+            _ctx.fillStyle = _ecolors[this.e_color];
+            _ctx.fillRect(this.x-this.r,this.y-this.r,this.d,this.d);
+            // _ctx.restore(); // restore the normal context state (fill white)
+          }
+          // else{
+          //   // carre plein
+          //   // _ctx.fillStyle = _ecolors[this.e_color];
+          //   // _ctx.fillRect(this.x - this.r,this.y - this.r,this.d,this.d);
+          //   // ou carre contour
+          //   _ctx.fillRect(this.line_width,this.line_width,this.d,this.d);
+          // }
+          _ctx.strokeStyle = _ecolors[this.e_color];
+          _ctx.strokeRect(this.x-this.r,this.y-this.r,this.d,this.d);
+          // _ctx.globalAlpha = 1;
+          _ctx.closePath();
        };

        Node.initialized = true;
@@ -545,9 +597,18 @@

      this.init();
    };
+
    // TODO: we may convert a lot of computation into a web worker
    // https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Using_web_workers
    function checkParticulesCollisions(){
+
+      // do not run particule collision every frames
+      if(check_parts_colid_tick < check_parts_colid_frq){
+        check_parts_colid_tick++;
+        return;
+      }
+      check_parts_colid_tick = 1;
+
      // pre create vars to save memory;
      var na,nb,
          ma,mb,
@@ -559,10 +620,10 @@
      // colisions between _particules
      for (var n = 0, l = _nodes.length; n < l; n++) {
        na = _nodes[n];
-        // avoid colliding for centered nodes
-        // if(_nodes[n].center) continue;
        // avoid colliding for scrambling nodes
-        if(na.scrambling) continue;
+        // avoid colliding for aside nodes
+        // avoid colliding for centered nodes
+        if(na.scrambling || na.aside || na.center) continue;

        ma = na.p.mass;

@@ -571,16 +632,16 @@
          // avoid impact between center and aside particules
          // if((na.center && nb.aside) || (na.aside && nb.center))
          // and between aside particules
-          if(na.aside || nb.aside)
+          if(nb.aside)
            continue;


          // avoid impact between two centered particulses that comes to the center
-          if(na.center && nb.center){
-            if(Math.min(na.p.distanceTo(_attracter), nb.p.distanceTo(_attracter)) > 300){
-              if( Math.random()>0.3 ) continue;
-            }
-          }
+          // if(na.center && nb.center){
+          //   if(Math.min(na.p.distanceTo(_attracter), nb.p.distanceTo(_attracter)) > 300){
+          //     if( Math.random()>0.3 ) continue;
+          //   }
+          // }

          w = h = (na.r+nb.r);
          // if(!na.aside && !nb.aside){
@@ -685,6 +746,22 @@
    };


+
+
+    //  ___         _      _   _            ____
+    // | __|_ _____| |_  _| |_(_)___ _ _   |_  /___ _ _  ___
+    // | _|\ V / _ \ | || |  _| / _ \ ' \   / // _ \ ' \/ -_)
+    // |___|\_/\___/_|\_,_|\__|_\___/_||_| /___\___/_||_\___|
+    function moveEvolutionZone(l, r){
+      var left = l || 0;
+      var right = r || 0;
+      _evolution_zone.left = Math.max(_scene_props.width/5, left+20);
+      _evolution_zone.right = Math.min(_scene_props.width - _scene_props.width/5, _scene_props.width-right+20);
+      _evolution_zone.center = _evolution_zone.left + (_evolution_zone.right - _evolution_zone.left)/2;
+      // move _attracter to the center of the zone
+      resizePhysics();
+    }
+
    //  ___              _             ___ _           _ _    _
    // | _ \__ _ _ _  __| |___ _ __   | _ \ |__ _ _  _| (_)__| |_
    // |   / _` | ' \/ _` / _ \ '  \  |  _/ / _` | || | | (_-<  _|
@@ -771,7 +848,8 @@
    // / __| ___ __ _ _ _ __| |_
    // \__ \/ -_) _` | '_/ _| ' \
    // |___/\___\__,_|_| \__|_||_|
-    function filterSearchResults(nids){
+    // and ajax modal content filtering
+    function filterByNids(nids){
      shutDownArticles();

      _nodes_centered = [];
@@ -793,6 +871,13 @@
    // \__ \/ _| '_/ _` | '  \| '_ \ | | ' \/ _` |
    // |___/\__|_| \__,_|_|_|_|_.__/_|_|_||_\__, |
    //                                      |___/
+    // function resolveNormalPosAllNodes(){
+    //   console.log('resolveNormalPosAllNodes');
+    //   for (var i = 0; i < _nodes.length; i++) {
+    //     _nodes[i].resolveNormalPos();
+    //   }
+    // };
+
    function scrambleCollection(){
      // console.log('scrambleCollection');
      for (var i = 0; i < _nodes.length; i++) {
@@ -940,6 +1025,11 @@
        })
        .on('close-all-entree', function(e){
          closeAllEntries();
+        })
+        .on('scramble-collection', function(e){
+          console.log('scramble-collection', e);
+          // resolveNormalPosAllNodes();
+          scrambleCollection();
        });

      _$entrees_block_termlinks.on('click', function(event) {
@@ -968,10 +1058,15 @@
        .on('chutier-action-done', function(e) {
          _nodes_by_nid[e.target_id].chutier_action = e.new_action;
        })
+        .on('ajax-node-loaded-linked-documents', function(e){
+          console.log("Edlp Corpus, ajax-node-loaded-linked-documents",e.nids);
+          // filter map's nodes
+          filterByNids(e.nids);
+        })
        .on('search-results-loaded', function(e){
          //console.log("Edlp Corpus, search-results-loaded",e.results);
-          // TODO: filter map's nodes
-          filterSearchResults(e.results);
+          // filter map's nodes
+          filterByNids(e.results);
        })
        .on('search-closed', function(e){
          scrambleCollection();
@@ -986,6 +1081,10 @@
              .parents('.item-list').removeClass('opened');
            scrambleCollection();
          }
+        })
+        .on('visible-space-changed', function(e){
+          // limits are absolute distance from each side (not positions from left)
+          moveEvolutionZone(e.left_limit, e.right_limit);
        });
    };

@@ -1,125 +1,4 @@
-(function ($, Drupal, drupalSettings) {

-  var settings = drupalSettings.edlp_search;
-  var _$body = $('body');
-  var _$container;
-  var _$form;
-
-  function init(){
-    // console.log('EdlpSearch Init', settings);
-    initEvents();
-    initAjax();
-  };
-
-  function initEvents(){
-    $('body')
-      .on('new-content-ajax-loaded', initAjax)
-      .on('edlp_search_search_form-col-closed', onSearchClosed);
-  };
-
-  function initAjax(){
-    _$form = $('#edlp-search-form:not(.ajax-enabled)');
-    if(!_$form.length) return false;
-
-    //console.log('EdlpSearch initAjaxForm()');
-    _$form = $('#edlp-search-form:not(.ajax-enabled)')
-      .on('submit', onSubmitForm)
-      .addClass('ajax-enabled');
-    _$container = _$form.parents('.row');
-    if(!_$container.length){
-      _$container = _$form.parent();
-    }
-  };
-
-  function onSubmitForm(e){
-    e.preventDefault();
-    // console.log('onSubmitForm',e);
-    var args = {};
-
-    // search for key words
-    args.keys = $('input[type="search"]', this).val();
-
-    // entries filter
-    args.entries = [];
-    $('input[type="checkbox"]:checked', '#edit-entries').each(function(index, el) {
-      args.entries.push($(this).val());
-    });
-
-    // langues
-    args.langues = $('input[name="language"]', this).val();
-
-    // genres
-    args.genres = $('input[name="genres"]', this).val();
-
-    //console.log('EdlpSearch onSubmitForm() : args',args);
-
-    loadResults(args);
-
-    return false;
-  };
-
-  function loadResults(args){
-    //console.log('EdlpSearch loadResults() : args', args);
-    _$form.addClass('ajax-loading');
-    _$body.addClass('ajax-loading');
-    $('[theme="edlp_search_results"]', _$container).addClass('ajax-loading');
-    var path = window.location.origin + drupalSettings.path.baseUrl +settings.results_ajax_url;
-    $.getJSON(path, args)
-      .done(function(data){
-        onResultsLoaded(data);
-      })
-      .fail(function(jqxhr, textStatus, error){
-        onResultsLoadFail(jqxhr, textStatus, error);
-      });
-  };
-
-  function onResultsLoaded(data){
-    // console.log('EdlpSearch onResultsLoaded()', data);
-    _$form.removeClass('ajax-loading');
-    _$body.removeClass('ajax-loading');
-
-    // insert results col
-    $prev_results = $('[theme="edlp_search_results"]', _$container);
-    if($prev_results.length){
-      $prev_results.replaceWith(data.rendered);
-    }else{
-      _$container.append(data.rendered);
-    }
-
-    // trigger event
-    _$body.trigger({
-      'type':'search-results-loaded',
-      'results':data.results_nids
-    });
-
-
-    // piwik
-    if(typeof _paq !== 'undefined'){
-      // page tracking
-      // https://matomo.org/blog/2017/02/how-to-track-single-page-websites-using-piwik-analytics/
-      // _paq.push(['setCustomUrl', state.url]);
-      // _paq.push(['setDocumentTitle', data.title]);
-      // _paq.push(['trackPageView']);
-
-      // trackEvent(category, action, [name], [value])
-      var search_name = data.keys+';'+data.langues+';'+data.genres+';'+data.entry_names.join(',');
-      // _paq.push(['trackEvent', 'AjaxSearch', 'Results', search_name, data.results_nids.length]);
-      // piwik track searches
-      // trackSiteSearch(keyword, [category], [resultsCount])
-      _paq.push(['trackSiteSearch', search_name, 'search', data.results_nids.length]);
-    }
-  };
-
-  function onResultsLoadFail(jqxhr, textStatus, error){
-    console.warn('EdlpSearch : search results ajax load failed : '+error, jqxhr.responseText);
-  };
-
-  function onSearchClosed(e){
-    // console.log('Edlp Search onSearchClosed()');
-    $('div[theme="edlp_search_results"]').remove();
-    // trigger event
-    _$body.trigger({'type':'search-closed'});
-  }
-
-  init();
-})(jQuery, Drupal, drupalSettings);
+(function($,Drupal,drupalSettings){var settings=drupalSettings.edlp_search;var _$body=$('body');var _$container;var _$form;function init(){initEvents();initAjax();};function initEvents(){$('body').on('new-content-ajax-loaded',initAjax).on('edlp_search_search_form-col-closed',onSearchClosed);};function initAjax(){_$form=$('#edlp-search-form:not(.ajax-enabled)');if(!_$form.length)return false;_$form=$('#edlp-search-form:not(.ajax-enabled)').on('submit',onSubmitForm).addClass('ajax-enabled');_$container=_$form.parents('.row');if(!_$container.length){_$container=_$form.parent();}};function onSubmitForm(e){e.preventDefault();var args={};args.keys=$('input[type="search"]',this).val();args.entries=[];$('input[type="checkbox"]:checked','#edit-entries').each(function(index,el){args.entries.push($(this).val());});args.langues=$('input[name="language"]',this).val();args.genres=$('input[name="genres"]',this).val();loadResults(args);return false;};function loadResults(args){_$form.addClass('ajax-loading');_$body.addClass('ajax-loading');$('[theme="edlp_search_results"]',_$container).addClass('ajax-loading');var path=window.location.origin+drupalSettings.path.baseUrl+settings.results_ajax_url;$.getJSON(path,args).done(function(data){onResultsLoaded(data);}).fail(function(jqxhr,textStatus,error){onResultsLoadFail(jqxhr,textStatus,error);});};function onResultsLoaded(data){_$form.removeClass('ajax-loading');_$body.removeClass('ajax-loading');$prev_results=$('[theme="edlp_search_results"]',_$container);if($prev_results.length){$prev_results.replaceWith(data.rendered);}else{_$container.append(data.rendered);}
+_$body.trigger({'type':'search-results-loaded','results':data.results_nids});if(typeof _paq!=='undefined'){var search_name=data.keys+';'+data.langues+';'+data.genres+';'+data.entry_names.join(',');_paq.push(['trackSiteSearch',search_name,'search',data.results_nids.length]);}};function onResultsLoadFail(jqxhr,textStatus,error){void 0;};function onSearchClosed(e){$('div[theme="edlp_search_results"]').remove();_$body.trigger({'type':'search-closed'});}
+init();})(jQuery,Drupal,drupalSettings);
@@ -1,408 +1,10 @@
-(function ($, Drupal, drupalSettings) {

-  var _settings = drupalSettings.edlp_studio;
-  var $composer;
-
-  // audio play is handled by edlp_theme
-
-  function init(){
-    // console.log('Studio Init');
-    initEvents();
-    initStudio();
-  };
-
-  function initEvents(){
-    $('body')
-      .on('new-audio-cartel-loaded', initAjaxChutierLinks)
-      .on('new-content-ajax-loaded', initStudio)
-      .on('all-modal-closed', initStudio);
-  };
-
-  function initStudio(){
-    if($('#studio-ui').length){
-      $composer = $('.composition_ui .composer', '#studio-ui');
-      initAjaxChutierLinks();
-      initAjaxCompoLinks();
-      initDragAndDropUI();
-      $('body').trigger({'type':'studio-initialized'});
-    }else{
-      $('body').trigger({'type':'studio-not-active'});
-    }
-  }
-
-  //   ___ _        _   _           _  _         _       _    _      _
-  //  / __| |_ _  _| |_(_)___ _ _  | \| |___  __| |___  | |  (_)_ _ | |__ ___
-  // | (__| ' \ || |  _| / -_) '_| | .` / _ \/ _` / -_) | |__| | ' \| / /(_-<
-  //  \___|_||_\_,_|\__|_\___|_|   |_|\_\___/\__,_\___| |____|_|_||_|_\_\/__/
-  function initAjaxChutierLinks(){
-    //console.log('studio initAjaxChutierLinks');
-    $('.chutier-ajax-link:not(.ajax-enabled)')
-      .addClass('ajax-enabled')
-      .on('click', onClickChutierAjaxLink);
-  };
-  function onClickChutierAjaxLink(e){
-    //console.log('studio onClickAjaxLink chutier');
-    e.preventDefault();
-    addRemoveToChutier($(this));
-    return false;
-  };
-  function addRemoveToChutier($link){
-    // var ajax_path = 'edlp_studio/ajax/chutier/add/'+id; // + '/' +cid;
-    var ajax_path = $link.attr('data-drupal-link-system-path');
-    var path = window.location.origin + drupalSettings.path.baseUrl + ajax_path;
-    $link.addClass('ajax-loading');
-    $.getJSON(path, {})
-      .done(function(data){
-        onActionToChutierDone($link, data);
-      })
-      .fail(function(jqxhr, textStatus, error){
-        onErrorActionToChutier(jqxhr, textStatus, error, $link);
-      });
-  };
-  function onActionToChutierDone($link, data){
-    //console.log('onActionToChutierDone',data);
-    $('body').trigger({
-      'type':'chutier-action-done',
-      'action_done':data.action_done,
-      'new_action':data.action_done == 'add' ? 'remove' : 'add',
-      'target_id':$link.attr('target_id'),
-    });
-    $link.replaceWith(data.new_link);
-    initAjaxChutierLinks();
-    // reload Studio chutier_ui's documents list
-    updateStudioChutier();
-  };
-  function onErrorActionToChutier(jqxhr, textStatus, error, $link){
-    console.warn('action to chuttier load failed : '+error, jqxhr.responseText);
-  };
-
-  //   ___                        _ _   _
-  //  / __|___ _ __  _ __  ___ __(_) |_(_)___ _ _  ___
-  // | (__/ _ \ '  \| '_ \/ _ (_-< |  _| / _ \ ' \(_-<
-  //  \___\___/_|_|_| .__/\___/__/_|\__|_\___/_||_/__/
-  //                |_|
-  function initAjaxCompoLinks(){
-    //console.log('studio initAjaxCompoLinks');
-    $('.new-composition-link:not(.ajax-enabled)')
-    .on('click', onClickNewCompoLink)
-      .addClass('ajax-enabled');
-    $('.composition-link:not(.ajax-enabled)')
-    .on('click', onClickCompoLink)
-      .addClass('ajax-enabled');
-    $('.delete-composition-link:not(.ajax-enabled)')
-      .on('click', onClickDeleteCompoLink)
-      .addClass('ajax-enabled');
-  };
-
-  //   ___                    ___
-  //  / _ \ _ __  ___ _ _    / __|___ _ __  _ __  ___
-  // | (_) | '_ \/ -_) ' \  | (__/ _ \ '  \| '_ \/ _ \
-  //  \___/| .__/\___|_||_|  \___\___/_|_|_| .__/\___/
-  //       |_|                             |_|
-  function onClickCompoLink(e){
-    e.preventDefault();
-    //console.log('onClickCompoLink');
-    openCompo($(this));
-    return false;
-  };
-  function openCompo($link){
-    var cid = $link.attr('cid');
-    var ajax_path = _settings.open_compo_ajax_url+'/'+cid;
-    var path = window.location.origin + Drupal.url(ajax_path);
-    $link.addClass('ajax-loading');
-    $composer.addClass('ajax-loading');
-    $.getJSON(path, {})
-      .done(function(data){
-        onOpenCompoDone(data, $link);
-      })
-      .fail(function(jqxhr, textStatus, error){
-        onErrorOpenCompo(jqxhr, textStatus, error, $link);
-      });
-  };
-  function onOpenCompoDone(data, $link){
-    //console.log('onActionToCompoDone',data);
-    $('.composition-link').removeClass('is-active');
-    $link.removeClass('ajax-loading').addClass('is-active');
-    if($('.composition', $composer).length){
-      $('.composition', $composer).replaceWith(data.compo);
-    }else{
-      $('header', $composer).after(data.compo);
-    }
-    $composer.removeClass('ajax-loading');
-    initDragAndDropUI();
-    $('body').trigger({
-      'type':'on-studio-compo-opened'
-    });
-  };
-  function onErrorOpenCompo(jqxhr, textStatus, error, $link){
-    $link.removeClass('ajax-loading');
-    console.warn('open compo load failed : '+error, jqxhr.responseText);
-  };
-
-  //  _ _  _____ __ __  __ ___ _ __  _ __  ___
-  // | ' \/ -_) V  V / / _/ _ \ '  \| '_ \/ _ \
-  // |_||_\___|\_/\_/  \__\___/_|_|_| .__/\___/
-  //                                |_|
-  function onClickNewCompoLink(e){
-    e.preventDefault();
-    setInputForNewCompoName($(this));
-    return false;
-  };
-  function setInputForNewCompoName($link){
-    var $form = $('<form>').addClass('new-compo-form')
-      .append($('<input>').attr('type', 'text').attr('placeholder', 'new name'))
-      .append($('<button>').attr('type', 'submit').html('+'))
-      .submit(function(e){
-        onNewCompoFormSubmit(e, $link, $(this));
-      });
-
-    $link
-      .after($form)
-      .addClass('folded');
-    $form.children('input[type="text"]').focus();
-  };
-  function onNewCompoFormSubmit(e, $link, $form){
-    var name = $('input[type="text"]',$form).val();
-    //console.log('onNewCompoFormSubmit', name);
-    if(name != ''){
-      $form.addClass('ajax-loading').children('*').attr('disabled', 'disabled');
-      createNewCompo(name, $link, $form);
-    }
-    e.preventDefault();
-  };
-  function createNewCompo(name,$link, $form){
-    var ajax_path = $link.attr('data-drupal-link-system-path');
-    var path = window.location.origin + drupalSettings.path.baseUrl + ajax_path;
-    // $link.addClass('ajax-loading');
-    $.getJSON(path, {
-        'new_name':name
-      })
-      .done(function(data){
-        onCreateCompoDone(data, $link, $form);
-      })
-      .fail(function(jqxhr, textStatus, error){
-        onErrorCreateCompo(jqxhr, textStatus, error, $link);
-      });
-  };
-  function onCreateCompoDone(data, $link, $form){
-    //console.log('onActionToCompoDone',data);
-    var $new_link = $(data.new_link);
-    var $delete_link = $(data.delete_link);
-    $link
-      .removeClass('folded')
-      .parents('li')
-        .before($('<li>').append($new_link).append($delete_link));
-    $form.remove();
-    // open new composition to composer
-    initAjaxCompoLinks();
-    openCompo($new_link);
-  };
-  function onErrorCreateCompo(jqxhr, textStatus, error, $link){
-    console.warn('action to compo load failed : '+error, jqxhr.responseText);
-  };
-
-  // ___      _     _
-  // |   \ ___| |___| |_ ___   __ ___ _ __  _ __  ___
-  // | |) / -_) / -_)  _/ -_) / _/ _ \ '  \| '_ \/ _ \
-  // |___/\___|_\___|\__\___| \__\___/_|_|_| .__/\___/
-  //                                       |_|
-  function onClickDeleteCompoLink(e){
-    e.preventDefault();
-    // TODO: confirm compo deletion
-    deleteCompo($(this));
-    return false;
-  };
-  function deleteCompo($link){
-    var ajax_path = $link.attr('data-drupal-link-system-path');
-    var path = window.location.origin + Drupal.url(ajax_path);
-    $link.parents('li').addClass('ajax-loading');
-    $.getJSON(path, {})
-      .done(function(data){
-        onDeleteCompoDone(data, $link);
-      })
-      .fail(function(jqxhr, textStatus, error){
-        onErrorDeleteCompo(jqxhr, textStatus, error, $link);
-      });
-  };
-  function onDeleteCompoDone(data, $link, $form){
-    //console.log('onDeleteCompoDone',data);
-    if(data.status == "ok"){
-      $link.parents('li').remove();
-      //console.log("$('.composition-link').length", $('.composition-link').length);
-      if($('.composition-link').length){
-        openCompo($('.composition-link').eq(0));
-      }else{
-        $('.composition', $composer).html();
-      }
-    }else{
-      console.warn(data.message);
-    }
-  };
-  function onErrorDeleteCompo(jqxhr, textStatus, error, $link){
-    $link.parents('li').removeClass('ajax-loading');
-    console.warn('delete compo load failed : '+error, jqxhr.responseText);
-  };
-
-  //  ___ _           _ _              _
-  // / __| |_ _  _ __| (_)___ ___ _  _(_)
-  // \__ \  _| || / _` | / _ \___| || | |
-  // |___/\__|\_,_\__,_|_\___/    \_,_|_|
-  // this seems dirty
-  function updateStudioChutier(){
-    $studioChutier = $('#studio-ui .chutier_ui');
-    if($studioChutier.length){
-      var ajax_path = _settings.chutier_ui_ajax;
-      var path = window.location.origin + drupalSettings.path.baseUrl + ajax_path;
-      $studioChutier.addClass('loading');
-      $.getJSON(path, {})
-        .done(function(data){
-          onLoadedChutier($studioChutier, data);
-        })
-        .fail(function(jqxhr, textStatus, error){
-          onLoadChutierError(jqxhr, textStatus, error, $studioChutier);
-        });
-    }
-  };
-  function onLoadedChutier($studioChutier, data){
-    $studioChutier.replaceWith(data.rendered);
-    initAjaxChutierLinks();
-    // set chutier element draggable again
-    setChutierDraggable();
-    $('body').trigger({
-      'type':'on-studio-chutier-updated'
-    });
-  }
-  function onLoadChutierError(jqxhr, textStatus, error, $studioChutier){
-    console.warn('Chutier load failed', jqxhr.responseText);
-    $studioChutier.removeClass('loading');
-
-  }
-
-  //  ___                  __       ___                 _   _ ___
-  // |   \ _ _ __ _ __ _  / _|___  |   \ _ _ ___ _ __  | | | |_ _|
-  // | |) | '_/ _` / _` | > _|_ _| | |) | '_/ _ \ '_ \ | |_| || |
-  // |___/|_| \__,_\__, | \_____|  |___/|_| \___/ .__/  \___/|___|
-  //               |___/                        |_|
-  function initDragAndDropUI(){
-    // check if field--name-documents exists
-    if (!$('.composition_ui .composer .composition .field--name-documents').length) {
-      // if not create it
-      $field_documents = $('<div>')
-        .addClass('field').addClass('field--name-documents')
-        .appendTo('.composition_ui .composer .composition');
-    }else{
-      // add real dom square element to handle sorting
-      $field_documents = $('.composition_ui .composer .composition .field--name-documents'); $('.field__item', $field_documents).each(function(i){
-        $(this).prepend($('<span>').addClass('handler'));
-      });
-    }
-
-    // create remove dropzone
-    var $remove_zone = $('<div>').addClass('remove-drop-zone')
-      .appendTo('.composition_ui .composer .composition')
-      .droppable({
-        tolerance:'pointer',
-        // scope:'composition_ui',
-        over:function(e,ui){
-          // console.log('on over remove : ui', ui);
-          ui.draggable.addClass('ready-to-remove');
-        },
-        out:function(e,ui){
-          // console.log('on over remove : ui', ui);
-          ui.draggable.removeClass('ready-to-remove');
-        },
-        drop:function(e,ui){
-          // console.log('on drop remove : ui', ui);
-          ui.draggable.remove();
-          // onOrderChanged(ui);
-        }
-      });
-
-    // create sortable
-    $field_documents.sortable({
-      revert:false,
-      handle: ".handler",
-      receive:function(e, ui){
-        $('.field__item', this).attr('style', '');
-        // TODO: trigger event to enable new audiolink player
-      },
-      update:function(e, ui){
-        onOrderChanged(e, ui);
-      },
-      connectWith : $remove_zone,
-    });
-
-    // set chutier element draggable
-    setChutierDraggable();
-
-  };
-  function setChutierDraggable(){
-    $('.chutier_ui .item-list li>div').draggable({
-      containment:$('#studio-ui'),
-      scroll:false,
-      helper:function(e){
-        // we reproduce here the irem structure of destination sortable elements
-        // var $audio_link = $('.audio-link',this);
-        return $('<div>').addClass('field__item')
-          .append(
-            $('<article>').addClass('node').append(
-              $('<h2>').addClass('node-title').append(
-                // $('<a>')
-                //   .attr('nid', $audio_link.attr('nid'))
-                //   .html($audio_link.html())
-                $('.audio-link',this).clone().removeClass('ajax-enable')
-              )
-            )
-          )
-          .prepend($('<span>').addClass('handler'));
-      },
-      // cursor:'grab',
-      cursorAt:{bottom:10,left:10},
-      zIndex:999,
-      revert:true,
-      revertDuration:0,
-      connectToSortable:$('.composition_ui .composer .composition .field--name-documents'),
-    });
-  }
-  function onOrderChanged(e, ui){
-    //console.log('onOrderChanged : e', e);
-    var cid = $(e.target).parents('.composition').attr('cid');
-    var documents = {};
-    $('a', e.target).each(function(i) {
-      // console.log(this);
-      documents[i] = $(this).attr('nid');
-    });
-    // console.log(documents);
-    recordCompoList(cid, documents);
-  };
-  function recordCompoList(cid, docs){
-    //console.log('recordCompoList '+cid, docs);
-    var ajax_path = _settings.save_compo_ajax_url+'/'+cid;
-    var path = window.location.origin + Drupal.url(ajax_path);
-    //console.log('path', path);
-    $.getJSON(path, {
-        documents:docs
-      })
-      .done(function(data){
-        onRecordCompoDone(data);
-      })
-      .fail(function(jqxhr, textStatus, error){
-        onErrorRecordCompo(jqxhr, textStatus, error);
-      });
-    $('body').trigger({
-      'type':'on-studio-compo-updated'
-    });
-  }
-  function onRecordCompoDone(data){
-    //console.log('onDeleteCompoDone',data);
-    if(data.status == "ok"){
-    }else{
-      console.warn(data.message);
-    }
-  };
-  function onErrorRecordCompo(jqxhr, textStatus, error){
-    console.warn('record compo failed : '+error, jqxhr.responseText);
-  };
-
-  init();
-})(jQuery, Drupal, drupalSettings);
+(function($,Drupal,drupalSettings){var _settings=drupalSettings.edlp_studio;var $composer;function init(){initEvents();initStudio();};function initEvents(){$('body').on('new-audio-cartel-loaded',initAjaxChutierLinks).on('new-content-ajax-loaded',initStudio).on('all-modal-closed',initStudio);};function initStudio(){if($('#studio-ui').length){$composer=$('.composition_ui .composer','#studio-ui');initAjaxChutierLinks();initAjaxCompoLinks();initDragAndDropUI();$('body').trigger({'type':'studio-initialized'});}else{$('body').trigger({'type':'studio-not-active'});}}
+function initAjaxChutierLinks(){$('.chutier-ajax-link:not(.ajax-enabled)').addClass('ajax-enabled').on('click',onClickChutierAjaxLink);};function onClickChutierAjaxLink(e){e.preventDefault();addRemoveToChutier($(this));return false;};function addRemoveToChutier($link){var ajax_path=$link.attr('data-drupal-link-system-path');var path=window.location.origin+drupalSettings.path.baseUrl+ajax_path;$link.addClass('ajax-loading');$.getJSON(path,{}).done(function(data){onActionToChutierDone($link,data);}).fail(function(jqxhr,textStatus,error){onErrorActionToChutier(jqxhr,textStatus,error,$link);});};function onActionToChutierDone($link,data){$('body').trigger({'type':'chutier-action-done','action_done':data.action_done,'new_action':data.action_done=='add'?'remove':'add','target_id':$link.attr('target_id'),});$link.replaceWith(data.new_link);initAjaxChutierLinks();updateStudioChutier();};function onErrorActionToChutier(jqxhr,textStatus,error,$link){void 0;};function initAjaxCompoLinks(){$('.new-composition-link:not(.ajax-enabled)').on('click',onClickNewCompoLink).addClass('ajax-enabled');$('.composition-link:not(.ajax-enabled)').on('click',onClickCompoLink).addClass('ajax-enabled');$('.delete-composition-link:not(.ajax-enabled)').on('click',onClickDeleteCompoLink).addClass('ajax-enabled');};function onClickCompoLink(e){e.preventDefault();openCompo($(this));return false;};function openCompo($link){var cid=$link.attr('cid');var ajax_path=_settings.open_compo_ajax_url+'/'+cid;var path=window.location.origin+Drupal.url(ajax_path);$link.addClass('ajax-loading');$composer.addClass('ajax-loading');$.getJSON(path,{}).done(function(data){onOpenCompoDone(data,$link);}).fail(function(jqxhr,textStatus,error){onErrorOpenCompo(jqxhr,textStatus,error,$link);});};function onOpenCompoDone(data,$link){$('.composition-link').removeClass('is-active');$link.removeClass('ajax-loading').addClass('is-active');if($('.composition',$composer).length){$('.composition',$composer).replaceWith(data.compo);}else{$('header',$composer).after(data.compo);}
+$composer.removeClass('ajax-loading');initDragAndDropUI();$('body').trigger({'type':'on-studio-compo-opened'});};function onErrorOpenCompo(jqxhr,textStatus,error,$link){$link.removeClass('ajax-loading');void 0;};function onClickNewCompoLink(e){e.preventDefault();setInputForNewCompoName($(this));return false;};function setInputForNewCompoName($link){var $form=$('<form>').addClass('new-compo-form').append($('<input>').attr('type','text').attr('placeholder','new name')).append($('<button>').attr('type','submit').html('+')).submit(function(e){onNewCompoFormSubmit(e,$link,$(this));});$link.after($form).addClass('folded');$form.children('input[type="text"]').focus();};function onNewCompoFormSubmit(e,$link,$form){var name=$('input[type="text"]',$form).val();if(name!=''){$form.addClass('ajax-loading').children('*').attr('disabled','disabled');createNewCompo(name,$link,$form);}
+e.preventDefault();};function createNewCompo(name,$link,$form){var ajax_path=$link.attr('data-drupal-link-system-path');var path=window.location.origin+drupalSettings.path.baseUrl+ajax_path;$.getJSON(path,{'new_name':name}).done(function(data){onCreateCompoDone(data,$link,$form);}).fail(function(jqxhr,textStatus,error){onErrorCreateCompo(jqxhr,textStatus,error,$link);});};function onCreateCompoDone(data,$link,$form){var $new_link=$(data.new_link);var $delete_link=$(data.delete_link);$link.removeClass('folded').parents('li').before($('<li>').append($new_link).append($delete_link));$form.remove();initAjaxCompoLinks();openCompo($new_link);};function onErrorCreateCompo(jqxhr,textStatus,error,$link){void 0;};function onClickDeleteCompoLink(e){e.preventDefault();deleteCompo($(this));return false;};function deleteCompo($link){var ajax_path=$link.attr('data-drupal-link-system-path');var path=window.location.origin+Drupal.url(ajax_path);$link.parents('li').addClass('ajax-loading');$.getJSON(path,{}).done(function(data){onDeleteCompoDone(data,$link);}).fail(function(jqxhr,textStatus,error){onErrorDeleteCompo(jqxhr,textStatus,error,$link);});};function onDeleteCompoDone(data,$link,$form){if(data.status=="ok"){$link.parents('li').remove();if($('.composition-link').length){openCompo($('.composition-link').eq(0));}else{$('.composition',$composer).html();}}else{void 0;}};function onErrorDeleteCompo(jqxhr,textStatus,error,$link){$link.parents('li').removeClass('ajax-loading');void 0;};function updateStudioChutier(){$studioChutier=$('#studio-ui .chutier_ui');if($studioChutier.length){var ajax_path=_settings.chutier_ui_ajax;var path=window.location.origin+drupalSettings.path.baseUrl+ajax_path;$studioChutier.addClass('loading');$.getJSON(path,{}).done(function(data){onLoadedChutier($studioChutier,data);}).fail(function(jqxhr,textStatus,error){onLoadChutierError(jqxhr,textStatus,error,$studioChutier);});}};function onLoadedChutier($studioChutier,data){$studioChutier.replaceWith(data.rendered);initAjaxChutierLinks();setChutierDraggable();$('body').trigger({'type':'on-studio-chutier-updated'});}
+function onLoadChutierError(jqxhr,textStatus,error,$studioChutier){void 0;$studioChutier.removeClass('loading');}
+function initDragAndDropUI(){if(!$('.composition_ui .composer .composition .field--name-documents').length){$field_documents=$('<div>').addClass('field').addClass('field--name-documents').appendTo('.composition_ui .composer .composition');}else{$field_documents=$('.composition_ui .composer .composition .field--name-documents');$('.field__item',$field_documents).each(function(i){$(this).prepend($('<span>').addClass('handler'));});}
+var $remove_zone=$('<div>').addClass('remove-drop-zone').appendTo('.composition_ui .composer .composition').droppable({tolerance:'pointer',over:function(e,ui){ui.draggable.addClass('ready-to-remove');},out:function(e,ui){ui.draggable.removeClass('ready-to-remove');},drop:function(e,ui){ui.draggable.remove();}});$field_documents.sortable({revert:false,handle:".handler",receive:function(e,ui){$('.field__item',this).attr('style','');},update:function(e,ui){onOrderChanged(e,ui);},connectWith:$remove_zone,});setChutierDraggable();};function setChutierDraggable(){$('.chutier_ui .item-list li>div').draggable({containment:$('#studio-ui'),scroll:false,helper:function(e){return $('<div>').addClass('field__item').append($('<article>').addClass('node').append($('<h2>').addClass('node-title').append($('.audio-link',this).clone().removeClass('ajax-enable')))).prepend($('<span>').addClass('handler'));},cursorAt:{bottom:10,left:10},zIndex:999,revert:true,revertDuration:0,connectToSortable:$('.composition_ui .composer .composition .field--name-documents'),});}
+function onOrderChanged(e,ui){var cid=$(e.target).parents('.composition').attr('cid');var documents={};$('a',e.target).each(function(i){documents[i]=$(this).attr('nid');});recordCompoList(cid,documents);};function recordCompoList(cid,docs){var ajax_path=_settings.save_compo_ajax_url+'/'+cid;var path=window.location.origin+Drupal.url(ajax_path);$.getJSON(path,{documents:docs}).done(function(data){onRecordCompoDone(data);}).fail(function(jqxhr,textStatus,error){onErrorRecordCompo(jqxhr,textStatus,error);});$('body').trigger({'type':'on-studio-compo-updated'});}
+function onRecordCompoDone(data){if(data.status=="ok"){}else{void 0;}};function onErrorRecordCompo(jqxhr,textStatus,error){void 0;};init();})(jQuery,Drupal,drupalSettings);
@@ -1,20 +1,2 @@
-console.log('EDLP THEME HISTORY.js');
-// var edlp is provided by edlp_ajax.module file
-if(edlp.redirect){
-  console.log('history redirect', edlp);
-  console.log('window.location', window.location);
-  // window.localStorage.setItem('edlp_origin_path', edlp.sys_path.replace(/^\//, ''));
-  edlp.sys_path = edlp.sys_path.replace(/^\//, '');

-  // window.localStorage.setItem('edlp_origin_url', window.location.pathname);
-  edlp.url = window.location.pathname;
-
-  // window.localStorage.setItem('edlp_origin_hash', window.location.hash);
-  edlp.hash = window.location.hash;
-
-  window.localStorage.setItem('edlp_origin', JSON.stringify(edlp));
-  // redirect to home
-  window.location.replace(window.location.origin+'/'+edlp.lang_code);
-}else{
-  console.log('history do not redirect');
-}
+void 0;if(edlp.redirect){void 0;void 0;edlp.sys_path=edlp.sys_path.replace(/^\//,'');edlp.url=window.location.pathname;edlp.hash=window.location.hash;window.localStorage.setItem('edlp_origin',JSON.stringify(edlp));window.location.replace(window.location.origin+'/'+edlp.lang_code);}else{void 0;}
@@ -15,6 +15,7 @@
      start:0,
      end:0
    };
+    var _corpus_promise;

    //  ___      _ _
    // |_ _|_ _ (_) |_
@@ -23,6 +24,11 @@
    function init(){
      console.log("EdlpTheme init()");

+      if(!drupalSettings.path.isFront)
+        return;
+
+      _deferred = initEvents();
+
      _audioPlayer = new AudioPlayer();
      _compoPlayer = new CompoPlayer();

@@ -30,11 +36,10 @@

      initHistory();

-      if(!drupalSettings.path.isFront)
-        return;
-
-      initEvents();
-
+      // if(!drupalSettings.path.isFront)
+      //   return;
+      //
+      // initEvents();
    };

    //  ___             _
@@ -42,8 +47,15 @@
    // | _|\ V / -_) ' \  _(_-<
    // |___|\_/\___|_||_\__/__/
    function initEvents(){
+      // https://www.html5rocks.com/en/tutorials/async/deferred/
+      var $corpus_df = $.Deferred();
+      _corpus_promise = $corpus_df.promise();
+
      _$body
-        .on('corpus-map-ready', onCorpusMapReady)
+        .on('corpus-map-ready', function(e){
+          onCorpusMapReady(e);
+          $corpus_df.resolve();
+        })
        .on('on-studio-chutier-updated', initAjaxLinks)
        .on('studio-initialized', function(e){
          _compoPlayer.newCompo();
@@ -247,6 +259,22 @@
          $('a[data-drupal-link-system-path="'+menu_sys_path+'"]').addClass('is-active-trail');
        }
      }
+      // if entity has corpus-map's linked document call a filter to corpus map
+      if(typeof data.documents_lies != 'undefined'){
+        if(_corpus_ready){
+          _$body.trigger({
+            type:'ajax-node-loaded-linked-documents',
+            nids:data.documents_lies
+          });
+        }else{
+          _corpus_promise.done(function(){
+            _$body.trigger({
+              type:'ajax-node-loaded-linked-documents',
+              nids:data.documents_lies
+            });
+          });
+        }
+      }

      // if block attached (eg : from edlp_productions module)
      // not used anymore as production block is always present (but not visible)
@@ -295,6 +323,8 @@

      initAjaxLinks();

+      checkVisibleCorpusMapSpace();
+
      // trigger other modules behaviours
      _$body.trigger({'type':'new-content-ajax-loaded'});

@@ -378,12 +408,8 @@
      }
      // remove the col
      $col.remove();
-      // if row is empty and we are not in productions or entree notice|index call closeAllModals()
-      if(!$('.col', _$row).length
-        && !_$body.is('.entity-type-node.bundle-page')
-        && !_$body.is('.entity-type-taxonomy_term.bundle-entrees')){
-          backToFrontPage();
-      }
+      checkRowEmpty();
+      checkVisibleCorpusMapSpace();
    };

    //    _    _            ___ _         _
@@ -546,6 +572,7 @@
        .add('a', '#block-footer.menu--footer')
        .add('a', '#block-productions')
        .add('a', 'article.node:not(.node--type-enregistrement) h2.node-title')
+        // .add('a', 'article.node--type-evenement.node--view-mode-teaser .field--name-field-page-liee')
        .add('a', '.productions-subtree')
        .add('a', '.productions-parent')
        // .add('a.index-link, a.notice-link', '#block-edlpentreesblock')
@@ -581,7 +608,7 @@
        return false;
      }

-      // NOT USED (YET)
+      // NOT USED ( YET ? )
      // if($link.is('.language-link')){
        // TODO: change global site current language
        // load all blocks translated (exepted language switcher) ... :/
@@ -666,6 +693,40 @@
      }
    };

+
+    function checkVisibleCorpusMapSpace(){
+      var left_limit = 0, right_limit = 0;
+      _$row.find('.col').each(function(i,e){
+        var $col = $(this);
+        var offset = $col.offset();
+        switch(true){
+          case $col.is('.float-right'):
+            right_limit = Math.max(right_limit, Math.abs(offset.left-window.innerWidth));
+            break;
+          default:
+            left_limit = Math.max(left_limit, offset.left+$col.width());
+            break;
+        }
+      });
+      console.log('checkVisibleCorpusMapSpace left_limit:'+left_limit+" right_limit:"+right_limit);
+
+      if(_corpus_ready){
+        _$body.trigger({
+          type:'visible-space-changed',
+          left_limit:left_limit,
+          right_limit:right_limit
+        });
+      }else{
+        _corpus_promise.done(function(){
+          _$body.trigger({
+            type:'visible-space-changed',
+            left_limit:left_limit,
+            right_limit:right_limit
+          });
+        });
+      }
+    };
+
    //    _          _ _
    //   /_\ _  _ __| (_)___
    //  / _ \ || / _` | / _ \
@@ -1335,53 +1396,6 @@
      // }
    };

-    //  ___            _   ___
-    // | __| _ ___ _ _| |_| _ \__ _ __ _ ___
-    // | _| '_/ _ \ ' \  _|  _/ _` / _` / -_)
-    // |_||_| \___/_||_\__|_| \__,_\__, \___|
-    //                             |___/
-    function backToFrontPage(pop_state){
-      console.log('backToFrontPage', pop_state);
-      closeAllModals();
-      // assume we are going back to front page
-      $('body').removeClass().addClass('path-frontpage');
-      $('a[data-drupal-link-system-path="<front>"]').addClass('is-active');
-      // close entrees
-      _$corpus_canvas.trigger({'type':'close-all-entree'});
-
-      if(typeof pop_state == "undefined" || !pop_state){
-        console.log('backToFrontPage push state');
-        history.pushState({home:true}, null, drupalSettings.path.baseUrl+drupalSettings.path.currentLanguage);
-      }
-    }
-
-    function initHome(){
-      addCloseModalBtnToCols();
-      // console.log('theme : initHome');
-      // console.log('theme : initProductions');
-      var $grid = $('.grid',_$row).masonry({
-        itemSelector:'.col',
-        columnWidth:'.col-2',
-        horizontalOrder: true,
-        containerStyle: null,
-        // disable initial layout
-        // initLayout: false,
-      });
-      // bind event
-      // $grid.masonry( 'on', 'layoutComplete', function() {
-      //   console.log('layout is complete');
-      // });
-
-      // layout Masonry after each image loads
-      $grid.imagesLoaded().progress( function() {
-        $grid.masonry('layout');
-      });
-
-      $grid.imagesLoaded(function(){
-        $grid.masonry('layout');
-      });
-    }
-
    //  ___             _         _   _
    // | _ \_ _ ___  __| |_  _ __| |_(_)___ _ _  ___
    // |  _/ '_/ _ \/ _` | || / _|  _| / _ \ ' \(_-<
@@ -1434,6 +1448,54 @@
      });
    };

+    //  ___            _   ___
+    // | __| _ ___ _ _| |_| _ \__ _ __ _ ___
+    // | _| '_/ _ \ ' \  _|  _/ _` / _` / -_)
+    // |_||_| \___/_||_\__|_| \__,_\__, \___|
+    //                             |___/
+    function backToFrontPage(pop_state){
+      console.log('backToFrontPage', pop_state);
+      closeAllModals();
+      // assume we are going back to front page
+      $('body').removeClass().addClass('path-frontpage');
+      $('a[data-drupal-link-system-path="<front>"]').addClass('is-active');
+      // close entrees
+      _$corpus_canvas.trigger({'type':'close-all-entree'});
+      _$corpus_canvas.trigger({'type':'scramble-collection'});
+
+      if(typeof pop_state == "undefined" || !pop_state){
+        console.log('backToFrontPage push state');
+        history.pushState({home:true}, null, drupalSettings.path.baseUrl+drupalSettings.path.currentLanguage);
+      }
+    }
+
+    function initHome(){
+      addCloseModalBtnToCols();
+      // console.log('theme : initHome');
+      // console.log('theme : initProductions');
+      var $grid = $('.grid',_$row).masonry({
+        itemSelector:'.col',
+        columnWidth:'.col-2',
+        horizontalOrder: true,
+        containerStyle: null,
+        // disable initial layout
+        // initLayout: false,
+      });
+      // bind event
+      // $grid.masonry( 'on', 'layoutComplete', function() {
+      //   console.log('layout is complete');
+      // });
+
+      // layout Masonry after each image loads
+      $grid.imagesLoaded().progress( function() {
+        $grid.masonry('layout');
+      });
+
+      $grid.imagesLoaded(function(){
+        $grid.masonry('layout');
+      });
+    }
+
    //  __  __         _      _
    // |  \/  |___  __| |__ _| |___
    // | |\/| / _ \/ _` / _` | (_-<
@@ -1444,6 +1506,26 @@
      _$row.html('');
      _$ajaxLinks.removeClass('is-active');
      _$body.trigger({'type':'all-modal-closed'});
+      // checkRowEmpty();
+    };
+
+    function checkRowEmpty(){
+      // if row is empty and we are not in productions or entree notice|index call closeAllModals()
+      if(!$('.col', _$row).length){
+        if(!_$body.is('.entity-type-taxonomy_term.bundle-entrees')){
+          if(!_$body.is('.entity-type-node.bundle-page')){
+            // we weren't on production or entree, so go back to front page
+            backToFrontPage();
+          }else{
+            // if we were on production page just scramble collection in case of map was filtered
+            _$corpus_canvas.trigger({'type':'scramble-collection'});
+          }
+        }else{
+          // remove is-active class from index or notice entree links
+          $('.entree-content a.is-active').removeClass('is-active');
+          // TODO: remove the hash index or notice
+        }
+      }
    };

    //  _  _     _
@@ -348,7 +348,24 @@ main[role="main"]{
        @include content_courant;
      }
    }
+  }

+  article.node--type-evenement{
+    .field--name-field-page-liee{
+      @include content_subtitles;
+    }
+    .field--name-field-date{
+      @include content_courant;
+    }
+    .field--name-title{
+      @include content_courant;
+    }
+    // .field--name-body{}
+  }
+  article.node--type-evenement.node--view-mode-aside{
+    .field--name-field-date{
+      @include content_subtitles;
+    }
  }

  div.taxonomy-term{
@@ -439,6 +456,8 @@ main[role="main"]{
    }
  }

+
+
  img{
    max-width: 100%;
    height: auto;
@@ -1744,7 +1763,7 @@ footer{
        }
      }
      &.opened, &.highlighted{
-        li:not(.opened):not(.highlighted){
+        li:not(.opened):not(.highlighted):not(:hover){
          a.term-link{
            color:#a1a1a1;
          }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
bachir	799c739999	mignified assets for prod	2018-04-24 13:53:09 +02:00
bachir	a4cdf3cfd2	new colors	2018-04-24 13:52:16 +02:00
bachir	1e52fb821c	date is now good	2018-04-24 13:49:46 +02:00
bachir	41717783ac	agenda dates displaying ok	2018-04-23 23:35:26 +02:00
bachir	bf0dade005	corpus map evolution zone linked to visible space left by modals	2018-04-23 22:38:02 +02:00
bachir	e4b3ca6c94	updated core to 8.52	2018-04-23 21:33:41 +02:00
bachir	0150486358	changed field upload limits	2018-04-23 21:29:31 +02:00
bachir	878e9adeb6	mignified assets for prod	2018-04-23 21:27:29 +02:00
bachir	afac7f57b0	production page can now filter the cospus map	2018-04-23 20:38:32 +02:00
bachir	cd374d7de8	remis les marges hautes et basses sur la carte corpus	2018-04-23 16:56:46 +02:00
bachir	56a2f0c21f	mignified assets for prod	2018-04-21 10:28:09 +02:00
bachir	f7e402320e	rewrited the corpus map drawing without virtual canvas pre-rendering as it's blured	2018-04-21 10:27:02 +02:00
bachir	79071bf0cc	improved checkcollision performance	2018-04-20 11:18:05 +02:00