Repository: ambari Updated Branches: refs/heads/trunk 663e0d6f0 -> 338190375
AMBARI-7071. Admin View: UI tweaks. (yusaku) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/33819037 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/33819037 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/33819037 Branch: refs/heads/trunk Commit: 33819037526678797645a626950051a54a6bcfc5 Parents: 663e0d6 Author: Yusaku Sako <[email protected]> Authored: Thu Aug 28 20:17:22 2014 -0700 Committer: Yusaku Sako <[email protected]> Committed: Thu Aug 28 20:41:31 2014 -0700 ---------------------------------------------------------------------- .../ambariViews/CreateViewInstanceCtrl.js | 5 +++-- .../controllers/ambariViews/ViewsListCtrl.js | 6 +++++- .../controllers/groups/GroupsCreateCtrl.js | 1 + .../controllers/users/UsersCreateCtrl.js | 1 + .../scripts/controllers/users/UsersShowCtrl.js | 21 +++++++++++++++----- .../admin-web/app/scripts/services/uiAlert.js | 21 ++++++++++++++++++-- .../app/views/ambariViews/listTable.html | 3 +++ .../ui/admin-web/app/views/leftNavbar.html | 2 +- 8 files changed, 49 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/33819037/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js index 92398ed..47b8f6a 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js @@ -74,7 +74,8 @@ angular.module('ambariAdminConsole') } else { View.createInstance($scope.instance) .then(function(data) { - $location.path('/views'); + uiAlert.success('Created View Instance ' + $scope.instance.instance_name); + $location.path('/views/' + $scope.instance.view_name + '/versions/' + $scope.instance.version + '/instances/' + $scope.instance.instance_name + '/edit'); }) .catch(function(data) { uiAlert.danger(data.data.status, data.data.message); @@ -86,4 +87,4 @@ angular.module('ambariAdminConsole') }); } }; -}]); \ No newline at end of file +}]); http://git-wip-us.apache.org/repos/asf/ambari/blob/33819037/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js index b85bcb4..ed97a19 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js @@ -51,9 +51,13 @@ angular.module('ambariAdminConsole') var result = []; var filter = $scope.viewsFilter.toLowerCase(); if(!filter){ // if no filter return all views - result = $scope.views; + result = $scope.views.map(function(view) { + view.isOpened = false; + return view; + }); } else { result = $scope.views.map(function(view) { + view.isOpened = true; if(view.view_name.toLowerCase().indexOf(filter) >= 0){ return view; // if filter matched with view name -- return whole view } else { http://git-wip-us.apache.org/repos/asf/ambari/blob/33819037/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/groups/GroupsCreateCtrl.js ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/groups/GroupsCreateCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/groups/GroupsCreateCtrl.js index d1c4542..ba35026 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/groups/GroupsCreateCtrl.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/groups/GroupsCreateCtrl.js @@ -25,6 +25,7 @@ angular.module('ambariAdminConsole') $scope.form.submitted = true; if ($scope.form.$valid){ $scope.group.save().then(function() { + uiAlert.success('Created group ' + $scope.group.group_name); $location.path('/groups'); }) .catch(function(data) { http://git-wip-us.apache.org/repos/asf/ambari/blob/33819037/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersCreateCtrl.js ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersCreateCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersCreateCtrl.js index 04ba77b..7918be0 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersCreateCtrl.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersCreateCtrl.js @@ -32,6 +32,7 @@ angular.module('ambariAdminConsole') 'Users/active': !!$scope.user.active, 'Users/admin': !!$scope.user.admin }).then(function() { + uiAlert.success('Created user ' + $scope.user.user_name); $location.path('/users'); }).catch(function(data) {; data = data.data; http://git-wip-us.apache.org/repos/asf/ambari/blob/33819037/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersShowCtrl.js ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersShowCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersShowCtrl.js index ee61cb1..4f15823 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersShowCtrl.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersShowCtrl.js @@ -109,15 +109,26 @@ angular.module('ambariAdminConsole') $scope.toggleUserActive = function() { if(!$scope.isCurrentUser){ - User.setActive($scope.user.user_name, !$scope.user.active); + ConfirmationModal.show('Change Status', 'Are you sure you want to change "'+ $scope.user.user_name +'" status?').then(function() { + User.setActive($scope.user.user_name, $scope.user.active); + }) + .catch(function() { + $scope.user.active = !$scope.user.active; + });; } }; $scope.toggleUserAdmin = function() { if(!$scope.isCurrentUser){ - User.setAdmin($scope.user.user_name, !$scope.user.admin) - .then(function() { - loadPrivilegies(); - }); + ConfirmationModal.show('Change Admin Privilege', 'Are you sure you want to change "'+$scope.user.user_name+'" Admin privilege?').then(function() { + User.setAdmin($scope.user.user_name, $scope.user.admin) + .then(function() { + loadPrivilegies(); + }); + }) + .catch(function() { + $scope.user.admin = !$scope.user.admin; + });; + } }; http://git-wip-us.apache.org/repos/asf/ambari/blob/33819037/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/uiAlert.js ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/uiAlert.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/uiAlert.js index 0856ad8..d916fc5 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/uiAlert.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/uiAlert.js @@ -29,6 +29,7 @@ angular.module('angularAlert',[]) 'left': '50%', 'z-index': '10000', 'opacity': '1', + 'padding': '20px', WebkitTransition : 'all .5s ease-in-out', MozTransition : 'all .5s ease-in-out', MsTransition : 'all .5s ease-in-out', @@ -46,9 +47,25 @@ angular.module('angularAlert',[]) } elem.addClass('alert-' + (type ? type : 'info') ); + $('<button type="button" class="close"><span aria-hidden="true">×</span><span class="sr-only">Close</span></button>') + .appendTo(elem) + .css({ + 'position': 'absolute', + 'top': '0', + 'right': '5px', + 'outline': 'none' + }).on('click', function() { + var alert = $(this).parent()[0]; + for(var i = 0; i < alerts.length; i++){ + if(alert === alerts[i][0]){ + alert.remove(); + alerts.splice(i, 1); + resetAlertsPositions(); + break; + } + } + }); elem.appendTo('body'); - - // return elem; alerts.push(elem); resetAlertsPositions(); }; http://git-wip-us.apache.org/repos/asf/ambari/blob/33819037/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html index a166c10..13c6118 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html @@ -74,6 +74,9 @@ </tfoot> </table> </accordion-group> + <div class="alert alert-info" ng-show="views && !filteredViews.length"> + No views to display. + </div> </accordion> </div> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/33819037/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html index 0d4570c..a904b01 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html @@ -30,7 +30,7 @@ </div> <div ng-hide="cluster"> - <a href="/" class="btn btn-primary btn-block createcluster-btn"> + <a href="/#/installer/step0" class="btn btn-primary btn-block createcluster-btn"> <span class="glyphicon glyphicon-plus"></span> Create a Cluster </a>
