summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-28 20:36:47 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-28 20:36:47 +0200
commit08a12f24b00a0d3c3b42ff80baaebba1f26a33a6 (patch)
tree08b28126e0af8bcf0cbc28fb9e6e54f08f47ae2d /app/views
parentd0d596ae4a7efd3c35031f485954896a3702f8d1 (diff)
downloadgitlab-ce-08a12f24b00a0d3c3b42ff80baaebba1f26a33a6.tar.gz
Make user settings account page nicer
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views')
-rw-r--r--app/views/profiles/accounts/show.html.haml23
1 files changed, 11 insertions, 12 deletions
diff --git a/app/views/profiles/accounts/show.html.haml b/app/views/profiles/accounts/show.html.haml
index c30a3f5d79a..a26d4e0c757 100644
--- a/app/views/profiles/accounts/show.html.haml
+++ b/app/views/profiles/accounts/show.html.haml
@@ -26,20 +26,23 @@
- if current_user.private_token
= text_field_tag "token", current_user.private_token, class: "form-control"
%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
%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?
- - if current_user.otp_required_for_login
- .panel.panel-success
- .panel-heading
- Two-factor Authentication enabled
- .panel-body
+ .panel.panel-default
+ .panel-heading
+ Two-factor Authentication
+ .panel-body
+ - if current_user.otp_required_for_login
.pull-right
= link_to 'Disable Two-factor Authentication', profile_two_factor_auth_path, method: :delete, class: 'btn btn-close btn-sm',
data: { confirm: 'Are you sure?' }
+ %p.text-success
+ %strong
+ Two-factor Authentication is enabled
%p
If you lose your recovery codes you can
%strong
@@ -47,11 +50,7 @@
= link_to 'generate new ones', codes_profile_two_factor_auth_path, method: :post, data: { confirm: 'Are you sure?' }
invalidating all previous codes.
- - else
- .panel.panel-default
- .panel-heading
- Two-factor Authentication
- .panel-body
+ - else
%p
Increase your account's security by enabling two-factor authentication (2FA).
%p