diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/EventListener/sessionListener.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/EventListener/sessionListener.php index 7424d150..231c31fd 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/EventListener/sessionListener.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/EventListener/sessionListener.php @@ -13,12 +13,15 @@ class sessionListener { protected $container; protected $em; + protected $token_storage; + protected $session; - public function __construct($container, EntityManager $em, TokenStorageInterface $token_storage) + public function __construct($container, EntityManager $em, TokenStorageInterface $token_storage,Session $session) { $this->container = $container; $this->em = $em; $this->token_storage = $token_storage; + $this->session = $session; } public function haveRole($curentuser,$roles,$tohave,$route) { @@ -44,7 +47,7 @@ } public function onDomainParse(Event $event) { - $session = new Session(); + $session = $this->session; $configs = $this->em->getRepository("CadolesCoreBundle:Config")->findAll(); foreach($configs as $config) { diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/services.yml b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/services.yml index 98bac823..734c2dc3 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/services.yml +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/services.yml @@ -26,7 +26,7 @@ services: cadoles.core.session.listener: public: true class: Cadoles\CoreBundle\EventListener\sessionListener - arguments: ['@service_container','@doctrine.orm.entity_manager',"@security.token_storage"] + arguments: ['@service_container','@doctrine.orm.entity_manager',"@security.token_storage","@session"] tags: - { name: kernel.event_listener, event: kernel.request, method: onDomainParse } diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css index 5ffbba81..8b25b99c 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css @@ -60,6 +60,17 @@ body { height: 20px; } +@media (max-width: 991px) { + .header .title{ + font-size: 30px; + } + + .header small { + font-size:14px; + top: 25px; + } +} + @media (max-width: 767px) { .header { display: none } #menu-header { display: none } @@ -116,6 +127,19 @@ body { right: 30px; } +.navbar-top-links #navbar-nameuser { + position: relative; + top: -8px; + right: inherit; +} + +@media (max-width: 991px) { + .navbar-top-links #navbar-nameuser { + display: none; + } +} + + @media (max-width: 767px) { .navbar-default .navbar-header #title { display: none; diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Config/update.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Config/update.html.twig index e27a21d9..611aef25 100755 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Config/update.html.twig +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Config/update.html.twig @@ -2,7 +2,7 @@ {% block pagewrapper %} {{ form_start(form) }} -

Modification Configuration Générale

+

Modification Configuration Générale = {{config.id}}

{{ form_widget(form.submit) }} Annuler diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/edit.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/edit.html.twig index ec6abbc3..17939e61 100755 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/edit.html.twig +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/edit.html.twig @@ -4,11 +4,11 @@ {{ form_start(form) }}

{% if mode=="update" %} - Modification Groupe + Modification Groupe = {{ group.label }} {% elseif mode=="submit" %} Création Groupe {% elseif mode=="delete" %} - Suppression Groupe + Suppression Groupe = {{ group.label }} {% endif %}

diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Niveau01/edit.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Niveau01/edit.html.twig index b5418f21..8018213a 100755 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Niveau01/edit.html.twig +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Niveau01/edit.html.twig @@ -4,11 +4,11 @@ {{ form_start(form) }}

{% if mode=="update" %} - Modification {{ labelniveau01 }} + Modification {{ labelniveau01 }} = {{niveau01.label}} {% elseif mode=="submit" %} Création {{ labelniveau01 }} {% elseif mode=="delete" %} - Suppression {{ labelniveau01 }} + Suppression {{ labelniveau01 }} = {{niveau01.label}} {% endif %}

diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Niveau02/edit.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Niveau02/edit.html.twig index 89e31b0a..fe9fa2cb 100755 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Niveau02/edit.html.twig +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Niveau02/edit.html.twig @@ -4,11 +4,11 @@ {{ form_start(form) }}

{% if mode=="update" %} - Modification {{ labelniveau02 }} + Modification {{ labelniveau02 }} = {{niveau02.label}} {% elseif mode=="submit" %} Création {{ labelniveau02 }} {% elseif mode=="delete" %} - Suppression {{ labelniveau02 }} + Suppression {{ labelniveau02 }} = {{niveau02.label}} {% endif %}

diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Permmodoprofil/edit.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Permmodoprofil/edit.html.twig index c8155f81..00b56a39 100755 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Permmodoprofil/edit.html.twig +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Permmodoprofil/edit.html.twig @@ -4,11 +4,11 @@ {{ form_start(form) }}

{% if mode=="update" %} - Modification Profil de Modération + Modification Profil de Modération = {{ permmodoprofil.name }} {% elseif mode=="submit" %} Création Profil de Modération {% elseif mode=="delete" %} - Suppression Profil de Modération + Suppression Profil de Modération = {{ permmodoprofil.name }} {% endif %}

diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Registration/edit.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Registration/edit.html.twig index ec426bbe..eb6f4218 100755 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Registration/edit.html.twig +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Registration/edit.html.twig @@ -5,11 +5,11 @@ {% if moderegistration!="none" %}

{% if mode=="send" %} - Confirmation à l'Utilisateur + Confirmation à l'Utilisateur = {{ registration.username }} {% elseif mode=="submit" %} Inscription {% elseif mode=="delete" %} - Suppression Inscription + Suppression Inscription = {{ registration.username }} {% endif %}

diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/edit.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/edit.html.twig index 8522fdf1..884c0d82 100755 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/edit.html.twig +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/edit.html.twig @@ -5,7 +5,7 @@

{% if mode=="update" %} {% if access=="config" %} - Modification Utilisateur + Modification Utilisateur = {{ user.username}} {% else %} Profil {% endif %} diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Whitelist/edit.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Whitelist/edit.html.twig index 8dcd1a91..c8ec4cbe 100755 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Whitelist/edit.html.twig +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Whitelist/edit.html.twig @@ -4,11 +4,11 @@ {{ form_start(form) }}

{% if mode=="update" %} - Modification Liste Blanche + Modification Liste Blanche = {{ whitelist.label }} {% elseif mode=="submit" %} Création Liste Blanche {% elseif mode=="delete" %} - Suppression Liste Blanche + Suppression Liste Blanche = {{ whitelist.label }} {% endif %}

diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/base.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/base.html.twig index 604ecd58..15beee54 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/base.html.twig +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/base.html.twig @@ -110,6 +110,9 @@