From a076dc298749751624f6aa7621d68fffcbeaabf0 Mon Sep 17 00:00:00 2001 From: Simon Lehericey Date: Mon, 20 Mar 2017 12:03:27 +0100 Subject: [PATCH] Wording --- app/views/admin/procedures/show.html.haml | 2 +- app/views/admin/profile/show.html.haml | 2 +- ...anel_admin_procedurescontroller_navbar.html.haml | 2 +- ...nel_backoffice_dossierscontroller_show.html.haml | 4 ++-- ...avbar_admin_procedurescontroller_index.html.haml | 2 +- app/views/users/description/_show.html.haml | 13 +------------ app/views/users/registrations/new.html.haml | 2 +- 7 files changed, 8 insertions(+), 19 deletions(-) diff --git a/app/views/admin/procedures/show.html.haml b/app/views/admin/procedures/show.html.haml index e0c945cff..7249a0ed6 100644 --- a/app/views/admin/procedures/show.html.haml +++ b/app/views/admin/procedures/show.html.haml @@ -82,7 +82,7 @@ .pieces_justificatives.col-xs-6.col-md-3 %h4.text-info - Pièces justificatives + Pièces jointes .badge.progress-bar-info = @facade.procedure.types_de_piece_justificative.size - @facade.procedure.types_de_piece_justificative.each do |piece_justificative| diff --git a/app/views/admin/profile/show.html.haml b/app/views/admin/profile/show.html.haml index 5349fd071..615d5331e 100644 --- a/app/views/admin/profile/show.html.haml +++ b/app/views/admin/profile/show.html.haml @@ -1,5 +1,5 @@ #profile_page -%h2 Profile +%h2 Profil %hr %p API TOKEN : 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 a78879adc..8a05145b8 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 @@ -31,7 +31,7 @@ - unless @procedure.locked? %a{:href => "#{url_for admin_procedure_pieces_justificatives_path(@procedure)}", id: 'onglet-pieces'} %div.procedure_list_element{class: ('active' if active == 'Pieces')} - Pièces justificatives + Pièces jointes - unless @procedure.locked? %a{:href => "#{url_for admin_procedure_types_de_champ_private_path(@procedure)}", id: 'onglet-private-champs'} diff --git a/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_show.html.haml b/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_show.html.haml index 9c8748b5b..12f7b4e7c 100644 --- a/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_show.html.haml +++ b/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_show.html.haml @@ -54,9 +54,9 @@ .type= "Un attribut à été changé: #{notification.liste.last}" - elsif ['piece_justificative'].include?(notification.type_notif) - if notification.liste.size > 1 - .type= "Plusieurs pièces justificatives ont été changés, dont: #{notification.liste.join(" ")}" + .type= "Plusieurs pièces jointes ont été changés, dont: #{notification.liste.join(" ")}" - else - .type= "Une pièce justificative à été changée: #{notification.liste.last}" + .type= "Une pièce jointe à été changée: #{notification.liste.last}" - else .type= notification.liste.last .split-hr diff --git a/app/views/layouts/navbars/_navbar_admin_procedurescontroller_index.html.haml b/app/views/layouts/navbars/_navbar_admin_procedurescontroller_index.html.haml index 8adfbc93d..13fdaf3c7 100644 --- a/app/views/layouts/navbars/_navbar_admin_procedurescontroller_index.html.haml +++ b/app/views/layouts/navbars/_navbar_admin_procedurescontroller_index.html.haml @@ -23,4 +23,4 @@ %li = link_to(admin_profile_path, id: :profile) do %i.fa.fa-user -  Profile +  Profil diff --git a/app/views/users/description/_show.html.haml b/app/views/users/description/_show.html.haml index 14b17b160..6fc76dc8a 100644 --- a/app/views/users/description/_show.html.haml +++ b/app/views/users/description/_show.html.haml @@ -22,7 +22,7 @@ -if !@procedure.lien_demarche.blank? || @procedure.cerfa_flag || @dossier.types_de_piece_justificative.size > 0 %br - %h3 Documents administratifs + %h3 Pièces jointes //TODO a refactorer @@ -30,17 +30,6 @@ .col-lg-8 = render partial: 'users/description/pieces_justificatives', locals: { dossier: @dossier } - #state_description.row{style:'width: 50%; margin-left:20px'} - .panel.panel-info - .panel-body.center - .row - .col-md-1.col-lg-1.col-sm-1.col-xs-1 - .fa.fa-info-circle.text-info{style:'font-size: 2em; margin-top: 20%'} - .col-xs-11 - Les documents administratifs ne sont pas indispensables afin d'initier votre dossier. - Vous pourrez dans tous les cas les compléter plus tard si vous ne les possédez pas de suite. - - -route = Rails.application.routes.recognize_path(request.referrer) # WTF ? - unless route[:controller].match('admin') %div{style: 'text-align:right'} diff --git a/app/views/users/registrations/new.html.haml b/app/views/users/registrations/new.html.haml index 12e3165cc..d8270c4a9 100644 --- a/app/views/users/registrations/new.html.haml +++ b/app/views/users/registrations/new.html.haml @@ -47,7 +47,7 @@ = f.email_field :email, class: 'form-control', placeholder: 'Email', value: params[:user_email] %br %h4 - = f.label :password + = f.label :password, 'Mot de passe' .input-group .input-group-addon %span.fa.fa-asterisk