diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss index 62174eb79..bd67ce171 100644 --- a/app/assets/stylesheets/login.scss +++ b/app/assets/stylesheets/login.scss @@ -8,6 +8,7 @@ padding: 20px; #btn_fc { + margin-top:8%; background-image: image-url('logo_FC_02.png'); background-repeat: no-repeat; background-size: 38px; diff --git a/app/views/administrateurs/sessions/new.html.haml b/app/views/administrateurs/sessions/new.html.haml index 646e33fe4..6e378a5fc 100644 --- a/app/views/administrateurs/sessions/new.html.haml +++ b/app/views/administrateurs/sessions/new.html.haml @@ -1,10 +1,27 @@ -%h1 Bienvenue sur TPS - Administration -%br -#gestionnaire_login - = form_for @administrateur, url: {controller: 'administrateurs/sessions', action: :create } do |f| - .form-group-lg - .form-group - = f.text_field :email, class: 'form-control', placeholder: 'Email' - .form-group - = f.password_field :password, class: 'form-control', placeholder: 'Mot de passe' - = f.submit 'Se connecter', class: %w(btn btn-lg btn-success), data: { disable_with: 'Connexion', submit: true } \ No newline at end of file +#form_login + = image_tag('logo-tps.png') + %br + %h2#login_user Administration + + %br + %br + #new_user + = form_for @administrateur, url: {controller: 'administrateurs/sessions', action: :create } do |f| + %h4 + = f.label :email + .input-group + .input-group-addon + %span.glyphicon.glyphicon-user + = f.email_field :email, class: 'form-control' + %br + %h4 + = f.label :password + .input-group + .input-group-addon + %span.glyphicon.glyphicon-asterisk + = f.password_field :password, autocomplete: "off", class: 'form-control' + %br + %br + .actions + = f.submit "Se connecter", class:'btn btn-primary' + %br \ No newline at end of file diff --git a/app/views/gestionnaires/sessions/new.html.haml b/app/views/gestionnaires/sessions/new.html.haml index b32ac2c06..3fba36f81 100644 --- a/app/views/gestionnaires/sessions/new.html.haml +++ b/app/views/gestionnaires/sessions/new.html.haml @@ -1,10 +1,27 @@ -%h1 Bienvenue sur TPS - Gestionnaire -%br -#gestionnaire_login - = form_for @gestionnaire, url: {controller: 'gestionnaires/sessions', action: :create } do |f| - .form-group-lg - .form-group - = f.text_field :email, class: 'form-control', placeholder: 'Email' - .form-group - = f.password_field :password, class: 'form-control', placeholder: 'Mot de passe' - = f.submit 'Se connecter', class: %w(btn btn-lg btn-success), data: { disable_with: 'Connexion', submit: true } \ No newline at end of file +#form_login + = image_tag('logo-tps.png') + %br + %h2#gestionnaire_login Gestionnaire + + %br + %br + #new_user + = form_for @gestionnaire, url: {controller: 'gestionnaires/sessions', action: :create } do |f| + %h4 + = f.label :email + .input-group + .input-group-addon + %span.glyphicon.glyphicon-user + = f.email_field :email, class: 'form-control' + %br + %h4 + = f.label :password + .input-group + .input-group-addon + %span.glyphicon.glyphicon-asterisk + = f.password_field :password, autocomplete: "off", class: 'form-control' + %br + %br + .actions + = f.submit "Se connecter", class:'btn btn-primary' + %br \ No newline at end of file diff --git a/app/views/users/sessions/new.html.haml b/app/views/users/sessions/new.html.haml index 82fa3b3a9..a6ee2fb85 100644 --- a/app/views/users/sessions/new.html.haml +++ b/app/views/users/sessions/new.html.haml @@ -1,7 +1,8 @@ #form_login - %h1#login_user Connexion - %br + = image_tag('logo-tps.png') %br + %h2#login_user Connexion + %a.btn.btn-default.btn-lg.btn-primary#btn_fc{href: '/france_connect'} %div{style:'margin-left:35px'} S'identifier avec