Merge branch 'master' into dist/envole/6/master

2021-10-18 15:10:39 +02:00
parent e41093d3b9 e66f8999ed
commit fec7eff6c5
27 changed files with 64 additions and 34 deletions
--- 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) {
--- 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 }

--- 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;
--- 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) }}
-    <h1 class="page-header">Modification Configuration Générale</h1>
+    <h1 class="page-header">Modification Configuration Générale = {{config.id}}</h1>

    {{ form_widget(form.submit) }}  <a class="btn btn-default" href={{ path('cadoles_core_config_commun') }}>Annuler</a>

--- 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) }}
    <h1 class="page-header">
    {% 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 %}
    </h1>

--- 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) }}
    <h1 class="page-header">
    {% 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 %}
    </h1>

--- 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) }}
    <h1 class="page-header">
    {% 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 %}
    </h1>

--- 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) }}
    <h1 class="page-header">
    {% 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 %}
    </h1>

--- 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" %}
        <h1 class="page-header">
        {% 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 %}
        </h1>

--- 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 @@
    <h1 class="page-header">
    {% if mode=="update" %}
        {% if access=="config" %}
-            Modification Utilisateur
+            Modification Utilisateur = {{ user.username}}
        {% else %}
            Profil
        {% endif %}
--- 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) }}
    <h1 class="page-header">
    {% 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 %}
    </h1>

--- 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 @@
                    </div>
    
                    <ul class="nav navbar-top-links navbar-right">
+                        {% if app.user %}
+                            <a id="navbar-nameuser" href="{{ path('cadoles_core_user') }}" title="Profil">{{ app.user.firstname }} {{ app.user.lastname }}</a>
+                        {% endif %}
                        {% if mustread is not  defined  %}
                            {{ include('@CadolesCore/Include/menu.html.twig') }}
                        {% endif %}
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Alert/edit.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Alert/edit.html.twig
@ -4,7 +4,7 @@
 {{ form_start(form) }}
    <h1 class="page-header">
    {% if mode=="update" %}
-    Modification Annonces
+    Modification Annonces = {{alert.title}}
    {% elseif mode=="submit" %}
    Création Annonces
    {% endif %}
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Alertcategory/edit.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Alertcategory/edit.html.twig
@ -4,7 +4,7 @@
 {{ form_start(form) }}
    <h1 class="page-header">
    {% if mode=="update" %}
-    Modification Catégorie d'Annonce
+    Modification Catégorie d'Annonce = {{alertcategory.label}}
    {% elseif mode=="submit" %}
    Création Catégorie d'Annonce
    {% endif %}
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Blog/edit.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Blog/edit.html.twig
@ -4,7 +4,7 @@
 {{ form_start(form) }}
    <h1 class="page-header">
    {% if mode=="update" %}
-    Modification Blog
+    Modification Blog = {{entity.name}}
    {% elseif mode=="submit" %}
    Création Blog
    {% endif %}
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Calendar/edit.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Calendar/edit.html.twig
@ -4,7 +4,7 @@
 {{ form_start(form) }}
    <h1 class="page-header">
    {% if mode=="update" %}
-    Modification Calendrier
+    Modification Calendrier = {{entity.name}}
    {% elseif mode=="submit" %}
    Création Calendrier
    {% endif %}
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Calendar/share.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Calendar/share.html.twig
@ -3,7 +3,7 @@
 {% block pagewrapper %}
 {{ form_start(form) }}
    <h1>
-        Partage Calendrier
+        Partage Calendrier = {{entity.name}}
    </h1>
    
    <p>
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Flux/edit.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Flux/edit.html.twig
@ -4,7 +4,7 @@
 {{ form_start(form) }}
    <h1 class="page-header">
    {% if mode=="update" %}
-    Modification Flux
+    Modification Flux = {{flux.title}}
    {% elseif mode=="submit" %}
    Création Flux
    {% endif %}
@ -17,7 +17,7 @@
    <a href={{ path('cadoles_portal_config_flux_delete',{'id':flux.id}) }}
        class="btn btn-danger pull-right"
        data-method="delete" data-csrf="_token:{{ 'csrf' }}"
-        data-confirm="Êtes-vous sûr de vouloir supprimer cette annonce ?">
+        data-confirm="Êtes-vous sûr de vouloir supprimer ce flux ?">
          Supprimer
    </a>
    {% endif %}
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/edit.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/edit.html.twig
@ -4,7 +4,7 @@
 {{ form_start(form) }}
    <h1 class="page-header">
    {% if mode=="update" %}
-    Modification Item
+    Modification Item = {{item.title}}
    {% elseif mode=="submit" %}
    Création Item
    {% endif %}
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Itemcategory/edit.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Itemcategory/edit.html.twig
@ -4,7 +4,7 @@
 {{ form_start(form) }}
    <h1 class="page-header">
    {% if mode=="update" %}
-    Modification Catégorie d'Item
+    Modification Catégorie d'Item = {{itemcategory.label}}
    {% elseif mode=="submit" %}
    Création Catégorie d'Item
    {% endif %}
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Notice/edit.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Notice/edit.html.twig
@ -4,7 +4,7 @@
 {{ form_start(form) }}
    <h1 class="page-header">
    {% if mode=="update" %}
-    Modification Charte
+    Modification Charte = {{notice.title}}
    {% elseif mode=="submit" %}
    Création Charte
    {% endif %}
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/updateeditor.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/updateeditor.html.twig
@ -4,7 +4,7 @@
 {{ form_start(form) }}
    <h1 class="page-header">
    {% if mode=="update" %}
-    Modification Page Editeur
+    Modification Page Editeur = {{entity.name}}
    {% elseif mode=="submit" %}
    Création Page Editeur
    {% endif %}
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/updatetool.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/updatetool.html.twig
@ -3,7 +3,7 @@
 {% block pagewrapper %}
 {{ form_start(form) }}
    <h1 class="page-header">
-    Modification Page {{ entity.pagecategory.name}}
+    Modification Page {{ entity.pagecategory.name}} = {{entity.name}}
    </h1>

    <p>
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/updateurl.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/updateurl.html.twig
@ -4,7 +4,7 @@
 {{ form_start(form) }}
    <h1 class="page-header">
    {% if mode=="update" %}
-    Modification Page URL
+    Modification Page URL = {{entity.name}}
    {% elseif mode=="submit" %}
    Création Page URL
    {% endif %}
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/updatewidget.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/updatewidget.html.twig
@ -142,9 +142,9 @@
 {{ form_start(form) }}
    <h1 class="page-header">
    {% if mode=="update" %}
-    Modification Page Widget
+    Modification Page Widget = {{entity.name}}
    {% elseif mode=="updatetemplate" %}
-    Modification Modèle de Page    
+    Modification Modèle de Page = {{entity.name}}
    {% elseif mode=="submit" %}
    Création Page Widget
    {% endif %}
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Project/edit.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Project/edit.html.twig
@ -4,7 +4,7 @@
 {{ form_start(form) }}
    <h1 class="page-header">
    {% if mode=="update" %}
-    Modification Projet
+    Modification Projet = {{entity.name}}
    {% elseif mode=="submit" %}
    Création Projet
    {% endif %}