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
66121d6c
Commit
66121d6c
authored
Feb 07, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve devise views
parent
210e9cd4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
21 deletions
+20
-21
login.scss
app/assets/stylesheets/sections/login.scss
+3
-3
new.html.erb
app/views/devise/passwords/new.html.erb
+5
-5
new.html.haml
app/views/devise/registrations/new.html.haml
+9
-10
new.html.haml
app/views/devise/sessions/new.html.haml
+3
-3
No files found.
app/assets/stylesheets/sections/login.scss
View file @
66121d6c
/* Login Page */
body
.login-page
{
padding-top
:
10
%
;
background
:
#
f1f1f1
;
body
.login-page
{
padding-top
:
7
%
;
background
:
#
666
;
}
.login-box
{
...
...
app/views/devise/passwords/new.html.erb
View file @
66121d6c
<%=
form_for
(
resource
,
:as
=>
resource_name
,
:url
=>
password_path
(
resource_name
),
:html
=>
{
:class
=>
"login-box"
,
:method
=>
:post
})
do
|
f
|
%>
<%=
image_tag
"login-logo.png"
,
:width
=>
"304"
,
:height
=>
"66"
,
:class
=>
"login-logo"
,
:alt
=>
"Login Logo"
%>
<%=
form_for
(
resource
,
as:
resource_name
,
url:
password_path
(
resource_name
),
html:
{
class:
"login-box"
,
method:
:post
})
do
|
f
|
%>
<%=
image_tag
"login-logo.png"
,
width:
"304"
,
height:
"66"
,
class:
"login-logo"
,
alt:
"Login Logo"
%>
<%=
devise_error_messages!
%>
<%=
f
.
email_field
:email
,
:placeholder
=>
"Email"
,
:class
=>
"text"
%>
<%=
f
.
email_field
:email
,
placeholder:
"Email"
,
class:
"text"
%>
<br/>
<br/>
<%=
f
.
submit
"Reset password"
,
:class
=>
"btn-primary btn"
%>
<div
class=
"
right"
>
<%=
link_to
"Sign in"
,
new_session_path
(
resource_name
),
:class
=>
"btn"
%>
<br
/></div>
<%=
f
.
submit
"Reset password"
,
class:
"btn-primary btn"
%>
<div
class=
"
pull-right"
>
<%=
link_to
"Sign in"
,
new_session_path
(
resource_name
),
class:
"btn"
%>
<br
/></div>
<%
end
%>
app/views/devise/registrations/new.html.haml
View file @
66121d6c
=
form_for
(
resource
,
:as
=>
resource_name
,
:url
=>
registration_path
(
resource_name
),
:html
=>
{
:class
=>
"login-box"
})
do
|
f
|
=
image_tag
"login-logo.png"
,
:width
=>
"304"
,
:height
=>
"66"
,
:class
=>
"login-logo"
,
:alt
=>
"Login Logo"
=
form_for
(
resource
,
as:
resource_name
,
url:
registration_path
(
resource_name
),
html:
{
class:
"login-box"
})
do
|
f
|
=
image_tag
"login-logo.png"
,
width:
"304"
,
height:
"66"
,
class:
"login-logo"
,
alt:
"Login Logo"
=
devise_error_messages!
%div
=
f
.
text_field
:name
,
:class
=>
"text top"
,
:placeholder
=>
"Name"
,
:required
=>
true
=
f
.
text_field
:name
,
class:
"text top"
,
placeholder:
"Name"
,
required:
true
%div
=
f
.
text_field
:username
,
:class
=>
"text middle"
,
:placeholder
=>
"Username"
,
:required
=>
true
=
f
.
text_field
:username
,
class:
"text middle"
,
placeholder:
"Username"
,
required:
true
%div
=
f
.
email_field
:email
,
:class
=>
"text middle"
,
:placeholder
=>
"Email"
,
:required
=>
true
=
f
.
email_field
:email
,
class:
"text middle"
,
placeholder:
"Email"
,
required:
true
%div
=
f
.
password_field
:password
,
:class
=>
"text middle"
,
:placeholder
=>
"Password"
,
:required
=>
true
=
f
.
password_field
:password
,
class:
"text middle"
,
placeholder:
"Password"
,
required:
true
%div
=
f
.
password_field
:password_confirmation
,
:class
=>
"text bottom"
,
:placeholder
=>
"Confirm password"
,
:required
=>
true
=
f
.
password_field
:password_confirmation
,
class:
"text bottom"
,
placeholder:
"Confirm password"
,
required:
true
%div
=
f
.
submit
"Sign up"
,
:class
=>
"btn-primary btn wide"
%br
=
f
.
submit
"Sign up"
,
class:
"btn-create btn"
%hr
=
link_to
"Sign in"
,
new_session_path
(
resource_name
)
=
link_to
"Forgot your password?"
,
new_password_path
(
resource_name
),
:class
=>
"
right"
=
link_to
"Forgot your password?"
,
new_password_path
(
resource_name
),
class:
"pull-
right"
app/views/devise/sessions/new.html.haml
View file @
66121d6c
...
...
@@ -11,18 +11,18 @@
=
f
.
check_box
:remember_me
%span
Remember me
%br
/
=
f
.
submit
"Sign in"
,
:class
=>
"btn-
primary btn wide
"
=
f
.
submit
"Sign in"
,
:class
=>
"btn-
create btn
"
.pull-right
=
link_to
"Forgot your password?"
,
new_password_path
(
resource_name
),
:class
=>
"btn"
%br
/
%br
/
-
if
Gitlab
.
config
.
gitlab
.
signup_enabled
%hr
/
Don't have an account?
=
link_to
"Sign up"
,
new_registration_path
(
resource_name
)
.clearfix
-
if
devise_mapping
.
omniauthable?
&&
resource_class
.
omniauth_providers
.
present?
%hr
%div
%span
Sign in with:
-
resource_class
.
omniauth_providers
.
each
do
|
provider
|
%span
=
link_to
authbutton
(
provider
,
32
),
omniauth_authorize_path
(
resource_name
,
provider
)
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