Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 e5812a7e9 -> ce7c763a3
# IGNITE-843 Link fix. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/facf9b6d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/facf9b6d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/facf9b6d Branch: refs/heads/ignite-843 Commit: facf9b6d9c67d1f63adbb306d0ebddc360bb932a Parents: 83e0457 Author: Andrey <anovi...@gridgain.com> Authored: Mon Aug 17 14:20:30 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Mon Aug 17 14:20:30 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/admin-controller.js | 7 ++++++- .../src/main/js/public/stylesheets/style.scss | 11 ++++++++++- .../src/main/js/views/includes/header.jade | 4 ++-- .../src/main/js/views/settings/admin.jade | 7 +++---- 4 files changed, 21 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/facf9b6d/modules/control-center-web/src/main/js/controllers/admin-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/admin-controller.js b/modules/control-center-web/src/main/js/controllers/admin-controller.js index 09490fe..894ead6 100644 --- a/modules/control-center-web/src/main/js/controllers/admin-controller.js +++ b/modules/control-center-web/src/main/js/controllers/admin-controller.js @@ -15,7 +15,8 @@ * limitations under the License. */ -controlCenterModule.controller('adminController', ['$scope', '$http', '$common', '$confirm', function ($scope, $http, $common, $confirm) { +controlCenterModule.controller('adminController', ['$scope', '$window', '$http', '$common', '$confirm', + function ($scope, $window, $http, $common, $confirm) { $scope.users = null; function reload() { @@ -30,6 +31,10 @@ controlCenterModule.controller('adminController', ['$scope', '$http', '$common', reload(); + $scope.becomeUser = function (user) { + $window.location = '/admin/become?viewedUserId=' + user._id; + }; + $scope.removeUser = function (user) { $confirm.show('Are you sure you want to remove user: "' + user.username + '"?').then(function () { $http.post('admin/remove', {userId: user._id}).success( http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/facf9b6d/modules/control-center-web/src/main/js/public/stylesheets/style.scss ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss index 28a3de7..bdddd5b 100644 --- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss +++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss @@ -1021,6 +1021,10 @@ label { margin-right: 0; } +.fa-eye { + cursor: pointer; +} + .fa-plus { cursor: pointer; } @@ -1164,8 +1168,13 @@ input.ng-dirty.ng-invalid, button.ng-dirty.ng-invalid { border-radius: 6px; } -.nav-tabs > li > a { +.theme-line .nav-tabs > li > a { padding: 5px 5px; + color: #555; +} + +.theme-line .nav-tabs > li.active > a { + color: $ignite-red; } .viewedUser { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/facf9b6d/modules/control-center-web/src/main/js/views/includes/header.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/includes/header.jade b/modules/control-center-web/src/main/js/views/includes/header.jade index b690ba2..aecdf16 100644 --- a/modules/control-center-web/src/main/js/views/includes/header.jade +++ b/modules/control-center-web/src/main/js/views/includes/header.jade @@ -32,11 +32,11 @@ header#header.header li(ng-controller='notebooks') a.dropdown-toggle(ng-hide='notebooks.length == 0' data-toggle='dropdown' bs-dropdown='notebookDropdown' data-placement='bottom-right') SQL span.caret - a(ng-hide='notebooks.length > 0' ng-class='{active: isActive("/sql")}' href='/notebooks/new') SQL + a(ng-hide='notebooks.length > 0' href='/notebooks/new') SQL //+header-item('/deploy', '/deploy', 'Deploy') ul.nav.navbar-nav.pull-right li(ng-if='user') - a.dropdown-toggle(data-toggle='dropdown' bs-dropdown='userDropdown' data-placement='bottom-right' data-ng-bind='::user.username') + a.dropdown-toggle(data-toggle='dropdown' bs-dropdown='userDropdown' data-placement='bottom-right') {{::user.username}} span.caret li.nav-login(ng-if='!user') a(ng-click='login()') Log In http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/facf9b6d/modules/control-center-web/src/main/js/views/settings/admin.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/settings/admin.jade b/modules/control-center-web/src/main/js/views/settings/admin.jade index 8345bb9..46210cb 100644 --- a/modules/control-center-web/src/main/js/views/settings/admin.jade +++ b/modules/control-center-web/src/main/js/views/settings/admin.jade @@ -47,10 +47,9 @@ block container input(type='checkbox' ng-disabled='row.adminChanging || row._id == user._id' ng-model='row.admin' ng-change='toggleAdmin(row)') td(style='text-align: center;') - a(ng-click='removeUser(row)' ng-show='row._id != user._id' bs-tooltip data-title='Remove user') - i.fa.fa-remove - a(style='margin-left: 5px' ng-href='admin/become?viewedUserId={{row._id}}' ng-show='row._id != user._id' bs-tooltip data-title='Become this user') - i.fa.fa-eye + div(ng-show='row._id != user._id') + i.fa.fa-remove(ng-click='removeUser(row)' bs-tooltip data-title='Remove user') + i.fa.fa-eye(ng-click='becomeUser(row)' style='margin-left: 5px' bs-tooltip data-title='Become this user') tfoot tr td.text-right(colspan='5')
