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
42003f53
Unverified
Commit
42003f53
authored
Dec 16, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve UI/UX for reset_password, signup, confirmation pages
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
6f556d8e
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
29 additions
and
12 deletions
+29
-12
new.html.haml
app/views/devise/confirmations/new.html.haml
+8
-2
edit.html.haml
app/views/devise/passwords/edit.html.haml
+3
-2
new.html.haml
app/views/devise/passwords/new.html.haml
+9
-6
new.html.haml
app/views/devise/registrations/new.html.haml
+7
-2
devise.html.haml
app/views/layouts/devise.html.haml
+2
-0
No files found.
app/views/devise/confirmations/new.html.haml
View file @
42003f53
.login-box
%h3
.page-title
Resend confirmation instructions
=
form_for
(
resource
,
as:
resource_name
,
url:
confirmation_path
(
resource_name
),
html:
{
method: :post
})
do
|
f
|
.devise-errors
=
devise_error_messages!
=
f
.
email_field
:email
,
placeholder:
'Email'
%div
=
f
.
submit
"Resend confirmation instructions"
,
class:
'btn btn-success'
=
f
.
email_field
:email
,
placeholder:
'Email'
,
class:
"text"
,
required:
true
.clearfix.append-bottom-10
=
f
.
submit
"Resend confirmation instructions"
,
class:
'btn btn-success'
%hr
%p
%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 @
42003f53
=
form_for
(
resource
,
as:
resource_name
,
url:
password_path
(
resource_name
),
html:
{
method: :put
,
class:
"login-box"
})
do
|
f
|
%h3
Change your password
.devise-errors
=
devise_error_messages!
=
f
.
hidden_field
:reset_password_token
%div
=
f
.
password_field
:password
,
class:
"text top"
,
placeholder:
"New password"
=
f
.
password_field
:password
,
class:
"text top"
,
placeholder:
"New password"
,
required:
true
%div
=
f
.
password_field
:password_confirmation
,
class:
"text bottom"
,
placeholder:
"Confirm new password"
=
f
.
password_field
:password_confirmation
,
class:
"text bottom"
,
placeholder:
"Confirm new password"
,
required:
true
%div
.clearfix.append-bottom-10
=
f
.
submit
"Change my password"
,
class:
"btn btn-primary"
...
...
app/views/devise/passwords/new.html.haml
View file @
42003f53
=
form_for
(
resource
,
as:
resource_name
,
url:
password_path
(
resource_name
),
html:
{
class:
"login-box"
,
method: :post
})
do
|
f
|
%h3
.page-title
Reset password
.devise-errors
=
devise_error_messages!
=
f
.
email_field
:email
,
placeholder:
"Email"
,
class:
"text"
%br
/
%br
/
=
f
.
email_field
:email
,
placeholder:
"Email"
,
class:
"text"
,
required:
true
.clearfix.append-bottom-10
=
f
.
submit
"Reset password"
,
class:
"btn-primary btn"
.pull-right
=
link_to
"Sign in"
,
new_session_path
(
resource_name
),
class:
"btn"
%br
/
%hr
%p
%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 @
42003f53
=
form_for
(
resource
,
as:
resource_name
,
url:
registration_path
(
resource_name
),
html:
{
class:
"login-box"
})
do
|
f
|
%h3
.page-title
Sign Up
%br
.devise-errors
=
devise_error_messages!
%div
=
f
.
text_field
:name
,
class:
"text top"
,
placeholder:
"Name"
,
required:
true
...
...
@@ -15,5 +15,10 @@
%div
=
f
.
submit
"Sign up"
,
class:
"btn-create btn"
%hr
%p
%span
.light
Have an account?
%strong
=
link_to
"Sign in"
,
new_session_path
(
resource_name
)
=
link_to
"Forgot your password?"
,
new_password_path
(
resource_name
),
class:
"pull-right"
%p
=
link_to
"Forgot your password?"
,
new_password_path
(
resource_name
)
app/views/layouts/devise.html.haml
View file @
42003f53
...
...
@@ -12,4 +12,6 @@
%br
#{
link_to
"Sign in"
,
new_user_session_path
}
or browse for
#{
link_to
"public projects"
,
public_projects_path
}
.
%hr
.container
.content
=
yield
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