BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Unverified Commit 6d332ce1 by Dmitriy Zaporozhets
Options

Improve signin/signup/reset pages UI

Signed-off-by: 's avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent f4fbc7b9
Showing with 121 additions and 116 deletions
app/assets/stylesheets/sections/login.scss
...@@ -6,12 +6,6 @@ ...@@ -6,12 +6,6 @@
} }
.login-box{ .login-box{
position: relative;
margin: auto;
padding: 20px;
background: #f5f5f5;
border: 1px solid #EEE;
@include box-shadow(0 1px 1px rgba(0, 0, 0, 0.05));
} }
.brand-image { .brand-image {
...@@ -27,7 +21,7 @@ ...@@ -27,7 +21,7 @@
} }
.form-control { .form-control {
background-color: #FFF; background-color: #F5F5F5;
font-size: 16px; font-size: 16px;
padding: 14px 10px; padding: 14px 10px;
width: 100%; width: 100%;
...@@ -49,6 +43,10 @@ ...@@ -49,6 +43,10 @@
margin-bottom:0px; margin-bottom:0px;
@include border-radius(0); @include border-radius(0);
} }
&:active, &:focus {
background-color: #FFF;
}
} }
.login-box a.forgot { .login-box a.forgot {
......
app/views/devise/confirmations/new.html.haml
.login-box .login-box.panel.panel-default
%h3.page-title Resend confirmation instructions .panel-heading
= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %h3.panel-title Resend confirmation instructions
.devise-errors .panel-body
= devise_error_messages! = form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|
.clearfix.append-bottom-20 .devise-errors
= f.email_field :email, placeholder: 'Email', class: "form-control", required: true = devise_error_messages!
.clearfix.append-bottom-10 .clearfix.append-bottom-20
= f.submit "Resend confirmation instructions", class: 'btn btn-success' = f.email_field :email, placeholder: 'Email', class: "form-control", required: true
%hr .clearfix.append-bottom-10
%p = f.submit "Resend confirmation instructions", class: 'btn btn-success'
%span.light .panel-footer
Already have login and password? = render 'devise/shared/sign_in_link'
%strong
= link_to "Sign in", new_session_path(resource_name)
app/views/devise/passwords/edit.html.haml
= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put, class: "login-box" }) do |f| .login-box.panel.panel-default
%h3 Change your password .panel-heading
.devise-errors %h3.panel-title Change your password
= devise_error_messages! .panel-body
= f.hidden_field :reset_password_token = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
%div .devise-errors
= f.password_field :password, class: "form-control top", placeholder: "New password", required: true = devise_error_messages!
%div = f.hidden_field :reset_password_token
= f.password_field :password_confirmation, class: "form-control bottom", placeholder: "Confirm new password", required: true %div
%div = f.password_field :password, class: "form-control top", placeholder: "New password", required: true
.clearfix.append-bottom-10 %div
= f.submit "Change my password", class: "btn btn-primary" = f.password_field :password_confirmation, class: "form-control bottom", placeholder: "Confirm new password", required: true
= link_to "Sign in", new_session_path(resource_name), class: "btn pull-right" .clearfix.append-bottom-10
%div = f.submit "Change my password", class: "btn btn-primary"
= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) .panel-footer
%p
= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name)
= render 'devise/shared/sign_in_link'
app/views/devise/passwords/new.html.haml
= form_for(resource, as: resource_name, url: password_path(resource_name), html: { class: "login-box", method: :post }) do |f| .login-box.panel.panel-default
%h3.page-title Reset password .panel-heading
.devise-errors %h3.panel-title Reset password
= devise_error_messages! .panel-body
.clearfix.append-bottom-20 = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|
= f.email_field :email, placeholder: "Email", class: "form-control", required: true .devise-errors
.clearfix.append-bottom-10 = devise_error_messages!
= f.submit "Reset password", class: "btn-primary btn" .clearfix.append-bottom-20
%hr = f.email_field :email, placeholder: "Email", class: "form-control", required: true
%p .clearfix.append-bottom-10
%span.light = f.submit "Reset password", class: "btn-primary btn"
Already have login and password? .panel-footer
%strong = render 'devise/shared/sign_in_link'
= link_to "Sign in", new_session_path(resource_name)
app/views/devise/registrations/new.html.haml
= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { class: "login-box" }) do |f| .login-box.panel.panel-success
%h3.page-title Sign Up .panel-heading
.devise-errors %h3.panel-title Sign up
= devise_error_messages! .panel-body
%div = form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
= f.text_field :name, class: "form-control top", placeholder: "Name", required: true .devise-errors
%div = devise_error_messages!
= f.text_field :username, class: "form-control middle", placeholder: "Username", required: true %div
%div = f.text_field :name, class: "form-control top", placeholder: "Name", required: true
= f.email_field :email, class: "form-control middle", placeholder: "Email", required: true %div
%div = f.text_field :username, class: "form-control middle", placeholder: "Username", required: true
= f.password_field :password, class: "form-control middle", placeholder: "Password", required: true %div
%div = f.email_field :email, class: "form-control middle", placeholder: "Email", required: true
= f.password_field :password_confirmation, class: "form-control bottom", placeholder: "Confirm password", required: true %div
%div = f.password_field :password, class: "form-control middle", placeholder: "Password", required: true
= f.submit "Sign up", class: "btn-create btn" %div
%hr = f.password_field :password_confirmation, class: "form-control bottom", placeholder: "Confirm password", required: true
%p %div
%span.light = f.submit "Sign up", class: "btn-create btn"
Have an account? .panel-footer
%strong %p
= link_to "Sign in", new_session_path(resource_name) %span.light
%p Have an account?
= link_to "Forgot your password?", new_password_path(resource_name) %strong
= link_to "Sign in", new_session_path(resource_name)
%p
= link_to "Forgot your password?", new_password_path(resource_name)
app/views/devise/sessions/_new_base.html.haml
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
%span Remember me %span Remember me
%div %div
= hidden_field_tag 'return_to', params[:return_to] = hidden_field_tag 'return_to', params[:return_to]
= f.submit "Sign in", class: "btn-create btn" = f.submit "Sign in", class: "btn-save btn"
.pull-right .pull-right
= link_to "Forgot your password?", new_password_path(resource_name), class: "btn" = link_to "Forgot your password?", new_password_path(resource_name), class: "btn"
app/views/devise/sessions/_new_ldap.html.haml
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
= text_field_tag :username, nil, {class: "form-control top", placeholder: "LDAP Login", autofocus: "autofocus"} = text_field_tag :username, nil, {class: "form-control top", placeholder: "LDAP Login", autofocus: "autofocus"}
= password_field_tag :password, nil, {class: "form-control bottom", placeholder: "Password"} = password_field_tag :password, nil, {class: "form-control bottom", placeholder: "Password"}
%br/ %br/
= submit_tag "LDAP Sign in", class: "btn-create btn" = submit_tag "LDAP Sign in", class: "btn-save btn"
app/views/devise/sessions/new.html.haml
.login-box .login-box.panel.panel-primary
%h3.page-title Sign in .panel-heading
- if ldap_enabled? && gitlab_config.signin_enabled %h3.panel-title Sign in
%ul.nav.nav-tabs .panel-body
%li.active - if ldap_enabled? && gitlab_config.signin_enabled
= link_to 'LDAP', '#tab-ldap', 'data-toggle' => 'tab' %ul.nav.nav-tabs
%li %li.active
= link_to 'Standard', '#tab-signin', 'data-toggle' => 'tab' = link_to 'LDAP', '#tab-ldap', 'data-toggle' => 'tab'
.tab-content %li
%div#tab-ldap.tab-pane.active = link_to 'Standard', '#tab-signin', 'data-toggle' => 'tab'
= render partial: 'devise/sessions/new_ldap' .tab-content
%div#tab-signin.tab-pane %div#tab-ldap.tab-pane.active
= render partial: 'devise/sessions/new_base' = render partial: 'devise/sessions/new_ldap'
%div#tab-signin.tab-pane
= render partial: 'devise/sessions/new_base'
- elsif ldap_enabled?
= render partial: 'devise/sessions/new_ldap'
- elsif gitlab_config.signin_enabled
= render partial: 'devise/sessions/new_base'
- else
%div
No authentication methods configured.
= render 'devise/sessions/oauth_providers' if Gitlab.config.omniauth.enabled && devise_mapping.omniauthable?
.panel-footer
- if gitlab_config.signup_enabled
%p
%span.light
Don't have an account?
%strong
= link_to "Sign up", new_registration_path(resource_name)
- elsif ldap_enabled?
= render partial: 'devise/sessions/new_ldap'
- elsif gitlab_config.signin_enabled
= render partial: 'devise/sessions/new_base'
- else
%div
No authentication methods configured.
= render 'devise/sessions/oauth_providers' if Gitlab.config.omniauth.enabled && devise_mapping.omniauthable?
%hr
- if gitlab_config.signup_enabled
%p %p
%span.light %span.light Did not receive confirmation email?
Don't have an account? = link_to "Send again", new_confirmation_path(resource_name)
%strong
= link_to "Sign up", new_registration_path(resource_name)
%p
%span.light Did not receive confirmation email?
= link_to "Send again", new_confirmation_path(resource_name)
- if extra_config.has_key?('sign_in_text') - if extra_config.has_key?('sign_in_text')
%hr %hr
= markdown(extra_config.sign_in_text) = markdown(extra_config.sign_in_text)
app/views/devise/shared/_sign_in_link.html.haml 0 → 100644
%p
%span.light
Already have login and password?
%strong
= link_to "Sign in", new_session_path(resource_name)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment