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

Revert "Redesign admin roles menu"
This commit is contained in:
Mathieu Magnin 2019-02-26 18:02:53 +01:00 committed by GitHub
commit ce3d626239
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 26 deletions

View file

@ -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;
}

View file

@ -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
  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
  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
 
Usager
- if gestionnaire_signed_in?
%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

View file

@ -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 }

View file

@ -31,7 +31,6 @@
= current_administrateur.procedures.archivees.count
.split-hr-left
= render partial: 'layouts/switch_devise_profile_module'
#infos-block