Merge pull request #3513 from betagouv/revert-3419-fix-3370

Revert "Redesign admin roles menu"

app/assets/stylesheets/switch_menu.scss

@@ -1,16 +1,6 @@
 #switch-menu {
   position: fixed;
+  left: 10px;
   bottom: 10px;
-  color: #FFFFFF;
+  z-index: 300;
-  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;
 }

app/views/layouts/_switch_devise_profile_module.html.haml

@@ -1,14 +1,25 @@
 - if SwitchDeviseProfileService.new(warden).multiple_devise_profile_connect?
-  %ul#switch-menu
+  #switch-menu.dropdown.dropup
-    %li
+    %button.btn.btn-default.dropdown-toggle{ type: :button, 'data-toggle' => 'dropdown', 'aria-haspopup' => true, 'aria-expanded' => false }
-      Changer de rôle
+      %i.fa.fa-toggle-on
-    - if user_signed_in?
+      %span.caret
-      %li
+    %ul.dropdown-menu.dropdown-menu-left
-        = link_to(dossiers_path, id: :menu_item_procedure, title: 'Aller dans votre espace usager. Vous pourrez revenir ici ensuite') do
+      - if user_signed_in?
-          %i.fa.fa-users
+        %li
-            Usager
+          = link_to(dossiers_path, id: :menu_item_procedure) do
-    - if gestionnaire_signed_in?
+            %i.fa.fa-user
-      %li
+             
-        = link_to(gestionnaire_procedures_path, title: 'Aller dans votre espace instructeur. Vous pourrez revenir ici ensuite.') do
+            Usager
-          %i.fa.fa-user
+      - if gestionnaire_signed_in?
-            Instructeur
+        %li
+          = link_to(gestionnaire_procedures_path) do
+            %i.fa.fa-user
+             
+            Instructeur
+
+      - if administrateur_signed_in?
+        %li
+          = link_to(admin_procedures_path) do
+            %i.fa.fa-user
+             
+            Administrateur

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 }

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