From 6a8e102fc602c9f09a8a651d585ba91c02d0af96 Mon Sep 17 00:00:00 2001 From: afornerot Date: Mon, 18 Oct 2021 13:37:10 +0200 Subject: [PATCH 1/4] modification style (fixes #33143) --- .../CoreBundle/EventListener/sessionListener.php | 7 +++++-- .../Cadoles/CoreBundle/Resources/config/services.yml | 2 +- .../Cadoles/CoreBundle/Resources/public/css/style.css | 11 +++++++++++ 3 files changed, 17 insertions(+), 3 deletions(-) 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..d2655bfe 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 } From c7586c86d59dfb8dfc54f993e4bef303c9578fad Mon Sep 17 00:00:00 2001 From: afornerot Date: Mon, 18 Oct 2021 14:08:53 +0200 Subject: [PATCH 2/4] =?UTF-8?q?ajout=20du=20titre=20de=20l'enregistrement?= =?UTF-8?q?=20dans=20le=20titre=20de=20la=20page=20modifi=C3=A9e=20(fixes?= =?UTF-8?q?=20#33046)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CoreBundle/Resources/views/Config/update.html.twig | 2 +- .../Cadoles/CoreBundle/Resources/views/Group/edit.html.twig | 4 ++-- .../CoreBundle/Resources/views/Niveau01/edit.html.twig | 4 ++-- .../CoreBundle/Resources/views/Niveau02/edit.html.twig | 4 ++-- .../CoreBundle/Resources/views/Permmodoprofil/edit.html.twig | 4 ++-- .../CoreBundle/Resources/views/Registration/edit.html.twig | 4 ++-- .../Cadoles/CoreBundle/Resources/views/User/edit.html.twig | 2 +- .../CoreBundle/Resources/views/Whitelist/edit.html.twig | 4 ++-- .../Cadoles/PortalBundle/Resources/views/Alert/edit.html.twig | 2 +- .../PortalBundle/Resources/views/Alertcategory/edit.html.twig | 2 +- .../Cadoles/PortalBundle/Resources/views/Blog/edit.html.twig | 2 +- .../PortalBundle/Resources/views/Calendar/edit.html.twig | 2 +- .../PortalBundle/Resources/views/Calendar/share.html.twig | 2 +- .../Cadoles/PortalBundle/Resources/views/Flux/edit.html.twig | 4 ++-- .../Cadoles/PortalBundle/Resources/views/Item/edit.html.twig | 2 +- .../PortalBundle/Resources/views/Itemcategory/edit.html.twig | 2 +- .../PortalBundle/Resources/views/Notice/edit.html.twig | 2 +- .../PortalBundle/Resources/views/Page/updateeditor.html.twig | 2 +- .../PortalBundle/Resources/views/Page/updatetool.html.twig | 2 +- .../PortalBundle/Resources/views/Page/updateurl.html.twig | 2 +- .../PortalBundle/Resources/views/Page/updatewidget.html.twig | 4 ++-- .../PortalBundle/Resources/views/Project/edit.html.twig | 2 +- 22 files changed, 30 insertions(+), 30 deletions(-) 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/PortalBundle/Resources/views/Alert/edit.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Alert/edit.html.twig index 34a97203..453e9b79 100755 --- 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) }}

{% if mode=="update" %} - Modification Annonces + Modification Annonces = {{alert.title}} {% elseif mode=="submit" %} Création Annonces {% endif %} diff --git 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 index a5f80c5d..2dba1257 100755 --- 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) }}

{% 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 %} diff --git 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 index 4b90a8a6..35a84e60 100644 --- 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) }}

{% if mode=="update" %} - Modification Blog + Modification Blog = {{entity.name}} {% elseif mode=="submit" %} Création Blog {% endif %} diff --git 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 index 3e3a5981..b1f2b811 100644 --- 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) }}

{% if mode=="update" %} - Modification Calendrier + Modification Calendrier = {{entity.name}} {% elseif mode=="submit" %} Création Calendrier {% endif %} diff --git 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 index e89ec99b..da63ac71 100644 --- 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) }}

- Partage Calendrier + Partage Calendrier = {{entity.name}}

diff --git 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 index bd9f3553..af14cca7 100755 --- 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) }}

{% if mode=="update" %} - Modification Flux + Modification Flux = {{flux.title}} {% elseif mode=="submit" %} Création Flux {% endif %} @@ -17,7 +17,7 @@ + data-confirm="Êtes-vous sûr de vouloir supprimer ce flux ?"> Supprimer {% endif %} diff --git 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 index afb54563..fef787b4 100755 --- 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) }}

{% if mode=="update" %} - Modification Item + Modification Item = {{item.title}} {% elseif mode=="submit" %} Création Item {% endif %} diff --git 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 index 3f555418..27b1cb72 100755 --- 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) }}

{% 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 %} diff --git 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 index 30fede0c..e798c6f1 100755 --- 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) }}

{% if mode=="update" %} - Modification Charte + Modification Charte = {{notice.title}} {% elseif mode=="submit" %} Création Charte {% endif %} diff --git 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 index c0cf4b56..3d8f89b5 100644 --- 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) }}

{% if mode=="update" %} - Modification Page Editeur + Modification Page Editeur = {{entity.name}} {% elseif mode=="submit" %} Création Page Editeur {% endif %} diff --git 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 index 275c2012..12adcb53 100644 --- 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) }}

- Modification Page {{ entity.pagecategory.name}} + Modification Page {{ entity.pagecategory.name}} = {{entity.name}}

diff --git 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 index e28fd8bc..6c9b25b7 100644 --- 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) }}

{% if mode=="update" %} - Modification Page URL + Modification Page URL = {{entity.name}} {% elseif mode=="submit" %} Création Page URL {% endif %} diff --git 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 index e6c53d2e..ae6aa2a8 100644 --- 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) }}

{% 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 %} diff --git 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 index 28d20d7c..ef335423 100644 --- 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) }}

{% if mode=="update" %} - Modification Projet + Modification Projet = {{entity.name}} {% elseif mode=="submit" %} Création Projet {% endif %} From 41915a0547f1db015c422c423aecf767b5b9ee6a Mon Sep 17 00:00:00 2001 From: afornerot Date: Mon, 18 Oct 2021 14:13:45 +0200 Subject: [PATCH 3/4] correction orthographe (fixes #33045) --- tmpl/ninegate-init-01.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmpl/ninegate-init-01.sql b/tmpl/ninegate-init-01.sql index 92f16e2d..edc0d944 100644 --- a/tmpl/ninegate-init-01.sql +++ b/tmpl/ninegate-init-01.sql @@ -71,7 +71,7 @@ INSERT IGNORE INTO `sidebar` (`id`, `parent_id`, `roworder`, `label`, `path`, `f (3116, 3000, 3116, 'GEPI via SIECLE', 'cadoles_portal_config_syncgepisiecle', 'fa fa-tags', 'ROLE_ADMIN,ROLE_MODO', 'widgepi_activate_syncenvole'), (3120, 3000, 3120, 'Limesurvey', 'cadoles_portal_config_synclimesurvey', 'fa fa-question', 'ROLE_ADMIN,ROLE_MODO', 'activate_widlimesurvey'), (3130, 3000, 3130, 'Moodle', 'cadoles_portal_config_syncmoodle', 'fa fa-graduation-cap', 'ROLE_ADMIN,ROLE_MODO', 'activate_widmoodle'), -(3140, 3000, 3140, 'Nexcloud', 'cadoles_portal_config_syncnextcloud', 'fa fa-cloud', 'ROLE_ADMIN,ROLE_MODO', 'widnextcloud_activate_syncenvole'), +(3140, 3000, 3140, 'Nextcloud', 'cadoles_portal_config_syncnextcloud', 'fa fa-cloud', 'ROLE_ADMIN,ROLE_MODO', 'widnextcloud_activate_syncenvole'), (3150, 3000, 3150, 'Sacoche via SIECLE', 'cadoles_portal_config_syncsacoche', 'fa fa-suitcase', 'ROLE_ADMIN,ROLE_MODO', 'widsacoche_activate_syncenvole'), (3160, 3000, 3160, 'Piwik', 'cadoles_portal_config_syncpiwik', 'fa fa-signal', 'ROLE_ADMIN,ROLE_MODO', 'widpiwik_activate_syncenvole'), (3230, 3000, 3230, 'Wordpress', 'cadoles_portal_config_syncwordpress', 'fab fa-wordpress', 'ROLE_ADMIN,ROLE_MODO', 'activate_widwordpress'), From e66f8999ed1e26c589628c858c022bb0376e9c35 Mon Sep 17 00:00:00 2001 From: afornerot Date: Mon, 18 Oct 2021 14:29:41 +0200 Subject: [PATCH 4/4] mise en forme de la zone username dans la barre de navigation (fixes #32780) --- .../CoreBundle/Resources/public/css/style.css | 13 +++++++++++++ .../CoreBundle/Resources/views/base.html.twig | 3 +++ 2 files changed, 16 insertions(+) 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 d2655bfe..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 @@ -127,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/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 @@