Commit 9721186e authored by joriot221's avatar joriot221
Browse files

Merge branch 'FJ_Icone'

# Conflicts:
#	module/Plafond/view/plafond/plafond/index.phtml
parents 6b249c2b c9909bde
Loading
Loading
Loading
Loading
+12 −12
Changes for module/Application/config/administration.config.php: 12 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ return [
                        'pages'    => [
                            'gestion-referentiel-commun' => [
                                'label'          => 'Gestion dictionnaires de données',
                                'icon'           => 'glyphicon glyphicon - list-alt',
                                'icon'           => 'fas fa-table-list',
                                'route'          => 'administration-referentiel-commun',
                                'resource'       => PrivilegeController::getResourceId('Application\Controller\Administration', 'administration-referentiel-commun'),
                                'order'          => 82,
@@ -108,7 +108,7 @@ return [
                                'pages'          => [
                                    'voirie' => [
                                        'label'        => 'Gestion des voiries',
                                        'icon'         => 'fa fa-graduation-cap',
                                        'icon'         => 'fas fa-graduation-cap',
                                        'route'        => 'voirie',
                                        'resource'     => PrivilegeController::getResourceId('Application\Controller\Voirie', 'index'),
                                        'order'        => 800,
@@ -119,7 +119,7 @@ return [
                            ],
                            'gestion-nomenclature-rh'    => [
                                'label'          => 'Gestion des nomenclatures RH',
                                'icon'           => 'glyphicon glyphicon - list-alt',
                                'icon'           => 'fas fa-table-list',
                                'route'          => 'administration-nomenclature-rh',
                                'resource'       => PrivilegeController::getResourceId('Application\Controller\Administration', 'administration-nomenclature-rh'),
                                'order'          => 83,
@@ -127,7 +127,7 @@ return [
                                'pages'          => [
                                    'grade'      => [
                                        'label'        => 'Gestion des grades',
                                        'icon'         => 'fa fa-graduation-cap',
                                        'icon'         => 'fas fa-graduation-cap',
                                        'route'        => 'grades',
                                        'resource'     => PrivilegeController::getResourceId('Application\Controller\Grade', 'index'),
                                        'order'        => 800,
@@ -135,7 +135,7 @@ return [
                                    ],
                                    'Employeurs' => [
                                        'border-color' => '#9F491F',
                                        'icon'         => 'glyphicon glyphicon-list-alt',
                                        'icon'         => 'fas fa-table-list',
                                        'label'        => "Gestion des employeurs",
                                        'title'        => "Gestion des employeurs",
                                        'route'        => 'employeur',
@@ -146,7 +146,7 @@ return [
                            ],
                            'gestion-periode'            => [
                                'label'          => 'Gestion des périodes',
                                'icon'           => 'glyphicon glyphicon - list-alt',
                                'icon'           => 'fas fa-table-list',
                                'route'          => 'periodes',
                                'resource'       => PrivilegeController::getResourceId('Application\Controller\Periode', 'index'),
                                'order'          => 84,
@@ -154,7 +154,7 @@ return [
                            ],
                            'gestion-etablissement'      => [
                                'label'          => 'Gestion des établissements',
                                'icon'           => 'glyphicon glyphicon - list-alt',
                                'icon'           => 'fas fa-table-list',
                                'route'          => 'etablissement',
                                'resource'       => PrivilegeController::getResourceId('Application\Controller\Etablissement', 'index'),
                                'order'          => 85,
@@ -162,7 +162,7 @@ return [
                            ],
                            'gestion-intervenant'        => [
                                'label'          => 'Gestion intervenants (Statuts, PJ,  etc...)',
                                'icon'           => 'glyphicon glyphicon - list-alt',
                                'icon'           => 'fas fa-table-list',
                                'route'          => 'administration-intervenant',
                                'resource'       => PrivilegeController::getResourceId('Application\Controller\Administration', 'administration-intervenant'),
                                'order'          => 80,
@@ -170,7 +170,7 @@ return [
                                'pages'          => [
                                    'statut'                                     => [
                                        'label'        => 'Edition des statuts des intervenants',
                                        'icon'         => 'fa fa-graduation-cap',
                                        'icon'         => 'fas fa-graduation-cap',
                                        'route'        => 'statut',
                                        'resource'     => PrivilegeController::getResourceId('Intervenant\Controller\Statut', 'index'),
                                        'order'        => 90,
@@ -201,7 +201,7 @@ return [
                            ],
                            'administration-financiere'  => [
                                'label'          => 'Données financières',
                                'icon'           => 'glyphicon glyphicon - list-alt',
                                'icon'           => 'fas fa-table-list',
                                'route'          => 'administration-financiere',
                                'resource'       => PrivilegeController::getResourceId('Application\Controller\Administration', 'administration-financiere'),
                                'order'          => 81,
@@ -209,7 +209,7 @@ return [
                                'pages'          => [
                                    'centre-cout'          => [
                                        'label'        => 'Edition des centres de coûts',
                                        'icon'         => 'fa fa-graduation-cap',
                                        'icon'         => 'fas fa-graduation-cap',
                                        'route'        => 'centre-cout',
                                        'resource'     => PrivilegeController::getResourceId('Application\Controller\CentreCout', 'index'),
                                        'order'        => 80,
@@ -217,7 +217,7 @@ return [
                                    ],
                                    'centre-cout-activite' => [
                                        'label'        => 'Edition des types d\'activités des centres de coûts',
                                        'icon'         => 'fa fa-graduation-cap',
                                        'icon'         => 'fas fa-graduation-cap',
                                        'route'        => 'centre-cout-activite',
                                        'resource'     => PrivilegeController::getResourceId('Application\Controller\CentreCout', 'index'),
                                        'order'        => 80,
+1 −1
Changes for module/Application/config/agrement.config.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ return [
                            'agrement' => [
                                'label'        => "Agréments par lot",
                                'title'        => "Gestion des agréments par lot",
                                'icon'         => 'fa fa-tags',
                                'icon'         => 'fas fa-tags',
                                'route'        => 'gestion/agrement',
                                'resource'     => PrivilegeController::getResourceId('Application\Controller\Agrement', 'index'),
                                'visible'      => Assertion\AgrementAssertion::class,
+1 −1
Changes for module/Application/config/budget.config.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ return [
                            'budget' => [
                                'label'        => 'Budget',
                                'title'        => 'Budget',
                                'icon'         => 'fa fa-eur',
                                'icon'         => 'fas fa-eur',
                                'route'        => 'budget',
                                'resource'     => PrivilegeController::getResourceId('Application\Controller\Budget', 'index'),
                                'order'        => 30,
+1 −1
Changes for module/Application/config/contrat.config.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ return [
                        'pages' => [
                            'contrats' => [
                                'label'        => 'Modèles de contrats de travail',
                                'icon'         => 'fa  fa-commenting',
                                'icon'         => 'fas fa-commenting',
                                'route'        => 'contrat/modeles',
                                'resource'     => PrivilegeController::getResourceId('Application\Controller\Contrat', 'modeles-liste'),
                                'order'        => 60,
+1 −1
Changes for module/Application/config/discipline.config.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ return [
                        'pages'    => [
                            'discipline' => [
                                'border-color' => '#9F491F',
                                'icon'         => 'glyphicon glyphicon-list-alt',
                                'icon'         => 'fas fa-table-list',
                                'label'        => "Disciplines",
                                'title'        => "Gestion des disciplines",
                                'route'        => 'discipline',
Loading