Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 77caa7526 -> be5e4bf66
IGNITE-843 Added confirm for password. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/be5e4bf6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/be5e4bf6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/be5e4bf6 Branch: refs/heads/ignite-843 Commit: be5e4bf669a7d921de9f40a3c8782eea16768ad7 Parents: 77caa75 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Thu Jul 9 17:27:54 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Thu Jul 9 17:27:54 2015 +0700 ---------------------------------------------------------------------- .../nodejs/controllers/models/caches.json | 2 +- modules/web-control-center/nodejs/views/index.jade | 1 + modules/web-control-center/nodejs/views/login.jade | 11 ++++++++--- 3 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/be5e4bf6/modules/web-control-center/nodejs/controllers/models/caches.json ---------------------------------------------------------------------- diff --git a/modules/web-control-center/nodejs/controllers/models/caches.json b/modules/web-control-center/nodejs/controllers/models/caches.json index 22f5e43..beddbfe 100644 --- a/modules/web-control-center/nodejs/controllers/models/caches.json +++ b/modules/web-control-center/nodejs/controllers/models/caches.json @@ -272,7 +272,7 @@ ] }, { - "label": "Near cache", + "label": "Server near cache", "tip": [ "Near cache settings.", "Near cache is a small local cache that stores most recently or most frequently accessed data.", http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/be5e4bf6/modules/web-control-center/nodejs/views/index.jade ---------------------------------------------------------------------- diff --git a/modules/web-control-center/nodejs/views/index.jade b/modules/web-control-center/nodejs/views/index.jade index 55fe816..999c4f8 100644 --- a/modules/web-control-center/nodejs/views/index.jade +++ b/modules/web-control-center/nodejs/views/index.jade @@ -15,6 +15,7 @@ limitations under the License. extends templates/layout + block container .row .docs-content http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/be5e4bf6/modules/web-control-center/nodejs/views/login.jade ---------------------------------------------------------------------- diff --git a/modules/web-control-center/nodejs/views/login.jade b/modules/web-control-center/nodejs/views/login.jade index 0d73552..35cbad1 100644 --- a/modules/web-control-center/nodejs/views/login.jade +++ b/modules/web-control-center/nodejs/views/login.jade @@ -38,10 +38,15 @@ .details-row label.col-sm-3.required Password: .col-sm-9 - input.form-control(type='password', ng-model='user_info.password', placeholder='Password', required) + input.form-control(type='password', ng-model='user_info.password', placeholder='Password', required, ng-keyup='action == "login" && $event.keyCode == 13 ? auth(action, user_info) : null') + .details-row(ng-show='action == "register"') + label.col-sm-3.required Confirm: + .col-sm-9.input-tip.has-feedback + input.form-control(type='password', ng-model='user_info.confirm', placeholder='Confirm password', required, ng-keyup='$event.keyCode == 13 ? auth(action, user_info) : null') + i.fa.fa-exclamation-triangle.form-control-feedback(ng-show='user_info.password != user_info.confirm' bs-tooltip data-title='Password does not match confirmation' type='button') .modal-footer a.show-signup.ng-hide(ng-show='action != "login"', ng-click='action = "login";') log in a.show-signup(ng-show="action != 'register'", ng-click='action = "register";') sign up | or - button.btn.btn-primary(ng-click='auth(action, user_info)' ng-show='action == "login"' ng-disabled='loginForm.$invalid') Log In - button.btn.btn-primary(ng-click='auth(action, user_info)' ng-show='action == "register"' ng-disabled='loginForm.$invalid') Sign Up + button.btn.btn-primary(ng-show='action == "login"' ng-disabled='loginForm.$invalid' ng-click='auth(action, user_info)') Log In + button.btn.btn-primary(ng-show='action == "register"' ng-disabled='loginForm.$invalid || user_info.password != user_info.confirm' ng-click='auth(action, user_info)') Sign Up
