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

Working on navbar, will put fake content to get css sizes

Browse source
This commit is contained in:
JC 2016-11-21 15:04:16 +01:00
parent b62587f9ab
commit 0db63f33c0
5 changed files with 84 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/assets/stylesheets/application.scss
View file

@ -76,15 +76,6 @@ body {
margin-right: 105px;
}
#header {
top: 0;
left: -3px;
position: fixed;
width: 100%;
z-index: 10;
}
.text-purple {
color: #8B008B
}
@ -219,3 +210,7 @@ div.pagination {
}
}
.no-padding {
padding: 0;
}

3
app/assets/stylesheets/left_pannel.scss Normal file
View file

@ -0,0 +1,3 @@
#left-pannel {
width: 100%;
}

40
app/assets/stylesheets/navbar.scss
View file

@ -1,3 +1,35 @@
#header {
top: 0;
left: 0;
position: fixed;
width: 100%;
z-index: 10;
border-radius: 0;
height: 60px;
#home {
text-align: center;
padding: 10px;
background-color: #003189;
.logo {
width: 118px;
height: 40px;
}
#tps-title {
font-family: Arial;
font-size: 24px;
font-weight: bold;
line-height: 28px;
padding: 5px 0 0 20px;
}
}
#navbar-body {
height: 60px;
background-color: #FFFFFF;
box-shadow: 0 1px 2px 0 rgba(0,0,0,0.5);
padding-left: 15px;
}
}
.btn-nav {
color: white;
background-color: transparent;
@ -27,7 +59,6 @@
.navbar {
color: white;
height: 35px;
background-color: rgb(15, 56, 130);
border: 0 !important;
.sign_in_FC {
@ -43,13 +74,6 @@
}
}
.logo {
margin-right: 10px;
max-height: 100%;
}
#title_navbar{
color: white;
font-weight: bold;

79
app/views/layouts/_navbar.html.haml
View file

@ -3,41 +3,50 @@
Beta
- else
Env Test
= image_tag('marianne_small.png', class: 'logo')
%a#title_navbar.btn{href: '/'}
TPS
- 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')
%div.col-lg-2.col-md-2.no-padding
%a#title_navbar{href: '/'}
%div.row#home
%div.col-lg-6
= image_tag('marianne_small.png', class: 'logo')
%div.col-lg-6#tps-title
TPS
#sign_out
-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'
%div.col-lg-10.col-md-10.no-padding
%div#navbar-body
%div.row
- 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
?
- 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
?

2
app/views/layouts/application.html.haml
View file

@ -30,6 +30,6 @@
%div.row
= render partial: 'layouts/flash_messages'
%div.row
= yield
=# yield
= render partial: 'layouts/footer'
= render partial: 'layouts/google_analytics'