You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/09/18 04:48:24 UTC
ignite git commit: IGNITE-843 Minor fixes.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 99600189a -> e754fa8a9
IGNITE-843 Minor fixes.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e754fa8a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e754fa8a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e754fa8a
Branch: refs/heads/ignite-843
Commit: e754fa8a9353c14618919d022539e63b228d1790
Parents: 9960018
Author: vsisko <vs...@gridgain.com>
Authored: Fri Sep 18 09:48:19 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Sep 18 09:48:19 2015 +0700
----------------------------------------------------------------------
.../control-center-web/src/main/js/controllers/common-module.js | 2 ++
.../control-center-web/src/main/js/views/settings/profile.jade | 3 +--
.../src/main/js/views/templates/agent-download.jade | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e754fa8a/modules/control-center-web/src/main/js/controllers/common-module.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js
index e5c118f..53e7cce 100644
--- a/modules/control-center-web/src/main/js/controllers/common-module.js
+++ b/modules/control-center-web/src/main/js/controllers/common-module.js
@@ -1722,6 +1722,8 @@ controlCenterModule.controller('auth', [
$scope.resetPassword = function (reset_info) {
$http.post('/password/reset', reset_info)
.success(function (data) {
+ $common.showInfo('Password successfully changed');
+
$scope.user_info = {email: data};
$scope.login();
})
http://git-wip-us.apache.org/repos/asf/ignite/blob/e754fa8a/modules/control-center-web/src/main/js/views/settings/profile.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/settings/profile.jade b/modules/control-center-web/src/main/js/views/settings/profile.jade
index 3fd22dc..b757b06 100644
--- a/modules/control-center-web/src/main/js/views/settings/profile.jade
+++ b/modules/control-center-web/src/main/js/views/settings/profile.jade
@@ -41,7 +41,7 @@ block container
input.form-control(id='profile-email' type='email' ng-model='profileUser.email' placeholder='you@domain.com' required)
.details-row
+lbl('Security token:')
- label {{profileUser.token}}
+ label(bs-tooltip data-title='The security token is used for authorization of web agent') {{profileUser.token}}
i.tipLabel.fa.fa-refresh(ng-click='generateToken()' bs-tooltip data-title='Generate random security token')
.details-row
.advanced-options
@@ -59,4 +59,3 @@ block container
input.form-control(type='password' ng-model='profileUser.confirmPassword' match='profileUser.newPassword' placeholder='Confirm new password' ng-required='profileUser.changePassword')
.col-xs-12.col-sm-12.details-row
a.btn.btn-primary(ng-disabled='!profileCouldBeSaved()' ng-click='profileCouldBeSaved() && saveUser()' bs-tooltip='' data-title='{{saveBtnTipText()}}' data-placement='bottom' data-trigger='hover') Save
-
http://git-wip-us.apache.org/repos/asf/ignite/blob/e754fa8a/modules/control-center-web/src/main/js/views/templates/agent-download.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/templates/agent-download.jade b/modules/control-center-web/src/main/js/views/templates/agent-download.jade
index f84d14b..57dcba1 100644
--- a/modules/control-center-web/src/main/js/views/templates/agent-download.jade
+++ b/modules/control-center-web/src/main/js/views/templates/agent-download.jade
@@ -37,5 +37,6 @@
b README.txt
| for more information.
.modal-footer
- label.labelField Security token: {{user.token}}
+ label.labelField Security token:
+ label.labelField(bs-tooltip='' data-title='The security token is used for authorization of web agent') {{user.token}}
button.btn.btn-primary(ng-click='downloadAgent()') Download zip