diff --git a/assets/css/app.scss b/assets/css/app.scss
index 7a4ff614b1fbd3122d86af0447cb868e66307dd2..581d6fe49ca994706c6e195d9a524151dac6a832 100644
--- a/assets/css/app.scss
+++ b/assets/css/app.scss
@@ -31,6 +31,9 @@ a:focus, button:focus {
.mb-1 {
margin-bottom: 1rem !important;
}
+.mb-2 {
+ margin-bottom: 2rem !important;
+}
.d-flex {
display: flex;
}
diff --git a/config/domain/admin/translations/messages.fr.yaml b/config/domain/admin/translations/messages.fr.yaml
index 49739c4d06d233efa834395ed29988ccffdd5c08..a21ef42809e7bf56bd1fb3171b86fdd6e3dbddde 100644
--- a/config/domain/admin/translations/messages.fr.yaml
+++ b/config/domain/admin/translations/messages.fr.yaml
@@ -3,10 +3,11 @@ admin:
breadcrumb:
duplicate: Traitement de la duplication
new: Module de duplication
- form:
+ label:
data: Données à dupliquer
source_collectivity: Structure source
type: Type de données
+ message_confirm: Attention, vous allez dupliquer des éléments sur un ensemble de structures.
tab:
source: Données sources
target: Données cibles
@@ -14,4 +15,6 @@ admin:
duplicate: Traitement de la duplication
new: Module de duplication
action:
- revert: Annuler la dernière duplication
+ revert: Annuler la dernière duplication*
+ new_submit: Dupliquer
+ confirm_submit: Confirmer la duplication
diff --git a/config/domain/maturity/translations/messages.fr.yaml b/config/domain/maturity/translations/messages.fr.yaml
index 11ee44ed823dce6b380205820aee4c61cf3430a4..6a4e01b7cf730397ba69dbc61a846b7b1da4714b 100644
--- a/config/domain/maturity/translations/messages.fr.yaml
+++ b/config/domain/maturity/translations/messages.fr.yaml
@@ -65,7 +65,7 @@ maturity:
question: Question
weight: Pondération
not_concerned: "Activer l'option : Non concerné"
- answers: Réponses :
+ answers: "Réponses :"
answer: Réponse
recommendation: Préconisation
delete_confirm: Souhaitez-vous vraiment supprimer le référentiel %object% du %date% ?
diff --git a/config/domain/user/translations/messages.fr.yaml b/config/domain/user/translations/messages.fr.yaml
index 31bf1572ad2dadfb002c266adae6d0134ee4392e..31998f705a536d123e5c086e491fcb9e7f6afceb 100644
--- a/config/domain/user/translations/messages.fr.yaml
+++ b/config/domain/user/translations/messages.fr.yaml
@@ -22,6 +22,7 @@ user:
new_submit: Créer la structure
edit_submit: Modifier la structure
my_organization_submit: Modifier ma structure
+ delete_submit: Supprimer la structure
tab:
address: Adresse
comite_il: Composition du comité Informatique et Libertés
@@ -62,13 +63,30 @@ user:
registre_public: Registre public
management_commitment: Engagement de la direction
continuous_improvement: Principe d'amélioration continue
+ delete_confirm: Souhaitez-vous vraiment supprimer la structure "%object%" ?
+ delete_confirm_list: "La suppression de la structure entrainera la suppression de toutes les données liées à cette structure :"
+ update_related_objects: "Mise à jour des éléments rattachés :"
+ update_duplicate: Éléments dupliqués
+ delete_related_objects: "Suppression des éléments rattachés :"
+ delete_treatments: Traitements
+ delete_contractors: Sous-traitants
+ delete_proofs: Preuves
+ delete_mesurements: Actions de protection
+ delete_users: Utilisateurs
+ updated: Mis à jour
+ deleted: Supprimés
+ error: Erreur
placeholder:
website: https://
flashbag:
success:
+ related_objects_deleted: Suppression des éléments liés effectuée. Vous pouvez maintenant supprimer la structure.
my_organization_edit: Votre structure vient d'être mise à jour
error:
- delete_related_objects: Une erreur est survenue lors de la suppression des %relateds% de la structure "%object%"
+ error_related_objects: Une erreur est survenue
+ warning:
+ delete_in_progress: Suppression des données liées à la structure "%object%" en cours.
+ progress_warning: Toute fermeture avant la finalisation de la suppression causera une suppression partielle des données.
collectivity:
flashbag:
@@ -116,6 +134,8 @@ user:
services: Services
sso_key: Fournisseur d'identité
sso_linked: Associé
+ archive_confirm: Souhaitez-vous vraiment archiver l'utilisateur "%object%" ?
+ unarchive_confirm: Souhaitez-vous vraiment désarchiver l'utilisateur "%object%" ?
list:
user: Utilisateur
last_login: Dernière connexion
diff --git a/src/Domain/Admin/Form/Type/DuplicationType.php b/src/Domain/Admin/Form/Type/DuplicationType.php
index 9f95c8809ec4a378f27e74b9797a73ad76c8dc60..085a7a826f3f464e37dc1cd6fd7e917e7ead32dd 100644
--- a/src/Domain/Admin/Form/Type/DuplicationType.php
+++ b/src/Domain/Admin/Form/Type/DuplicationType.php
@@ -68,14 +68,14 @@ class DuplicationType extends AbstractType
$builder
->add('type', DictionaryType::class, [
'name' => 'admin_duplication_type',
- 'label' => 'admin.duplication.form.type',
+ 'label' => 'admin.duplication.label.type',
'required' => true,
'multiple' => false,
'expanded' => true,
])
->add('sourceCollectivity', EntityType::class, [
'class' => UserModel\Collectivity::class,
- 'label' => 'admin.duplication.form.source_collectivity',
+ 'label' => 'admin.duplication.label.source_collectivity',
'query_builder' => function (EntityRepository $er) {
return $er->createQueryBuilder('c')
->orderBy('c.name', 'ASC');
@@ -85,7 +85,7 @@ class DuplicationType extends AbstractType
'expanded' => false,
])
->add('data', ChoiceType::class, [
- 'label' => 'admin.duplication.form.data',
+ 'label' => 'admin.duplication.label.data',
'required' => true,
'multiple' => true,
'expanded' => false,
@@ -153,7 +153,7 @@ class DuplicationType extends AbstractType
}, $choices);
$form->add('data', ChoiceType::class, [
- 'label' => 'admin.duplication.form.data',
+ 'label' => 'admin.duplication.label.data',
'required' => true,
'multiple' => true,
'expanded' => false,
diff --git a/src/Domain/User/Controller/CollectivityController.php b/src/Domain/User/Controller/CollectivityController.php
index 21084602f82cd7fa83b76f3ebc0a13aa6eec6dd8..4ea994436ee3045e389de559f765d8a252c48cd0 100644
--- a/src/Domain/User/Controller/CollectivityController.php
+++ b/src/Domain/User/Controller/CollectivityController.php
@@ -302,7 +302,7 @@ class CollectivityController extends CRUDController
'object' => $object,
]);
- $this->addFlash('success', $this->helper->trans('user.organization.flashbag.success.delete'));
+ $this->addFlash('success', $this->getFlashbagMessage('success', 'delete', $object));
return $this->redirectToRoute($this->getRouteName('list'));
}
@@ -372,7 +372,7 @@ class CollectivityController extends CRUDController
$this->entityManager->remove($object);
$this->entityManager->flush();
- $this->addFlash('success', $this->helper->trans('user.organization.flashbag.success.delete'));
+ $this->addFlash('success', $this->getFlashbagMessage('success', 'delete', $object));
return $this->redirectToRoute($this->getRouteName('list'));
}
diff --git a/templates/Admin/Duplication/new.html.twig b/templates/Admin/Duplication/new.html.twig
index 1af504deb830625fb4ac82d2b30883f3a405999e..6bdb9a04ab1f0fca4e1ca797724a72868ebf84d0 100644
--- a/templates/Admin/Duplication/new.html.twig
+++ b/templates/Admin/Duplication/new.html.twig
@@ -65,7 +65,7 @@
<div class="col-md-12">
<div class="box box-solid">
<div class="box-body text-center">
- <a class="btn btn-primary" data-toggle="modal" data-target="#validate_modal"> Dupliquer</a>
+ <a class="btn btn-primary" data-toggle="modal" data-target="#validate_modal">{{ 'admin.duplication.action.new_submit'|trans }}</a>
</div>
</div>
</div>
@@ -74,11 +74,11 @@
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-body">
- Attention, vous allez dupliquer des éléments sur un ensemble de structures
+ <p>{{ 'admin.duplication.label.message_confirm'|trans }}</p>
</div>
<div class="modal-footer">
- <button type="button" class="btn btn-secondary" data-dismiss="modal">Annuler</button>
- <input type="submit" class="btn btn-primary" value="{{ 'global.action.duplicate'|trans }}">
+ <button type="button" class="btn btn-secondary" data-dismiss="modal">{{ 'global.action.cancel'|trans }}</button>
+ <input type="submit" class="btn btn-primary" value="{{ 'admin.duplication.action.confirm_submit'|trans }}">
</div>
</div>
</div>
diff --git a/templates/Aipd/Analyse_impact/_form_step_3.html.twig b/templates/Aipd/Analyse_impact/_form_step_3.html.twig
index a2bdc12c1ed620f5acf4d9b8709fc270db3029f0..4b87d49d7d2db50a2080dd791bb6ce3dbbb7b97a 100644
--- a/templates/Aipd/Analyse_impact/_form_step_3.html.twig
+++ b/templates/Aipd/Analyse_impact/_form_step_3.html.twig
@@ -1,8 +1,8 @@
<table class="table table-bordered" id="step3-table">
<thead>
<tr>
- <th scope="col" title="{{ 'aipd.modele_analyse.label.title_disponibility'|trans }}" style="width: 3%">{{ 'aipd.modele_analyse.label.confidentiality'|trans }}</th>
- <th scope="col" title="{{ 'aipd.modele_analyse.label.title_integrity'|trans }}" style="width: 3%">{{ 'aipd.modele_analyse.label.confidentiality'|trans }}</th>
+ <th scope="col" title="{{ 'aipd.modele_analyse.label.title_disponibility'|trans }}" style="width: 3%">{{ 'aipd.modele_analyse.label.disponibility'|trans }}</th>
+ <th scope="col" title="{{ 'aipd.modele_analyse.label.title_integrity'|trans }}" style="width: 3%">{{ 'aipd.modele_analyse.label.integrity'|trans }}</th>
<th scope="col" title="{{ 'aipd.modele_analyse.label.title_confidentiality'|trans }}" style="width: 3%">{{ 'aipd.modele_analyse.label.confidentiality'|trans }}</th>
<th scope="col" style="width: 35%">{{ 'aipd.modele_analyse.label.scenario'|trans }}</th>
<th scope="col" style="width: 12%">{{ 'aipd.modele_analyse.label.vraisemblance'|trans }}</th>
diff --git a/templates/Aipd/Analyse_impact/evaluation.html.twig b/templates/Aipd/Analyse_impact/evaluation.html.twig
index 257c9b01f2b4fee6c52fad1b1acf2c07eec28bb3..8a3e8c6c8c45609360a072fe64b0fd0694523c75 100644
--- a/templates/Aipd/Analyse_impact/evaluation.html.twig
+++ b/templates/Aipd/Analyse_impact/evaluation.html.twig
@@ -28,6 +28,7 @@
{% block body %}
<div class="row">
+ {# LEFT #}
<div class="col-md-6">
<div class="box box-solid box-info">
<div class="box-header with-border"><h3 class="box-title">{{ 'aipd.analyse_impact.tab.grands_domaines'|trans }}</h3></div>
@@ -43,8 +44,8 @@
</div>
<div class="box box-solid box-info">
<div class="box-header with-border"><h3 class="box-title">{{ 'aipd.analyse_impact.tab.description_conformite'|trans }}</h3></div>
- <div class="box-body">
- <table class="table table-bordered">
+ <div class="box-body no-padding">
+ <table class="table mb-2">
<tr>
<th scope="col">{{ 'aipd.analyse_impact.label.contexte'|trans }}</th>
<th scope="col" style="width: 25%;">{{ 'registry.conformite_traitement.label.conformite'|trans }}</th>
@@ -56,8 +57,7 @@
</tr>
{% endfor %}
</table>
- <hr style="border: 0"/>
- <table class="table table-bordered">
+ <table class="table">
<tr>
<th scope="col">{{ 'registry.conformite_traitement.label.question'|trans }}</th>
<th scope="col" style="width: 25%">{{ 'registry.conformite_traitement.label.conformite'|trans }}</th>
@@ -72,6 +72,8 @@
</div>
</div>
</div>
+
+ {# RIGHT #}
<div class="col-md-6">
<div class="box box-solid box-primary">
<div class="box-header with-border"><h3 class="box-title">{{ 'aipd.analyse_impact.tab.mesures_securites'|trans }}</h3></div>
@@ -88,8 +90,8 @@
</div>
<div class="box box-solid box-primary">
<div class="box-header with-border"><h3 class="box-title">{{ 'aipd.analyse_impact.tab.gestion_risques'|trans }}</h3></div>
- <div class="box-body">
- <table class="table table-bordered">
+ <div class="box-body no-padding">
+ <table class="table">
<tr>
<th scope="col">{{ 'aipd.modele_analyse.label.scenario'|trans }}</th>
<th scope="col" style="width: 20%;">{{ 'aipd.analyse_impact.label.impact_potentiel'|trans }}</th>
diff --git a/templates/Aipd/Modele_analyse/_form.html.twig b/templates/Aipd/Modele_analyse/_form.html.twig
index 3a4800e7566919fca610e13ee1c827131977db7e..29cbe622a83bd592342e5eecdb1de6e1b269cf87 100644
--- a/templates/Aipd/Modele_analyse/_form.html.twig
+++ b/templates/Aipd/Modele_analyse/_form.html.twig
@@ -88,7 +88,7 @@
<th scope="col" class="required">{{ 'aipd.modele_analyse.label.message_non_conforme'|trans }}</th>
<th scope="col" class="required">{{ 'aipd.modele_analyse.label.message_non_applicable'|trans }}</th>
<th scope="col">{{ 'aipd.modele_analyse.label.justify'|trans }}</th>
- <th scope="col">{{ 'aipd.modele_analyse.label.file'|trans }}<br><small class="text-muted">{{ 'aipd.modele_analyse.label.help.file'|trans({'max_size': app_max_upload_size}) }}</small></th>
+ <th scope="col" style="width: 10%">{{ 'aipd.modele_analyse.label.file'|trans }}<br><small class="text-muted">{{ 'aipd.modele_analyse.label.help.file'|trans({'max_size': app_max_upload_size}) }}</small></th>
</tr>
</thead>
{% for critere in form.criterePrincipeFondamentaux %}
diff --git a/templates/Aipd/Modele_analyse/delete.html.twig b/templates/Aipd/Modele_analyse/delete.html.twig
index 0cf8a6fd5cf4364e3714bd751b2773e59d2873fa..967936771b960dccf247882cfb984b88a9292d59 100644
--- a/templates/Aipd/Modele_analyse/delete.html.twig
+++ b/templates/Aipd/Modele_analyse/delete.html.twig
@@ -29,7 +29,7 @@
<div class="box box-solid">
<div class="box-header"></div>
<div class="box-body">
- {{ 'aipd.modele_analyse.label.delete_confirm'|trans({'%name%': object.nom}) }}
+ <p>{{ 'aipd.modele_analyse.label.delete_confirm'|trans({'%name%': object.nom}) }}</p>
</div>
<div class="box-footer">
<a href="{{ path('aipd_modele_analyse_list') }}" class="btn btn-default">
diff --git a/templates/Page/sitemap.html.twig b/templates/Page/sitemap.html.twig
index 5eaae45958df5addd762544156b6d37260fcbd4e..9ac975886a05c679dee48e1badf6f3ecbb2995e7 100644
--- a/templates/Page/sitemap.html.twig
+++ b/templates/Page/sitemap.html.twig
@@ -20,190 +20,119 @@
{% block body %}
<ul data-widget="tree">
- <li><a href="{{ path('logout') }}">Déconnexion</a></li>
+ <li><a href="{{ path('logout') }}">{{ 'global.sidebar_menu.logout'|trans }}</a></li>
<li>
- <a href="{{ path('reporting_dashboard_index') }}">
- <span>{{ 'global.sidebar_menu.dashboard'|trans }}</span>
- </a>
+ {# DASHBOARD #}
+ <a href="{{ path('reporting_dashboard_index') }}">{{ 'global.sidebar_menu.dashboard'|trans }}</a>
<ul>
+ {# NOTIFICATIONS #}
{% if app_activate_notifications %}
- <li><a href="{{ path('notification_notification_list') }}">Centre de notifications</a></li>
+ <li><a href="{{ path('notification_notification_list') }}">{{ 'notifications.title.list'|trans }}</a></li>
{% endif %}
- <li><a href="{{ path('registry_treatment_list') }}">
- <span>Liste des traitements (Actif)</span>
- </a>
+ {# TREATMENTS #}
+ <li>
+ <a href="{{ path('registry_treatment_list') }}">{{ 'registry.treatment.title.list'|trans }} ({{ 'registry.treatment.title.list_active'|trans }})</a>
<ul>
- <li><a href="{{ path('registry_treatment_list', {'active' : 'false'}) }}">
- <span>Liste des traitements (Inactif)</span>
- </a></li>
- {% if is_granted('ROLE_ADMIN') %}
- <li>
- <a href="{{ path('registry_treatment_configuration') }}">
- <span>{{ 'global.sidebar_menu.configuration_treatments'|trans }}</span>
- </a>
- </li>
- {% endif %}
+ <li><a href="{{ path('registry_treatment_list', {'active' : 'false'}) }}">{{ 'registry.treatment.title.list'|trans }} ({{ 'registry.treatment.title.list_inactive'|trans }})</a></li>
+ {% if is_granted('ROLE_ADMIN') %}
+ <li><a href="{{ path('registry_treatment_configuration') }}">{{ 'registry.treatment.title.configure'|trans }}</a></li>
+ {% endif %}
</ul>
</li>
- <li><a href="{{ path('registry_contractor_list') }}">
- <span>Liste des sous-traitants</span>
- </a></li>
+ {# CONTRACTORS #}
+ <li><a href="{{ path('registry_contractor_list') }}">{{ 'registry.contractor.title.list'|trans }}</a></li>
+ {# TOOLS #}
{% if is_granted('ROLE_ADMIN') or app.user.collectivity.hasModuleTools == true %}
- <li><a href="{{ path('registry_tool_list') }}">
- <span>Liste des logiciels et supports</span>
- </a></li>
+ <li><a href="{{ path('registry_tool_list') }}">{{ 'registry.tool.title.list'|trans }}</a></li>
{% endif %}
- <li><a href="{{ path('registry_request_list') }}">
- <span>Liste des demandes (Non archivés)</span>
- </a>
+ {# REQUESTS #}
+ <li>
+ <a href="{{ path('registry_request_list') }}">{{ 'registry.request.title.list'|trans }} ({{ 'registry.request.title.list_not_archived'|trans }})</a>
<ul>
- <li><a href="{{ path('registry_request_list', {'archive' : 'true'}) }}">
- <span>Liste des demandes (Archivés)</span>
- </a></li>
+ <li><a href="{{ path('registry_request_list', {'archive' : 'true'}) }}">{{ 'registry.request.title.list'|trans }} ({{ 'registry.request.title.list_archived'|trans }})</a></li>
</ul>
</li>
- <li><a href="{{ path('registry_violation_list') }}">
- <span>Liste des violations (Non archivés)</span>
- </a>
+ {# VIOLATIONS #}
+ <li>
+ <a href="{{ path('registry_violation_list') }}">{{ 'registry.violation.title.list'|trans }} ({{ 'registry.violation.title.list_not_archived'|trans }})</a>
<ul>
- <li><a href="{{ path('registry_violation_list', {'archive' : 'true'}) }}">
- <span>Liste des violations (Archivés)</span>
- </a></li>
+ <li><a href="{{ path('registry_violation_list', {'archive' : 'true'}) }}">{{ 'registry.violation.title.list'|trans }} ({{ 'registry.violation.title.list_archived'|trans }})</a></li>
</ul>
</li>
- <li><a href="{{ path('registry_proof_list') }}">
- <span>Liste des preuves (Non archivés)</span>
- </a>
+ {# PROOFS #}
+ <li>
+ <a href="{{ path('registry_proof_list') }}">{{ 'registry.proof.title.list'|trans }} ({{ 'registry.proof.title.list_not_archived'|trans }})</a>
<ul>
- <li><a href="{{ path('registry_proof_list', {'archive' : 'true'}) }}">
- <span>Liste des preuves (Archivés)</span>
- </a></li>
+ <li><a href="{{ path('registry_proof_list', {'archive' : 'true'}) }}">{{ 'registry.proof.title.list'|trans }} ({{ 'registry.proof.title.list_archived'|trans }})</a></li>
</ul>
</li>
- <li><a href="{{ path('registry_mesurement_list') }}">
- <span>Liste des actions de protection</span>
- </a></li>
- <li><a href="{{ path('registry_mesurement_action_plan') }}">
- <span>Plan d'actions</span>
- </a></li>
-
+ {# MESUREMENTS #}
+ <li><a href="{{ path('registry_mesurement_list') }}">{{ 'registry.mesurement.title.list'|trans }}</a></li>
+ <li><a href="{{ path('registry_mesurement_action_plan') }}">{{ 'registry.mesurement.title.action_plan'|trans }}</a></li>
+ {# AIPD #}
{% if is_granted('ROLE_ADMIN') %}
- <li>
- <a href="{{ path('aipd_modele_analyse_list') }}">
- Liste des modèles d'analyse
- </a>
- </li>
- <li>
- <a href="{{ path('aipd_mesure_protection_list') }}">
- <span>Liste des mesures de protection</span>
- </a>
- </li>
+ <li><a href="{{ path('aipd_modele_analyse_list') }}">{{ 'aipd.modele_analyse.title.list'|trans }}</a></li>
+ <li><a href="{{ path('aipd_mesure_protection_list') }}">{{ 'aipd.mesure_protection.title.list'|trans }}</a></li>
{% endif %}
{% if is_granted('ROLE_ADMIN') or app.user.collectivity.hasModuleConformiteTraitement == true %}
- <li>
- <a href="{{ path('aipd_analyse_impact_list') }}">
- <span>{{ 'global.sidebar_menu.aipd_analyse_impact'|trans }}</span>
- </a>
- </li>
+ <li><a href="{{ path('aipd_analyse_impact_list') }}">{{ 'aipd.analyse_impact.title.list'|trans }}</a></li>
{% endif %}
- <li>
- <a href="{{ path('maturity_survey_list') }}">
- <span>Liste des indices de maturité</span>
- </a>
- </li>
+ {# MATURITY #}
+ <li><a href="{{ path('maturity_survey_list') }}">{{ 'maturity.survey.title.list'|trans }}</a></li>
{% if is_granted('ROLE_ADMIN') %}
- <li>
- <a href="{{ path('maturity_referentiel_list') }}">
- <span>{{ 'global.sidebar_menu.maturity_referentiel'|trans }}</span>
- </a>
- </li>
+ <li><a href="{{ path('maturity_referentiel_list') }}">{{ 'maturity.referentiel.title.list'|trans }}</a></li>
{% endif %}
+ {# TREATMENTS CONFORMITY #}
{% if is_granted('ROLE_ADMIN') or app.user.collectivity.hasModuleConformiteTraitement %}
- <li>
- <a href="{{ path('registry_conformite_traitement_list') }}">
- <span>{{ 'global.sidebar_menu.conformite_treatments'|trans }}</span>
- </a>
- </li>
+ <li><a href="{{ path('registry_conformite_traitement_list') }}">{{ 'registry.conformite_traitement.title.list'|trans }}</a></li>
{% endif %}
+ {# ORGANIZATION CONFORMITY #}
{% if is_granted('ROLE_ADMIN') or app.user.collectivity.hasModuleConformiteOrganisation %}
- <li>
- <a href="{{ path('registry_conformite_organisation_list') }}">
- <span>{{ 'global.sidebar_menu.conformite_organization'|trans }}</span>
- </a>
- </li>
+ <li><a href="{{ path('registry_conformite_organisation_list') }}">{{ 'registry.conformite_organisation.title.list'|trans }}</a></li>
{% endif %}
+ {# DOCUMENTATION #}
<li>
- <a href="{{ path('documentation_document_index') }}">
- <span>{{ 'global.sidebar_menu.documentation'|trans }}</span>
- </a>
-
- {% if is_granted('ROLE_ADMIN') %}
- <ul>
- <li><a href="{{ path('documentation_category_list') }}">
- {{ 'documentation.category.action.list'|trans }}
- </a>
- </li>
- </ul>
- {% endif %}
+ <a href="{{ path('documentation_document_index') }}">{{ 'documentation.document.title.title'|trans }}</a>
+ {% if is_granted('ROLE_ADMIN') %}
+ <ul>
+ <li><a href="{{ path('documentation_category_list') }}">{{ 'documentation.category.title.subtitle'|trans }}</a></li>
+ </ul>
+ {% endif %}
</li>
+ {# ADMIN & REFERENT #}
{% if is_granted('ROLE_REFERENT') %}
- {# Referent is not allowed to duplicate#}
+ {# DUPLICATION - Referent is not allowed to duplicate #}
{% if is_granted('ROLE_ADMIN') %}
- <li>
- <a href="{{ path('admin_duplication_new') }}">
- <span>{{ 'global.sidebar_menu.admin_duplication'|trans }}</span>
- </a>
- </li>
+ <li><a href="{{ path('admin_duplication_new') }}">{{ 'admin.duplication.title.new'|trans }}</a></li>
{% endif %}
+ {# ORGANIZATIONS & MY ORGANIZATION #}
<li>
- <a href="{{ path('user_collectivity_list') }}">
- Liste des structures
- </a>
+ <a href="{{ path('user_collectivity_list') }}">{{ 'user.organization.title.list'|trans }}</a>
<ul>
- <li {% if menuItem == 'user_profile_collectivity' %}class="active"{% endif %}>
- <a href="{{ path('user_profile_collectivity_show') }}">
- <span>{{ 'global.sidebar_menu.user_organization'|trans }}</span>
- </a>
- </li>
+ <li><a href="{{ path('user_profile_collectivity_show') }}">{{ 'global.sidebar_menu.user_organization'|trans }}</a></li>
</ul>
</li>
+ {# USERS & MY PROFIL #}
<li>
- <a href="{{ path('user_user_list') }}">
- Liste des utilisateurs (Non archivés)
- </a>
+ <a href="{{ path('user_user_list') }}">{{ 'user.user.title.list'|trans }} ({{ 'user.user.title.list_not_archived'|trans }})</a>
<ul>
- <li>
- <a href="{{ path('user_user_list', {'archive' : 'true'}) }}">
- Liste des utilisateurs (Archivés)
- </a>
- </li>
- <li {% if menuItem == 'user_profile_user' %}class="active"{% endif %}>
- <a href="{{ path('user_profile_user_edit') }}">
- <span>{{ 'global.sidebar_menu.user_profile'|trans }}</span>
- </a>
- </li>
+ <li><a href="{{ path('user_user_list', {'archive' : 'true'}) }}">{{ 'user.user.title.list'|trans }} ({{ 'user.user.title.list_archived'|trans }})</a></li>
+ <li><a href="{{ path('user_profile_user_edit') }}">{{ 'global.sidebar_menu.user_profile'|trans }}</a></li>
</ul>
</li>
{% endif %}
+ {# USERS #}
{% if not is_granted('ROLE_ADMIN') and not is_granted('ROLE_REFERENT')%}
- <li {% if menuItem == 'user_profile_collectivity' %}class="active"{% endif %}>
- <a href="{{ path('user_profile_collectivity_show') }}">
- <span>{{ 'global.sidebar_menu.user_organization'|trans }}</span>
- </a>
- </li>
- <li {% if menuItem == 'user_profile_user' %}class="active"{% endif %}>
- <a href="{{ path('user_profile_user_edit') }}">
- <span>{{ 'global.sidebar_menu.user_profile'|trans }}</span>
- </a>
- </li>
+ {# MY ORGANIZATION #}
+ <li><a href="{{ path('user_profile_collectivity_show') }}">{{ 'global.sidebar_menu.user_organization'|trans }}</a></li>
+ {# MY PROFIL #}
+ <li><a href="{{ path('user_profile_user_edit') }}">{{ 'global.sidebar_menu.user_profile'|trans }}</a></li>
{% endif %}
+ {# REPORTING #}
{% if is_granted('ROLE_ADMIN') %}
- <li>
- <a href="{{ path('reporting_journalisation_index') }}">
- <span>{{ 'global.sidebar_menu.reporting_journalisation'|trans }} des actions</span>
- </a>
- </li>
+ <li><a href="{{ path('reporting_journalisation_index') }}">{{ 'reporting.journalisation.title'|trans }}</a></li>
{% endif %}
+ {# ACCESSIBILITY #}
<li>
<a href="{{ path('page_declaration') }}">{{ 'page.declaration.title'|trans }}</a>
<ul>
@@ -217,8 +146,10 @@
</li>
</ul>
</li>
+ {# CREDIT #}
<li><a href="{{ path('page_credit') }}">{{ 'page.credit.title'|trans }}</a></li>
- <li><a href="{{ path('page_sitemap') }}">{{ 'page.sitemap.title'|trans }}</a></li>
+ {# SITEMAP #}
+ <li><a aria-current="true" href="{{ path('page_sitemap') }}">{{ 'page.sitemap.title'|trans }}</a></li>
</ul>
</li>
</ul>
diff --git a/templates/Registry/Treatment/public_list.html.twig b/templates/Registry/Treatment/public_list.html.twig
index 1b060118d39994c3b5c715f536be9bf194d30937..f40edb8bff34515087a73132274f52c0b0181134 100644
--- a/templates/Registry/Treatment/public_list.html.twig
+++ b/templates/Registry/Treatment/public_list.html.twig
@@ -14,10 +14,10 @@
<h1>
{{ 'registry.treatment.title.list'|trans }} - {{ collectivity }}
<small>
- {% if app.request.query.get('active') == 'false' %}
- {{ 'global.label.inactive'|trans }}
+ {% if app.request.query.get('active') == 'true' %}
+ {{ 'registry.treatment.title.list_active'|trans }}
{% else %}
- {{ 'global.label.active'|trans }}
+ {{ 'registry.treatment.title.list_inactive'|trans }}c
{% endif %}
</small>
</h1>
diff --git a/templates/User/Collectivity/delete.html.twig b/templates/User/Collectivity/delete.html.twig
index 0ee7d315a24458386d08c74eef171ea1ff9c9530..61dc20f0f1fa14606e2ab333271a55273ba519ae 100644
--- a/templates/User/Collectivity/delete.html.twig
+++ b/templates/User/Collectivity/delete.html.twig
@@ -30,18 +30,15 @@
<div class="box box-solid">
<div class="box-header"></div>
<div class="box-body">
- Souhaitez vous vraiment supprimer la structure "{{ object }}" ?
- <p>
- <b>La suppression de la structure entrainera la suppression de toutes les données liées à cette structure :
- <ul>
- {% for deletedObject in deletedObjects %}
- <li>
- {{ deletedObject }}
- </li>
- {% endfor %}
- </ul>
- </b>
- </p>
+ <p>{{ 'user.organization.label.delete_confirm'|trans({'%object%': object }) }}</p>
+ <p><strong>{{ 'user.organization.label.delete_confirm_list'|trans }}</strong></p>
+ <ul>
+ {% for deletedObject in deletedObjects %}
+ <li>
+ {{ deletedObject }}
+ </li>
+ {% endfor %}
+ </ul>
</div>
<div class="box-footer">
<a href="{{ path('user_collectivity_list') }}" class="btn btn-default">
diff --git a/templates/User/Collectivity/delete_processing.html.twig b/templates/User/Collectivity/delete_processing.html.twig
index c66983e6cc2ee32ba1d184850830b60f3a93be14..782f63eb8b91fb125ea97f7cca12f3bd6e3aceb3 100644
--- a/templates/User/Collectivity/delete_processing.html.twig
+++ b/templates/User/Collectivity/delete_processing.html.twig
@@ -28,9 +28,8 @@
<div class="row">
<div class="col-xs-12">
<div role="status" id="deletion-status-flashbag" class="alert alert-warning">
- <strong>ATTENTION</strong><br/>
- Cette page réalise et vous informe de l'avancée de la suppression de la structure.<br/>
- Toute fermeture avant la finalisation de la suppression causera une <strong>suppression partielle</strong> des données.
+ <p><i aria-hidden="true" class="icon fa fa-spinner"></i><strong>{{ 'user.organization.flashbag.warning.delete_in_progress'|trans({'%object%': object}) }}</strong></p>
+ <p>{{ 'user.organization.flashbag.warning.progress_warning'|trans }}</p>
</div>
</div>
</div>
@@ -38,32 +37,28 @@
<div class="row">
<div class="col-xs-12">
<div class="box box-solid">
- <div class="box-header"></div>
<div class="box-body">
- Suppression de la structure "{{ object }}" en cours.
- <p>Mise à jour des éléments dupliqués <span id="maj_duplicate"></span></p>
- <p></p>
- <p id="todelete_list">
- <b>Suppression des éléments rattachés en cours</b>
- <ul>
- <li>Suppression des traitements <span id="check_treatments"></span></li>
- <li>Suppression des actions de protection <span id="check_mesurements"></span></li>
- <li>Suppression des sous-traitants <span id="check_contractors"></span></li>
- <li>Suppression des utilisateurs <span id="check_users"></span></li>
- <li>Suppression des preuves <span id="check_proofs"></span></li>
- </ul>
- </p>
+ <p>{{ 'user.organization.label.update_related_objects'|trans }}</p>
+ <ul>
+ <li>{{ 'user.organization.label.update_duplicate'|trans }} <span id="check_duplicate"></span></li>
+ </ul>
+ <p>{{ 'user.organization.label.delete_related_objects'|trans }}</p>
+ <ul>
+ <li>{{ 'user.organization.label.delete_treatments'|trans }} <span id="check_treatments"></span></li>
+ <li>{{ 'user.organization.label.delete_contractors'|trans }} <span id="check_contractors"></span></li>
+ <li>{{ 'user.organization.label.delete_proofs'|trans }} <span id="check_proofs"></span></li>
+ <li>{{ 'user.organization.label.delete_mesurements'|trans }} <span id="check_mesurements"></span></li>
+ <li>{{ 'user.organization.label.delete_users'|trans }} <span id="check_users"></span></li>
+ </ul>
+ </div>
+ <div class="box-footer" id="delete_button" style="display:none">
+ <form method="POST" action="{{ path('user_collectivity_delete_process', { 'id': object.id }) }}">
+ <button type="submit" class="btn btn-primary">{{ 'user.organization.action.delete_submit'|trans }}</button>
+ </form>
</div>
</div>
</div>
</div>
- <div class="row" id="delete_button" style="display:none">
- <div class="col-xs-12">
- <form method="POST" action="{{ path('user_collectivity_delete_process', { 'id': object.id }) }}">
- <button type="submit" class="btn btn-primary">Supprimer la structure</button>
- </form>
- </div>
- </div>
{% endblock %}
{% block javascripts %}
@@ -78,93 +73,91 @@
let flashbag = $('#deletion-status-flashbag');
flashbag.hasClass('alert-warning') && flashbag.removeClass('alert-warning');
flashbag.addClass('alert-success');
- flashbag.html('<strong>Suppression des éléments liés effectuée</strong><br/> Vous pouvez maintenant supprimer la structure avec le bouton en bas de page.');
+ flashbag.html('<i aria-hidden="true" class="icon fa fa-check"></i>{{ 'user.organization.flashbag.success.related_objects_deleted'|trans }}');
$('#delete_button').show()
};
const majCloned = () => {
- console.log("Maj cloned");
+ // console.log("Maj cloned");
return $.ajax({
url: '{{ path('user_collectivity_delete_update_cloned_from', { 'id': object.id }) }}',
method: 'POST',
success: function(data, textStatuts, jqXHR) {
- $(`#maj_duplicate`).html('<i aria-hidden="true" class="fa fa-check text-green"></i>');
+ $(`#check_duplicate`).html('<span class="badge bg-green">{{ 'user.organization.label.updated'|trans }}</span>');
deleteTreatments()
},
error: function(jqXHR, textStatus, errorThrown) {
- $(`#todelete_list`).html('<span>Une erreur est survenue lors de la mise à jour des éléments dupliqués depuis les éléments rattachés à la structure {{ object }}<i aria-hidden="true" class="fa fa-times text-red">');
-
+ $(`#check_duplicate`).html('<span class="badge bg-red">{{ 'user.organization.label.error'|trans }}</span>');
},
})
}
const deleteTreatments = () => {
- console.log("Delete treatments");
+ // console.log("Delete treatments");
return $.ajax({
url: '{{ path('user_collectivity_delete_related', { 'id': object.id, 'objectType': 'treatments' }) }}',
method: 'POST',
success: function(data, textStatuts, jqXHR) {
- $(`#check_treatments`).html('<i aria-hidden="true" class="fa fa-check text-green"></i>');
+ $(`#check_treatments`).html('<span class="badge bg-green">{{ 'user.organization.label.deleted'|trans }}</span>');
deleteMesurements()
},
error: function(jqXHR, textStatus, errorThrown) {
- $(`#todelete_list`).html('<span>{{ 'user.organization.flashbag.error.delete_related_objects'|trans({'%relateds%': 'traitements', '%object%': object}) }}<i aria-hidden="true" class="fa fa-times text-red">');
+ $(`#check_treatments`).html('<span class="badge bg-red">{{ 'user.organization.label.error'|trans }}</span>');
},
})
}
- const deleteMesurements = () => {
- console.log("Delete mesurements");
+ const deleteContractors = () => {
+ // console.log("Delete contractors");
return $.ajax({
- url: '{{ path('user_collectivity_delete_related', { 'id': object.id, 'objectType': 'mesurements' }) }}',
+ url: '{{ path('user_collectivity_delete_related', { 'id': object.id, 'objectType': 'contractors' }) }}',
method: 'POST',
success: function(data, textStatuts, jqXHR) {
- $(`#check_mesurements`).html('<i aria-hidden="true" class="fa fa-check text-green"></i>');
- deleteContractors()
+ $(`#check_contractors`).html('<span class="badge bg-green">{{ 'user.organization.label.deleted'|trans }}</span>');
+ deleteUsers()
},
error: function(jqXHR, textStatus, errorThrown) {
- $(`#todelete_list`).html('<span>{{ 'user.organization.flashbag.error.delete_related_objects'|trans({'%relateds%': 'actions de protection', '%object%': object}) }}<i aria-hidden="true" class="fa fa-times text-red">');
-
+ $(`#check_contractors`).html('<span class="badge bg-red">{{ 'user.organization.label.error'|trans }}</span>');
},
})
}
- const deleteContractors = () => {
- console.log("Delete contractors");
+ const deleteProofs = () => {
+ // console.log("Delete proofs");
return $.ajax({
- url: '{{ path('user_collectivity_delete_related', { 'id': object.id, 'objectType': 'contractors' }) }}',
+ url: '{{ path('user_collectivity_delete_related', { 'id': object.id, 'objectType': 'proofs' }) }}',
method: 'POST',
success: function(data, textStatuts, jqXHR) {
- $(`#check_contractors`).html('<i aria-hidden="true" class="fa fa-check text-green"></i>');
- deleteUsers()
+ $(`#check_proofs`).html('<span class="badge bg-green">{{ 'user.organization.label.deleted'|trans }}</span>');
+ showEndingFlashbag()
},
error: function(jqXHR, textStatus, errorThrown) {
- $(`#todelete_list`).html('<span>{{ 'user.organization.flashbag.error.delete_related_objects'|trans({'%relateds%': 'sous-traitants', '%object%': object}) }}<i aria-hidden="true" class="fa fa-times text-red">');
+ $(`#check_proofs`).html('<span class="badge bg-red">{{ 'user.organization.label.error'|trans }}</span>');
},
})
}
- const deleteUsers = () => {
- console.log("Delete users");
+ const deleteMesurements = () => {
+ // console.log("Delete mesurements");
return $.ajax({
- url: '{{ path('user_collectivity_delete_related', { 'id': object.id, 'objectType': 'users' }) }}',
+ url: '{{ path('user_collectivity_delete_related', { 'id': object.id, 'objectType': 'mesurements' }) }}',
method: 'POST',
success: function(data, textStatuts, jqXHR) {
- $(`#check_users`).html('<i aria-hidden="true" class="fa fa-check text-green"></i>');
- deleteProofs()
+ $(`#check_mesurements`).html('<span class="badge bg-green">{{ 'user.organization.label.deleted'|trans }}</span>');
+ deleteContractors()
},
error: function(jqXHR, textStatus, errorThrown) {
- $(`#todelete_list`).html('<span>{{ 'user.organization.flashbag.error.delete_related_objects'|trans({'%relateds%': 'sous-traitants', '%object%': object}) }}<i aria-hidden="true" class="fa fa-times text-red">');
+ $(`#check_mesurements`).html('<span class="badge bg-red">{{ 'user.organization.label.error'|trans }}</span>');
},
})
}
- const deleteProofs = () => {
- console.log("Delete proofs");
+ const deleteUsers = () => {
+ // console.log("Delete users");
return $.ajax({
- url: '{{ path('user_collectivity_delete_related', { 'id': object.id, 'objectType': 'proofs' }) }}',
+ url: '{{ path('user_collectivity_delete_related', { 'id': object.id, 'objectType': 'users' }) }}',
method: 'POST',
success: function(data, textStatuts, jqXHR) {
- $(`#check_proofs`).html('<i aria-hidden="true" class="fa fa-check text-green"></i>');
- showEndingFlashbag()
+ $(`#check_users`).html('<span class="badge bg-green">{{ 'user.organization.label.deleted'|trans }}</span>');
+ deleteProofs()
},
error: function(jqXHR, textStatus, errorThrown) {
- $(`#todelete_list`).html('<span>{{ 'user.organization.flashbag.error.delete_related_objects'|trans({'%relateds%': 'Preuves', '%object%': object}) }}<i aria-hidden="true" class="fa fa-times text-red">');
+ $(`#check_users`).html('<span class="badge bg-red">{{ 'user.organization.label.error'|trans }}</span>');
},
})
}
diff --git a/templates/User/User/delete.html.twig b/templates/User/User/delete.html.twig
index a6134cd7fef00bef04bd857bde6c08ca71917607..fe3c6446454fda5a220169a08a96f100be21c455 100644
--- a/templates/User/User/delete.html.twig
+++ b/templates/User/User/delete.html.twig
@@ -26,7 +26,7 @@
<div class="box box-solid">
<div class="box-header"></div>
<div class="box-body">
- Souhaitez vous vraiment archiver l'utilisateur "{{ object }}" ?
+ <p>{{ 'user.user.label.archive_confirm'|trans({'%object%': object }) }}</p>
</div>
<div class="box-footer">
<a href="{{ path('user_user_list') }}" class="btn btn-default">
diff --git a/templates/User/User/unarchive.html.twig b/templates/User/User/unarchive.html.twig
index c43f1402029ef38be9ccef15bb1189a8f94225d4..3e26be33cc66210261b6bedfe90c24f99a12d2a4 100644
--- a/templates/User/User/unarchive.html.twig
+++ b/templates/User/User/unarchive.html.twig
@@ -26,7 +26,7 @@
<div class="box box-solid">
<div class="box-header"></div>
<div class="box-body">
- Souhaitez-vous vraiment désarchiver l'utilisateur "{{ object }}" ?
+ <p>{{ 'user.user.label.unarchive_confirm'|trans({'%object%': object }) }}</p>
</div>
<div class="box-footer">
<a href="{{ path('user_user_list') }}" class="btn btn-default">
diff --git a/templates/_breadcrumb.html.twig b/templates/_breadcrumb.html.twig
index f29641d811d3f24383131ec0007e42a4306ce861..3a9deaaa99756ad67f383ba3f46ad73d39eb9ef3 100644
--- a/templates/_breadcrumb.html.twig
+++ b/templates/_breadcrumb.html.twig
@@ -11,7 +11,7 @@
{% endif %}
</li>
{% for item in breadcrumb %}
- <li {% if loop.last %}class="active"{% endif %}>
+ <li {% if loop.last %}class="active" aria-current="true"{% endif %}>
{% if item.link is defined %}
<a href="{{ item.link }}">
{% endif %}
diff --git a/templates/_footer.html.twig b/templates/_footer.html.twig
index b34496caa351976a8be31199e4d64b193f98bd5c..33aa3545d24c2f738c2a59611d8b9f25acf7c94c 100644
--- a/templates/_footer.html.twig
+++ b/templates/_footer.html.twig
@@ -6,9 +6,9 @@
{% if app.user %}
<ul class="list-unstyled list-inline">
- <li class="no-padding"><a href="{{ path('page_sitemap') }}">{{ 'page.sitemap.title'|trans }}</a><span aria-hidden="true" style="padding: 0 5px;">|</span></li>
- <li class="no-padding"><a href="{{ path('page_declaration') }}">Accessibilité<!-- : {{ 'page.declaration.result'|trans }}--></a><span aria-hidden="true" style="padding: 0 5px;">|</span></li>
- <li class="no-padding"><a href="{{ path('page_credit') }}">{{ 'page.credit.title'|trans }}</a><span aria-hidden="true" style="padding: 0 5px;">|</span></li>
+ <li class="no-padding"><a href="{{ path('page_sitemap') }}" {% if menuItem == 'page_sitemap' %}aria-current="page"{% endif %}>{{ 'page.sitemap.title'|trans }}</a><span aria-hidden="true" style="padding: 0 5px;">|</span></li>
+ <li class="no-padding"><a href="{{ path('page_declaration') }} {% if menuItem == 'page_declaration' %}aria-current="page"{% endif %}">Accessibilité<!-- : {{ 'page.declaration.result'|trans }}--></a><span aria-hidden="true" style="padding: 0 5px;">|</span></li>
+ <li class="no-padding"><a href="{{ path('page_credit') }}" {% if menuItem == 'page_credit' %}aria-current="page"{% endif %}>{{ 'page.credit.title'|trans }}</a><span aria-hidden="true" style="padding: 0 5px;">|</span></li>
<li class="no-padding">v{{ app_version }}</li>
</ul>
{% else %}
diff --git a/templates/_header.html.twig b/templates/_header.html.twig
index ac5d7dee4675c5c83cd7b0b653d2481fc7c212e7..20eda18a138a33109160e69eb91e2498a2f0ea66 100644
--- a/templates/_header.html.twig
+++ b/templates/_header.html.twig
@@ -47,13 +47,13 @@
</button>
<ul class="dropdown-menu header-menu">
<li {% if menuItem == 'user_profile_user' %}class="active"{% endif %}>
- <a href="{{ path('user_profile_user_edit') }}">
+ <a href="{{ path('user_profile_user_edit') }}" {% if menuItem == 'user_profile_user' %}aria-current="page"{% endif %}>
<i aria-hidden="true" class="fa fa-user"></i>
<span>{{ 'global.sidebar_menu.user_profile'|trans }}</span>
</a>
</li>
<li {% if menuItem == 'user_profile_collectivity' %}class="active"{% endif %}>
- <a href="{{ path('user_profile_collectivity_show') }}">
+ <a href="{{ path('user_profile_collectivity_show') }}" {% if menuItem == 'user_profile_collectivity' %}aria-current="page"{% endif %}>
<i aria-hidden="true" class="fa fa-home"></i>
<span>{{ 'global.sidebar_menu.user_organization'|trans }}</span>
</a>
diff --git a/templates/_sidebar.html.twig b/templates/_sidebar.html.twig
index 38ef28bc4e236de8f6f1071a5a6bb7a108527d68..945eb3489de06e57b34506543e086c37f3575707 100644
--- a/templates/_sidebar.html.twig
+++ b/templates/_sidebar.html.twig
@@ -2,7 +2,7 @@
<ul class="sidebar-menu" data-widget="tree">
<li {% if menuItem == 'reporting_dashboard' %}class="active"{% endif %}>
- <a aria-label="{{ 'global.sidebar_menu.dashboard'|trans }}" href="{{ path('reporting_dashboard_index') }}">
+ <a aria-label="{{ 'global.sidebar_menu.dashboard'|trans }}" href="{{ path('reporting_dashboard_index') }}" {% if menuItem == 'reporting_dashboard' %}aria-current="page"{% endif %}>
<i aria-hidden="true" class="fa fa-tachometer-alt"></i>
<span>{{ 'global.sidebar_menu.dashboard'|trans }}</span>
</a>
@@ -13,33 +13,33 @@
<span>{{ 'global.sidebar_menu.registry'|trans }}</span>
<ul class="sidebar-menu">
<li {% if menuItem == 'registry_treatment' %}class="active"{% endif %}>
- <a aria-label="{{ 'global.sidebar_menu.registry_treatments'|trans }}" href="{{ path('registry_treatment_list') }}">
+ <a aria-label="{{ 'global.sidebar_menu.registry_treatments'|trans }}" href="{{ path('registry_treatment_list') }}" {% if menuItem == 'registry_treatment' %}aria-current="page"{% endif %}>
<i aria-hidden="true" class="fa fa-list"></i>
<span>{{ 'global.sidebar_menu.registry_treatments'|trans }}</span>
</a>
</li>
<li {% if menuItem == 'registry_contractor' %}class="active"{% endif %}>
- <a aria-label="{{ 'global.sidebar_menu.registry_contractors'|trans }}" href="{{ path('registry_contractor_list') }}">
+ <a aria-label="{{ 'global.sidebar_menu.registry_contractors'|trans }}" href="{{ path('registry_contractor_list') }}" {% if menuItem == 'registry_contractor' %}aria-current="page"{% endif %}>
<i aria-hidden="true" class="fa fa-address-card"></i>
<span>{{ 'global.sidebar_menu.registry_contractors'|trans }}</span>
</a>
</li>
{% if is_granted('ROLE_ADMIN') or app.user.collectivity.hasModuleTools == true %}
<li {% if menuItem == 'registry_tool' %}class="active"{% endif %}>
- <a aria-label="{{ 'global.sidebar_menu.registry_tools'|trans }}" href="/logiciel-et-support/liste" >
+ <a aria-label="{{ 'global.sidebar_menu.registry_tools'|trans }}" href="/logiciel-et-support/liste" {% if menuItem == 'registry_tool' %}aria-current="page"{% endif %}>
<i aria-hidden="true" class="fa fa-briefcase"></i>
<span>{{ 'global.sidebar_menu.registry_tools'|trans }}</span>
</a>
</li>
{% endif %}
<li {% if menuItem == 'registry_request' %}class="active"{% endif %}>
- <a aria-label="{{ 'global.sidebar_menu.registry_requests'|trans }}" href="{{ path('registry_request_list') }}">
+ <a aria-label="{{ 'global.sidebar_menu.registry_requests'|trans }}" href="{{ path('registry_request_list') }}" {% if menuItem == 'registry_request' %}aria-current="page"{% endif %}>
<i aria-hidden="true" class="fa fa-users"></i>
<span>{{ 'global.sidebar_menu.registry_requests'|trans }}</span>
</a>
</li>
<li {% if menuItem == 'registry_violation' %}class="active"{% endif %}>
- <a aria-label="{{ 'global.sidebar_menu.registry_violations'|trans }}" href="{{ path('registry_violation_list') }}">
+ <a aria-label="{{ 'global.sidebar_menu.registry_violations'|trans }}" href="{{ path('registry_violation_list') }}" {% if menuItem == 'registry_violation' %}aria-current="page"{% endif %}>
<i aria-hidden="true" class="fa fa-exclamation-circle"></i>
<span>{{ 'global.sidebar_menu.registry_violations'|trans }}</span>
</a>
@@ -51,7 +51,7 @@
<span>{{ 'global.sidebar_menu.proofs'|trans }}</span>
<ul class="sidebar-menu">
<li {% if menuItem == 'registry_proof' %}class="active"{% endif %}>
- <a aria-label="{{ 'global.sidebar_menu.registry_proofs'|trans }}" href="{{ path('registry_proof_list') }}">
+ <a aria-label="{{ 'global.sidebar_menu.registry_proofs'|trans }}" href="{{ path('registry_proof_list') }}" {% if menuItem == 'registry_proof' %}aria-current="page"{% endif %}>
<i aria-hidden="true" class="fa fa-file-shield"></i>
<span>{{ 'global.sidebar_menu.registry_proofs'|trans }}</span>
</a>
@@ -63,13 +63,13 @@
<span>{{ 'global.sidebar_menu.actions'|trans }}</span>
<ul class="sidebar-menu">
<li {% if menuItem == 'registry_mesurement' %}class="active"{% endif %}>
- <a aria-label="{{ 'global.sidebar_menu.registry_mesurements'|trans }}" href="{{ path('registry_mesurement_list') }}">
+ <a aria-label="{{ 'global.sidebar_menu.registry_mesurements'|trans }}" href="{{ path('registry_mesurement_list') }}" {% if menuItem == 'registry_mesurement' %}aria-current="page"{% endif %}>
<i aria-hidden="true" class="fa fa-adjust"></i>
<span>{{ 'global.sidebar_menu.registry_mesurements'|trans }}</span>
</a>
</li>
<li {% if menuItem == 'registry_mesurement_action_plan' %}class="active"{% endif %}>
- <a aria-label="{{ 'global.sidebar_menu.registry_action_plan'|trans }}" href="{{ path('registry_mesurement_action_plan') }}">
+ <a aria-label="{{ 'global.sidebar_menu.registry_action_plan'|trans }}" href="{{ path('registry_mesurement_action_plan') }}" {% if menuItem == 'registry_mesurement_action_plan' %}aria-current="page"{% endif %}>
<i aria-hidden="true" class="fa fa-crosshairs"></i>
<span>{{ 'global.sidebar_menu.registry_action_plan'|trans }}</span>
</a>
@@ -83,13 +83,13 @@
<ul class="sidebar-menu">{% endif %}
{% if is_granted('ROLE_ADMIN') %}
<li {% if menuItem == 'aipd_modele_analyse' %}class="active"{% endif %}>
- <a aria-label="{{ 'global.sidebar_menu.aipd_modele'|trans }}" href="{{ path('aipd_modele_analyse_list') }}">
+ <a aria-label="{{ 'global.sidebar_menu.aipd_modele'|trans }}" href="{{ path('aipd_modele_analyse_list') }}" {% if menuItem == 'aipd_modele_analyse' %}aria-current="page"{% endif %}>
<i aria-hidden="true" class="fa fa-chart-bar"></i>
<span>{{ 'global.sidebar_menu.aipd_modele'|trans }}</span>
</a>
</li>
<li {% if menuItem == 'aipd_mesure_protection' %}class="active"{% endif %}>
- <a aria-label="{{ 'global.sidebar_menu.aipd_mesure_protection'|trans }}" href="{{ path('aipd_mesure_protection_list') }}">
+ <a aria-label="{{ 'global.sidebar_menu.aipd_mesure_protection'|trans }}" href="{{ path('aipd_mesure_protection_list') }}" {% if menuItem == 'aipd_mesure_protection' %}aria-current="page"{% endif %}>
<i aria-hidden="true" class="fa fa-shield-halved"></i>
<span>{{ 'global.sidebar_menu.aipd_mesure_protection'|trans }}</span>
</a>
@@ -97,7 +97,7 @@
{% endif %}
{% if is_granted('ROLE_ADMIN') or app.user.collectivity.hasModuleConformiteTraitement == true %}
<li {% if menuItem == 'aipd_analyse_impact' %}class="active"{% endif %}>
- <a aria-label="{{ 'global.sidebar_menu.aipd_analyse_impact'|trans }}" href="{{ path('aipd_analyse_impact_list') }}">
+ <a aria-label="{{ 'global.sidebar_menu.aipd_analyse_impact'|trans }}" href="{{ path('aipd_analyse_impact_list') }}" {% if menuItem == 'aipd_analyse_impact' %}aria-current="page"{% endif %}>
<i aria-hidden="true" class="fa fa-magnifying-glass-chart"></i>
<span>{{ 'global.sidebar_menu.aipd_analyse_impact'|trans }}</span>
</a>
@@ -110,21 +110,21 @@
<span>{{ 'global.sidebar_menu.reporting'|trans }}</span>
<ul class="sidebar-menu">
<li {% if menuItem == 'maturity_survey' %}class="active"{% endif %}>
- <a aria-label="{{ 'global.sidebar_menu.maturity_survey'|trans }}" href="{{ path('maturity_survey_list') }}">
+ <a aria-label="{{ 'global.sidebar_menu.maturity_survey'|trans }}" href="{{ path('maturity_survey_list') }}" {% if menuItem == 'maturity_survey' %}aria-current="page"{% endif %}>
<i aria-hidden="true" class="fa fa-chart-line"></i>
<span>{{ 'global.sidebar_menu.maturity_survey'|trans }}</span>
</a>
</li>
{% if is_granted('ROLE_ADMIN') %}
<li {% if menuItem == 'maturity_referentiel' %}class="active"{% endif %}>
- <a aria-label="{{ 'global.sidebar_menu.maturity_referentiel'|trans }}" href="{{ path('maturity_referentiel_list') }}">
+ <a aria-label="{{ 'global.sidebar_menu.maturity_referentiel'|trans }}" href="{{ path('maturity_referentiel_list') }}" {% if menuItem == 'maturity_referentiel' %}aria-current="page"{% endif %}>
<i aria-hidden="true" class="fa fa-book"></i>
<span>{{ 'global.sidebar_menu.maturity_referentiel'|trans }}</span>
</a>
</li>
{% endif %}
<li {% if menuItem == 'reporting_review' %}class="active"{% endif %}>
- <a aria-label="{{ 'global.sidebar_menu.reporting_review'|trans }}" href="{{ path('reporting_review_index', {'id': app.user.collectivity.id}) }}">
+ <a aria-label="{{ 'global.sidebar_menu.reporting_review'|trans }}" href="{{ path('reporting_review_index', {'id': app.user.collectivity.id}) }}" {% if menuItem == 'reporting_review' %}aria-current="page"{% endif %}>
<i aria-hidden="true" class="fa fa-clipboard-list"></i>
<span>{{ 'global.sidebar_menu.reporting_review'|trans }}</span>
</a>
@@ -138,7 +138,7 @@
<ul class="sidebar-menu">
{% if is_granted('ROLE_ADMIN') or app.user.collectivity.hasModuleConformiteTraitement %}
<li {% if menuItem == 'registry_conformite_traitement' %}class="active"{% endif %}>
- <a aria-label="{{ 'global.sidebar_menu.conformite_treatments'|trans }}" href="{{ path('registry_conformite_traitement_list') }}">
+ <a aria-label="{{ 'global.sidebar_menu.conformite_treatments'|trans }}" href="{{ path('registry_conformite_traitement_list') }}" {% if menuItem == 'registry_conformite_traitement' %}aria-current="page"{% endif %}>
<i aria-hidden="true" class="fa fa-list-check"></i>
<span>{{ 'global.sidebar_menu.conformite_treatments'|trans }}</span>
</a>
@@ -146,7 +146,7 @@
{% endif %}
{% if is_granted('ROLE_ADMIN') or app.user.collectivity.hasModuleConformiteOrganisation %}
<li {% if menuItem == 'registry_conformite_organisation' %}class="active"{% endif %}>
- <a aria-label="{{ 'global.sidebar_menu.conformite_organization'|trans }}" href="{{ path('registry_conformite_organisation_list') }}">
+ <a aria-label="{{ 'global.sidebar_menu.conformite_organization'|trans }}" href="{{ path('registry_conformite_organisation_list') }}" {% if menuItem == 'registry_conformite_organisation' %}aria-current="page"{% endif %}>
<i aria-hidden="true" class="fa fa-house-circle-check"></i>
<span>{{ 'global.sidebar_menu.conformite_organization'|trans }}</span>
</a>
@@ -160,7 +160,7 @@
<span>{{ 'global.sidebar_menu.document'|trans }}</span>
<ul class="sidebar-menu">
<li {% if menuItem == 'documentation' %}class="active"{% endif %}>
- <a aria-label="{{ 'global.sidebar_menu.documentation'|trans }}" href="{{ path('documentation_document_index') }}">
+ <a aria-label="{{ 'global.sidebar_menu.documentation'|trans }}" href="{{ path('documentation_document_index') }}" {% if menuItem == 'documentation' %}aria-current="page"{% endif %}>
<i aria-hidden="true" class="fa fa-file"></i>
<span>{{ 'global.sidebar_menu.documentation'|trans }}</span>
</a>
@@ -175,20 +175,20 @@
{# Referent is not allowed to duplicate#}
{% if is_granted('ROLE_ADMIN') %}
<li {% if menuItem == 'admin_duplication' %}class="active"{% endif %}>
- <a aria-label="{{ 'global.sidebar_menu.admin_duplication'|trans }}" href="{{ path('admin_duplication_new') }}">
+ <a aria-label="{{ 'global.sidebar_menu.admin_duplication'|trans }}" href="{{ path('admin_duplication_new') }}" {% if menuItem == 'admin_duplication' %}aria-current="page"{% endif %}>
<i aria-hidden="true" class="fa fa-clone"></i>
<span>{{ 'global.sidebar_menu.admin_duplication'|trans }}</span>
</a>
</li>
{% endif %}
<li {% if menuItem == 'user_collectivity' %}class="active"{% endif %}>
- <a aria-label="{{ 'global.sidebar_menu.organizations'|trans }}" href="{{ path('user_collectivity_list') }}">
+ <a aria-label="{{ 'global.sidebar_menu.organizations'|trans }}" href="{{ path('user_collectivity_list') }}" {% if menuItem == 'user_collectivity' %}aria-current="page"{% endif %}>
<i aria-hidden="true" class="fa fa-home"></i>
<span>{{ 'global.sidebar_menu.organizations'|trans }}</span>
</a>
</li>
<li {% if menuItem == 'user_user' %}class="active"{% endif %}>
- <a aria-label="{{ 'global.sidebar_menu.users'|trans }}" href="{{ path('user_user_list') }}">
+ <a aria-label="{{ 'global.sidebar_menu.users'|trans }}" href="{{ path('user_user_list') }}" {% if menuItem == 'user_user' %}aria-current="page"{% endif %}>
<i aria-hidden="true" class="fa fa-users"></i>
<span>{{ 'global.sidebar_menu.users'|trans }}</span>
</a>
@@ -196,7 +196,7 @@
{# Referent is not allowed to journalisation #}
{% if is_granted('ROLE_ADMIN') %}
<li {% if menuItem == 'reporting_journalisation' %}class="active"{% endif %}>
- <a aria-label="{{ 'global.sidebar_menu.reporting_journalisation'|trans }}" href="{{ path('reporting_journalisation_index') }}">
+ <a aria-label="{{ 'global.sidebar_menu.reporting_journalisation'|trans }}" href="{{ path('reporting_journalisation_index') }}" {% if menuItem == 'reporting_journalisation' %}aria-current="page"{% endif %}>
<i aria-hidden="true" class="fa fa-list"></i>
<span>{{ 'global.sidebar_menu.reporting_journalisation'|trans }}</span>
</a>
@@ -212,7 +212,7 @@
<ul class="sidebar-menu">
{% if is_granted('ROLE_ADMIN') %}
<li {% if menuItem == 'registry_treatment_configuration' %}class="active"{% endif %}>
- <a aria-label="{{ 'global.sidebar_menu.configuration_treatments'|trans }}" href="{{ path('registry_treatment_configuration') }}">
+ <a aria-label="{{ 'global.sidebar_menu.configuration_treatments'|trans }}" href="{{ path('registry_treatment_configuration') }}" {% if menuItem == 'registry_treatment_configuration' %}aria-current="page"{% endif %}>
<i aria-hidden="true" class="fa fa-gears"></i>
<span>{{ 'global.sidebar_menu.configuration_treatments'|trans }}</span>
</a>