Merge branch 'master' into dist/envole/6/master
This commit is contained in:
commit
fec7eff6c5
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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 }
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<h1 class="page-header">
|
||||
{% if mode=="update" %}
|
||||
{% if access=="config" %}
|
||||
Modification Utilisateur
|
||||
Modification Utilisateur = {{ user.username}}
|
||||
{% else %}
|
||||
Profil
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
|
|
|
|||
|
|
@ -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 %}
|
||||
|
|
|
|||
|
|
@ -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 %}
|
||||
|
|
|
|||
|
|
@ -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 %}
|
||||
|
|
|
|||
|
|
@ -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 %}
|
||||
|
|
|
|||
|
|
@ -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 %}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
{% block pagewrapper %}
|
||||
{{ form_start(form) }}
|
||||
<h1>
|
||||
Partage Calendrier
|
||||
Partage Calendrier = {{entity.name}}
|
||||
</h1>
|
||||
|
||||
<p>
|
||||
|
|
|
|||
|
|
@ -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 %}
|
||||
|
|
|
|||
|
|
@ -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 %}
|
||||
|
|
|
|||
|
|
@ -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 %}
|
||||
|
|
|
|||
|
|
@ -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 %}
|
||||
|
|
|
|||
|
|
@ -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 %}
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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 %}
|
||||
|
|
|
|||
|
|
@ -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 %}
|
||||
|
|
|
|||
|
|
@ -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 %}
|
||||
|
|
|
|||
|
|
@ -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'),
|
||||
|
|
|
|||
Loading…
Reference in New Issue