From 402f44c5fd94717df28c7a3a6fb8b6eb5450cc08 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Wed, 26 Apr 2017 15:15:38 +0200 Subject: [PATCH] =?UTF-8?q?Champs=20priv=C3=A9s=20->=20Annotations=20priv?= =?UTF-8?q?=C3=A9es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/facades/admin_types_de_champ_facades.rb | 2 +- app/views/admin/procedures/show.html.haml | 2 +- .../_left_panel_admin_procedurescontroller_navbar.html.haml | 4 ++-- ...t_panel_admin_typesdechampprivatecontroller_show.html.haml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/facades/admin_types_de_champ_facades.rb b/app/facades/admin_types_de_champ_facades.rb index d6488193d..a8f7fe578 100644 --- a/app/facades/admin_types_de_champ_facades.rb +++ b/app/facades/admin_types_de_champ_facades.rb @@ -11,7 +11,7 @@ class AdminTypesDeChampFacades end def active - @private ? 'Champs privés' : 'Champs' + @private ? 'Annotations privées' : 'Champs' end def url diff --git a/app/views/admin/procedures/show.html.haml b/app/views/admin/procedures/show.html.haml index 71b0c3501..cce49b7a2 100644 --- a/app/views/admin/procedures/show.html.haml +++ b/app/views/admin/procedures/show.html.haml @@ -73,7 +73,7 @@ .champs_private.col-xs-6.col-md-3 %h4.text-info - Champs privés + Annotations privées .badge.progress-bar-info = @facade.procedure.types_de_champ_private.size %ul diff --git a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_navbar.html.haml b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_navbar.html.haml index 3185ce653..0bb60d458 100644 --- a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_navbar.html.haml +++ b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_navbar.html.haml @@ -34,8 +34,8 @@ - unless @procedure.locked? %a#onglet-private-champs{ :href => "#{url_for admin_procedure_types_de_champ_private_path(@procedure)}" } - .procedure-list-element{ class: ('active' if active == 'Champs privés') } - Champs privés + .procedure-list-element{ class: ('active' if active == 'Annotations privées') } + Annotations privées %a#onglet-inemailsfos{ :href => "#{url_for admin_procedure_mail_templates_path(@procedure)}" } .procedure-list-element{ class: ('active' if active == 'E-mails') } diff --git a/app/views/layouts/left_panels/_left_panel_admin_typesdechampprivatecontroller_show.html.haml b/app/views/layouts/left_panels/_left_panel_admin_typesdechampprivatecontroller_show.html.haml index 7c678cf26..37ee65c0f 100644 --- a/app/views/layouts/left_panels/_left_panel_admin_typesdechampprivatecontroller_show.html.haml +++ b/app/views/layouts/left_panels/_left_panel_admin_typesdechampprivatecontroller_show.html.haml @@ -1 +1 @@ -= render partial: 'layouts/left_panels/left_panel_admin_procedurescontroller_navbar', locals: { active: "Champs privés" } += render partial: 'layouts/left_panels/left_panel_admin_procedurescontroller_navbar', locals: { active: "Annotations privées" }