Update : Add CKEditor with image / media + Add Page BO + Add reconversion + Add…

Update : Add CKEditor with image / media + Add Page BO + Add reconversion + Add reconverti on transfert groupe comptoir...

Update : Add CKEditor with image / media + Add Page BO + Add reconversion + Add…
Update : Add CKEditor with image / media + Add Page BO + Add reconversion + Add reconverti on transfert groupe comptoir...
5015f2c7 · Julien Jorry · 99f8ef01 · 5015f2c7 · 5015f2c7 · 5015f2c7
Commit 5015f2c7 authored Mar 07, 2019 by Julien Jorry
21 changed files
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,6 @@
        "ext-ctype": "*",
        "ext-iconv": "*",
        "api-platform/api-pack": "^1.2",
-        "friendsofsymfony/ckeditor-bundle": "^2.0",
        "friendsofsymfony/rest-bundle": "^2.4",
        "friendsofsymfony/user-bundle": "^2.1",
        "geocoder-php/cache-provider": "^4.1",
@@ -25,6 +24,7 @@
        "sonata-project/block-bundle": "^3.12",
        "sonata-project/doctrine-orm-admin-bundle": "^3.6",
        "sonata-project/easy-extends-bundle": "^2.5",
+        "sonata-project/formatter-bundle": "^4.1",
        "sonata-project/intl-bundle": "^2.5",
        "sonata-project/media-bundle": "^3.16",
        "sonata-project/translation-bundle": "^2.4",

--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "7ac11d25e4e3f7f116995e5f3029628d",
+    "content-hash": "c855f16e7c222c9670fefee9294ed53b",
    "packages": [
        {
            "name": "api-platform/api-pack",
@@ -1662,47 +1662,49 @@
        },
        {
            "name": "friendsofsymfony/ckeditor-bundle",
-            "version": "2.0.1",
+            "version": "1.2.0",
            "source": {
                "type": "git",
                "url": "https://github.com/FriendsOfSymfony/FOSCKEditorBundle.git",
-                "reference": "6f05079d769b32a3f61629a0aa33f937a5374cec"
+                "reference": "7d428b16154a7136e1dd4c11062573afa1bfb3df"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfSymfony/FOSCKEditorBundle/zipball/6f05079d769b32a3f61629a0aa33f937a5374cec",
+                "url": "https://api.github.com/repos/FriendsOfSymfony/FOSCKEditorBundle/zipball/7d428b16154a7136e1dd4c11062573afa1bfb3df",
-                "reference": "6f05079d769b32a3f61629a0aa33f937a5374cec",
+                "reference": "7d428b16154a7136e1dd4c11062573afa1bfb3df",
                "shasum": ""
            },
            "require": {
-                "ext-json": "*",
                "ext-zip": "*",
-                "php": "^7.1",
+                "php": "^5.6 || ^7.0",
-                "symfony/asset": "^3.4 || ^4.0",
+                "symfony/asset": "^2.7 || ^3.0 || ^4.0",
-                "symfony/config": "^3.4 || ^4.0",
+                "symfony/config": "^2.7 || ^3.0 || ^4.0",
-                "symfony/dependency-injection": "^3.4 || ^4.0",
+                "symfony/dependency-injection": "^2.7 || ^3.0 || ^4.0",
-                "symfony/expression-language": "^3.4 || ^4.0",
+                "symfony/expression-language": "^2.7 || ^3.0 || ^4.0",
-                "symfony/form": "^3.4 || ^4.0",
+                "symfony/form": "^2.7 || ^3.0 || ^4.0",
-                "symfony/framework-bundle": "^3.4 || ^4.0",
+                "symfony/framework-bundle": "^2.7 || ^3.0 || ^4.0",
-                "symfony/http-foundation": "^3.4 || ^4.0",
+                "symfony/http-foundation": "^2.7 || ^3.0 || ^4.0",
-                "symfony/http-kernel": "^3.4 || ^4.0",
+                "symfony/http-kernel": "^2.7 || ^3.0 || ^4.0",
-                "symfony/options-resolver": "^3.4 || ^4.0",
+                "symfony/options-resolver": "^2.7 || ^3.0 || ^4.0",
-                "symfony/property-access": "^3.4 || ^4.0",
+                "symfony/property-access": "^2.7 || ^3.0 || ^4.0",
-                "symfony/routing": "^3.4 || ^4.0",
+                "symfony/routing": "^2.7 || ^3.0 || ^4.0"
-                "symfony/twig-bundle": "^3.4 || ^4.0",
-                "twig/twig": "^2.0"
            },
            "conflict": {
                "sebastian/environment": "<1.3.4",
                "sebastian/exporter": "<2.0.0"
            },
            "require-dev": {
+                "composer/composer": "^1.0",
                "friendsofphp/php-cs-fixer": "^2.0",
                "matthiasnoback/symfony-dependency-injection-test": "^1.0 || ^2.0",
-                "phpunit/phpunit": "^6.0",
+                "phpunit/phpunit": "^5.0 || ^6.0",
-                "symfony/console": "^3.4 || ^4.0",
+                "sensio/distribution-bundle": "^3.0.12 || ^4.0 || ^5.0",
-                "symfony/phpunit-bridge": "^4.1",
+                "symfony/console": "^2.7 || ^3.0 || ^4.0",
-                "symfony/yaml": "^3.4 || ^4.0"
+                "symfony/phpunit-bridge": "^4.0",
+                "symfony/templating": "^2.7 || ^3.0 || ^4.0",
+                "symfony/twig-bridge": "^2.7 || ^3.0 || ^4.0",
+                "symfony/yaml": "^2.7 || ^3.0 || ^4.0",
+                "twig/twig": "^1.34 || ^2.0"
            },
            "suggest": {
                "egeloen/form-extra-bundle": "Allows to load CKEditor asynchronously"
@@ -1710,7 +1712,7 @@
            "type": "symfony-bundle",
            "extra": {
                "branch-alias": {
-                    "dev-master": "2.x-dev"
+                    "dev-master": "1.x-dev"
                }
            },
            "autoload": {
@@ -1736,7 +1738,7 @@
            "keywords": [
                "CKEditor"
            ],
-            "time": "2018-12-15T15:15:21+00:00"
+            "time": "2018-10-03T20:51:58+00:00"
        },
        {
            "name": "friendsofsymfony/rest-bundle",
@@ -2978,6 +2980,69 @@
            "time": "2018-09-11T07:54:48+00:00"
        },
        {
+            "name": "knplabs/knp-markdown-bundle",
+            "version": "1.7.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/KnpLabs/KnpMarkdownBundle.git",
+                "reference": "c055def2e67fe0d3b3d2e993584f01ff222eff86"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/KnpLabs/KnpMarkdownBundle/zipball/c055def2e67fe0d3b3d2e993584f01ff222eff86",
+                "reference": "c055def2e67fe0d3b3d2e993584f01ff222eff86",
+                "shasum": ""
+            },
+            "require": {
+                "michelf/php-markdown": "~1.4",
+                "php": ">=5.5.9",
+                "symfony/dependency-injection": "~2.8|~3.0|^4.0",
+                "symfony/framework-bundle": "~2.8|~3.0|^4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.5",
+                "symfony/templating": "~2.8|~3.0|^4.0"
+            },
+            "suggest": {
+                "ext-sundown": "to use optional support for php-sundown extension instead of php implementation",
+                "symfony/twig-bundle": "to use the Twig markdown filter"
+            },
+            "type": "symfony-bundle",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.5.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Knp\\Bundle\\MarkdownBundle\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "KnpLabs Team",
+                    "homepage": "http://knplabs.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://github.com/KnpLabs/KnpMarkdownBundle/contributors"
+                }
+            ],
+            "description": "Knplabs markdown bundle transforms markdown into html",
+            "homepage": "http://github.com/KnpLabs/KnpMarkdownBundle",
+            "keywords": [
+                "bundle",
+                "knp",
+                "knplabs",
+                "markdown"
+            ],
+            "time": "2019-01-03T19:47:10+00:00"
+        },
+        {
            "name": "knplabs/knp-menu",
            "version": "2.3.0",
            "source": {
@@ -3379,6 +3444,52 @@
            "time": "2018-07-10T12:53:54+00:00"
        },
        {
+            "name": "michelf/php-markdown",
+            "version": "1.8.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/michelf/php-markdown.git",
+                "reference": "01ab082b355bf188d907b9929cd99b2923053495"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/michelf/php-markdown/zipball/01ab082b355bf188d907b9929cd99b2923053495",
+                "reference": "01ab082b355bf188d907b9929cd99b2923053495",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Michelf\\": "Michelf/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Michel Fortin",
+                    "email": "michel.fortin@michelf.ca",
+                    "homepage": "https://michelf.ca/",
+                    "role": "Developer"
+                },
+                {
+                    "name": "John Gruber",
+                    "homepage": "https://daringfireball.net/"
+                }
+            ],
+            "description": "PHP Markdown",
+            "homepage": "https://michelf.ca/projects/php-markdown/",
+            "keywords": [
+                "markdown"
+            ],
+            "time": "2018-01-15T00:49:33+00:00"
+        },
+        {
            "name": "monolog/monolog",
            "version": "1.24.0",
            "source": {
@@ -5570,6 +5681,92 @@
            "time": "2018-12-15T18:40:08+00:00"
        },
        {
+            "name": "sonata-project/formatter-bundle",
+            "version": "4.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sonata-project/SonataFormatterBundle.git",
+                "reference": "c3ef62497743a0d21082a31b38bf944b426e4439"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sonata-project/SonataFormatterBundle/zipball/c3ef62497743a0d21082a31b38bf944b426e4439",
+                "reference": "c3ef62497743a0d21082a31b38bf944b426e4439",
+                "shasum": ""
+            },
+            "require": {
+                "friendsofsymfony/ckeditor-bundle": "^1.0",
+                "knplabs/knp-markdown-bundle": "^1.7",
+                "php": "^7.1",
+                "psr/log": "^1.0",
+                "sonata-project/block-bundle": "^3.11",
+                "sonata-project/core-bundle": "^3.9",
+                "symfony/config": "^3.4 || ^4.0",
+                "symfony/dependency-injection": "^3.2 || ^4.0",
+                "symfony/event-dispatcher": "^3.2 || ^4.0",
+                "symfony/form": "^3.4 || ^4.0",
+                "symfony/framework-bundle": "^3.4 || ^4.0",
+                "symfony/http-foundation": "^3.4 || ^4.0",
+                "symfony/http-kernel": "^3.4 || ^4.0",
+                "symfony/options-resolver": "^3.4 || ^4.0",
+                "symfony/property-access": "^3.4 || ^4.0",
+                "symfony/translation": "^3.4 || ^4.0",
+                "symfony/twig-bridge": "^3.4 || ^4.0",
+                "symfony/validator": "^3.4 || ^4.0",
+                "twig/twig": "^2.4"
+            },
+            "conflict": {
+                "sonata-project/admin-bundle": "<3.27",
+                "sonata-project/media-bundle": "<3.0"
+            },
+            "require-dev": {
+                "matthiasnoback/symfony-dependency-injection-test": "^3.0",
+                "sonata-project/admin-bundle": "^3.31",
+                "sonata-project/media-bundle": "^3.10",
+                "symfony/phpunit-bridge": "^4.1"
+            },
+            "suggest": {
+                "sonata-project/admin-bundle": "For using the admin media browser.",
+                "sonata-project/media-bundle": "For using the admin media browser."
+            },
+            "type": "symfony-bundle",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Sonata\\FormatterBundle\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Sonata Community",
+                    "homepage": "https://github.com/sonata-project/SonataFormatterBundle/contributors"
+                },
+                {
+                    "name": "Thomas Rabaix",
+                    "email": "thomas.rabaix@sonata-project.org",
+                    "homepage": "https://sonata-project.org"
+                }
+            ],
+            "description": "Symfony SonataFormatterBundle",
+            "homepage": "https://sonata-project.org/bundles/formatter",
+            "keywords": [
+                "CKEditor",
+                "formatter",
+                "markdown",
+                "markitup",
+                "sonata"
+            ],
+            "time": "2018-10-08T20:53:21+00:00"
+        },
+        {
            "name": "sonata-project/intl-bundle",
            "version": "2.5.0",
            "source": {
@@ -6227,16 +6424,16 @@
        },
        {
            "name": "symfony/config",
-            "version": "v4.2.2",
+            "version": "v4.2.4",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/config.git",
-                "reference": "a7a7d0a0244cfc82f040729ccf769e6cf55a78fb"
+                "reference": "7f70d79c7a24a94f8e98abb988049403a53d7b31"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/a7a7d0a0244cfc82f040729ccf769e6cf55a78fb",
+                "url": "https://api.github.com/repos/symfony/config/zipball/7f70d79c7a24a94f8e98abb988049403a53d7b31",
-                "reference": "a7a7d0a0244cfc82f040729ccf769e6cf55a78fb",
+                "reference": "7f70d79c7a24a94f8e98abb988049403a53d7b31",
                "shasum": ""
            },
            "require": {
@@ -6286,7 +6483,7 @@
            ],
            "description": "Symfony Config Component",
            "homepage": "https://symfony.com",
-            "time": "2019-01-03T09:07:35+00:00"
+            "time": "2019-02-23T15:17:42+00:00"
        },
        {
            "name": "symfony/console",
@@ -6427,16 +6624,16 @@
        },
        {
            "name": "symfony/debug",
-            "version": "v4.2.2",
+            "version": "v4.2.4",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/debug.git",
-                "reference": "64cb33c81e37d19b7715d4a6a4d49c1c382066dd"
+                "reference": "de73f48977b8eaf7ce22814d66e43a1662cc864f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/64cb33c81e37d19b7715d4a6a4d49c1c382066dd",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/de73f48977b8eaf7ce22814d66e43a1662cc864f",
-                "reference": "64cb33c81e37d19b7715d4a6a4d49c1c382066dd",
+                "reference": "de73f48977b8eaf7ce22814d66e43a1662cc864f",
                "shasum": ""
            },
            "require": {
@@ -6479,20 +6676,20 @@
            ],
            "description": "Symfony Debug Component",
            "homepage": "https://symfony.com",
-            "time": "2019-01-03T09:07:35+00:00"
+            "time": "2019-03-03T18:11:24+00:00"
        },
        {
            "name": "symfony/dependency-injection",
-            "version": "v4.2.2",
+            "version": "v4.2.4",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "a28dda9df1d5494367454cad91e44751ac53921c"
+                "reference": "cdadb3765df7c89ac93628743913b92bb91f1704"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/a28dda9df1d5494367454cad91e44751ac53921c",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/cdadb3765df7c89ac93628743913b92bb91f1704",
-                "reference": "a28dda9df1d5494367454cad91e44751ac53921c",
+                "reference": "cdadb3765df7c89ac93628743913b92bb91f1704",
                "shasum": ""
            },
            "require": {
@@ -6552,7 +6749,7 @@
            ],
            "description": "Symfony DependencyInjection Component",
            "homepage": "https://symfony.com",
-            "time": "2019-01-05T16:37:49+00:00"
+            "time": "2019-02-23T15:17:42+00:00"
        },
        {
            "name": "symfony/doctrine-bridge",
@@ -6644,16 +6841,16 @@
        },
        {
            "name": "symfony/event-dispatcher",
-            "version": "v4.2.2",
+            "version": "v4.2.4",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "887de6d34c86cf0cb6cbf910afb170cdb743cb5e"
+                "reference": "3354d2e6af986dd71f68b4e5cf4a933ab58697fb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/887de6d34c86cf0cb6cbf910afb170cdb743cb5e",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/3354d2e6af986dd71f68b4e5cf4a933ab58697fb",
-                "reference": "887de6d34c86cf0cb6cbf910afb170cdb743cb5e",
+                "reference": "3354d2e6af986dd71f68b4e5cf4a933ab58697fb",
                "shasum": ""
            },
            "require": {
@@ -6704,7 +6901,7 @@
            ],
            "description": "Symfony EventDispatcher Component",
            "homepage": "https://symfony.com",
-            "time": "2019-01-05T16:37:49+00:00"
+            "time": "2019-02-23T15:17:42+00:00"
        },
        {
            "name": "symfony/expression-language",
@@ -6759,16 +6956,16 @@
        },
        {
            "name": "symfony/filesystem",
-            "version": "v4.2.2",
+            "version": "v4.2.4",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/filesystem.git",
-                "reference": "c2ffd9a93f2d6c5be2f68a0aa7953cc229f871f8"
+                "reference": "e16b9e471703b2c60b95f14d31c1239f68f11601"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/c2ffd9a93f2d6c5be2f68a0aa7953cc229f871f8",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/e16b9e471703b2c60b95f14d31c1239f68f11601",
-                "reference": "c2ffd9a93f2d6c5be2f68a0aa7953cc229f871f8",
+                "reference": "e16b9e471703b2c60b95f14d31c1239f68f11601",
                "shasum": ""
            },
            "require": {
@@ -6805,7 +7002,7 @@
            ],
            "description": "Symfony Filesystem Component",
            "homepage": "https://symfony.com",
-            "time": "2019-01-03T09:07:35+00:00"
+            "time": "2019-02-07T11:40:08+00:00"
        },
        {
            "name": "symfony/finder",
@@ -7106,16 +7303,16 @@
        },
        {
            "name": "symfony/http-foundation",
-            "version": "v4.2.2",
+            "version": "v4.2.4",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "a633d422a09242064ba24e44a6e1494c5126de86"
+                "reference": "850a667d6254ccf6c61d853407b16f21c4579c77"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/a633d422a09242064ba24e44a6e1494c5126de86",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/850a667d6254ccf6c61d853407b16f21c4579c77",
-                "reference": "a633d422a09242064ba24e44a6e1494c5126de86",
+                "reference": "850a667d6254ccf6c61d853407b16f21c4579c77",
                "shasum": ""
            },
            "require": {
@@ -7156,20 +7353,20 @@
            ],
            "description": "Symfony HttpFoundation Component",
            "homepage": "https://symfony.com",
-            "time": "2019-01-05T16:37:49+00:00"
+            "time": "2019-02-26T08:03:39+00:00"
        },
        {
            "name": "symfony/http-kernel",
-            "version": "v4.2.2",
+            "version": "v4.2.4",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "83de6543328917c18d5498eeb6bb6d36f7aab31b"
+                "reference": "895ceccaa8149f9343e6134e607c21da42d73b7a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/83de6543328917c18d5498eeb6bb6d36f7aab31b",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/895ceccaa8149f9343e6134e607c21da42d73b7a",
-                "reference": "83de6543328917c18d5498eeb6bb6d36f7aab31b",
+                "reference": "895ceccaa8149f9343e6134e607c21da42d73b7a",
                "shasum": ""
            },
            "require": {
@@ -7245,20 +7442,20 @@
            ],
            "description": "Symfony HttpKernel Component",
            "homepage": "https://symfony.com",
-            "time": "2019-01-06T16:19:23+00:00"
+            "time": "2019-03-03T19:38:09+00:00"
        },
        {
            "name": "symfony/inflector",
-            "version": "v4.2.2",
+            "version": "v4.2.4",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/inflector.git",
-                "reference": "9f64271222922ef1a10e43f77d88baf72bf22b0e"
+                "reference": "275e54941a4f17a471c68d2a00e2513fc1fd4a78"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/inflector/zipball/9f64271222922ef1a10e43f77d88baf72bf22b0e",
+                "url": "https://api.github.com/repos/symfony/inflector/zipball/275e54941a4f17a471c68d2a00e2513fc1fd4a78",
-                "reference": "9f64271222922ef1a10e43f77d88baf72bf22b0e",
+                "reference": "275e54941a4f17a471c68d2a00e2513fc1fd4a78",
                "shasum": ""
            },
            "require": {
@@ -7303,7 +7500,7 @@
                "symfony",
                "words"
            ],
-            "time": "2019-01-03T09:07:35+00:00"
+            "time": "2019-01-16T20:31:39+00:00"
        },
        {
            "name": "symfony/intl",
@@ -7513,16 +7710,16 @@
        },
        {
            "name": "symfony/options-resolver",
-            "version": "v4.2.2",
+            "version": "v4.2.4",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "fbcb106aeee72f3450298bf73324d2cc00d083d1"
+                "reference": "3896e5a7d06fd15fa4947694c8dcdd371ff147d1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/fbcb106aeee72f3450298bf73324d2cc00d083d1",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/3896e5a7d06fd15fa4947694c8dcdd371ff147d1",
-                "reference": "fbcb106aeee72f3450298bf73324d2cc00d083d1",
+                "reference": "3896e5a7d06fd15fa4947694c8dcdd371ff147d1",
                "shasum": ""
            },
            "require": {
@@ -7563,7 +7760,7 @@
                "configuration",
                "options"
            ],
-            "time": "2019-01-03T09:07:35+00:00"
+            "time": "2019-02-23T15:17:42+00:00"
        },
        {
            "name": "symfony/orm-pack",
@@ -7761,16 +7958,16 @@
        },
        {
            "name": "symfony/property-access",
-            "version": "v4.2.2",
+            "version": "v4.2.4",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/property-access.git",
-                "reference": "a21d40670000f61a1a4b90a607d54696aad914cd"
+                "reference": "d5e10532c51db0b657b1e25b2bd70acbcd13bbf9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/property-access/zipball/a21d40670000f61a1a4b90a607d54696aad914cd",
+                "url": "https://api.github.com/repos/symfony/property-access/zipball/d5e10532c51db0b657b1e25b2bd70acbcd13bbf9",
-                "reference": "a21d40670000f61a1a4b90a607d54696aad914cd",
+                "reference": "d5e10532c51db0b657b1e25b2bd70acbcd13bbf9",
                "shasum": ""
            },
            "require": {
@@ -7824,7 +8021,7 @@
                "property path",
                "reflection"
            ],
-            "time": "2019-01-05T16:37:49+00:00"
+            "time": "2019-02-23T15:17:42+00:00"
        },
        {
            "name": "symfony/property-info",
@@ -7904,16 +8101,16 @@
        },
        {
            "name": "symfony/routing",
-            "version": "v4.2.2",
+            "version": "v4.2.4",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/routing.git",
-                "reference": "e69b7a13a0b58af378a49b49dd7084462de16cee"
+                "reference": "ff03eae644e6b1e26d4a04b2385fe3a1a7f04e42"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/e69b7a13a0b58af378a49b49dd7084462de16cee",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/ff03eae644e6b1e26d4a04b2385fe3a1a7f04e42",
-                "reference": "e69b7a13a0b58af378a49b49dd7084462de16cee",
+                "reference": "ff03eae644e6b1e26d4a04b2385fe3a1a7f04e42",
                "shasum": ""
            },
            "require": {
@@ -7977,7 +8174,7 @@
                "uri",
                "url"
            ],
-            "time": "2019-01-03T09:07:35+00:00"
+            "time": "2019-02-23T15:17:42+00:00"
        },
        {
            "name": "symfony/security-acl",

--- a/config/bundles.php
+++ b/config/bundles.php
@@ -37,7 +37,6 @@ return [
    Hautelook\AliceBundle\HautelookAliceBundle::class => ['dev' => true, 'test' => true],
    JMS\SerializerBundle\JMSSerializerBundle::class => ['all' => true],
    Sonata\MediaBundle\SonataMediaBundle::class => ['all' => true],
-    FOS\CKEditorBundle\FOSCKEditorBundle::class => ['all' => true],
    App\Application\Sonata\MediaBundle\ApplicationSonataMediaBundle::class => ['all' => true],
    Bazinga\GeocoderBundle\BazingaGeocoderBundle::class => ['all' => true],
    Sonata\TranslationBundle\SonataTranslationBundle::class => ['all' => true],
@@ -46,4 +45,7 @@ return [
    Prodigious\Sonata\MenuBundle\ProdigiousSonataMenuBundle::class => ['all' => true],
    Nelmio\CorsBundle\NelmioCorsBundle::class => ['all' => true],
    ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle::class => ['all' => true],
+    Knp\Bundle\MarkdownBundle\KnpMarkdownBundle::class => ['all' => true],
+    FOS\CKEditorBundle\FOSCKEditorBundle::class => ['all' => true],
+    Sonata\FormatterBundle\SonataFormatterBundle::class => ['all' => true],
 ];
--- a/config/packages/fos_ckeditor.yaml
+++ b/config/packages/fos_ckeditor.yaml
@@ -17,18 +17,18 @@ fos_ck_editor:
              Blockquote, -, Image, Link, Unlink, Table]
            - [Format, Maximize, Source]
-            # filebrowserBrowseRoute: admin_sonata_media_media_ckeditor_browser
+            filebrowserBrowseRoute: admin_sonata_media_media_ckeditor_browser
-            # filebrowserImageBrowseRoute: admin_sonata_media_media_ckeditor_browser
+            filebrowserImageBrowseRoute: admin_sonata_media_media_ckeditor_browser
-            # # Display images by default when clicking the image dialog browse button
+            # Display images by default when clicking the image dialog browse button
-            # filebrowserImageBrowseRouteParameters:
+            filebrowserImageBrowseRouteParameters:
-            #     provider: sonata.media.provider.image
+                provider: sonata.media.provider.image
-            # filebrowserUploadMethod: form
+            filebrowserUploadMethod: form
-            # filebrowserUploadRoute: admin_sonata_media_media_ckeditor_upload
+            filebrowserUploadRoute: admin_sonata_media_media_ckeditor_upload
-            # filebrowserUploadRouteParameters:
+            filebrowserUploadRouteParameters:
-            #     provider: sonata.media.provider.file
+                provider: sonata.media.provider.file
-            # # Upload file as image when sending a file from the image dialog
+            # Upload file as image when sending a file from the image dialog
-            # filebrowserImageUploadRoute: admin_sonata_media_media_ckeditor_upload
+            filebrowserImageUploadRoute: admin_sonata_media_media_ckeditor_upload
-            # filebrowserImageUploadRouteParameters:
+            filebrowserImageUploadRouteParameters:
-            #     provider: sonata.media.provider.image
+                provider: sonata.media.provider.image
-            #     context: my-context # Optional, to upload in a custom context
+                context: default # Optional, to upload in a custom context
-            #     format: my-big # Optional, media format or original size returned to editor
+                #format: my-big # Optional, media format or original size returned to editor
\ No newline at end of file
--- a/config/packages/sonata.yaml
+++ b/config/packages/sonata.yaml
@@ -29,3 +29,19 @@ sonata_block:
            contexts: [admin]
        sonata.admin.block.search_result:
            contexts:   [admin]
+        sonata.formatter.block.formatter:
+            contexts:   [admin]
+sonata_formatter:
+    default_formatter: text
+    formatters:
+        text:
+            service: sonata.formatter.text.text
+            extensions:
+                - sonata.formatter.twig.control_flow
+                - sonata.formatter.twig.gist
+    ckeditor:
+        templates:
+            browser: '@SonataFormatter/Ckeditor/browser.html.twig'
+            upload: '@SonataFormatter/Ckeditor/upload.html.twig'
--- a/config/packages/sonata_admin.yaml
+++ b/config/packages/sonata_admin.yaml
@@ -198,6 +198,14 @@ sonata_admin:
                icon:            '<i class="fa fa-file-text"></i>'
                items:
                    - admin.document.gerer
+            sonata.admin.group.page:
+                keep_open:       false
+                on_top:          true
+                label:           "Pages"
+                label_catalogue: SonataAdminBundle
+                icon:            '<i class="fa fa-newspaper-o"></i>'
+                items:
+                    - admin.page.gerer
            sonata.admin.group.rubrique:
                keep_open:       false
                on_top:          true
@@ -232,6 +240,7 @@ sonata_admin:
                    - admin.all.cotisations
                    - admin.transfert.gerer
                    - admin.transaction.gerer
+                    - admin.reconversion.gerer
            sonata.admin.group.menu_builder:
                keep_open:       false
                on_top:          true

--- a/config/packages/twig.yaml
+++ b/config/packages/twig.yaml
@@ -2,4 +2,6 @@ twig:
    default_path: '%kernel.project_dir%/templates'
    debug: '%kernel.debug%'
    strict_variables: '%kernel.debug%'
-    form_themes: ['bootstrap_4_layout.html.twig']
+    form_themes:
\ No newline at end of file
+      - 'bootstrap_4_layout.html.twig'
+      - '@SonataFormatter/Form/formatter.html.twig'
\ No newline at end of file
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -302,6 +302,31 @@ services:
        calls:
            - [ setSecurity, ['@security.helper']]
+    admin.reconversion.gerer:
+        class: App\Admin\ReconversionAdmin
+        arguments: [~, App\Entity\Transfert, ~]
+        tags:
+            - name: sonata.admin
+              manager_type: orm
+              group: "Flux"
+              label: "Reconversion"
+              pager_type: "simple"
+        public: true
+        calls:
+            - [ setSecurity, ['@security.helper']]
+    admin.page.gerer:
+        class: App\Admin\PageAdmin
+        arguments: [~, App\Entity\Page, ~]
+        tags:
+            - name: sonata.admin
+              manager_type: orm
+              group: "Pages"
+              label: "Pages"
+        public: true
+        calls:
+            - [ setSecurity, ['@security.helper']]
    # admin.flux.gerer:
    #     class: App\Admin\FluxAdmin
    #     arguments: [~, App\Entity\Transaction, ~]

--- a/fixtures/fixtures-mlc-test.yaml
+++ b/fixtures/fixtures-mlc-test.yaml
@@ -38,6 +38,7 @@ App\Entity\Usergroup:
            'ROLE_ADMIN_DOCUMENT_GERER_ALL',
            'ROLE_ADMIN_RUBRIQUE_GERER_ALL',
            'ROLE_ADMIN_FAQ_GERER_ALL',
+            'ROLE_ADMIN_PAGE_GERER_ALL',
            'ROLE_ADMIN_TRADUCTION_GERER_ALL']]
    usergroup_controleur:
        __construct: ['Contrôleur', [
@@ -52,6 +53,7 @@ App\Entity\Usergroup:
            'ROLE_ADMIN_PRESTATAIRE_GERER_ALL',
            'ROLE_ADMIN_PRESTATAIRE_COTISATIONS_ALL',
            'ROLE_ADMIN_ALL_COTISATIONS_ALL',
+            'ROLE_ADMIN_RECONVERSION_GERER_ALL',
            'ROLE_ADMIN_TRANSFERT_GERER_ALL']]
    usergroup_gestiongroupe:
        __construct: ['Gestionnaire de Groupe', [

--- a/src/Admin/GroupeAdmin.php
+++ b/src/Admin/GroupeAdmin.php
@@ -11,6 +11,7 @@ use Sonata\AdminBundle\Datagrid\ListMapper;
 use Sonata\AdminBundle\Form\FormMapper;
 use Sonata\AdminBundle\Route\RouteCollection;
 use Sonata\AdminBundle\Show\ShowMapper;
+use Sonata\FormatterBundle\Form\Type\SimpleFormatterType;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\CollectionType;
@@ -53,6 +54,12 @@ class GroupeAdmin extends AbstractAdmin
                    'label' => 'Description :',
                    'required' => false,
                ))
+                // ->add('content', SimpleFormatterType::class, [
+                //     'format' => 'richhtml',
+                //     'ckeditor_context' => 'default',
+                //     'label' => 'Description :',
+                //     'required' => false,
+                // ])
                ->add('comptoirs', CollectionType::class, array(
                    'label' => 'Comptoirs',
                    'entry_type' => EntityType::class,

--- a/src/Admin/GroupeprestataireAdmin.php
+++ b/src/Admin/GroupeprestataireAdmin.php
@@ -17,7 +17,6 @@ use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
-use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 use Symfony\Component\Security\Core\Security;
 class GroupeprestataireAdmin extends AbstractAdmin

--- a/src/Admin/PageAdmin.php
+++ b/src/Admin/PageAdmin.php
+<?php
+namespace App\Admin;
+use App\Entity\User;
+use FOS\CKEditorBundle\Form\Type\CKEditorType;
+use Sonata\AdminBundle\Admin\AbstractAdmin;
+use Sonata\AdminBundle\Datagrid\DatagridMapper;
+use Sonata\AdminBundle\Datagrid\ListMapper;
+use Sonata\AdminBundle\Form\FormMapper;
+use Sonata\AdminBundle\Route\RouteCollection;
+use Sonata\AdminBundle\Show\ShowMapper;
+use Sonata\MediaBundle\Form\Type\MediaType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\Extension\Core\Type\TextareaType;
+use Symfony\Component\Security\Core\Security;
+class PageAdmin extends AbstractAdmin
+{
+    protected $security;
+    protected $datagridValues = [
+        '_sort_order' => 'DESC',
+        '_sort_by' => 'updatedAt',
+    ];
+    public function setSecurity(Security $security)
+    {
+        $this->security = $security;
+    }
+    public function configure()
+    {
+        parent::configure();
+    }
+    /**
+    * {@inheritdoc}
+    */
+    protected function configureDatagridFilters(DatagridMapper $datagridMapper): void
+    {
+        parent::configureDatagridFilters($datagridMapper);
+        $datagridMapper
+            ->add('user')
+        ;
+    }
+    /**
+    * {@inheritdoc}
+    */
+    protected function configureFormFields(FormMapper $formMapper)
+    {
+        $page = $this->getSubject();
+        if ($this->isCurrentRoute('create')) {
+            $page->setUser($this->security->getUser());
+        }
+        $formMapper
+            ->add('user', HiddenType::class, array(
+                'data' => $this->getConfigurationPool()->getContainer()->get('security.token_storage')->getToken()->getUser()->getId(),
+                'data_class' => null,
+                'entity_class' => User::class,
+                'em' => $this->getConfigurationPool()->getContainer()->get('doctrine')->getEntityManager()
+            ))
+            ->add('name', TextType::class, array(
+                'label' => 'Titre :',
+                'required' => true
+            ))
+            ->add('content', CKEditorType::class, array(
+                'label' => 'Contenu :',
+                'required' => true
+            ))
+            ->add('metaDescription', TextType::class, array(
+                'label' => 'Meta Description :',
+                'required' => true
+            ))
+            ->add('metaKeywords', TextType::class, array(
+                'label' => 'Meta Keywords :',
+                'required' => true
+            ))
+            ->add('template', TextType::class, array(
+                'label' => 'Template :',
+                'required' => false
+            ))
+            ->add('css', TextareaType::class, array(
+                'label' => 'CSS :',
+                'required' => false
+            ))
+            ->add('js', TextareaType::class, array(
+                'label' => 'JS :',
+                'required' => false
+            ))
+            ->add('enabled', CheckboxType::class, array(
+                'label' => 'Activé ?',
+                'label_attr' => array('class' => 'checkbox-inline'),
+                'required' => false
+            ))
+        ;
+    }
+    /**
+    * {@inheritdoc}
+    */
+    protected function configureListFields(ListMapper $listMapper)
+    {
+        unset($this->listModes['mosaic']);
+        $listMapper
+            ->addIdentifier('user', null, array('label' => 'Auteur'))
+            ->addIdentifier('name', null, array('label' => 'Titre'))
+            // ->addIdentifier('enabled', null, array('label' => 'Activé', 'datatype' => 'App.Page', 'template' => '@SonataAdmin/Boolean/editable_boolean.html.twig'))
+        ;
+    }
+    protected function configureRoutes(RouteCollection $collection)
+    {
+        $collection->remove('delete');
+    }
+    public function getBatchActions()
+    {
+        $actions = parent::getBatchActions();
+        unset($actions['delete']);
+        return $actions;
+    }
+}
--- a/src/Admin/PrestataireAdmin.php
+++ b/src/Admin/PrestataireAdmin.php
@@ -111,9 +111,13 @@ class PrestataireAdmin extends AbstractAdmin
        $now = new \DateTime();
        $cotisation = null;
        if ($this->isCurrentRoute('create')) {
+            if ($user->isGranted('ROLE_CONTACT') or $user->isGranted('ROLE_COMPTOIR')) {
+                $user->setEnabled(false);
+            } else {
+                $user->setEnabled(true);
+            }
            $user = $this->userManager->createUser();
            $groupe = $this->getConfigurationPool()->getContainer()->get('doctrine')->getRepository(Usergroup::class)->findOneByName('Prestataire');
-            $user->setEnabled(true);
            $user->addGroup($groupe);
            $user->addRole('ROLE_PRESTATAIRE');
            $user->setPrestataire($presta);
@@ -416,7 +420,13 @@ class PrestataireAdmin extends AbstractAdmin
                'sort_field_mapping' => array('fieldName' => 'name'),
                'sort_parent_association_mappings' => array(array('fieldName' => 'groupe'))
            ))
+        ;
+        if ($user->isGranted('ROLE_GESTION_GROUPE')) {
+            $listMapper
                ->addIdentifier('user.enabled', null, array('label' => 'Activé', 'datatype' => 'App.User', 'template' => '@SonataAdmin/Boolean/editable_boolean.html.twig'))
+            ;
+        }
+        $listMapper
            ->addIdentifier('user.createdAt')
        ;

--- a/src/Admin/ReconversionAdmin.php
+++ b/src/Admin/ReconversionAdmin.php
+<?php
+namespace App\Admin;
+use App\Admin\FluxAdmin;
+use App\Entity\User;
+use Sonata\AdminBundle\Admin\AbstractAdmin;
+use Sonata\AdminBundle\Datagrid\DatagridMapper;
+use Sonata\AdminBundle\Datagrid\ListMapper;
+use Sonata\AdminBundle\Form\FormMapper;
+use Sonata\AdminBundle\Form\Type\Filter\ChoiceType;
+use Sonata\AdminBundle\Route\RouteCollection;
+use Sonata\AdminBundle\Show\ShowMapper;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType as SChoiceType;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Translation\TranslatorInterface;
+class ReconversionAdmin extends FluxAdmin
+{
+    protected $security;
+    protected $datagridValues = [
+        '_sort_order' => 'DESC',
+        '_sort_by' => 'createdAt',
+    ];
+    public function setSecurity(Security $security)
+    {
+        $this->security = $security;
+    }
+    /**
+    * {@inheritdoc}
+    */
+    public function createQuery($context = 'list')
+    {
+        $user = $this->security->getUser();
+        $query = parent::createQuery($context);
+        $query->andWhere($query->getRootAliases()[0].".type = :type")
+                ->setParameter('type', 'prestataire_siege');
+        ;
+        return $query;
+    }
+    /**
+    * {@inheritdoc}
+    */
+    protected function configureListFields(ListMapper $listMapper)
+    {
+        unset($this->listModes['mosaic']);
+        $listMapper
+            ->addIdentifier('createdAt', null, array('label' => 'Date'))
+            ->addIdentifier('type', null, array('label' => 'Type'))
+            ->addIdentifier('operateur', User::class, array('label' => 'Operateur'))
+            ->addIdentifier('expediteur', null, array('label' => 'Expediteur'))
+            ->addIdentifier('destinataire', null, array('label' => 'Destinataire'))
+            ->addIdentifier('montant', null, array('label' => 'Montant'))
+            ->addIdentifier('reference', null, array('label' => 'Reference'))
+            ->addIdentifier('reconverti', null, array('label' => 'Reconverti ?', 'datatype' => 'App.Flux', 'template' => 'block/reconverti_field.html.twig'))
+        ;
+    }
+    /**
+    * {@inheritdoc}
+    */
+    protected function configureDatagridFilters(DatagridMapper $datagridMapper): void
+    {
+        $datagridMapper
+            ->remove('transfert_or_transaction')
+            ->remove('type')
+            ->remove('operateur')
+        ;
+    }
+}
--- a/src/Controller/AdminController.php
+++ b/src/Controller/AdminController.php
@@ -2,6 +2,7 @@
 namespace App\Controller;
+use App\Entity\TransfertPrestataireSiege;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\JsonResponse;
@@ -46,6 +47,33 @@ class AdminController extends Controller
        return new JsonResponse(array('status' => $status, 'newvalue' => ($object->isEnabled()?'true':'false')));
    }
+    /**
+     * @Route("/setreconverti/{id}", name="setreconverti")
+     */
+    public function setReconvertiAction($id, Request $request)
+    {
+        $referer = $request->headers->get('referer');
+        if ($referer && !$request->isXmlHttpRequest()) {
+            return $this->redirect($referer);
+        } elseif (!$request->isXmlHttpRequest()) {
+            return new Response('', Response::HTTP_BAD_REQUEST);
+        }
+        $status = 'success';
+        try {
+            $object = $this->em->getRepository(TransfertPrestataireSiege::class)->findOneById($id);
+            if ($object && method_exists($object, 'setReconverti')) {
+                $object->setReconverti(!$object->getReconverti());
+                $this->em->persist($object);
+                $this->em->flush();
+            } else {
+                $status = 'error';
+            }
+        } catch (\Exception $e) {
+            $status = 'error';
+        }
+        return new JsonResponse(array('status' => $status, 'newvalue' => ($object->getReconverti()?'true':'false')));
+    }
    // /**
    //  * Voir tous les dashboards
    //  * Route admin_index

--- a/src/Entity/Page.php
+++ b/src/Entity/Page.php
@@ -71,6 +71,11 @@ class Page
     */
    private $user;
+    public function getId()
+    {
+        return $this->getId();
+    }
    /**
     * @return null|string
     */
@@ -178,4 +183,9 @@ class Page
        $this->user = $user;
        return $this;
    }
+    public function __toString(): string
+    {
+        return $this->getName()?$this->getName():'Page';
+    }
 }
--- a/src/Entity/TransfertPrestataireSiege.php
+++ b/src/Entity/TransfertPrestataireSiege.php
@@ -32,6 +32,12 @@ class TransfertPrestataireSiege extends Transfert
     */
    protected $reconverti = false;
+    public function __construct()
+    {
+        parent::__construct();
+        $this->reconverti = false;
+    }
    public function getReconverti(): bool
    {
        return $this->reconverti;

--- a/src/Entity/User.php
+++ b/src/Entity/User.php
@@ -102,6 +102,12 @@ class User extends BaseUser
     */
    private $news;
+    /**
+     * @var ArrayCollection|Page[]
+     * @ORM\OneToMany(targetEntity="App\Entity\Page", mappedBy="user", cascade={"persist"})
+     */
+    private $pages;
    public function __construct()
    {
        parent::__construct();
@@ -433,4 +439,35 @@ class User extends BaseUser
        return $this;
    }
+    /**
+     * @return Collection|Page[]
+     */
+    public function getPage(): Collection
+    {
+        return $this->page;
+    }
+    public function addPage(Page $page): self
+    {
+        if (!$this->page->contains($page)) {
+            $this->page[] = $page;
+            $page->setUser($this);
+        }
+        return $this;
+    }
+    public function removePage(Page $page): self
+    {
+        if ($this->page->contains($page)) {
+            $this->page->removeElement($page);
+            // set the owning side to null (unless already changed)
+            if ($page->getUser() === $this) {
+                $page->setUser(null);
+            }
+        }
+        return $this;
+    }
 }
--- a/symfony.lock
+++ b/symfony.lock
@@ -123,13 +123,7 @@
        "version": "1.0.0"
    },
    "friendsofsymfony/ckeditor-bundle": {
-        "version": "2.0",
+        "version": "1.2.0"
-        "recipe": {
-            "repo": "github.com/symfony/recipes-contrib",
-            "branch": "master",
-            "version": "2.0",
-            "ref": "8eb1cd0962ded6a6d6e1e5a9b6d3e888f9f94ff6"
-        }
    },
    "friendsofsymfony/rest-bundle": {
        "version": "2.2",
@@ -212,6 +206,9 @@
    "knplabs/knp-components": {
        "version": "v1.3.10"
    },
+    "knplabs/knp-markdown-bundle": {
+        "version": "1.7.1"
+    },
    "knplabs/knp-menu": {
        "version": "2.3.0"
    },
@@ -236,6 +233,9 @@
            "ref": "523b4b0cfb88dc8637cb56e427e6be7718bdce32"
        }
    },
+    "michelf/php-markdown": {
+        "version": "1.8.0"
+    },
    "monolog/monolog": {
        "version": "1.24.0"
    },
@@ -410,6 +410,9 @@
    "sonata-project/exporter": {
        "version": "1.9.1"
    },
+    "sonata-project/formatter-bundle": {
+        "version": "4.1.2"
+    },
    "sonata-project/intl-bundle": {
        "version": "2.5.0"
    },

--- a/templates/block/reconverti_field.html.twig
+++ b/templates/block/reconverti_field.html.twig
+{% extends '@SonataAdmin/CRUD/base_list_field.html.twig' %}
+{% if object is instanceof("App\\Entity\\Flux") and (app.user.isGranted('ROLE_SUPER_ADMIN') or app.user.isGranted('ROLE_TRESORIER')) %}
+    {% block field%}
+    {%- spaceless %}
+        {% if value %}
+            {% set text = 'label_type_yes'|trans({}, 'SonataAdminBundle') %}
+        {% else %}
+            {% set text = 'label_type_no'|trans({}, 'SonataAdminBundle') %}
+        {% endif %}
+        {% if field_description.options.inverse|default(false) ? not value : value %}
+            {% set class = 'label-success' %}
+        {% else %}
+            {% set class = 'label-danger' %}
+        {% endif %}
+        <span class="label {{ class }} editableboolean" data-value="{{value ? 'true' : 'false'}}" data-url="{{path('setreconverti', {'id': object.id})}}" style='cursor:pointer;'>{{ text }}</span>
+    {% endspaceless -%}
+    {% endblock %}
+{% endif %}
\ No newline at end of file
--- a/templates/page.html.twig
+++ b/templates/page.html.twig
-{% set title = page.metatitle %}
+{% set title = page.name %}
 {% set description = page.metadescription %}
 {% set keywords = page.metakeywords %}
 {% extends 'common/layout.html.twig' %}
+{% if page.css %}
+	{% block css %}
+		{{parent()}}
+		{{ page.css|raw }}
+	{% endblock css %}
+{% endif %}
+{% if page.js %}
+	{% block js %}
+		{{parent()}}
+		{{ page.js|raw }}
+	{% endblock js %}
+{% endif %}
 {% block content %}
 <div class='container'>
 	<h4>{{page.title}}</h4>
 	<p class="paragraf">
 		{{page.content|raw}}
-		{#  Cette Charte des valeurs a été adoptée lors de l'assemblée générale du 25 janvier 2014.<br>
-		<br>
-		<strong>En signant cette Charte des valeurs, je m'engage en tant que consommateur ou prestataire à utiliser  la monnaie locale comme </strong>&nbsp;: <br>
-		porteuse de valeurs éthiques, écologiques et sociales dans une recherche de mieux être collectif, outil pour inciter chacun à mieux comprendre sa  façon de produire et de consommer, moyen de contribuer à  une alternative non-spéculative au modèle économique actuel<br>
-		<strong>En signant cette Charte des valeurs, je m'engage en tant que consommateur ou prestataire à favoriser&nbsp;</strong>: #}
-	</p>
-	{# <p class="paragraf" style="min-height:60px;">
-	  <img src="./pictocharte/proximite.gif" style="float:left;margin-right:10px;width:36px;"> L'activité et les emplois locaux en privilégiant les productions, les services et les commerces de proximité, dans une démarche de qualité.<br>
-	</p><p class="paragraf" style="min-height:60px;">
-	  <img src="./pictocharte/environnement.gif" style="float:left;margin-right:10px;width:36px;"> Les pratiques respectueuses de la nature et de notre environnement.<br>
-	</p>
-	<p class="paragraf" style="min-height:60px;">
-	  <img src="./pictocharte/cooperation.gif" style="float:left;margin-right:10px;width:36px;"> Les échanges entre acteurs locaux dans un esprit de complémentarité, de coopération et de solidarité.<br>
-	</p>
-	<p class="paragraf" style="min-height:60px;">
-	  <img src="./pictocharte/populaire.gif" style="float:left;margin-right:10px;width:36px;"> L'accès à la qualité des biens et des services au plus grand nombre.<br>
-	</p>
-	<p class="paragraf" style="min-height:60px;">
-	  <img src="./pictocharte/relations.gif" style="float:left;margin-right:10px;width:36px;"> De bonnes relations et conditions de travail.<br>
-	</p>
-	<p class="paragraf" style="min-height:60px;">
-	  <img src="./pictocharte/biologique.gif" style="float:left;margin-right:10px;width:36px;"> Le bio avant tout.<br>
 	</p>
-	<p class="paragraf" style="min-height:60px;">
-	  <img src="./pictocharte/motivation.gif" style="float:left;margin-right:10px;width:36px;"> Le degré de motivation.<br>
-    </p> #}
 </div>
 {% endblock %}