Merge branch 'develop' into staging

This commit is contained in:
Xavier J 2016-09-26 14:12:06 +02:00
commit 35bd872a64

View file

@ -7,10 +7,14 @@
%a{href: '/'} %a{href: '/'}
= image_tag('logo-tps.png', class: 'logo') = image_tag('logo-tps.png', class: 'logo')
%a{href: (current_gestionnaire.procedure_filter.empty? ? '/' : backoffice_dossiers_procedure_path(current_gestionnaire.procedure_filter)), class: 'btn btn-md'} - if gestionnaire_signed_in?
-if gestionnaire_signed_in? || user_signed_in? %a{href: (current_gestionnaire.procedure_filter.empty? ? '/' : backoffice_dossiers_procedure_path(current_gestionnaire.procedure_filter)), class: 'btn btn-md'}
Mes Dossiers Mes Dossiers
-elsif administrateur_signed_in? - elsif user_signed_in?
%a{href: '/', class: 'btn btn-md'}
Mes Dossiers
- elsif administrateur_signed_in?
%a{href: '/', class: 'btn btn-md'}
Mes Procédures Mes Procédures
#sign_out #sign_out