Commit 917ae13b authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'signin-page-headings' into 'master'

Add headings to signin/signup blocks on signin page.

See #1986

![Screen Shot 2015-02-13 at 15.17.34](https://dev.gitlab.org/uploads/gitlab/gitlabhq/4feb067a23/Screen_Shot_2015-02-13_at_15.17.34.png)

When signup is disabled, the heading for sign in only reads "Sign in", because there is no longer a choice of Existing/New user.

I've moved the OAuth signin options to just below the signin box because it looked odd as a separate box without a heading.

cc @sytse

See merge request !1516
parents 2f9661dc 7c39e728
...@@ -40,8 +40,7 @@ ...@@ -40,8 +40,7 @@
.login-heading h3 { .login-heading h3 {
font-weight: 300; font-weight: 300;
line-height: 1.5; line-height: 1.5;
margin: 0; margin: 0 0 10px 0;
display: none;
} }
.login-footer { .login-footer {
......
= render 'devise/shared/signup_box' = render 'devise/shared/signup_box'
.clearfix.prepend-top-20 = render 'devise/shared/sign_in_link'
= render 'devise/shared/sign_in_link' \ No newline at end of file
%p
%span.light Did not receive confirmation email?
= link_to "Send again", new_confirmation_path(resource_name)
\ No newline at end of file
%div %div
= render 'devise/shared/signin_box' = render 'devise/shared/signin_box'
- if Gitlab.config.omniauth.enabled && devise_mapping.omniauthable?
.prepend-top-20
= render 'devise/shared/oauth_box'
- if signup_enabled? - if signup_enabled?
.prepend-top-20 .prepend-top-20
= render 'devise/shared/signup_box' = render 'devise/shared/signup_box'
.clearfix.prepend-top-20
%p
%span.light Did not receive confirmation email?
= link_to "Send again", new_confirmation_path(resource_name)
- providers = additional_providers
- if providers.present?
.login-box{:'data-no-turbolink' => 'data-no-turbolink'}
%span Sign in with  
- providers.each do |provider|
%span
- if default_providers.include?(provider)
= link_to authbutton(provider, 32), omniauth_authorize_path(resource_name, provider)
- else
= link_to provider.to_s.titleize, omniauth_authorize_path(resource_name, provider), class: "btn"
.login-box .login-box
- if signup_enabled?
.login-heading
%h3 Existing user? Sign in
- else
.login-heading .login-heading
%h3 Sign in %h3 Sign in
.login-body .login-body
...@@ -23,3 +27,16 @@ ...@@ -23,3 +27,16 @@
- else - else
%div %div
No authentication methods configured. No authentication methods configured.
- if Gitlab.config.omniauth.enabled && devise_mapping.omniauthable?
.clearfix.prepend-top-20
%p
%span.light
Sign in with  
- providers = additional_providers
- providers.each do |provider|
%span.light
- if default_providers.include?(provider)
= link_to authbutton(provider, 32), omniauth_authorize_path(resource_name, provider)
- else
= link_to provider.to_s.titleize, omniauth_authorize_path(resource_name, provider), class: "btn"
\ No newline at end of file
.login-box .login-box
- if signin_enabled?
.login-heading .login-heading
%h3 Sign up %h3 New user? Create an account
- else
.login-heading
%h3 Create an account
.login-body .login-body
= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| = form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
.devise-errors .devise-errors
...@@ -15,3 +19,8 @@ ...@@ -15,3 +19,8 @@
= f.password_field :password, class: "form-control bottom", id: "user_password_sign_up", placeholder: "Password", required: true = f.password_field :password, class: "form-control bottom", id: "user_password_sign_up", placeholder: "Password", required: true
%div %div
= f.submit "Sign up", class: "btn-create btn" = f.submit "Sign up", class: "btn-create btn"
.clearfix.prepend-top-20
%p
%span.light Did not receive confirmation email?
= link_to "Send again", new_confirmation_path(resource_name)
\ No newline at end of file
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