IGNITE-843 Fixed signin on enter + minor code cleanup.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ea979d83 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ea979d83 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ea979d83 Branch: refs/heads/ignite-2612 Commit: ea979d83a7629e1d7007fa3e99b35d70c50b3559 Parents: dc5ada5 Author: vsisko <[email protected]> Authored: Fri Feb 19 14:56:45 2016 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Fri Feb 19 14:56:45 2016 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/common-module.js | 2 +- .../src/main/js/serve/routes/public.js | 2 +- .../control-center-web/src/main/js/views/signin.jade | 2 +- .../src/main/js/views/sql/notebook-new.jade | 13 ++++++------- .../src/main/js/views/templates/clone.jade | 10 +++++----- 5 files changed, 14 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ea979d83/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 fe11359..1de5433 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 @@ -2054,7 +2054,7 @@ consoleModule.controller('resetPassword', [ } ]); -// Login popup controller. +// Sign in controller. // TODO IGNITE-1936 Refactor this controller. consoleModule.controller('auth', ['$scope', '$focus', 'Auth', 'IgniteCountries', function ($scope, $focus, Auth, countries) { $scope.auth = Auth.auth; http://git-wip-us.apache.org/repos/asf/ignite/blob/ea979d83/modules/control-center-web/src/main/js/serve/routes/public.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/serve/routes/public.js b/modules/control-center-web/src/main/js/serve/routes/public.js index 02986a8..33aa287 100644 --- a/modules/control-center-web/src/main/js/serve/routes/public.js +++ b/modules/control-center-web/src/main/js/serve/routes/public.js @@ -116,7 +116,7 @@ module.exports.factory = function(express, passport, nodemailer, settings, mail, }); /** - * Login in exist account. + * Sign in into exist account. */ router.post('/signin', (req, res, next) => { passport.authenticate('local', (errAuth, user) => { http://git-wip-us.apache.org/repos/asf/ignite/blob/ea979d83/modules/control-center-web/src/main/js/views/signin.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/signin.jade b/modules/control-center-web/src/main/js/views/signin.jade index cb78abc..663b77b 100644 --- a/modules/control-center-web/src/main/js/views/signin.jade +++ b/modules/control-center-web/src/main/js/views/signin.jade @@ -63,7 +63,7 @@ header#header.header .settings-row(ng-show='action != "password/forgot"') +lblRequired('Password:') .col-xs-9.col-md-8 - input#user_password.form-control(enter-focus-next='user_confirm' type='password' ng-model='user_info.password' placeholder='Password' ng-required='action != "password/forgot"' on-enter='action == "login" && form.$valid && auth(action, user_info)') + input#user_password.form-control(enter-focus-next='user_confirm' type='password' ng-model='user_info.password' placeholder='Password' ng-required='action != "password/forgot"' on-enter='action == "signin" && form.$valid && auth(action, user_info)') .settings-row(ng-if='action == "signup"') +lblRequired('Confirm:') .col-xs-9.col-md-8 http://git-wip-us.apache.org/repos/asf/ignite/blob/ea979d83/modules/control-center-web/src/main/js/views/sql/notebook-new.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/sql/notebook-new.jade b/modules/control-center-web/src/main/js/views/sql/notebook-new.jade index 6a7766c..2a50137 100644 --- a/modules/control-center-web/src/main/js/views/sql/notebook-new.jade +++ b/modules/control-center-web/src/main/js/views/sql/notebook-new.jade @@ -20,13 +20,12 @@ .modal-header button.close(ng-click='$hide()') × h4.modal-title New SQL notebook - form.form-horizontal(name='ui.inputForm' novalidate) - .modal-body.row - .login - .col-sm-3 - label.required.labelFormField Name: - .col-sm-9 - input.form-control(id='create-notebook' type='text' ng-model='name' required on-enter='ui.inputForm.$valid && createNewNotebook(name)' auto-focus) + form.form-horizontal.modal-body.row(name='ui.inputForm' novalidate) + div + .col-sm-2 + label.required.labelFormField Name: + .col-sm-10 + input.form-control(id='create-notebook' type='text' ng-model='name' required on-enter='ui.inputForm.$valid && createNewNotebook(name)' auto-focus) .modal-footer button.btn.btn-default(id='copy-btn-cancel' ng-click='$hide()') Cancel button.btn.btn-primary(id='copy-btn-confirm' ng-disabled='ui.inputForm.$invalid' ng-click='createNewNotebook(name)') Create http://git-wip-us.apache.org/repos/asf/ignite/blob/ea979d83/modules/control-center-web/src/main/js/views/templates/clone.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/templates/clone.jade b/modules/control-center-web/src/main/js/views/templates/clone.jade index 9628cc5..26b5385 100644 --- a/modules/control-center-web/src/main/js/views/templates/clone.jade +++ b/modules/control-center-web/src/main/js/views/templates/clone.jade @@ -21,11 +21,11 @@ button.close(ng-click='$hide()') × h4.modal-title Clone form.form-horizontal.modal-body.row(name='ui.inputForm' novalidate) - .login - .col-sm-3 - label.required.labelFormField New name: - .col-sm-9 - input.form-control(id='copy-new-name' type='text' ng-model='newName' required auto-focus) + div + .col-sm-2 + label.required.labelFormField New name: + .col-sm-10 + input.form-control(id='copy-new-name' type='text' ng-model='newName' required auto-focus) .modal-footer button.btn.btn-default(id='copy-btn-cancel' ng-click='$hide()') Cancel button.btn.btn-primary(id='copy-btn-confirm' ng-disabled='ui.inputForm.$invalid' ng-click='ok(newName)') Confirm
