BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
6d332ce1
Unverified
Commit
6d332ce1
authored
Jul 11, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve signin/signup/reset pages UI
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
f4fbc7b9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
44 additions
and
39 deletions
+44
-39
login.scss
app/assets/stylesheets/sections/login.scss
+5
-7
new.html.haml
app/views/devise/confirmations/new.html.haml
+6
-8
edit.html.haml
app/views/devise/passwords/edit.html.haml
+8
-5
new.html.haml
app/views/devise/passwords/new.html.haml
+7
-8
new.html.haml
app/views/devise/registrations/new.html.haml
+6
-3
_new_base.html.haml
app/views/devise/sessions/_new_base.html.haml
+1
-1
_new_ldap.html.haml
app/views/devise/sessions/_new_ldap.html.haml
+1
-1
new.html.haml
app/views/devise/sessions/new.html.haml
+5
-6
_sign_in_link.html.haml
app/views/devise/shared/_sign_in_link.html.haml
+5
-0
No files found.
app/assets/stylesheets/sections/login.scss
View file @
6d332ce1
...
@@ -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
:
#F
FF
;
background-color
:
#F
5F5F5
;
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
View file @
6d332ce1
.login-box
.login-box.panel.panel-default
%h3
.page-title
Resend confirmation instructions
.panel-heading
%h3
.panel-title
Resend confirmation instructions
.panel-body
=
form_for
(
resource
,
as:
resource_name
,
url:
confirmation_path
(
resource_name
),
html:
{
method: :post
})
do
|
f
|
=
form_for
(
resource
,
as:
resource_name
,
url:
confirmation_path
(
resource_name
),
html:
{
method: :post
})
do
|
f
|
.devise-errors
.devise-errors
=
devise_error_messages!
=
devise_error_messages!
...
@@ -7,9 +9,5 @@
...
@@ -7,9 +9,5 @@
=
f
.
email_field
:email
,
placeholder:
'Email'
,
class:
"form-control"
,
required:
true
=
f
.
email_field
:email
,
placeholder:
'Email'
,
class:
"form-control"
,
required:
true
.clearfix.append-bottom-10
.clearfix.append-bottom-10
=
f
.
submit
"Resend confirmation instructions"
,
class:
'btn btn-success'
=
f
.
submit
"Resend confirmation instructions"
,
class:
'btn btn-success'
%hr
.panel-footer
%p
=
render
'devise/shared/sign_in_link'
%span
.light
Already have login and password?
%strong
=
link_to
"Sign in"
,
new_session_path
(
resource_name
)
app/views/devise/passwords/edit.html.haml
View file @
6d332ce1
=
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
%h3
.panel-title
Change your password
.panel-body
=
form_for
(
resource
,
as:
resource_name
,
url:
password_path
(
resource_name
),
html:
{
method: :put
})
do
|
f
|
.devise-errors
.devise-errors
=
devise_error_messages!
=
devise_error_messages!
=
f
.
hidden_field
:reset_password_token
=
f
.
hidden_field
:reset_password_token
...
@@ -7,9 +10,9 @@
...
@@ -7,9 +10,9 @@
=
f
.
password_field
:password
,
class:
"form-control top"
,
placeholder:
"New password"
,
required:
true
=
f
.
password_field
:password
,
class:
"form-control top"
,
placeholder:
"New password"
,
required:
true
%div
%div
=
f
.
password_field
:password_confirmation
,
class:
"form-control bottom"
,
placeholder:
"Confirm new password"
,
required:
true
=
f
.
password_field
:password_confirmation
,
class:
"form-control bottom"
,
placeholder:
"Confirm new password"
,
required:
true
%div
.clearfix.append-bottom-10
.clearfix.append-bottom-10
=
f
.
submit
"Change my password"
,
class:
"btn btn-primary"
=
f
.
submit
"Change my password"
,
class:
"btn btn-primary"
=
link_to
"Sign in"
,
new_session_path
(
resource_name
),
class:
"btn pull-right"
.panel-footer
%div
%p
=
link_to
"Didn't receive confirmation instructions?"
,
new_confirmation_path
(
resource_name
)
=
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
View file @
6d332ce1
=
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
%h3
.panel-title
Reset password
.panel-body
=
form_for
(
resource
,
as:
resource_name
,
url:
password_path
(
resource_name
),
html:
{
method: :post
})
do
|
f
|
.devise-errors
.devise-errors
=
devise_error_messages!
=
devise_error_messages!
.clearfix.append-bottom-20
.clearfix.append-bottom-20
=
f
.
email_field
:email
,
placeholder:
"Email"
,
class:
"form-control"
,
required:
true
=
f
.
email_field
:email
,
placeholder:
"Email"
,
class:
"form-control"
,
required:
true
.clearfix.append-bottom-10
.clearfix.append-bottom-10
=
f
.
submit
"Reset password"
,
class:
"btn-primary btn"
=
f
.
submit
"Reset password"
,
class:
"btn-primary btn"
%hr
.panel-footer
%p
=
render
'devise/shared/sign_in_link'
%span
.light
Already have login and password?
%strong
=
link_to
"Sign in"
,
new_session_path
(
resource_name
)
app/views/devise/registrations/new.html.haml
View file @
6d332ce1
=
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
%h3
.panel-title
Sign up
.panel-body
=
form_for
(
resource
,
as:
resource_name
,
url:
registration_path
(
resource_name
))
do
|
f
|
.devise-errors
.devise-errors
=
devise_error_messages!
=
devise_error_messages!
%div
%div
...
@@ -14,7 +17,7 @@
...
@@ -14,7 +17,7 @@
=
f
.
password_field
:password_confirmation
,
class:
"form-control bottom"
,
placeholder:
"Confirm password"
,
required:
true
=
f
.
password_field
:password_confirmation
,
class:
"form-control bottom"
,
placeholder:
"Confirm password"
,
required:
true
%div
%div
=
f
.
submit
"Sign up"
,
class:
"btn-create btn"
=
f
.
submit
"Sign up"
,
class:
"btn-create btn"
%h
r
.panel-foote
r
%p
%p
%span
.light
%span
.light
Have an account?
Have an account?
...
...
app/views/devise/sessions/_new_base.html.haml
View file @
6d332ce1
...
@@ -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-
creat
e btn"
=
f
.
submit
"Sign in"
,
class:
"btn-
sav
e 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
View file @
6d332ce1
...
@@ -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-
creat
e btn"
=
submit_tag
"LDAP Sign in"
,
class:
"btn-
sav
e btn"
app/views/devise/sessions/new.html.haml
View file @
6d332ce1
.login-box
.login-box.panel.panel-primary
%h3
.page-title
Sign in
.panel-heading
%h3
.panel-title
Sign in
.panel-body
-
if
ldap_enabled?
&&
gitlab_config
.
signin_enabled
-
if
ldap_enabled?
&&
gitlab_config
.
signin_enabled
%ul
.nav.nav-tabs
%ul
.nav.nav-tabs
%li
.active
%li
.active
...
@@ -14,18 +16,15 @@
...
@@ -14,18 +16,15 @@
-
elsif
ldap_enabled?
-
elsif
ldap_enabled?
=
render
partial:
'devise/sessions/new_ldap'
=
render
partial:
'devise/sessions/new_ldap'
-
elsif
gitlab_config
.
signin_enabled
-
elsif
gitlab_config
.
signin_enabled
=
render
partial:
'devise/sessions/new_base'
=
render
partial:
'devise/sessions/new_base'
-
else
-
else
%div
%div
No authentication methods configured.
No authentication methods configured.
=
render
'devise/sessions/oauth_providers'
if
Gitlab
.
config
.
omniauth
.
enabled
&&
devise_mapping
.
omniauthable?
=
render
'devise/sessions/oauth_providers'
if
Gitlab
.
config
.
omniauth
.
enabled
&&
devise_mapping
.
omniauthable?
%hr
.panel-footer
-
if
gitlab_config
.
signup_enabled
-
if
gitlab_config
.
signup_enabled
%p
%p
%span
.light
%span
.light
...
...
app/views/devise/shared/_sign_in_link.html.haml
0 → 100644
View file @
6d332ce1
%p
%span
.light
Already have login and password?
%strong
=
link_to
"Sign in"
,
new_session_path
(
resource_name
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment