Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
6fa29429
Commit
6fa29429
authored
May 05, 2015
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update login views for two-factor auth
parent
e512f770
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
6 deletions
+2
-6
app/views/devise/sessions/_new_base.html.haml
app/views/devise/sessions/_new_base.html.haml
+0
-1
app/views/devise/sessions/two_factor.html.haml
app/views/devise/sessions/two_factor.html.haml
+2
-5
No files found.
app/views/devise/sessions/_new_base.html.haml
View file @
6fa29429
=
form_for
(
resource
,
as:
resource_name
,
url:
session_path
(
resource_name
))
do
|
f
|
=
form_for
(
resource
,
as:
resource_name
,
url:
session_path
(
resource_name
))
do
|
f
|
=
f
.
text_field
:login
,
class:
"form-control top"
,
placeholder:
"Username or Email"
,
autofocus:
"autofocus"
=
f
.
text_field
:login
,
class:
"form-control top"
,
placeholder:
"Username or Email"
,
autofocus:
"autofocus"
=
f
.
password_field
:password
,
class:
"form-control bottom"
,
placeholder:
"Password"
=
f
.
password_field
:password
,
class:
"form-control bottom"
,
placeholder:
"Password"
=
f
.
hidden_field
:otp_attempt
,
value:
''
-
if
devise_mapping
.
rememberable?
-
if
devise_mapping
.
rememberable?
.remember-me.checkbox
.remember-me.checkbox
%label
{
for:
"user_remember_me"
}
%label
{
for:
"user_remember_me"
}
...
...
app/views/devise/sessions/two_factor.html.haml
View file @
6fa29429
...
@@ -7,10 +7,7 @@
...
@@ -7,10 +7,7 @@
-
if
@error
-
if
@error
.alert.alert-danger
.alert.alert-danger
=
@error
=
@error
.hide
=
f
.
hidden_field
:login
=
f
.
text_field
:login
,
class:
"form-control top"
,
placeholder:
"Username or Email"
,
autofocus:
"autofocus"
=
f
.
text_field
:otp_attempt
,
class:
'form-control'
,
placeholder:
'Two-factor authentication code'
,
required:
true
,
autofocus:
true
=
f
.
password_field
:password
,
class:
"form-control bottom"
,
placeholder:
"Password"
=
f
.
text_field
:otp_attempt
,
class:
'form-control'
,
placeholder:
'Two-factor authentication token'
,
required:
true
,
autofocus:
true
.prepend-top-20
.prepend-top-20
=
f
.
submit
"Verify code"
,
class:
"btn btn-save"
=
f
.
submit
"Verify code"
,
class:
"btn btn-save"
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