From 083698a4876482de8f79a77f9cb558349770307f Mon Sep 17 00:00:00 2001
From: Frederic Merizen <frederic.merizen@soft-xki.com>
Date: Tue, 26 Feb 2019 17:51:26 +0100
Subject: [PATCH] Revert "Redesign admin roles menu"

---
 app/assets/stylesheets/switch_menu.scss       | 14 +------
 .../_switch_devise_profile_module.html.haml   | 37 ++++++++++++-------
 app/views/layouts/application_old.html.haml   |  2 +
 ...admin_procedurescontroller_index.html.haml |  1 -
 4 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/app/assets/stylesheets/switch_menu.scss b/app/assets/stylesheets/switch_menu.scss
index bd8e913ea..e9c18733c 100644
--- a/app/assets/stylesheets/switch_menu.scss
+++ b/app/assets/stylesheets/switch_menu.scss
@@ -1,16 +1,6 @@
 #switch-menu {
   position: fixed;
+  left: 10px;
   bottom: 10px;
-  color: #FFFFFF;
-  list-style: none;
-  text-decoration: none;
-  padding-left: 20px;
-}
-
-#switch-menu a,
-#switch-menu a:link,
-#switch-menu a:visited,
-#switch-menu a:hover {
-  text-decoration: none;
-  color: #FFFFFF;
+  z-index: 300;
 }
diff --git a/app/views/layouts/_switch_devise_profile_module.html.haml b/app/views/layouts/_switch_devise_profile_module.html.haml
index 02f2678a2..2b13779b5 100644
--- a/app/views/layouts/_switch_devise_profile_module.html.haml
+++ b/app/views/layouts/_switch_devise_profile_module.html.haml
@@ -1,14 +1,25 @@
 - if SwitchDeviseProfileService.new(warden).multiple_devise_profile_connect?
-  %ul#switch-menu
-    %li
-      Changer de rôle
-    - if user_signed_in?
-      %li
-        = link_to(dossiers_path, id: :menu_item_procedure, title: 'Aller dans votre espace usager. Vous pourrez revenir ici ensuite') do
-          %i.fa.fa-users
-          &nbsp; Usager
-    - if gestionnaire_signed_in?
-      %li
-        = link_to(gestionnaire_procedures_path, title: 'Aller dans votre espace instructeur. Vous pourrez revenir ici ensuite.') do
-          %i.fa.fa-user
-          &nbsp; Instructeur
+  #switch-menu.dropdown.dropup
+    %button.btn.btn-default.dropdown-toggle{ type: :button, 'data-toggle' => 'dropdown', 'aria-haspopup' => true, 'aria-expanded' => false }
+      %i.fa.fa-toggle-on
+      %span.caret
+    %ul.dropdown-menu.dropdown-menu-left
+      - if user_signed_in?
+        %li
+          = link_to(dossiers_path, id: :menu_item_procedure) do
+            %i.fa.fa-user
+            &nbsp;
+            Usager
+      - if gestionnaire_signed_in?
+        %li
+          = link_to(gestionnaire_procedures_path) do
+            %i.fa.fa-user
+            &nbsp;
+            Instructeur
+
+      - if administrateur_signed_in?
+        %li
+          = link_to(admin_procedures_path) do
+            %i.fa.fa-user
+            &nbsp;
+            Administrateur
diff --git a/app/views/layouts/application_old.html.haml b/app/views/layouts/application_old.html.haml
index 633e368dc..a5a6a67b8 100644
--- a/app/views/layouts/application_old.html.haml
+++ b/app/views/layouts/application_old.html.haml
@@ -48,4 +48,6 @@
       %h1
         %i.fa.fa-times{ style: 'position: fixed; top: 10; right: 30; color: white;' }
 
+    = render partial: 'layouts/switch_devise_profile_module'
+
     = render partial: 'layouts/footer', locals: { main_container_size: main_container_size }
diff --git a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_index.html.haml b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_index.html.haml
index 30c64b9bf..bdf47c5e3 100644
--- a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_index.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_index.html.haml
@@ -31,7 +31,6 @@
           = current_administrateur.procedures.archivees.count
 
   .split-hr-left
-  = render partial: 'layouts/switch_devise_profile_module'
 
 
 #infos-block