First change connexion navbar

app/assets/stylesheets/application.scss

@@ -32,7 +32,7 @@ html, body {
 }
 
 body {
-  padding-top: 70px;
+  padding-top: 60px;
 }
 
 form {

app/assets/stylesheets/navbar.scss

@@ -63,11 +63,6 @@
         padding-left: 10px;
       }
     }
-    .log-options {
-      color: #003189;
-      font-size: 45px;
-      padding: 8px 0 0 20px;
-    }
   }
 }
 
@@ -110,10 +105,10 @@
     height: 70px;
   }
   .btn{
-    color: white;
+    //color: white;
   }
   .btn:hover{
-    color: #aaaaaa;
+    //color: #aaaaaa;
   }
 }
 

app/controllers/users/dossiers_controller.rb

@@ -27,7 +27,7 @@ class Users::DossiersController < UsersController
 
   def commencer
     unless params[:procedure_path].nil?
-      procedure = ProcedurePath.where(path: params[:procedure_path]).first!.procedure
+      procedure = ProcedurePath.where(path: params[:procedure_path]).last.procedure
     end
 
     if procedure.archived?

app/views/layouts/_navbar.html.haml

@@ -13,40 +13,5 @@
         = render partial: @navbar_url
       -rescue
         = render partial: 'layouts/navbars/navbar_default'
-      %div.col-lg-1.col-md-1.log-options
-        %span.fa.fa-sign-out
 
-- if false
-  - if gestionnaire_signed_in? && user_signed_in?
-    %a{href: (current_gestionnaire.procedure_filter.blank? ? backoffice_dossiers_path : backoffice_dossiers_procedure_path(current_gestionnaire.procedure_filter)), class: 'btn btn-md'}
-      =t('dynamics.backoffice.dossiers')
-    %a{href: users_dossiers_path, class: 'btn btn-md'}
-      =t('dynamics.users.mes_dossiers')
-  - elsif gestionnaire_signed_in?
-    %a{href: (current_gestionnaire.procedure_filter.blank? ? backoffice_dossiers_path : backoffice_dossiers_procedure_path(current_gestionnaire.procedure_filter)), class: 'btn btn-md'}
-      =t('dynamics.users.mes_dossiers')
-  - elsif user_signed_in?
-    %a{href: users_dossiers_path, class: 'btn btn-md'}
-      =t('dynamics.users.mes_dossiers')
-  - elsif administrateur_signed_in?
-    %a{href: admin_procedures_path, class: 'btn btn-md'}
-      =t('dynamics.admin.menu.title')
-
-    -if user_signed_in?
-      = render partial: 'users/login_banner'
-    -elsif gestionnaire_signed_in?
-      = render partial: 'gestionnaires/login_banner'
-    -elsif administrateur_signed_in?
-      = render partial: 'administrateurs/login_banner'
-    -else
-      = link_to "Utilisateur", '/users/sign_in', method: :get, :class => 'btn btn-md'
-      -unless Features.unified_login
-        = link_to "Accompagnateur", '/gestionnaires/sign_in', method: :get, :class => 'btn btn-md'
-      = link_to "Administrateur", '/administrateurs/sign_in', method: :get, :class => 'btn btn-md'
-
-  - if Rails.env != 'production'
-    %div.staging_warning
-      %b{style:'color: #B00100', 'data-placement' => 'bottom', 'data-original-title' => "Aucune donnée présente sur cette plateforme ne pourra être transférée sur l'environnement final de production.", 'data-toggle' => 'tooltip'}
-        Vous vous trouvez actuellement sur la plateforme de test.
-        %div.badge.progress-bar-danger
-          ?
+      = render partial: 'layouts/navbars/navbar_log_options'

app/views/layouts/navbars/_navbar_backoffice_dossiers_procedurecontroller_index.html.haml

@@ -1 +1,11 @@
-= render partial: 'layouts/navbars/navbar_backoffice_dossierscontroller_index'
+%div.col-lg-3.col-md-3.main-info
+  =@facade_data_view.procedure_id.nil? ? "Tous les dossiers" :  truncate(@facade_data_view.procedure.libelle, {length: 50})
+%div.col-lg-3.col-md-3.options
+  %div.row
+    %div.col-lg-12.col-md-12
+      %a.button_navbar#pref_list_dossier_open_action{href: '#', type: :button, 'data-toggle' => 'dropdown', 'aria-haspopup' => true, 'aria-expanded' => false }
+        %i.fa.fa-pencil
+        Modifier le tableau
+  %div.row
+    %div.col-lg-12.col-md-12
+      = render partial: "dossiers/download_dossiers"

app/views/layouts/navbars/_navbar_backoffice_dossierscontroller_index.html.haml

@@ -1,11 +0,0 @@
-%div.col-lg-8.col-md-8.main-info
-  =@facade_data_view.procedure_id.nil? ? "Tous les dossiers" :  truncate(@facade_data_view.procedure.libelle, {length: 50})
-%div.col-lg-3.col-md-3.options
-  %div.row
-    %div.col-lg-12.col-md-12
-      %a.button_navbar#pref_list_dossier_open_action{href: '#', type: :button, 'data-toggle' => 'dropdown', 'aria-haspopup' => true, 'aria-expanded' => false }
-        %i.fa.fa-pencil
-        Modifier le tableau
-  %div.row
-    %div.col-lg-12.col-md-12
-      = render partial: "dossiers/download_dossiers"

app/views/layouts/navbars/_navbar_default.html.haml

@@ -1,2 +1,2 @@
-.col-lg-11.col-md-11
+.col-lg-2.col-md-2
   Default navbar

app/views/layouts/navbars/_navbar_log_options.html.haml

@@ -0,0 +1,14 @@
+-#%span.fa.fa-sign-out
+
+-if user_signed_in?
+  = render partial: 'users/login_banner'
+-elsif gestionnaire_signed_in?
+  .col-lg-2.col-md-2
+    = render partial: 'gestionnaires/login_banner'
+-elsif administrateur_signed_in?
+  = render partial: 'administrateurs/login_banner'
+-else
+  .col-lg-5.col-md-5
+    = link_to "Connexion", '/users/sign_in', :class => 'btn btn-md'
+    -unless Features.unified_login
+      = link_to "Accompagnateur", '/gestionnaires/sign_in', :class => 'btn btn-md'

app/views/users/sessions/new.html.haml

@@ -33,5 +33,11 @@
       = f.submit "Se connecter", class:'btn btn-primary'
     %br
   = render "users/shared/links"
+  %div{style: "margin-top: 5px; margin-bottom: 5px;"}
+    \-
+  Vous êtes un administrateur de procédure ?
+  %br
+  = link_to "Cliquez ici.", '/administrateurs/sign_in'
+
 
 

config/initializers/features.yml

@@ -1,3 +1,3 @@
 remote_storage: true
-unified_login: false
+unified_login: true
 opensimplif: false