diff --git a/TODO.md b/TODO.md index 401ef6a8e7d205b4380e8552b4cacf99ae3ce041..657644f3f4a94bea2fce4c83a0028e6ddfd6108d 100644 --- a/TODO.md +++ b/TODO.md @@ -1,9 +1,15 @@ ACL --- - - contact-adherents/ + - Mise à jour du breadcrumb login en ligne (changement du titre des pages) + - Lien de connexion / inscription + - Tester droits + médias privés + - Partie privée - Page liens - Changement mail et validation + + + - 404 ? - Sitemap @@ -16,5 +22,5 @@ ACL - Mail (site + info adhérants) - Wysiwyg - - Filtre des pages dans le menu par défaut + - Captcha sur les commentaires \ No newline at end of file diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig deleted file mode 100644 index bafd28d3bda05c01971c5b8e600f549fe9450389..0000000000000000000000000000000000000000 --- a/app/Resources/views/base.html.twig +++ /dev/null @@ -1,13 +0,0 @@ - - - - - {% block title %}Welcome!{% endblock %} - {% block stylesheets %}{% endblock %} - - - - {% block body %}{% endblock %} - {% block javascripts %}{% endblock %} - - diff --git a/app/Resources/views/default/index.html.twig b/app/Resources/views/default/index.html.twig deleted file mode 100644 index ed261498cb70b2a8a482373c3a62f7dcccc96948..0000000000000000000000000000000000000000 --- a/app/Resources/views/default/index.html.twig +++ /dev/null @@ -1,5 +0,0 @@ -{% extends 'base.html.twig' %} - -{% block body %} - Homepage. -{% endblock %} diff --git a/app/config/sonata/sonata_admin.yml b/app/config/sonata/sonata_admin.yml index e7884d69237fcc6f7361b5e72d3dc70c3c2fc96d..51db3a1e891df1deb385514db290d4e7570f2b0d 100644 --- a/app/config/sonata/sonata_admin.yml +++ b/app/config/sonata/sonata_admin.yml @@ -18,10 +18,10 @@ sonata_admin: object_permissions: [VIEW, EDIT, DELETE, UNDELETE, OPERATOR, MASTER, OWNER] title: "Amicale du Combat Libre" - title_logo: %sonata_admin.logo_title% + title_logo: "/favicon-white.png" options: html5_validate: false # does not use html5 validation - pager_links: 5 # pager max links to display + pager_links: 10 # pager max links to display templates: # default global templates diff --git a/app/config/sonata/sonata_user.yml b/app/config/sonata/sonata_user.yml index 1c8519d12a9f1843527b045fd27a49753fa118fb..028c8f92a53dcfd537f9c9eb16088cffcd788749 100644 --- a/app/config/sonata/sonata_user.yml +++ b/app/config/sonata/sonata_user.yml @@ -1,6 +1,10 @@ # # more information can be found here http://sonata-project.org/bundles/user # + +parameters: + sonata.user.profile.form.type.class: Application\Sonata\UserBundle\Form\Type\ProfileType + # Enable Doctrine to map the provided entities doctrine: orm: @@ -30,16 +34,13 @@ sonata_user: profile: dashboard: blocks: - - { position: left, type: sonata.block.service.text, settings: { content: "

Welcome!

This is a sample user profile dashboard, feel free to override it in the configuration! Want to make this text dynamic? For instance display the user's name? Create a dedicated block and edit the configuration!

"} } - - { position: left, type: sonata.order.block.recent_orders, settings: { title: Recent Orders, number: 5, mode: public }} + - { position: left, type: sonata.block.service.text, settings: { content: "

Bienvenue !

Le tableau de bord est un peu vide pour l'instant, mais il se remplira bientôt !

"} } - { position: right, type: sonata.timeline.block.timeline, settings: { max_per_page: 15 }} - - { position: right, type: sonata.news.block.recent_posts, settings: { title: Recent Posts, number: 5, mode: public }} - - { position: right, type: sonata.news.block.recent_comments, settings: { title: Recent Comments, number: 5, mode: public }} + - { position: left, type: sonata.news.block.recent_posts, settings: { title: News Récentes, number: 5, mode: public }} + - { position: left, type: sonata.news.block.recent_comments, settings: { title: Commentaires Récents, number: 5, mode: public }} menu: - { route: 'sonata_user_profile_show', label: 'sonata_profile_title', domain: 'SonataUserBundle'} - { route: 'sonata_user_profile_edit', label: 'link_edit_profile', domain: 'SonataUserBundle'} - - { route: 'sonata_customer_addresses', label: 'link_list_addresses', domain: 'SonataCustomerBundle'} - - { route: 'sonata_order_index', label: 'order_list', domain: 'SonataOrderBundle'} form: type: sonata_user_profile handler: sonata.user.profile.form.handler.default @@ -48,3 +49,10 @@ sonata_user: # Defaults: - Profile - Default + +services: + sonata.user.profile.form.type: + class: Application\Sonata\UserBundle\Form\Type\ProfileType + tags: + - { name: form.type, alias: sonata_user_profile } + arguments: [%fos_user.model.user.class%] \ No newline at end of file diff --git a/composer.json b/composer.json index ed959375c5cab9523bbff671d332c05dc28cb149..283521aa32fa19c63912c95004a670ce0d9f8a63 100644 --- a/composer.json +++ b/composer.json @@ -31,13 +31,12 @@ "doctrine/doctrine-bundle": "~1.2", "doctrine/doctrine-migrations-bundle": "~2.0dev", "doctrine/migrations": "~1.0@dev", - "doctrine/doctrine-fixtures-bundle": "~2.2", "doctrine/data-fixtures": "~1.0@dev", "symfony-cmf/routing-bundle": "~1.1", "knplabs/gaufrette": "0.1.4", - "knplabs/knp-menu-bundle": "~2.0", + "knplabs/knp-menu-bundle": "~1.0", "knplabs/knp-paginator-bundle": "2.4.2", "sonata-project/datagrid-bundle": "2.2.*@dev", diff --git a/composer.lock b/composer.lock index 8ddce2336ad715a20cba8c628c0491d7e8bc2cce..53ac2366882e8163c6b778003a94ce2749dfcd95 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "a59cb81503bcdf69a87ef96322775646", - "content-hash": "dd8c6b16cfa69992b849347874c65f9c", + "hash": "7977c591284a4d7e1c450f69032a1e23", + "content-hash": "ca062604d52cd017fd8bacaab8e65729", "packages": [ { "name": "behat/transliterator", @@ -729,63 +729,6 @@ ], "time": "2015-11-05 13:48:27" }, - { - "name": "doctrine/doctrine-fixtures-bundle", - "version": "2.3.0", - "source": { - "type": "git", - "url": "https://github.com/doctrine/DoctrineFixturesBundle.git", - "reference": "0f1a2f91b349e10f5c343f75ab71d23aace5b029" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/0f1a2f91b349e10f5c343f75ab71d23aace5b029", - "reference": "0f1a2f91b349e10f5c343f75ab71d23aace5b029", - "shasum": "" - }, - "require": { - "doctrine/data-fixtures": "~1.0", - "doctrine/doctrine-bundle": "~1.0", - "php": ">=5.3.2", - "symfony/doctrine-bridge": "~2.3|~3.0" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "2.2.x-dev" - } - }, - "autoload": { - "psr-4": { - "Doctrine\\Bundle\\FixturesBundle\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, - { - "name": "Doctrine Project", - "homepage": "http://www.doctrine-project.org" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "Symfony DoctrineFixturesBundle", - "homepage": "http://www.doctrine-project.org", - "keywords": [ - "Fixture", - "persistence" - ], - "time": "2015-11-04 21:23:23" - }, { "name": "doctrine/doctrine-migrations-bundle", "version": "dev-master", @@ -804,7 +747,7 @@ "require": { "doctrine/doctrine-bundle": "~1.0", "doctrine/migrations": "~1.0", - "php": ">=5.3.2", + "php": ">=5.4.0", "symfony/framework-bundle": "~2.3|~3.0" }, "type": "symfony-bundle", @@ -972,19 +915,19 @@ "source": { "type": "git", "url": "https://github.com/doctrine/migrations.git", - "reference": "68cc7bf629a7c1fc0696e583cc8ed46f897d0afb" + "reference": "503ea5cc9c8ae38790a6899d842aaa92d55258bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/migrations/zipball/68cc7bf629a7c1fc0696e583cc8ed46f897d0afb", - "reference": "68cc7bf629a7c1fc0696e583cc8ed46f897d0afb", + "url": "https://api.github.com/repos/doctrine/migrations/zipball/503ea5cc9c8ae38790a6899d842aaa92d55258bb", + "reference": "503ea5cc9c8ae38790a6899d842aaa92d55258bb", "shasum": "" }, "require": { "doctrine/dbal": "~2.2", "php": ">=5.4.0", - "symfony/console": "~2.3", - "symfony/yaml": "~2.3" + "symfony/console": "~2.3|~3.0", + "symfony/yaml": "~2.3|~3.0" }, "require-dev": { "doctrine/coding-standard": "dev-master", @@ -1032,7 +975,7 @@ "database", "migrations" ], - "time": "2015-10-22 11:55:15" + "time": "2015-11-19 20:17:27" }, { "name": "doctrine/orm", @@ -1221,12 +1164,12 @@ "source": { "type": "git", "url": "https://github.com/FriendsOfSymfony/FOSCommentBundle.git", - "reference": "2cc3e380e7eccc6fee563225513a3877594ad261" + "reference": "fa2a6762b8752db1284d3b6a4ecf09b3dda23e8e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfSymfony/FOSCommentBundle/zipball/2cc3e380e7eccc6fee563225513a3877594ad261", - "reference": "2cc3e380e7eccc6fee563225513a3877594ad261", + "url": "https://api.github.com/repos/FriendsOfSymfony/FOSCommentBundle/zipball/fa2a6762b8752db1284d3b6a4ecf09b3dda23e8e", + "reference": "fa2a6762b8752db1284d3b6a4ecf09b3dda23e8e", "shasum": "" }, "require": { @@ -1290,7 +1233,7 @@ "forum", "threads" ], - "time": "2015-11-02 09:54:17" + "time": "2015-11-16 08:38:13" }, { "name": "friendsofsymfony/rest-bundle", @@ -1498,16 +1441,16 @@ }, { "name": "gedmo/doctrine-extensions", - "version": "v2.4.7", + "version": "v2.4.8", "source": { "type": "git", "url": "https://github.com/Atlantic18/DoctrineExtensions.git", - "reference": "1a86ba1c7426238b4f765089e0af51174a38af7f" + "reference": "096ed89496f8adab9a57aaf0e3624c3407f64d4f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Atlantic18/DoctrineExtensions/zipball/1a86ba1c7426238b4f765089e0af51174a38af7f", - "reference": "1a86ba1c7426238b4f765089e0af51174a38af7f", + "url": "https://api.github.com/repos/Atlantic18/DoctrineExtensions/zipball/096ed89496f8adab9a57aaf0e3624c3407f64d4f", + "reference": "096ed89496f8adab9a57aaf0e3624c3407f64d4f", "shasum": "" }, "require": { @@ -1573,7 +1516,7 @@ "tree", "uploadable" ], - "time": "2015-09-28 16:39:27" + "time": "2015-11-25 05:46:30" }, { "name": "genemu/form-bundle", @@ -1704,21 +1647,21 @@ }, { "name": "incenteev/composer-parameter-handler", - "version": "v2.1.1", + "version": "v2.1.2", "source": { "type": "git", "url": "https://github.com/Incenteev/ParameterHandler.git", - "reference": "84a205fe80a46101607bafbc423019527893ddd0" + "reference": "d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Incenteev/ParameterHandler/zipball/84a205fe80a46101607bafbc423019527893ddd0", - "reference": "84a205fe80a46101607bafbc423019527893ddd0", + "url": "https://api.github.com/repos/Incenteev/ParameterHandler/zipball/d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc", + "reference": "d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc", "shasum": "" }, "require": { "php": ">=5.3.3", - "symfony/yaml": "~2.0" + "symfony/yaml": "~2.3|~3.0" }, "require-dev": { "composer/composer": "1.0.*@dev", @@ -1751,7 +1694,7 @@ "keywords": [ "parameters management" ], - "time": "2015-06-03 08:27:03" + "time": "2015-11-10 17:04:01" }, { "name": "jdorn/sql-formatter", @@ -2457,26 +2400,25 @@ }, { "name": "knplabs/knp-menu", - "version": "v2.1.0", + "version": "v1.1.2", "source": { "type": "git", "url": "https://github.com/KnpLabs/KnpMenu.git", - "reference": "c6ad49933babd06a27b2f962a3469601ec9038b8" + "reference": "f8e867268f63f561c1adadd6cbb5d8524f921873" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/KnpLabs/KnpMenu/zipball/c6ad49933babd06a27b2f962a3469601ec9038b8", - "reference": "c6ad49933babd06a27b2f962a3469601ec9038b8", + "url": "https://api.github.com/repos/KnpLabs/KnpMenu/zipball/f8e867268f63f561c1adadd6cbb5d8524f921873", + "reference": "f8e867268f63f561c1adadd6cbb5d8524f921873", "shasum": "" }, "require": { "php": ">=5.3.0" }, "require-dev": { - "pimple/pimple": "~1.0", - "silex/silex": "~1.0", - "symfony/phpunit-bridge": "~2.7", - "twig/twig": "~1.16|~2.0" + "pimple/pimple": "*", + "silex/silex": "1.0.*", + "twig/twig": ">=1.2,<2.0-dev" }, "suggest": { "pimple/pimple": "for the built-in implementations of the menu provider and renderer provider", @@ -2486,12 +2428,12 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { - "psr-4": { - "Knp\\Menu\\": "src/Knp/Menu" + "psr-0": { + "Knp\\Menu\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2504,7 +2446,7 @@ "email": "stof@notk.org" }, { - "name": "Knplabs", + "name": "KnpLabs", "homepage": "http://knplabs.com" }, { @@ -2518,39 +2460,31 @@ "menu", "tree" ], - "time": "2015-09-20 08:23:47" + "time": "2012-06-10 16:20:40" }, { "name": "knplabs/knp-menu-bundle", - "version": "v2.1.0", + "version": "v1.1.2", + "target-dir": "Knp/Bundle/MenuBundle", "source": { "type": "git", "url": "https://github.com/KnpLabs/KnpMenuBundle.git", - "reference": "2246a70109bdd313a105d2a7ef464a763aacf0cd" + "reference": "2fecac02614e5a006f674dd5dd754eeaeca060b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/KnpLabs/KnpMenuBundle/zipball/2246a70109bdd313a105d2a7ef464a763aacf0cd", - "reference": "2246a70109bdd313a105d2a7ef464a763aacf0cd", + "url": "https://api.github.com/repos/KnpLabs/KnpMenuBundle/zipball/2fecac02614e5a006f674dd5dd754eeaeca060b9", + "reference": "2fecac02614e5a006f674dd5dd754eeaeca060b9", "shasum": "" }, "require": { - "knplabs/knp-menu": "~2.1", - "symfony/framework-bundle": "~2.3" - }, - "require-dev": { - "symfony/expression-language": "~2.4", - "symfony/phpunit-bridge": "~2.7" + "knplabs/knp-menu": "~1.1", + "symfony/framework-bundle": "~2.0" }, "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "2.1.x-dev" - } - }, "autoload": { - "psr-4": { - "Knp\\Bundle\\MenuBundle\\": "" + "psr-0": { + "Knp\\Bundle\\MenuBundle": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -2575,7 +2509,7 @@ "keywords": [ "menu" ], - "time": "2015-09-28 15:23:54" + "time": "2013-05-25 10:20:03" }, { "name": "knplabs/knp-paginator-bundle", @@ -2640,38 +2574,37 @@ }, { "name": "kriswallsmith/assetic", - "version": "v1.3.1", + "version": "v1.3.2", "source": { "type": "git", "url": "https://github.com/kriswallsmith/assetic.git", - "reference": "cb92b179dddfb8a3f341d53bd27e088f24d9c2e5" + "reference": "9928f7c4ad98b234e3559d1049abd13387f86db5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/cb92b179dddfb8a3f341d53bd27e088f24d9c2e5", - "reference": "cb92b179dddfb8a3f341d53bd27e088f24d9c2e5", + "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/9928f7c4ad98b234e3559d1049abd13387f86db5", + "reference": "9928f7c4ad98b234e3559d1049abd13387f86db5", "shasum": "" }, "require": { "php": ">=5.3.1", - "symfony/process": "~2.1" + "symfony/process": "~2.1|~3.0" }, "conflict": { - "twig/twig": "<1.12" + "twig/twig": "<1.23" }, "require-dev": { - "cssmin/cssmin": "*", - "joliclic/javascript-packer": "*", - "kamicane/packager": "*", + "cssmin/cssmin": "3.0.1", + "joliclic/javascript-packer": "1.1", + "kamicane/packager": "1.0", "leafo/lessphp": "^0.3.7", - "leafo/scssphp": "*@dev", - "leafo/scssphp-compass": "*@dev", - "mrclay/minify": "*", + "leafo/scssphp": "~0.1", + "mrclay/minify": "~2.2", "patchwork/jsqueeze": "~1.0|~2.0", "phpunit/phpunit": "~4.8", "psr/log": "~1.0", - "ptachoire/cssembed": "*", - "symfony/phpunit-bridge": "~2.7", + "ptachoire/cssembed": "~1.0", + "symfony/phpunit-bridge": "~2.7|~3.0", "twig/twig": "~1.8|~2.0" }, "suggest": { @@ -2714,7 +2647,7 @@ "compression", "minification" ], - "time": "2015-10-15 01:33:42" + "time": "2015-11-12 13:51:40" }, { "name": "kriswallsmith/buzz", @@ -4248,16 +4181,16 @@ }, { "name": "sonata-project/exporter", - "version": "1.4.0", + "version": "1.4.1", "source": { "type": "git", "url": "https://github.com/sonata-project/exporter.git", - "reference": "92835b5aac7a5300b3c34f4b52ed4327a1d1ed47" + "reference": "474be8b9dbb8ca1c378aa24e701df940a89ec124" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sonata-project/exporter/zipball/92835b5aac7a5300b3c34f4b52ed4327a1d1ed47", - "reference": "92835b5aac7a5300b3c34f4b52ed4327a1d1ed47", + "url": "https://api.github.com/repos/sonata-project/exporter/zipball/474be8b9dbb8ca1c378aa24e701df940a89ec124", + "reference": "474be8b9dbb8ca1c378aa24e701df940a89ec124", "shasum": "" }, "require": { @@ -4266,15 +4199,15 @@ "require-dev": { "fabpot/php-cs-fixer": "~0.1|~1.0", "propel/propel1": "~1.6", - "symfony/phpunit-bridge": "~2.7", - "symfony/property-access": "~2.3", - "symfony/routing": "~2.3" + "symfony/phpunit-bridge": "~2.7|~3.0", + "symfony/property-access": "~2.3|~3.0", + "symfony/routing": "~2.3|~3.0" }, "suggest": { "ext-curl": "*", "propel/propel1": "~1.6", - "symfony/property-access": "~2.3", - "symfony/routing": "~2.3" + "symfony/property-access": "~2.3|~3.0", + "symfony/routing": "~2.3|~3.0" }, "type": "library", "extra": { @@ -4307,7 +4240,7 @@ "export", "xls" ], - "time": "2015-06-29 18:36:46" + "time": "2015-11-25 09:33:45" }, { "name": "sonata-project/formatter-bundle", @@ -5411,25 +5344,25 @@ }, { "name": "symfony/assetic-bundle", - "version": "v2.7.0", + "version": "v2.7.1", "source": { "type": "git", "url": "https://github.com/symfony/assetic-bundle.git", - "reference": "3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5" + "reference": "d885ec8451d5a7b077bda81bb19ac9fbff9cdc76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/assetic-bundle/zipball/3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5", - "reference": "3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5", + "url": "https://api.github.com/repos/symfony/assetic-bundle/zipball/d885ec8451d5a7b077bda81bb19ac9fbff9cdc76", + "reference": "d885ec8451d5a7b077bda81bb19ac9fbff9cdc76", "shasum": "" }, "require": { "kriswallsmith/assetic": "~1.3", "php": ">=5.3.0", - "symfony/console": "~2.3", - "symfony/dependency-injection": "~2.3", - "symfony/framework-bundle": "~2.3", - "symfony/yaml": "~2.3" + "symfony/console": "~2.3|~3.0", + "symfony/dependency-injection": "~2.3|~3.0", + "symfony/framework-bundle": "~2.3|~3.0", + "symfony/yaml": "~2.3|~3.0" }, "conflict": { "kriswallsmith/spork": "<=0.2", @@ -5438,11 +5371,11 @@ "require-dev": { "kriswallsmith/spork": "~0.3", "patchwork/jsqueeze": "~1.0", - "symfony/class-loader": "~2.3", - "symfony/css-selector": "~2.3", - "symfony/dom-crawler": "~2.3", - "symfony/phpunit-bridge": "~2.7", - "symfony/twig-bundle": "~2.3" + "symfony/class-loader": "~2.3|~3.0", + "symfony/css-selector": "~2.3|~3.0", + "symfony/dom-crawler": "~2.3|~3.0", + "symfony/phpunit-bridge": "~2.7|~3.0", + "symfony/twig-bundle": "~2.3|~3.0" }, "suggest": { "kriswallsmith/spork": "to be able to dump assets in parallel", @@ -5477,33 +5410,33 @@ "compression", "minification" ], - "time": "2015-09-01 00:05:29" + "time": "2015-11-17 09:45:47" }, { "name": "symfony/monolog-bundle", - "version": "2.8.1", + "version": "v2.8.2", "source": { "type": "git", "url": "https://github.com/symfony/monolog-bundle.git", - "reference": "7117b9a145722e3c5768db4585f6ad0643ed5c4a" + "reference": "84785c4d44801c4dd82829fa2e1820cacfe2c46f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/7117b9a145722e3c5768db4585f6ad0643ed5c4a", - "reference": "7117b9a145722e3c5768db4585f6ad0643ed5c4a", + "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/84785c4d44801c4dd82829fa2e1820cacfe2c46f", + "reference": "84785c4d44801c4dd82829fa2e1820cacfe2c46f", "shasum": "" }, "require": { "monolog/monolog": "~1.8", "php": ">=5.3.2", - "symfony/config": "~2.3|3.*", - "symfony/dependency-injection": "~2.3|3.*", - "symfony/http-kernel": "~2.3|3.*", - "symfony/monolog-bridge": "~2.3|3.*" + "symfony/config": "~2.3|~3.0", + "symfony/dependency-injection": "~2.3|~3.0", + "symfony/http-kernel": "~2.3|~3.0", + "symfony/monolog-bridge": "~2.3|~3.0" }, "require-dev": { - "symfony/console": "~2.3|3.*", - "symfony/yaml": "~2.3" + "symfony/console": "~2.3|~3.0", + "symfony/yaml": "~2.3|~3.0" }, "type": "symfony-bundle", "extra": { @@ -5536,7 +5469,7 @@ "log", "logging" ], - "time": "2015-10-02 11:51:59" + "time": "2015-11-17 10:02:29" }, { "name": "symfony/swiftmailer-bundle", diff --git a/src/ACL/Bundle/ACLBundle/Controller/MenuController.php b/src/ACL/Bundle/ACLBundle/Controller/MenuController.php index 3f5cd4292747fafe5e64a657fde9ecda516c7a11..be405ae27895e9fd783fc8bbe192f019789d0c19 100644 --- a/src/ACL/Bundle/ACLBundle/Controller/MenuController.php +++ b/src/ACL/Bundle/ACLBundle/Controller/MenuController.php @@ -29,22 +29,26 @@ class MenuController extends Controller $this->addToPageList($pagesList, "Blog", $router->generate('sonata_news_home')); $this->addToPageList($pagesList, "Contact", $router->generate('mremi_contact_form')); - - - -// echo '
';
-//        var_dump($pagesList);
-//        echo '
'; + $securityContext = $this->container->get('security.context'); + + if ($securityContext->isGranted('IS_AUTHENTICATED_REMEMBERED')) { + $user = $securityContext->getToken()->getUser(); + $this->addToPageList($pagesList, $user->getUsername(), $router->generate('sonata_user_profile_show'), 'glyphicon glyphicon-user'); + $this->addToPageList($pagesList, "", $router->generate('sonata_user_security_logout'), 'glyphicon glyphicon-log-out'); + } else { + $this->addToPageList($pagesList, "Connexion", $router->generate('sonata_user_security_login'), 'glyphicon glyphicon-log-in'); + } return $this->render('ACLBundle:Default:menu.html.twig', array('pages' => $pagesList)); } - private function addToPageList(&$pagesList, $name, $url) + private function addToPageList(&$pagesList, $name, $url, $icon='') { $pagesList[] = array( 'name' => $name, - 'url' => $url + 'url' => $url, + 'icon' => $icon ); } } diff --git a/src/ACL/Bundle/ACLBundle/Resources/public/css/perso.css b/src/ACL/Bundle/ACLBundle/Resources/public/css/perso.css index 495f77be0f11f054521388cfa4e8591a073c5840..de747cc486075e2dd52ae411aaa9d9ab436ce297 100644 --- a/src/ACL/Bundle/ACLBundle/Resources/public/css/perso.css +++ b/src/ACL/Bundle/ACLBundle/Resources/public/css/perso.css @@ -24,6 +24,9 @@ h1, h2, h3{ .h2, h2 { font-size: 22px; } +.h3, h3 { + font-size: 18px; +} #header { width: 100%; @@ -99,7 +102,10 @@ h1.title { height: 20px; } -#menu .navbar-brand a:focus, #menu .navbar-brand a:hover { +#menu .navbar-brand a:focus, #menu .navbar-brand a:hover, +h1 a:focus, h1 a:hover, +h2 a:focus, h2 a:hover, +h3 a:focus, h3 a:hover { text-decoration: none; } diff --git a/src/ACL/Bundle/ACLBundle/Resources/views/Default/menu.html.twig b/src/ACL/Bundle/ACLBundle/Resources/views/Default/menu.html.twig index e6305e2fbced3dbcf18ed278616ec69ca0abbbde..48c2c43eb6afb1c6ceb635d22096ff59dfb7e937 100644 --- a/src/ACL/Bundle/ACLBundle/Resources/views/Default/menu.html.twig +++ b/src/ACL/Bundle/ACLBundle/Resources/views/Default/menu.html.twig @@ -13,7 +13,14 @@ \ No newline at end of file diff --git a/src/Application/Mremi/ContactBundle/Resources/views/layout.html.twig b/src/Application/Mremi/ContactBundle/Resources/views/layout.html.twig index 4d9a1501a625cb6f4a2771fc53a2ee2effc8d91a..6b348614ea07197ec7e893c5c288b268740ef991 100644 --- a/src/Application/Mremi/ContactBundle/Resources/views/layout.html.twig +++ b/src/Application/Mremi/ContactBundle/Resources/views/layout.html.twig @@ -1,23 +1,18 @@ {% extends "SonataPageBundle::base_layout.html.twig" %} -{% block application_breadcrumb %} -