css+js

CHANGELOG.md

@@ -1,3 +1,15 @@
+# v1.5.7
+## 01/25/2018
+
+1. [](#new)
+    * Support for AWS Cloudfront forwarded scheme header [#2297](https://github.com/getgrav/grav/pull/2297)
+1. [](#improved)
+    * Set homepage with `https://` protocol [#2299](https://github.com/getgrav/grav/pull/2299)
+    * Preserve accents in fields containing Twig expr. using unicode [#2279](https://github.com/getgrav/grav/pull/2279)
+    * Updated vendor libraries
+1. [](#bugfix)
+    * Support spaces with filenames in responsive images [#2300](https://github.com/getgrav/grav/pull/2300)
+    
 # v1.5.6
 ## 12/14/2018
 

composer.json

@@ -3,7 +3,7 @@
     "type": "project",
     "description": "Modern, Crazy Fast, Ridiculously Easy and Amazingly Powerful Flat-File CMS",
     "keywords": ["cms","flat-file cms","flat cms","flatfile cms","php"],
-    "homepage": "http://getgrav.org",
+    "homepage": "https://getgrav.org",
     "license": "MIT",
     "require": {
         "php": ">=5.6.4",

composer.lock

@@ -52,16 +52,16 @@
         },
         {
             "name": "composer/ca-bundle",
-            "version": "1.1.2",
+            "version": "1.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/ca-bundle.git",
-                "reference": "46afded9720f40b9dc63542af4e3e43a1177acb0"
+                "reference": "8afa52cd417f4ec417b4bfe86b68106538a87660"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/46afded9720f40b9dc63542af4e3e43a1177acb0",
-                "reference": "46afded9720f40b9dc63542af4e3e43a1177acb0",
+                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/8afa52cd417f4ec417b4bfe86b68106538a87660",
+                "reference": "8afa52cd417f4ec417b4bfe86b68106538a87660",
                 "shasum": ""
             },
             "require": {
@@ -104,7 +104,7 @@
                 "ssl",
                 "tls"
             ],
-            "time": "2018-08-08T08:57:40+00:00"
+            "time": "2018-10-18T06:09:13+00:00"
         },
         {
             "name": "doctrine/cache",
@@ -245,16 +245,16 @@
         },
         {
             "name": "donatj/phpuseragentparser",
-            "version": "v0.10.0",
+            "version": "v0.11.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/donatj/PhpUserAgent.git",
-                "reference": "9de58cc2a3e986bfee7f4cea3365c830b765cf65"
+                "reference": "0eab93a89a1a73a087e795abc96d5777c3d48b64"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/donatj/PhpUserAgent/zipball/9de58cc2a3e986bfee7f4cea3365c830b765cf65",
-                "reference": "9de58cc2a3e986bfee7f4cea3365c830b765cf65",
+                "url": "https://api.github.com/repos/donatj/PhpUserAgent/zipball/0eab93a89a1a73a087e795abc96d5777c3d48b64",
+                "reference": "0eab93a89a1a73a087e795abc96d5777c3d48b64",
                 "shasum": ""
             },
             "require": {
@@ -283,7 +283,7 @@
                     "role": "Developer"
                 }
             ],
-            "description": "Simple, streamlined PHP user-agent parser",
+            "description": "Lightning fast, minimalist PHP UserAgent string parser.",
             "homepage": "http://donatstudios.com/PHP-Parser-HTTP_USER_AGENT",
             "keywords": [
                 "browser",
@@ -292,7 +292,7 @@
                 "user agent",
                 "useragent"
             ],
-            "time": "2018-06-21T15:54:46+00:00"
+            "time": "2018-10-25T20:22:53+00:00"
         },
         {
             "name": "erusev/parsedown",
@@ -385,16 +385,16 @@
         },
         {
             "name": "filp/whoops",
-            "version": "2.2.1",
+            "version": "2.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filp/whoops.git",
-                "reference": "e79cd403fb77fc8963a99ecc30e80ddd885b3311"
+                "reference": "bc0fd11bc455cc20ee4b5edabc63ebbf859324c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filp/whoops/zipball/e79cd403fb77fc8963a99ecc30e80ddd885b3311",
-                "reference": "e79cd403fb77fc8963a99ecc30e80ddd885b3311",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/bc0fd11bc455cc20ee4b5edabc63ebbf859324c7",
+                "reference": "bc0fd11bc455cc20ee4b5edabc63ebbf859324c7",
                 "shasum": ""
             },
             "require": {
@@ -442,7 +442,7 @@
                 "throwable",
                 "whoops"
             ],
-            "time": "2018-06-30T13:14:06+00:00"
+            "time": "2018-10-23T09:00:00+00:00"
         },
         {
             "name": "gregwar/cache",
@@ -489,17 +489,17 @@
         },
         {
             "name": "gregwar/image",
-            "version": "v2.0.22",
+            "version": "v2.0.23",
             "target-dir": "Gregwar/Image",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Gregwar/Image.git",
-                "reference": "c506d57d7fb5e67961d4eea6540ae8e23dffd406"
+                "reference": "25fbb91a95d41d44587ee7ca8923745b66221a7d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Gregwar/Image/zipball/c506d57d7fb5e67961d4eea6540ae8e23dffd406",
-                "reference": "c506d57d7fb5e67961d4eea6540ae8e23dffd406",
+                "url": "https://api.github.com/repos/Gregwar/Image/zipball/25fbb91a95d41d44587ee7ca8923745b66221a7d",
+                "reference": "25fbb91a95d41d44587ee7ca8923745b66221a7d",
                 "shasum": ""
             },
             "require": {
@@ -537,36 +537,37 @@
                 "gd",
                 "image"
             ],
-            "time": "2018-01-31T17:40:17+00:00"
+            "time": "2018-10-25T17:12:13+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "1.4.2",
+            "version": "1.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c"
+                "reference": "9f83dded91781a01c63574e387eaa769be769115"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
-                "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/9f83dded91781a01c63574e387eaa769be769115",
+                "reference": "9f83dded91781a01c63574e387eaa769be769115",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.4.0",
-                "psr/http-message": "~1.0"
+                "psr/http-message": "~1.0",
+                "ralouphie/getallheaders": "^2.0.5"
             },
             "provide": {
                 "psr/http-message-implementation": "1.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.0"
+                "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.4-dev"
+                    "dev-master": "1.5-dev"
                 }
             },
             "autoload": {
@@ -596,13 +597,14 @@
             "keywords": [
                 "http",
                 "message",
+                "psr-7",
                 "request",
                 "response",
                 "stream",
                 "uri",
                 "url"
             ],
-            "time": "2017-03-20T17:10:46+00:00"
+            "time": "2018-12-04T20:46:45+00:00"
         },
         {
             "name": "league/climate",
@@ -667,16 +669,16 @@
         },
         {
             "name": "matthiasmullie/minify",
-            "version": "1.3.60",
+            "version": "1.3.61",
             "source": {
                 "type": "git",
                 "url": "https://github.com/matthiasmullie/minify.git",
-                "reference": "ab7fea80ce5ce6549baaf272bc8bd926a7e08f90"
+                "reference": "d5acb8ce5b6acb7d11bafe97cecc533f6e4fd751"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/matthiasmullie/minify/zipball/ab7fea80ce5ce6549baaf272bc8bd926a7e08f90",
-                "reference": "ab7fea80ce5ce6549baaf272bc8bd926a7e08f90",
+                "url": "https://api.github.com/repos/matthiasmullie/minify/zipball/d5acb8ce5b6acb7d11bafe97cecc533f6e4fd751",
+                "reference": "d5acb8ce5b6acb7d11bafe97cecc533f6e4fd751",
                 "shasum": ""
             },
             "require": {
@@ -723,20 +725,20 @@
                 "minifier",
                 "minify"
             ],
-            "time": "2018-04-18T08:50:35+00:00"
+            "time": "2018-11-26T23:10:39+00:00"
         },
         {
             "name": "matthiasmullie/path-converter",
-            "version": "1.1.1",
+            "version": "1.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/matthiasmullie/path-converter.git",
-                "reference": "3082a6838be02b930239a97d38b5c9da4d693aca"
+                "reference": "5e4b121c8b9f97c80835c1d878b0812ba1d607c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/matthiasmullie/path-converter/zipball/3082a6838be02b930239a97d38b5c9da4d693aca",
-                "reference": "3082a6838be02b930239a97d38b5c9da4d693aca",
+                "url": "https://api.github.com/repos/matthiasmullie/path-converter/zipball/5e4b121c8b9f97c80835c1d878b0812ba1d607c9",
+                "reference": "5e4b121c8b9f97c80835c1d878b0812ba1d607c9",
                 "shasum": ""
             },
             "require": {
@@ -772,7 +774,7 @@
                 "paths",
                 "relative"
             ],
-            "time": "2018-02-02T11:30:10+00:00"
+            "time": "2018-10-25T15:19:41+00:00"
         },
         {
             "name": "maximebf/debugbar",
@@ -892,16 +894,16 @@
         },
         {
             "name": "monolog/monolog",
-            "version": "1.23.0",
+            "version": "1.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4"
+                "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
-                "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
+                "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
                 "shasum": ""
             },
             "require": {
@@ -966,7 +968,7 @@
                 "logging",
                 "psr-3"
             ],
-            "time": "2017-06-19T01:22:40+00:00"
+            "time": "2018-11-05T09:00:11+00:00"
         },
         {
             "name": "pimple/pimple",
@@ -1119,16 +1121,16 @@
         },
         {
             "name": "psr/log",
-            "version": "1.0.2",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
+                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
-                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
+                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
                 "shasum": ""
             },
             "require": {
@@ -1162,7 +1164,7 @@
                 "psr",
                 "psr-3"
             ],
-            "time": "2016-10-10T12:19:37+00:00"
+            "time": "2018-11-20T15:27:04+00:00"
         },
         {
             "name": "psr/simple-cache",
@@ -1212,6 +1214,46 @@
             ],
             "time": "2017-10-23T01:57:42+00:00"
         },
+        {
+            "name": "ralouphie/getallheaders",
+            "version": "2.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ralouphie/getallheaders.git",
+                "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
+                "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~3.7.0",
+                "satooshi/php-coveralls": ">=1.0"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/getallheaders.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ralph Khattar",
+                    "email": "ralph.khattar@gmail.com"
+                }
+            ],
+            "description": "A polyfill for getallheaders.",
+            "time": "2016-02-11T07:05:27+00:00"
+        },
         {
             "name": "rockettheme/toolbox",
             "version": "1.4.2",
@@ -1311,16 +1353,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v3.4.17",
+            "version": "v3.4.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "3b2b415d4c48fbefca7dc742aa0a0171bfae4e0b"
+                "reference": "a700b874d3692bc8342199adfb6d3b99f62cc61a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/3b2b415d4c48fbefca7dc742aa0a0171bfae4e0b",
-                "reference": "3b2b415d4c48fbefca7dc742aa0a0171bfae4e0b",
+                "url": "https://api.github.com/repos/symfony/console/zipball/a700b874d3692bc8342199adfb6d3b99f62cc61a",
+                "reference": "a700b874d3692bc8342199adfb6d3b99f62cc61a",
                 "shasum": ""
             },
             "require": {
@@ -1376,20 +1418,20 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2018-10-02T16:33:53+00:00"
+            "time": "2019-01-04T04:42:43+00:00"
         },
         {
             "name": "symfony/debug",
-            "version": "v3.4.17",
+            "version": "v3.4.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",
-                "reference": "0a612e9dfbd2ccce03eb174365f31ecdca930ff6"
+                "reference": "26d7f23b9bd0b93bee5583e4d6ca5cb1ab31b186"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/0a612e9dfbd2ccce03eb174365f31ecdca930ff6",
-                "reference": "0a612e9dfbd2ccce03eb174365f31ecdca930ff6",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/26d7f23b9bd0b93bee5583e4d6ca5cb1ab31b186",
+                "reference": "26d7f23b9bd0b93bee5583e4d6ca5cb1ab31b186",
                 "shasum": ""
             },
             "require": {
@@ -1432,20 +1474,20 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2018-10-02T16:33:53+00:00"
+            "time": "2019-01-01T13:45:19+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v3.4.17",
+            "version": "v3.4.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "b2e1f19280c09a42dc64c0b72b80fe44dd6e88fb"
+                "reference": "d1cdd46c53c264a2bd42505bd0e8ce21423bd0e2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b2e1f19280c09a42dc64c0b72b80fe44dd6e88fb",
-                "reference": "b2e1f19280c09a42dc64c0b72b80fe44dd6e88fb",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d1cdd46c53c264a2bd42505bd0e8ce21423bd0e2",
+                "reference": "d1cdd46c53c264a2bd42505bd0e8ce21423bd0e2",
                 "shasum": ""
             },
             "require": {
@@ -1495,11 +1537,11 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2018-07-26T09:06:28+00:00"
+            "time": "2019-01-01T18:08:36+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.9.0",
+            "version": "v1.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
@@ -1557,16 +1599,16 @@
         },
         {
             "name": "symfony/polyfill-iconv",
-            "version": "v1.9.0",
+            "version": "v1.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-iconv.git",
-                "reference": "bcc0cd69185b8a5d8b4a5400c489ed3333bf9bb2"
+                "reference": "97001cfc283484c9691769f51cdf25259037eba2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/bcc0cd69185b8a5d8b4a5400c489ed3333bf9bb2",
-                "reference": "bcc0cd69185b8a5d8b4a5400c489ed3333bf9bb2",
+                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/97001cfc283484c9691769f51cdf25259037eba2",
+                "reference": "97001cfc283484c9691769f51cdf25259037eba2",
                 "shasum": ""
             },
             "require": {
@@ -1612,20 +1654,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2018-08-06T14:22:27+00:00"
+            "time": "2018-09-21T06:26:08+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.9.0",
+            "version": "v1.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8"
+                "reference": "c79c051f5b3a46be09205c73b80b346e4153e494"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d0cd638f4634c16d8df4508e847f14e9e43168b8",
-                "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/c79c051f5b3a46be09205c73b80b346e4153e494",
+                "reference": "c79c051f5b3a46be09205c73b80b346e4153e494",
                 "shasum": ""
             },
             "require": {
@@ -1671,20 +1713,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2018-08-06T14:22:27+00:00"
+            "time": "2018-09-21T13:07:52+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v3.4.17",
+            "version": "v3.4.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "ff8ac19e97e5c7c3979236b584719a1190f84181"
+                "reference": "a5f39641bb62e8b74e343467b145331273f615a2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ff8ac19e97e5c7c3979236b584719a1190f84181",
-                "reference": "ff8ac19e97e5c7c3979236b584719a1190f84181",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/a5f39641bb62e8b74e343467b145331273f615a2",
+                "reference": "a5f39641bb62e8b74e343467b145331273f615a2",
                 "shasum": ""
             },
             "require": {
@@ -1740,20 +1782,20 @@
                 "debug",
                 "dump"
             ],
-            "time": "2018-10-02T16:33:53+00:00"
+            "time": "2019-01-01T13:45:19+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v3.4.17",
+            "version": "v3.4.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "640b6c27fed4066d64b64d5903a86043f4a4de7f"
+                "reference": "554a59a1ccbaac238a89b19c8e551a556fd0e2ea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/640b6c27fed4066d64b64d5903a86043f4a4de7f",
-                "reference": "640b6c27fed4066d64b64d5903a86043f4a4de7f",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/554a59a1ccbaac238a89b19c8e551a556fd0e2ea",
+                "reference": "554a59a1ccbaac238a89b19c8e551a556fd0e2ea",
                 "shasum": ""
             },
             "require": {
@@ -1799,35 +1841,35 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2018-10-02T16:33:53+00:00"
+            "time": "2019-01-01T13:45:19+00:00"
         },
         {
             "name": "twig/twig",
-            "version": "v1.35.4",
+            "version": "v1.37.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "7e081e98378a1e78c29cc9eba4aefa5d78a05d2a"
+                "reference": "66be9366c76cbf23e82e7171d47cbfa54a057a62"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/7e081e98378a1e78c29cc9eba4aefa5d78a05d2a",
-                "reference": "7e081e98378a1e78c29cc9eba4aefa5d78a05d2a",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/66be9366c76cbf23e82e7171d47cbfa54a057a62",
+                "reference": "66be9366c76cbf23e82e7171d47cbfa54a057a62",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3",
+                "php": ">=5.4.0",
                 "symfony/polyfill-ctype": "^1.8"
             },
             "require-dev": {
                 "psr/container": "^1.0",
                 "symfony/debug": "^2.7",
-                "symfony/phpunit-bridge": "^3.3"
+                "symfony/phpunit-bridge": "^3.4.19|^4.1.8"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.35-dev"
+                    "dev-master": "1.37-dev"
                 }
             },
             "autoload": {
@@ -1865,22 +1907,22 @@
             "keywords": [
                 "templating"
             ],
-            "time": "2018-07-13T07:12:17+00:00"
+            "time": "2019-01-14T14:59:29+00:00"
         }
     ],
     "packages-dev": [
         {
             "name": "behat/gherkin",
-            "version": "v4.5.1",
+            "version": "v4.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Behat/Gherkin.git",
-                "reference": "74ac03d52c5e23ad8abd5c5cce4ab0e8dc1b530a"
+                "reference": "ab0a02ea14893860bca00f225f5621d351a3ad07"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/74ac03d52c5e23ad8abd5c5cce4ab0e8dc1b530a",
-                "reference": "74ac03d52c5e23ad8abd5c5cce4ab0e8dc1b530a",
+                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/ab0a02ea14893860bca00f225f5621d351a3ad07",
+                "reference": "ab0a02ea14893860bca00f225f5621d351a3ad07",
                 "shasum": ""
             },
             "require": {
@@ -1888,8 +1930,8 @@
             },
             "require-dev": {
                 "phpunit/phpunit": "~4.5|~5",
-                "symfony/phpunit-bridge": "~2.7|~3",
-                "symfony/yaml": "~2.3|~3"
+                "symfony/phpunit-bridge": "~2.7|~3|~4",
+                "symfony/yaml": "~2.3|~3|~4"
             },
             "suggest": {
                 "symfony/yaml": "If you want to parse features, represented in YAML files"
@@ -1926,20 +1968,20 @@
                 "gherkin",
                 "parser"
             ],
-            "time": "2017-08-30T11:04:43+00:00"
+            "time": "2019-01-16T14:22:17+00:00"
         },
         {
             "name": "codeception/codeception",
-            "version": "2.5.0",
+            "version": "2.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/Codeception.git",
-                "reference": "dee493561daf644134c95cf176fd2c25aff59ea9"
+                "reference": "4f89de32929fef53ca6d83b159fe329b6d484c1c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/dee493561daf644134c95cf176fd2c25aff59ea9",
-                "reference": "dee493561daf644134c95cf176fd2c25aff59ea9",
+                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/4f89de32929fef53ca6d83b159fe329b6d484c1c",
+                "reference": "4f89de32929fef53ca6d83b159fe329b6d484c1c",
                 "shasum": ""
             },
             "require": {
@@ -2018,7 +2060,7 @@
                 "functional testing",
                 "unit testing"
             ],
-            "time": "2018-09-24T09:33:01+00:00"
+            "time": "2019-01-02T10:28:51+00:00"
         },
         {
             "name": "codeception/phpunit-wrapper",
@@ -3335,16 +3377,16 @@
         },
         {
             "name": "symfony/browser-kit",
-            "version": "v3.4.17",
+            "version": "v3.4.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "f6668d1a6182d5a8dec65a1c863a4c1d963816c0"
+                "reference": "6d98fb221a263c66b1311203fe4eed154035f508"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/f6668d1a6182d5a8dec65a1c863a4c1d963816c0",
-                "reference": "f6668d1a6182d5a8dec65a1c863a4c1d963816c0",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/6d98fb221a263c66b1311203fe4eed154035f508",
+                "reference": "6d98fb221a263c66b1311203fe4eed154035f508",
                 "shasum": ""
             },
             "require": {
@@ -3388,20 +3430,20 @@
             ],
             "description": "Symfony BrowserKit Component",
             "homepage": "https://symfony.com",
-            "time": "2018-07-26T09:06:28+00:00"
+            "time": "2019-01-01T13:45:19+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v3.4.17",
+            "version": "v3.4.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "3503415d4aafabc31cd08c3a4ebac7f43fde8feb"
+                "reference": "12f86295c46c36af9896cf21db6b6b8a1465315d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/3503415d4aafabc31cd08c3a4ebac7f43fde8feb",
-                "reference": "3503415d4aafabc31cd08c3a4ebac7f43fde8feb",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/12f86295c46c36af9896cf21db6b6b8a1465315d",
+                "reference": "12f86295c46c36af9896cf21db6b6b8a1465315d",
                 "shasum": ""
             },
             "require": {
@@ -3441,20 +3483,20 @@
             ],
             "description": "Symfony CssSelector Component",
             "homepage": "https://symfony.com",
-            "time": "2018-10-02T16:33:53+00:00"
+            "time": "2019-01-02T09:30:52+00:00"
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v3.4.17",
+            "version": "v3.4.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "c705bee03ade5b47c087807dd9ffaaec8dda2722"
+                "reference": "311f666d85d1075b0a294ba1f3de4ae9307d8180"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/c705bee03ade5b47c087807dd9ffaaec8dda2722",
-                "reference": "c705bee03ade5b47c087807dd9ffaaec8dda2722",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/311f666d85d1075b0a294ba1f3de4ae9307d8180",
+                "reference": "311f666d85d1075b0a294ba1f3de4ae9307d8180",
                 "shasum": ""
             },
             "require": {
@@ -3498,20 +3540,20 @@
             ],
             "description": "Symfony DomCrawler Component",
             "homepage": "https://symfony.com",
-            "time": "2018-10-02T12:28:39+00:00"
+            "time": "2019-01-01T13:45:19+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v3.4.17",
+            "version": "v3.4.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "54ba444dddc5bd5708a34bd095ea67c6eb54644d"
+                "reference": "3f2a2ab6315dd7682d4c16dcae1e7b95c8b8555e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/54ba444dddc5bd5708a34bd095ea67c6eb54644d",
-                "reference": "54ba444dddc5bd5708a34bd095ea67c6eb54644d",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/3f2a2ab6315dd7682d4c16dcae1e7b95c8b8555e",
+                "reference": "3f2a2ab6315dd7682d4c16dcae1e7b95c8b8555e",
                 "shasum": ""
             },
             "require": {
@@ -3547,20 +3589,20 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2018-10-03T08:46:40+00:00"
+            "time": "2019-01-01T13:45:19+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v3.4.17",
+            "version": "v3.4.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "1dc2977afa7d70f90f3fefbcd84152813558910e"
+                "reference": "0d41dd7d95ed179aed6a13393b0f4f97bfa2d25c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/1dc2977afa7d70f90f3fefbcd84152813558910e",
-                "reference": "1dc2977afa7d70f90f3fefbcd84152813558910e",
+                "url": "https://api.github.com/repos/symfony/process/zipball/0d41dd7d95ed179aed6a13393b0f4f97bfa2d25c",
+                "reference": "0d41dd7d95ed179aed6a13393b0f4f97bfa2d25c",
                 "shasum": ""
             },
             "require": {
@@ -3596,7 +3638,7 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2018-10-02T12:28:39+00:00"
+            "time": "2019-01-02T21:24:08+00:00"
         },
         {
             "name": "victorjonsson/markdowndocs",
@@ -3646,20 +3688,21 @@
         },
         {
             "name": "webmozart/assert",
-            "version": "1.3.0",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozart/assert.git",
-                "reference": "0df1908962e7a3071564e857d86874dad1ef204a"
+                "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a",
-                "reference": "0df1908962e7a3071564e857d86874dad1ef204a",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9",
+                "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.3 || ^7.0"
+                "php": "^5.3.3 || ^7.0",
+                "symfony/polyfill-ctype": "^1.8"
             },
             "require-dev": {
                 "phpunit/phpunit": "^4.6",
@@ -3692,7 +3735,7 @@
                 "check",
                 "validate"
             ],
-            "time": "2018-01-29T19:49:41+00:00"
+            "time": "2018-12-25T11:19:39+00:00"
         }
     ],
     "aliases": [],

system/blueprints/config/site.yaml

@@ -29,11 +29,6 @@ form:
                     label: PLUGIN_ADMIN.DEFAULT_AUTHOR
                     help: PLUGIN_ADMIN.DEFAULT_AUTHOR_HELP
 
-                author.profession:
-                  type: text
-                  size: large
-                  label: Profession
-
                 author.email:
                     type: text
                     size: large

system/blueprints/user/account.yaml

@@ -53,18 +53,11 @@ form:
                 validate:
                   required: true
 
-            profession:
-                type: text
-                size: large
-                label: Profession
-
-
             title:
                 type: text
                 size: large
                 label: PLUGIN_ADMIN.TITLE
 
-
             language:
                 type: select
                 label: PLUGIN_ADMIN.LANGUAGE

system/defines.php

@@ -8,7 +8,7 @@
 
 // Some standard defines
 define('GRAV', true);
-define('GRAV_VERSION', '1.5.6');
+define('GRAV_VERSION', '1.5.7');
 define('GRAV_TESTING', false);
 define('DS', '/');
 

system/src/Grav/Common/Page/Medium/ImageMedium.php

@@ -223,7 +223,7 @@ class ImageMedium extends Medium
         foreach ($this->alternatives as $ratio => $medium) {
             $srcset[] = $medium->url($reset) . ' ' . $medium->get('width') . 'w';
         }
-        $srcset[] = $this->url($reset) . ' ' . $this->get('width') . 'w';
+        $srcset[] = str_replace(' ', '%20', $this->url($reset)) . ' ' . $this->get('width') . 'w';
 
         return implode(', ', $srcset);
     }

system/src/Grav/Common/Page/Page.php

@@ -168,7 +168,7 @@ class Page implements PageInterface
                     unset($process_fields[$field]);
                 }
             }
-            $text_header = Grav::instance()['twig']->processString(json_encode($process_fields), ['page' => $this]);
+            $text_header = Grav::instance()['twig']->processString(json_encode($process_fields, JSON_UNESCAPED_UNICODE), ['page' => $this]);
             $this->header((object)(json_decode($text_header, true) + $ignored_fields));
         }
     }

system/src/Grav/Common/Uri.php

@@ -1140,6 +1140,8 @@ class Uri
             $this->scheme = $env['HTTP_X_FORWARDED_PROTO'];
         } elseif (isset($env['X-FORWARDED-PROTO'])) {
             $this->scheme = $env['X-FORWARDED-PROTO'];
+        } elseif (isset($env['HTTP_CLOUDFRONT_FORWARDED_PROTO'])) {
+            $this->scheme = $env['HTTP_CLOUDFRONT_FORWARDED_PROTO'];
         } elseif (isset($env['REQUEST_SCHEME'])) {
            $this->scheme = $env['REQUEST_SCHEME'];
         } else {
@@ -1168,6 +1170,10 @@ class Uri
            $this->port = (int)$env['HTTP_X_FORWARDED_PORT'];
         } elseif (isset($env['X-FORWARDED-PORT'])) {
            $this->port = (int)$env['X-FORWARDED-PORT'];
+        } elseif (isset($env['HTTP_CLOUDFRONT_FORWARDED_PROTO'])) {
+           // Since AWS Cloudfront does not provide a forwarded port header,
+           // we have to build the port using the scheme.
+           $this->port = $this->port();
         } elseif (isset($env['SERVER_PORT'])) {
            $this->port = (int)$env['SERVER_PORT'];
         } else {

user/config/system.yaml

@@ -1,13 +1,17 @@
 absolute_urls: false
+timezone: ''
+default_locale: null
 param_sep: ':'
 wrapped_site: false
 reverse_proxy_setup: false
 force_ssl: false
 force_lowercase_urls: true
+custom_base_url: ''
 username_regex: '^[a-z0-9_-]{3,16}$'
 pwd_regex: '(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}'
 intl_enabled: true
 languages:
+  supported: {  }
   include_default_lang: true
   translations: true
   translations_fallback: true
@@ -18,13 +22,14 @@ home:
   alias: /home
   hide_in_urls: false
 pages:
-  theme: le_style_de_lours
+  theme: le_style_de_lours_modif
   order:
     by: default
     dir: asc
   list:
     count: 20
   dateformat:
+    default: null
     short: 'd-m-y G:i'
     long: 'F jS \a\t g:ia'
   publish_dates: true
@@ -52,7 +57,9 @@ pages:
     - json
     - rss
     - atom
+  append_url_extension: ''
   expires: 604800
+  cache_control: null
   last_modified: false
   etag: false
   vary_accept_encoding: false
@@ -82,6 +89,8 @@ cache:
   lifetime: 604800
   gzip: false
   allow_webserver_gzip: false
+  redis:
+    socket: false
 twig:
   cache: false
   debug: false
@@ -120,6 +129,8 @@ images:
   auto_fix_orientation: false
 media:
   enable_media_timestamp: false
+  unsupported_inline_types: {  }
+  allowed_fallback_types: {  }
   auto_metadata_exif: false
   upload_limit: 2097152
 session:
@@ -130,8 +141,10 @@ session:
   secure: false
   httponly: true
   split: true
+  path: null
 gpm:
   releases: stable
+  proxy_url: null
   method: auto
   verify_peer: true
   official_gpm_only: true

user/pages/02.metier/_img1/text.md

@@ -1,7 +0,0 @@
----
-title: 'Secrétaire d’édition et de rédaction'
-image_align: left
----
-
-Quelques soit l’avancée de votre projet, je vous accompagne de la rédaction à la livraison. Secrétaire de rédaction, je prends en charge les corrections et si besoin la réécriture de votre document, dans le respect des normes ortho-typographiques en vigueur. Formé au droit à l’image,  je vérifie leur bonne conformité, leur résolution, vous oriente dans les choix iconographiques. 
-

user/pages/02.metier/_img3/text.md

@@ -1,12 +0,0 @@
----
-title: 'Étape 1'
-media_order: etape_1.jpg
-image_align: left
----
-
-Je prends connaissance du projet. Je vous conseille.On définit ensemble le cahier des charges technique :
-- style graphique,
-- caractéristiques techniques (format, nombre de pages, nombre de plis, type de papier, nature du 
-support, nombre de couleurs, mode d’impression, finition…),
-- nombre d’exemplaires,
-- date et mode de livraison.

user/pages/02.metier/_img4/text.md

@@ -1,12 +0,0 @@
----
-title: 'Étape 2'
-media_order: etape_2.jpg
-image_align: left
----
-
-Je prends connaissance du projet. Je vous conseille.On définit ensemble le cahier des charges technique :
-- style graphique,
-- caractéristiques techniques (format, nombre de pages, nombre de plis, type de papier, nature du 
-support, nombre de couleurs, mode d’impression, finition…),
-- nombre d’exemplaires,
-- date et mode de livraison.

user/pages/02.metier/_test1/text.md

@@ -1,12 +0,0 @@
----
-title: 'Étape 3'
-media_order: etape_3.jpg
-image_align: left
----
-
-Je prends connaissance du projet. Je vous conseille.On définit ensemble le cahier des charges technique :
-- style graphique,
-- caractéristiques techniques (format, nombre de pages, nombre de plis, type de papier, nature du 
-support, nombre de couleurs, mode d’impression, finition…),
-- nombre d’exemplaires,
-- date et mode de livraison.

user/pages/02.metier/_text1/text.md

@@ -1,12 +0,0 @@
----
-title: 'Étape 4'
-media_order: etape_4.jpg
-image_align: left
----
-
-Je prends connaissance du projet. Je vous conseille.On définit ensemble le cahier des charges technique :
-- style graphique,
-- caractéristiques techniques (format, nombre de pages, nombre de plis, type de papier, nature du 
-support, nombre de couleurs, mode d’impression, finition…),
-- nombre d’exemplaires,
-- date et mode de livraison.

user/pages/02.metier/modular.md

@@ -1,7 +0,0 @@
----
-title: Metier
-content:
-    items: '@self.modular'
----
-
-### FIABILITÉ - ÉCOUTE - ENGAGEMENT

user/pages/02.nouvelle-section-1/03.etape-1/item.md

@@ -0,0 +1,16 @@
+---
+title: 'étape 1'
+media_order: etape_1.jpg
+---
+
+Définir/préciser le projet ensemble
+Quel public ?
+Quel style ?
+Quel format ?
+Combien de pages ?
+Quel type de papier ou autre support ?
+Combien de couleurs ?
+Quels délais ?
+Quel graphiste ?
+Quel imprimeur ?
+Quel prix ?

user/pages/02.nouvelle-section-1/04.etape-2/item.md

@@ -0,0 +1,15 @@
+---
+title: 'étape 2'
+media_order: etape_2.jpg
+---
+
+Le mettre en forme
+Secrétariat de rédaction :
+    • Relecture, vérification, uniformisation des textes
+    • Correction orthographique, typographique, grammaticale des textes
+Iconographie
+Vérification des mentions légales
+Direction artistique :
+    • Mise en page, PAO
+    • Corrections maquettes, ajustements, chromie
+Validation, bon à graver (BAG)

user/pages/02.nouvelle-section-1/05.etape-3/item.md

@@ -0,0 +1,10 @@
+---
+title: 'étape 3'
+media_order: etape_3.jpg
+---
+
+L’imprimer, le fabriquer
+Demande de Bon à tirer (BAT)
+Contrôle qualité
+Impression, finition
+Livraison

user/pages/02.nouvelle-section-1/06.etape-4/item.md

@@ -0,0 +1,10 @@
+---
+title: 'étape 4'
+media_order: etape_4.jpg
+---
+
+Le réceptionner
+Délais initiaux respectés
+Budget tenu
+Document de qualité
+Client satisfait

user/pages/02.nouvelle-section-1/blog.md

@@ -0,0 +1,14 @@
+---
+title: Métier
+content:
+    items:
+        - '@self.children'
+    limit: 0
+    order:
+        by: default
+        dir: asc
+    pagination: true
+    url_taxonomy_filters: true
+---
+    
+### FIABILITÉ - ÉCOUTE - ENGAGEMENT

user/pages/03.nouvelle-section-2/01.sous-section-2-1/blog.md

@@ -0,0 +1,15 @@
+---
+title: 'travaux réalisés'
+blog:
+    config: true
+content:
+    items:
+        - '@self.children'
+    limit: 0
+    order:
+        by: default
+        dir: desc
+    pagination: true
+    url_taxonomy_filters: true
+---
+

user/pages/03.nouvelle-section-2/01.sous-section-2-1/projet-n-2/item.md

@@ -0,0 +1,7 @@
+---
+title: 'projet n°2'
+media_order: LivretA5_ouvgroupe_EXE_HD3-1.jpg
+---
+
+Livret A5 32 pages réalisé pour les Scouts et Guides de France.
+Secrétariat de rédaction, secrétariat d'édition et fabrication : www.lestyledelours.fr

user/pages/03.nouvelle-section-2/01.sous-section-2-1/projet-n-3/item.md

@@ -0,0 +1,7 @@
+---
+title: 'projet n°3'
+media_order: affiche_AFS_cartedumonde_v13.jpg
+---
+
+Affiche 60 x 80 cm réalisée pour AFS Vivre sans frontière.
+Conception, secrétariat de rédaction, secrétariat d'édition et fabrication : www.lestyledelours.fr

user/pages/03.nouvelle-section-2/01.sous-section-2-1/projet-n-4/item.md

@@ -0,0 +1,7 @@
+---
+title: 'projet n°4'
+media_order: 'RA SC Paris 2017_V6-1.jpg'
+---
+
+Livret A5, 36 pages, réalisé pour le Secours Catholique de Paris.
+Secrétariat de rédaction, secrétariat d'édition et fabrication : www.lestyledelours.fr

user/pages/03.nouvelle-section-2/01.sous-section-2-1/projet-n-5/item.md

@@ -0,0 +1,7 @@
+---
+title: 'projet n°5'
+media_order: Formations_SC_Paris2018_HD-1.jpg
+---
+
+Rapport d'activité A4, 52 pages, réalisé pour le Secours Catholique de Paris.
+Secrétariat de rédaction, secrétariat d'édition et fabrication : www.lestyledelours.fr

user/pages/03.nouvelle-section-2/01.sous-section-2-1/projet-n-6/item.md

@@ -0,0 +1,7 @@
+---
+title: 'projet n°6'
+media_order: SIGNAL_HD-1.jpg
+---
+
+Dépliant 4-pages A4 réalisé pour le Secours Catholique Paris.
+Secrétariat d'édition et de rédaction + fabrication : www.lestyledelours.fr

user/pages/03.nouvelle-section-2/01.sous-section-2-1/projet-n-7/item.md

@@ -0,0 +1,7 @@
+---
+title: 'projet n°7'
+media_order: RA_Solifap2018.jpg
+---
+
+Brochure A4, 20 pages, réalisée pour SOLIFAP.
+Secrétariat de rédaction, secrétariat d'édition, fabrication : www.lestyledelours.fr

user/pages/03.nouvelle-section-2/01.sous-section-2-1/projetn-1/item.md

@@ -0,0 +1,7 @@
+---
+title: ProjetN°1
+media_order: depliant-v12_IMP_HD-1.jpg
+---
+
+Plaquette 3-volets A4 réalisée pour l'école Massillon à Paris.
+Secrétariat de rédaction, secrétariat d'édition et fabrication : www.lestyledelours.fr

user/pages/03.nouvelle-section-2/02.recommandations/blog.md

@@ -0,0 +1,15 @@
+---
+title: recommandations
+blog:
+    config: true
+content:
+    items:
+        - '@self.children'
+    limit: 5
+    order:
+        by: date
+        dir: desc
+    pagination: true
+    url_taxonomy_filters: true
+---
+

user/pages/03.nouvelle-section-2/02.recommandations/reco-n-1/item.md

@@ -0,0 +1,7 @@
+---
+title: 'reco n°1'
+media_order: versoHD.jpg
+---
+
+Ludovic, Signal Expertise
+« Parfait ! Merci Emmanuel pour ton travail réalisé dans les délais. »

user/pages/03.nouvelle-section-2/02.recommandations/reco-n-2/item.md

@@ -0,0 +1,8 @@
+---
+title: 'reco n°2'
+media_order: versoHD.jpg
+---
+
+**Antoine, Secours Catholique**
+
+« Je travaille régulièrement avec Emmanuel sur l'édition de documents pour l’association. J'apprécie son regard et sa capacité à traduire nos messages. Emmanuel est un conseil précieux pour améliorer la qualité de nos publications, dans le fond comme dans la forme. »

user/pages/03.nouvelle-section-2/02.recommandations/reco-n-3/item.md

@@ -0,0 +1,8 @@
+---
+title: 'reco n°3'
+media_order: versoHD.jpg
+---
+
+**Antoine, CCFD-Terre Solidaire**
+
+« J'ai travaillé avec Emmanuel lorsque j'étais DG du CCFD-Terre Solidaire. J'ai apprécié son grand professionnalisme et son souci à toujours trouver la bonne réponse à mes demandes en matière d'édition de documents. »

user/pages/03.nouvelle-section-2/02.recommandations/reco-n-4/item.md

@@ -0,0 +1,8 @@
+---
+title: 'reco n°4'
+media_order: versoHD.jpg
+---
+
+**Philippe, fondation Terre Solidaire**
+
+« Ce fut un très grand plaisir de travailler avec Emmanuel. J’ai fortement apprécié ses capacités à conseiller, écouter, préciser et enrichir mes demandes de productions. Il faut souligner son respect des délais, la rigueur et la précision de son travail qui met en confiance et rassure. »

user/pages/03.nouvelle-section-2/02.recommandations/reco-n-5/item.md

@@ -0,0 +1,8 @@
+---
+title: 'reco n°5'
+media_order: versoHD.jpg
+---
+
+**Philippe, CCFD-Terre Solidaire**
+
+« J'ai collaboré avec Emmanuel lorsque j'étais directeur. Je n'ai eu qu'à m'en féliciter : réactivité, inventivité, clarté des suggestions, fiabilité des budgets, maîtrise technique. Et, derrière l'homme discret, une belle expérience humaine et une passion pour son métier. »

user/pages/03.nouvelle-section-2/03.clients/blog.md

@@ -0,0 +1,14 @@
+---
+title: Clients
+media_order: 'EC_BD.jpg,etape_4.jpg'
+content:
+    items:
+        - '@self.children'
+    limit: 5
+    order:
+        by: date
+        dir: desc
+    pagination: true
+    url_taxonomy_filters: true
+---
+

user/pages/03.reference/_01.travaux_realises/_projet1/text.md

@@ -1,9 +0,0 @@
----
-title: 'projet 1'
-media_order: etape_4.jpg
-image_align: left
----
-
-Dépliant 4 pages A4 réalisé pour le Secours Catholique Paris
-Secrétariat d'édition
-et de rédaction + fabrication

user/pages/03.reference/_01.travaux_realises/_secours-cat/text.md

@@ -1,8 +0,0 @@
----
-title: 'Secours cat'
-media_order: 46446946_252836978923795_7087389658438434816_n.jpg
-image_align: left
----
-
-Dépliant 4 pages A4 réalisé pour le Secours Catholique Paris
-Secrétariat d'édition et de rédactio, + fabrication

user/pages/03.reference/_01.travaux_realises/_secours-cat0/text.md

@@ -1,8 +0,0 @@
----
-title: 'Secours cat'
-media_order: 46446946_252836978923795_7087389658438434816_n.jpg
-image_align: left
----
-
-Dépliant 4 pages A4 réalisé pour le Secours Catholique Paris
-Secrétariat d'édition et de rédactio, + fabrication

user/pages/03.reference/_01.travaux_realises/modular.md

@@ -1,10 +0,0 @@
----
-title: 'Travaux réalisés'
-taxonomy:
-    category:
-        - gallerie
-image_align: left
-content:
-    items: '@self.modular'
----
-

user/pages/03.reference/_02.recommandations/_reco1/text.md

@@ -1,9 +0,0 @@
----
-title: 'reco1'
-media_order: etape_4.jpg
-image_align: left
----
-
-Dépliant 4 pages A4 réalisé pour le Secours Catholique Paris
-Secrétariat d'édition
-et de rédaction + fabrication

user/pages/03.reference/_02.recommandations/modular.md

@@ -1,10 +0,0 @@
----
-title: Recommandation
-taxonomy:
-    category:
-        - gallerie
-image_align: left
-content:
-    items: '@self.modular'
----
-

user/pages/03.reference/_03.clients/_reco1/text.md

@@ -1,5 +0,0 @@
----
-title: 'logo1'
-media_order: etape_4.jpg
-image_align: left
----

user/pages/03.reference/_03.clients/modular.md

@@ -1,6 +0,0 @@
----
-title: Clients
-image_align: left
-content:
-    items: '@self.modular'
----

user/pages/04.contact/modular.md → user/pages/04.contact/blog.md

@@ -1,17 +1,16 @@
 ---
 title: Contact
 content:
-    items: '@self.modular'
-image_align: left
+    items:
+        - '@self.children'
+    limit: 5
+    order:
+        by: date
+        dir: desc
+    pagination: true
+    url_taxonomy_filters: true
 ---
 
-LE STYLE DE L'OURS
-Emmanuel CAUCHOIS
-10, rue Georges-Guynemer
-78300 POISSY
-Tél. : 06 03 23 08 42
-Email : lesstyledelours@sfr.fr
-
 NOM DU FICHIER : 
 Emmanuel Cauchois
 FORMAT : 
@@ -31,4 +30,4 @@ emmanuelcauchois.fr
 RÉSOLUTION : 
 mettre mon expérience au service de la qualité de vos projets.
 DÉPÔT LÉGAL : 
-Mai 2018
+Mai 2018

user/pages/04.contact/conditions-generales-des-services/item.md

@@ -0,0 +1,22 @@
+---
+title: 'conditions générales des services'
+---
+
+Article 1. Généralités
+
+Les conditions générales de service établies ci-dessous régissent toutes les relations contractuelles établies entre LE STYLE DE L’OURS, entreprise individuelle d’Emmanuel Cauchois, ci-dessous nommée l’entreprise d’une part, et le client, d’autre part.
+
+LE STYLE DE L’OURS est domiciliée au 10 rue Georges-Guynemer, 78300 Poissy.
+
+LE STYLE DE L’OURS – Emmanuel Cauchois est enregistrée sous le numéro de SIRET 495 107 286 00025.
+
+ Article 2. Objet et champ d’application
+
+Les conditions générales de service doivent être lues et acceptées par le client lors de la signature d’un devis, valant contrat. Le client s’engage avoir pris connaissance de ces conditions générales de service lorsqu’il signe avec la mention « Bon pour accord » tout devis établi par l’entreprise à son attention.
+
+L’entreprise tient à disposition un exemplaire exhaustif de conditions générales de service au client qui en ferait la demande.
+
+Les CGS entrent en vigueur dès leur publication sur le site internet lestyledelours.fr et sont applicables à tout client de l’entreprise. Les CGS restent en vigueur jusqu’à l’extinction des obligations de l’entreprise et de ses clients.
+
+Article 3. Services et prix
+

user/themes/le_style_de_lours/js/scritps.js

@@ -1,17 +0,0 @@
-function jcarousel() {
-      $('.slider').bxSlider({
-        // preloadImages: 'visible',
-        minSlides: 1,
-        maxSlides : 3,
-        // mode: 'fade',
-   captions: true,
-   pagerCustom: '#bx-pager',
-   adaptiveWidth: true,
-   // slideWidth: 600
-      });
-}
-
-
-jQuery(document).ready(function($){
-jcarousel();
-});

user/themes/le_style_de_lours/scss/theme/_animation.scss

@@ -1,23 +0,0 @@
-.default-animation {
-  transition: all 0.5s ease;
-}
-
-// Pulse Animation
-.pulse {
-  animation-name: pulse_animation;
-  animation-duration: 2000ms;
-  transform-origin:70% 70%;
-  animation-iteration-count: infinite;
-  animation-timing-function: linear;
-}
-
-@keyframes pulse_animation {
-  0% { transform: scale(1); }
-  30% { transform: scale(1); }
-  40% { transform: scale(1.08); }
-  50% { transform: scale(1); }
-  60% { transform: scale(1); }
-  70% { transform: scale(1.05); }
-  80% { transform: scale(1); }
-  100% { transform: scale(1); }
-}

user/themes/le_style_de_lours/scss/theme/_carousel.scss

@@ -1,13 +0,0 @@
-.bx-wrapper{
-  .slider{
-    & > div{
-      // width: auto!important;
-    }
-  }
-  .img{
-    img{
-      width: auto;
-      height: 300px;
-    }
-  }
-}

user/themes/le_style_de_lours/scss/theme/_start.scss

@@ -1,90 +0,0 @@
-#start{
-  section{
-    position: relative;
-    margin-top: -10px;
-    margin-bottom: 100px;
-    padding-top: 5px;
-    & > h2, & > h3{
-      text-align: center;
-    }
-    h3{
-      width: 100%;
-    }
-  }
-   h2{
-    text-align: center;
-    width: 350px;
-    background: white;
-    z-index: 1;
-    margin: auto;
-    margin-top: -35px;
-  }
-  .filet{
-    z-index: -1;
-    width: auto;
-    height: 2px;
-    background: black;
-  }
-  #home{
-    width: 60%;
-    margin: 0 auto 100px auto;
-  }
-  #metier{
-    background: #bd9a8428;
-    display: inline-flex;
-    flex-wrap: wrap;
-    justify-content: space-around;
-    .block{
-      width: 35%;
-      min-width: 350px;
-      &:nth-of-type(n+3){
-        position: relative;
-        .title{
-          position: absolute;
-          z-index: 1;
-          transform: rotate(-35deg);
-          background: red;
-        }
-      .img{
-        height: auto;
-        position: relative;
-        .content{
-          position: absolute;
-          top: 0;
-          left: 0;
-          display: none;
-          height: 100%;
-          background: #0f265cff;
-          opacity: 0.9;
-          p,ul,li{
-            color: white;
-          }
-        }
-        &:hover{
-          .content{
-            display: block;
-          }
-        }
-      }
-    }
-    }
-  }
-  #référence{
-    background: #fff59b8c;
-  }
-  #contact{
-    display: inline-flex;
-    width: 100%;
-    p{
-      &:nth-of-type(1){
-        width: 60%;
-      }
-      &:nth-of-type(2){
-        width: 40%;
-      }
-    }
-    .block{
-      display: none;
-    }
-  }
-}

user/themes/le_style_de_lours/templates/modular.html.twig

@@ -1,72 +0,0 @@
-{% extends 'partials/base.html.twig' %}
-
-{% macro pageLinkName(text) %}{{ text|lower|replace({' ':'_'}) }}{% endmacro %}
-
-{% import _self as macro %}
-
-{% set show_onpage_menu = header.onpage_menu == true or header.onpage_menu is null %}
-
-{% block javascripts %}
-    {% if show_onpage_menu %}
-        {% do assets.add('theme://js/singlepagenav.min.js') %}
-    {% endif %}
-    {{ parent() }}
-{% endblock %}
-
-{% block bottom %}
-    {{ parent() }}
-    {% if show_onpage_menu %}
-        <script>
-        // singlePageNav initialization & configuration
-        $('ul.navigation').singlePageNav({
-            offset: $('#header').outerHeight(),
-            filter: ':not(.external)',
-            updateHash: true,
-            currentClass: 'active'
-        });
-        </script>
-    {% endif %}
-{% endblock %}
-
-{% block header_navigation %}
-    {% if show_onpage_menu %}
-        <ul class="navigation">
-        {% for module in page.collection() if module.header.visible is not same as(false) %}
-            {% set current_module = (module.active or module.activeChild) ? 'active' : '' %}
-            <li><a class="{{ current_module }}" href="#{{ macro.pageLinkName(module.menu) }}">{{ module.menu }}</a></li>
-        {% endfor %}
-        {% for mitem in site.menu %}
-            <li>
-                <a {% if mitem.class %}class="{{ mitem.class }}"{% endif %} href="{{ mitem.url }}">
-                    {% if mitem.icon %}<i class="fa fa-{{ mitem.icon }}"></i>{% endif %}
-                    {{ mitem.text }}
-                </a>
-            </li>
-        {% endfor %}
-        </ul>
-    {% else %}
-        {{  parent() }}
-    {% endif %}
-{% endblock %}
-
-{% block body %}
-  <section id="home">
-    {{ content }}
-  </section>
-
-    {% for module in page.collection() %}
-
-      <div class="filet"></div>
-      <h2>{{ module.title|raw }}</h2>
-      <section id="{{ macro.pageLinkName(module.menu) }}">
-
-        {{ module.content|raw }}
-
-      {% for children in module.collection() %}
-        {{children.content}}
-      {% endfor %}
-
-      </section>
-    {% endfor %}
-
-{% endblock %}

user/themes/le_style_de_lours/templates/modular/modular.html.twig

@@ -1,58 +0,0 @@
-{% set image = page.media.images|first %}
-{% set tax = header.taxonomy.category %}
-
-{% if tax %}
-
-  <div class="block">
-    {% if image %}
-      <div>
-        {{ content|raw }}
-      </div>
-
-      <div>
-        {% if image %}
-          {{ image.html|raw }}
-        {% endif %}
-      </div>
-
-    {% else %}
-
-      <h3>{{page.title}}</h3>
-      {{ content|raw }}
-
-    {% endif %}
-
-    <div class="slider">
-        {% for module in page.collection() %}
-        <div>
-            {{module.content|raw}}
-        </div>
-        {% endfor %}
-
-    </div>
-  </div>
-
-{% else %}
-  <div class="block">
-    {% if image %}
-      <div>
-        {{ content|raw }}
-      </div>
-
-      <div>
-        {% if image %}
-          {{ image.html|raw }}
-        {% endif %}
-      </div>
-
-    {% else %}
-      <h3>{{page.title}}</h3>
-      {{ content|raw }}
-    {% endif %}
-
-    {% for module in page.collection() %}
-      {{module.content|raw}}
-    {% endfor %}
-  </div>
-
-{% endif %}

user/themes/le_style_de_lours/templates/modular/text.html.twig

@@ -1,16 +0,0 @@
-{% set image = page.media.images|first %}
-
-<div class="block">
-  <div class="title">
-    <h3>{{ page.title|raw }}</h3>
-  </div>
-
-  <div class="img">
-    {{ image.html|raw }}
-    {% if content %}
-      <div class="content">
-        {{ content|raw }}
-      </div>
-    {% endif %}
-  </div>
-</div>

user/themes/le_style_de_lours/templates/partials/base.html.twig

@@ -1,98 +0,0 @@
-{% set compress = theme_var('production-mode') ? '.min.css' : '.css' %}
-<!DOCTYPE html>
-<html lang="{{ grav.language.getActive ?: grav.config.site.default_lang }}">
-<head>
-{% block head %}
-    <meta charset="utf-8" />
-    <title>{% if header.title %}{{ header.title|e('html') }} | {% endif %}{{ site.title|e('html') }}</title>
-
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    {% include 'partials/metadata.html.twig' %}
-
-    <link rel="icon" type="image/png" href="{{ url('theme://images/favicon.png') }}" />
-    <link rel="canonical" href="{{ page.url(true, true) }}" />
-
-    {% block stylesheets %}
-        {% do assets.addCss('theme://css-compiled/theme'~compress) %}
-    {% endblock %}
-    {{ assets.css()|raw }}
-
-    {% block javascripts %}
-        {% do assets.addJs('jquery', 101) %}
-        {% do assets.addJs('theme://js/jquery.treemenu.js', {group:'bottom'}) %}
-        {% do assets.addJs('theme://js/jquery.bxslider.min.js', {group:'bottom'}) %}
-        {% do assets.addJs('theme://js/scritps.js', {group:'bottom'}) %}
-        {% do assets.addJs('theme://js/site.js', {group:'bottom'}) %}
-    {% endblock %}
-    {{ assets.js()|raw }}
-
-{% endblock head %}
-</head>
-<body id="top">
-
-
-{% block header %}
-<section class="header">
-
-    <nav class="navbar">
-      {% block header_navigation %}
-        {% include 'partials/navigation.html.twig' %}
-      {% endblock %}
-    </nav>
-
-    <div class="title">
-      <h1><a href="{{ home_url }}">{{site.title}}</a></h1>
-      <div class="filet"></div>
-    </div>
-
-    <section class="logo">
-
-      <section id="user">
-        <div class="name">
-          <p>{{ theme_config.profile.name | default(site.author.name) }}</p>
-        </div>
-
-        <div class="pro">
-          <p>{{ site.author.profession }}</p>
-        </div>
-      </section>
-
-      {% include 'partials/logo.html.twig' %}
-
-      {% for module in page.find('/home').children.order('date', 'desc') %}
-        <section class="why_lsdo close">
-          {{module.content}}
-          <svg>
-            <path d="M 5,0 100,5 0,35 Z" style="fill:#964587" />
-          </svg>
-        </section>
-      {% endfor %}
-
-    </section>
-
-    <div class="mobile-menu">
-      <div class="button_container" id="toggle">
-        <span class="top"></span>
-        <span class="middle"></span>
-        <span class="bottom"></span>
-      </div>
-    </div>
-
-</section>
-{% endblock %}
-
-  <section id="start">
-    {% block body %}{% endblock %}
-  </section>
-
-  {% block footer %}
-      {% include 'partials/footer.html.twig' %}
-  {% endblock %}
-
-  {% block bottom %}
-    {{ assets.js('bottom')|raw }}
-  {% endblock %}
-
-</body>
-</html>

user/themes/le_style_de_lours/templates/partials/footer.html.twig

@@ -1,7 +0,0 @@
-<section id="footer">
-  {% for module in page.find('/contact').children.order('date', 'desc') %}
-    <ul class="nav-footer">
-      <li><a href="#{{ macro.pageLinkName(module.menu) }}">{{module.title}}</a></li>
-    </ul>
-  {% endfor %}
-</section>

user/themes/le_style_de_lours/blueprints.yaml → user/themes/le_style_de_lours_modif/blueprints.yaml

@@ -1,4 +1,4 @@
-name: le_style_de_lours
+name: le_style_de_lours_modif
 version: 1.0
 description: Theme pour le site internet Le style de l'ours
 icon:  microchip

user/themes/le_style_de_lours/blueprints/blog.yaml → user/themes/le_style_de_lours_modif/blueprints/blog.yaml

@@ -14,6 +14,19 @@ form:
       active: 1
 
       fields:
+
+        content:
+          fields:
+            header.blog.config:
+              type: toggle
+              label: Gallerie
+              highlight: 1
+              options:
+                  1: Oui
+                  0: Non
+              validate:
+                  type: bool
+
         advanced:
           fields:
             overrides:
@@ -90,5 +103,3 @@ form:
           import@:
             type: partials/blog-bits
             context: blueprints://pages
-
-