DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Rename gestionnaire in code to instructeur

Browse source
This commit is contained in:
simon lehericey 2019-08-06 11:02:54 +02:00
parent 6902f84b85
commit 3fde2a6f70
175 changed files with 1162 additions and 1162 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/layouts/_account_dropdown.haml
View file

@ -16,9 +16,9 @@
= link_to dossiers_path, class: "menu-item menu-link" do
= image_tag "icons/switch-profile.svg"
Passer en usager
- if gestionnaire_signed_in? && nav_bar_profile != :gestionnaire
- if instructeur_signed_in? && nav_bar_profile != :instructeur
%li
= link_to gestionnaire_procedures_path, class: "menu-item menu-link" do
= link_to instructeur_procedures_path, class: "menu-item menu-link" do
= image_tag "icons/switch-profile.svg"
Passer en instructeur
- if administrateur_signed_in? && nav_bar_profile != :administrateur

2
app/views/layouts/_credentials.html.haml
View file

@ -1,4 +1,4 @@
.dropdown-menu#credentials
.description= t("utils.deconnexion")
= @current_gestionnaire.email if @current_gestionnaire
= @current_instructeur.email if @current_instructeur
= @current_user.email if @current_user

22
app/views/layouts/_new_header.haml
View file

@ -9,17 +9,17 @@
.flex.align-center
= link_to '', root_path_for_profile(nav_bar_profile), class: "header-logo", title: "Revenir à l’accueil"
- if nav_bar_profile == :gestionnaire && gestionnaire_signed_in?
- if nav_bar_profile == :instructeur && instructeur_signed_in?
- current_url = request.path_info
%ul.header-tabs
- if current_gestionnaire.visible_procedures.count > 0
- if current_instructeur.visible_procedures.count > 0
%li
= active_link_to "Démarches", gestionnaire_procedures_path, active: :inclusive, class: 'tab-link'
- if current_gestionnaire.avis.count > 0
= active_link_to "Démarches", instructeur_procedures_path, active: :inclusive, class: 'tab-link'
- if current_instructeur.avis.count > 0
%li
= active_link_to gestionnaire_avis_index_path, active: :inclusive, class: 'tab-link' do
= active_link_to instructeur_avis_index_path, active: :inclusive, class: 'tab-link' do
Avis
- avis_counter = current_gestionnaire.avis.without_answer.count
- avis_counter = current_instructeur.avis.without_answer.count
- if avis_counter > 0
%span.badge.warning= avis_counter
@ -29,10 +29,10 @@
= active_link_to "Dossiers", dossiers_path, active: :inclusive, class: 'tab-link'
%ul.header-right-content
- if nav_bar_profile == :gestionnaire && gestionnaire_signed_in?
- if nav_bar_profile == :instructeur && instructeur_signed_in?
%li
.header-search
= form_tag gestionnaire_recherche_path, method: :get, class: "form" do
= form_tag instructeur_recherche_path, method: :get, class: "form" do
= text_field_tag "q", "#{@search_terms if @search_terms.present?}", placeholder: "Rechercher un dossier"
%button{ title: "Rechercher" }
= image_tag "icons/search-blue.svg"
@ -45,7 +45,7 @@
%button{ title: "Rechercher" }
= image_tag "icons/search-blue.svg"
- if gestionnaire_signed_in? || user_signed_in?
- if instructeur_signed_in? || user_signed_in?
%li
= render partial: 'layouts/account_dropdown', locals: { nav_bar_profile: nav_bar_profile }
@ -64,8 +64,8 @@
- elsif procedure.present? && (nav_bar_profile == :user || nav_bar_profile == :guest)
= render partial: 'shared/help/help_dropdown_procedure', locals: { procedure: procedure }
- elsif nav_bar_profile == :gestionnaire
= render partial: 'shared/help/help_dropdown_gestionnaire'
- elsif nav_bar_profile == :instructeur
= render partial: 'shared/help/help_dropdown_instructeur'
- else
= render partial: 'shared/help/help_button'

4
app/views/layouts/_switch_devise_profile_module.html.haml
View file

@ -7,8 +7,8 @@
= link_to(dossiers_path, id: :menu_item_procedure, title: 'Aller dans votre espace usager. Vous pourrez revenir ici ensuite') do
%i.fa.fa-users
  Usager
- if gestionnaire_signed_in?
- if instructeur_signed_in?
%li
= link_to(gestionnaire_procedures_path, title: 'Aller dans votre espace instructeur. Vous pourrez revenir ici ensuite.') do
= link_to(instructeur_procedures_path, title: 'Aller dans votre espace instructeur. Vous pourrez revenir ici ensuite.') do
%i.fa.fa-user
  Instructeur

4
app/views/layouts/mailers/layout.html.erb
View file

@ -50,7 +50,7 @@
<tr>
<td style="word-wrap:break-word;font-size:0px;padding:0;padding-top:0px;padding-bottom:0px;" align="left">
<div class="" style="cursor:auto;color:#55575d;font-family:Helvetica, Arial, sans-serif;font-size:11px;text-align:left;">
<img align="middle" alt="Logo demarches-simplifiees.fr" src="<%= image_url('mailer/gestionnaire_mailer/logo.png') %>" style="max-width=600px; padding=30px 0; display=inline !important; vertical-align=bottom; border=0; height=auto; outline=none; text-decoration=none; -ms-interpolation-mode=bicubic;" />
<img align="middle" alt="Logo demarches-simplifiees.fr" src="<%= image_url('mailer/instructeur_mailer/logo.png') %>" style="max-width=600px; padding=30px 0; display=inline !important; vertical-align=bottom; border=0; height=auto; outline=none; text-decoration=none; -ms-interpolation-mode=bicubic;" />
</div>
</td>
</tr>
@ -167,7 +167,7 @@
<tr>
<td style="word-wrap:break-word;font-size:0px;padding:0px 20px 0px 20px;padding-top:0px;padding-bottom:0px;" align="center">
<div class="" style="cursor:auto;color:#55575d;font-family:Helvetica, Arial, sans-serif;font-size:11px;line-height:22px;text-align:center;">
<img align="middle" alt="Logo Beta Gouv Fr" src="<%= image_url('mailer/gestionnaire_mailer/logo-beta-gouv-fr.png') %>" style="max-width=125px; padding=30px 0; display=inline !important; vertical-align=bottom; border=0; height=auto; outline=none; text-decoration=none; -ms-interpolation-mode=bicubic;" />
<img align="middle" alt="Logo Beta Gouv Fr" src="<%= image_url('mailer/instructeur_mailer/logo-beta-gouv-fr.png') %>" style="max-width=125px; padding=30px 0; display=inline !important; vertical-align=bottom; border=0; height=auto; outline=none; text-decoration=none; -ms-interpolation-mode=bicubic;" />
</div>
</td>
</tr>

2
app/views/layouts/navbars/_navbar_admin_procedurescontroller_index.html.haml
View file

@ -15,7 +15,7 @@
&nbsp;
= t('dynamics.admin.menu.procedures')
%li
= link_to(admin_gestionnaires_path) do
= link_to(admin_instructeurs_path) do
%i.fa.fa-user
&nbsp;
= t('dynamics.admin.menu.instructeurs')

4
app/views/layouts/navbars/_navbar_log_options.html.haml
View file

@ -2,9 +2,9 @@
#sign-out.col-xs-2.no-padding
= render partial: 'users/login_banner'
= render partial: 'layouts/credentials'
- elsif gestionnaire_signed_in?
- elsif instructeur_signed_in?
#sign-out.col-xs-2.no-padding
= render partial: 'gestionnaires/login_banner'
= render partial: 'instructeurs/login_banner'
= render partial: 'layouts/credentials'
- elsif administrateur_signed_in?
#sign-out.col-xs-2.no-padding