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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
08a12f24
Commit
08a12f24
authored
May 28, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make user settings account page nicer
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
d0d596ae
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
14 deletions
+14
-14
app/assets/stylesheets/pages/profile.scss
app/assets/stylesheets/pages/profile.scss
+3
-2
app/views/profiles/accounts/show.html.haml
app/views/profiles/accounts/show.html.haml
+11
-12
No files found.
app/assets/stylesheets/pages/profile.scss
View file @
08a12f24
...
@@ -84,8 +84,9 @@
...
@@ -84,8 +84,9 @@
}
}
.btn
{
.btn
{
line-height
:
36px
;
line-height
:
40px
;
height
:
56px
;
height
:
42px
;
padding
:
0px
12px
;
img
{
img
{
width
:
32px
;
width
:
32px
;
...
...
app/views/profiles/accounts/show.html.haml
View file @
08a12f24
...
@@ -26,20 +26,23 @@
...
@@ -26,20 +26,23 @@
-
if
current_user
.
private_token
-
if
current_user
.
private_token
=
text_field_tag
"token"
,
current_user
.
private_token
,
class:
"form-control"
=
text_field_tag
"token"
,
current_user
.
private_token
,
class:
"form-control"
%div
%div
=
f
.
submit
'Reset private token'
,
data:
{
confirm:
"Are you sure?"
},
class:
"btn btn-
primary
btn-build-token"
=
f
.
submit
'Reset private token'
,
data:
{
confirm:
"Are you sure?"
},
class:
"btn btn-
default
btn-build-token"
-
else
-
else
%span
You don`t have one yet. Click generate to fix it.
%span
You don`t have one yet. Click generate to fix it.
=
f
.
submit
'Generate'
,
class:
"btn
success
btn-build-token"
=
f
.
submit
'Generate'
,
class:
"btn
btn-default
btn-build-token"
-
unless
current_user
.
ldap_user?
-
unless
current_user
.
ldap_user?
-
if
current_user
.
otp_required_for_login
.panel.panel-default
.panel
.panel-success
.panel
-heading
.panel-heading
Two-factor Authentication
Two-factor Authentication enabled
.panel-body
.panel-body
-
if
current_user
.
otp_required_for_login
.pull-right
.pull-right
=
link_to
'Disable Two-factor Authentication'
,
profile_two_factor_auth_path
,
method: :delete
,
class:
'btn btn-close btn-sm'
,
=
link_to
'Disable Two-factor Authentication'
,
profile_two_factor_auth_path
,
method: :delete
,
class:
'btn btn-close btn-sm'
,
data:
{
confirm:
'Are you sure?'
}
data:
{
confirm:
'Are you sure?'
}
%p
.text-success
%strong
Two-factor Authentication is enabled
%p
%p
If you lose your recovery codes you can
If you lose your recovery codes you can
%strong
%strong
...
@@ -47,11 +50,7 @@
...
@@ -47,11 +50,7 @@
=
link_to
'generate new ones'
,
codes_profile_two_factor_auth_path
,
method: :post
,
data:
{
confirm:
'Are you sure?'
}
=
link_to
'generate new ones'
,
codes_profile_two_factor_auth_path
,
method: :post
,
data:
{
confirm:
'Are you sure?'
}
invalidating all previous codes.
invalidating all previous codes.
-
else
-
else
.panel.panel-default
.panel-heading
Two-factor Authentication
.panel-body
%p
%p
Increase your account's security by enabling two-factor authentication (2FA).
Increase your account's security by enabling two-factor authentication (2FA).
%p
%p
...
...
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