DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Fix admin log out navbar style

Browse source
This commit is contained in:
Xavier J 2016-12-01 13:21:56 +01:00
parent bca0292fc4
commit d2a221ee40
8 changed files with 52 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
app/assets/stylesheets/admin_index.scss
View file

@ -1,17 +1,23 @@
.table {
#id {
width: 5%;
}
#admin_index{
margin-left: 2em;
margin-right: 2em;
#libelle {
width: 40%;
}
.table {
#id {
width: 5%;
}
#organisation {
width: 28%;
}
#libelle {
width: 40%;
}
#direction {
width: 22%;
#organisation {
width: 28%;
}
#direction {
width: 22%;
}
}
}
}

28
app/views/administrateurs/_login_banner.html.haml
View file

@ -1,27 +1 @@
%div{ style: "decorate:none; display: flex;box-shadow:none; float:right; display: flex" }
%div{ style: "vertical-align: middle; margin-right: 10px; margin-top: auto; margin-bottom: auto;" }
= current_administrateur.email
.dropdown#admin_menu
%button.btn.btn-default.dropdown-toggle#dropdownMenuAdmin{ type: :button, 'data-toggle' => 'dropdown', 'aria-haspopup' => true, 'aria-expanded' => false}
%i.fa.fa-cog
%span.caret
%ul.dropdown-menu.dropdown-menu-right
%li
= link_to(admin_procedures_path, id: :menu_item_procedure) do
%i.fa.fa-list{ style: "background-size: 10px;"}
 
=t('dynamics.admin.menu.procedures')
%li
= link_to(admin_gestionnaires_path) do
%i.fa.fa-user
 
=t('dynamics.admin.menu.accompagnateurs')
%li.divider{ role: :separator}
%li
= link_to(admin_profile_path, id: :profile) do
%i.fa.fa-user
 Profile
%li
= link_to('/administrateurs/sign_out',id: :admin_sign_out, method: :delete) do
%i.fa.fa-power-off
 Se déconnecter
= link_to "", '/administrateurs/sign_out', method: :delete, :class => 'btn btn-md fa fa-sign-out'

1
app/views/layouts/navbars/_navbar_admin_gestionnairescontroller_index.html.haml Normal file
View file

@ -0,0 +1 @@
= render partial: 'layouts/navbars/navbar_admin_procedurescontroller_index'

1
app/views/layouts/navbars/_navbar_admin_procedurescontroller_archived.html.haml Normal file
View file

@ -0,0 +1 @@
= render partial: 'layouts/navbars/navbar_admin_procedurescontroller_index'

1
app/views/layouts/navbars/_navbar_admin_procedurescontroller_draft.html.haml Normal file
View file

@ -0,0 +1 @@
= render partial: 'layouts/navbars/navbar_admin_procedurescontroller_index'

26
app/views/layouts/navbars/_navbar_admin_procedurescontroller_index.html.haml Normal file
View file

@ -0,0 +1,26 @@
%div.col-lg-8.col-md-8.main-info
%div.col-lg-3.col-md-3.options
%div{ style: "decorate:none; display: flex;box-shadow:none; float:right; display: flex; margin-top: 5px" }
%div{ style: "vertical-align: middle; margin-right: 10px; margin-top: auto; margin-bottom: auto;" }
= current_administrateur.email
.dropdown#admin_menu
%button.btn.btn-default.dropdown-toggle#dropdownMenuAdmin{ type: :button, 'data-toggle' => 'dropdown', 'aria-haspopup' => true, 'aria-expanded' => false}
%i.fa.fa-cog
%span.caret
%ul.dropdown-menu.dropdown-menu-right
%li
= link_to(admin_procedures_path, id: :menu_item_procedure) do
%i.fa.fa-list{ style: "background-size: 10px;"}
 
=t('dynamics.admin.menu.procedures')
%li
= link_to(admin_gestionnaires_path) do
%i.fa.fa-user
 
=t('dynamics.admin.menu.accompagnateurs')
%li.divider{ role: :separator}
%li
= link_to(admin_profile_path, id: :profile) do
%i.fa.fa-user
 Profile

1
app/views/layouts/navbars/_navbar_admin_profilecontroller_show.html.haml Normal file
View file

@ -0,0 +1 @@
= render partial: 'layouts/navbars/navbar_admin_procedurescontroller_index'

3
app/views/layouts/navbars/_navbar_log_options.html.haml
View file

@ -7,7 +7,8 @@
.col-lg-1.col-md-1#sign_out.no-padding
= render partial: 'gestionnaires/login_banner'
-elsif administrateur_signed_in?
= render partial: 'administrateurs/login_banner'
.col-lg-1.col-md-1#sign_out.no-padding
= render partial: 'administrateurs/login_banner'
-else
.col-lg-1.col-md-1#sign_in
= link_to "Connexion", '/users/sign_in', :class => 'btn btn-lg'