You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2016/05/20 17:33:41 UTC
ambari git commit: AMBARI-16795. Ambari Admin: UX cleanup +
consistency (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk f1acbe381 -> d818782d8
AMBARI-16795. Ambari Admin: UX cleanup + consistency (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d818782d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d818782d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d818782d
Branch: refs/heads/trunk
Commit: d818782d87aeb937840e8a045b02e4582099c4d3
Parents: f1acbe3
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Fri May 20 20:32:54 2016 +0300
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Fri May 20 20:33:31 2016 +0300
----------------------------------------------------------------------
.../controllers/clusters/UserAccessListCtrl.js | 2 +-
.../resources/ui/admin-web/app/scripts/i18n.config.js | 8 ++++----
.../ui/admin-web/app/scripts/services/View.js | 4 ++--
.../main/resources/ui/admin-web/app/styles/main.css | 14 ++++++--------
.../ui/admin-web/app/views/ambariViews/edit.html | 9 ++++-----
.../admin-web/app/views/clusters/userAccessList.html | 8 +++-----
6 files changed, 20 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d818782d/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js
index 894f02d..19fb971 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/UserAccessListCtrl.js
@@ -97,7 +97,7 @@ function($scope, $location, Cluster, $modal, $rootScope, $routeParams, Permissio
} else {
return angular.copy($scope.NONE_ROLE);
}
- }
+ };
$scope.loadRoles = function() {
Cluster.getPermissions().then(function(data) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/d818782d/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
index 02af3aa..2d51ece 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
@@ -206,7 +206,7 @@ angular.module('ambariAdminConsole')
'shortUrl':'Short URL',
'instanceDescription': 'Instance Description',
'clusterConfiguration': 'Cluster Configuration',
- 'localCluster': 'Local Ambari Managed Cluster',
+ 'localCluster': 'Local Cluster',
'remoteCluster': 'Remote Cluster',
'registerRemoteCluster' : 'Register Remote Cluster',
'clusterName': 'Cluster Name',
@@ -231,7 +231,7 @@ angular.module('ambariAdminConsole')
'allclusteruser': 'Cluster User',
'allserviceadministrator': 'Service Administrator',
'allserviceoperator': 'Service Operator',
- 'infoMessage': 'Grant <strong>Use</strong> permission for the following <strong>{{cluster}}</strong>',
+ 'infoMessage': 'Grant <strong>Use</strong> permission for the following <strong>{{cluster}}</strong> Roles:',
'nonLocalClusterMessage': 'The ability to inherit view <strong>Use</strong> permission based on Cluster Roles is only available when using a Local Cluster configuration.'
},
@@ -347,7 +347,7 @@ angular.module('ambariAdminConsole')
'clusterOperator': 'Cluster Operator',
'serviceAdministrator': 'Service Administrator',
'serviceOperator': 'Service Operator',
- 'ambariAdmin': 'Administrator',
+ 'ambariAdmin': 'Ambari Administrator',
'viewUser': 'View User',
'none': 'None',
'oneRolePerUser': 'Only 1 role allowed per user'
@@ -511,4 +511,4 @@ angular.module('ambariAdminConsole')
});
$translateProvider.preferredLanguage('en');
-}]);
\ No newline at end of file
+}]);
http://git-wip-us.apache.org/repos/asf/ambari/blob/d818782d/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/View.js
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/View.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/View.js
index dfe7ba8..bdee427 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/View.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/View.js
@@ -194,9 +194,9 @@ angular.module('ambariAdminConsole')
View.clusterInheritedPermissionKeys = [
"ALL.CLUSTER.ADMINISTRATOR",
"ALL.CLUSTER.OPERATOR",
- "ALL.CLUSTER.USER",
"ALL.SERVICE.OPERATOR",
- "ALL.SERVICE.ADMINISTRATOR"
+ "ALL.SERVICE.ADMINISTRATOR",
+ "ALL.CLUSTER.USER"
];
View.getInstance = function(viewName, version, instanceName) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/d818782d/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css b/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css
index b15c5ae..4434908 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css
@@ -1584,10 +1584,6 @@ thead.view-permission-header > tr > th {
width: 40%;
}
-.role-actions {
- width: 400px;
-}
-
.green-icon {
color: #5ab400;
}
@@ -1685,11 +1681,13 @@ legend {
}
.cluster-inherited-permission {
- border-bottom: 2px solid #ddd;
- padding-bottom: 10px;
- margin-top: 5px;
+ border-bottom: 2px solid #ddd;
+ padding-bottom: 10px;
+ padding-left: 8px;
+ margin-top: 5px;
+ margin-bottom: 5px;
}
.glyphicon-question-sign {
color: #0572ff;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d818782d/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html
index a0bd138..05544d2 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html
@@ -274,13 +274,12 @@
</tr>
</tbody>
</table>
+ <div class="cluster-inherited-permission">
+ <strong>{{'views.clusterPermissions.label' | translate}}</strong>
+ </div>
<div ng-show="!isPermissionsEmpty && (data.clusterType == 'LOCAL_AMBARI') && editConfigurationDisabled">
- <div class="col-sm-12 cluster-inherited-permission">
- <strong>{{'views.clusterPermissions.label' | translate}}</strong>
- </div>
<div class="col-sm-12">
<span translate="views.clusterPermissions.infoMessage" translate-values="{cluster: cluster}"></span>
- <div>{{'common.roles' | translate}}:</div>
</div>
<div class="col-sm-offset-2 col-sm-10">
<div class="checkbox col-sm-12" ng-repeat="key in clusterInheritedPermissionKeys">
@@ -300,4 +299,4 @@
<div class="alert alert-info">{{'views.alerts.notDefined' | translate: '{term: constants.perms}'}}</div>
</div>
</div>
-</div>
\ No newline at end of file
+</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d818782d/ambari-admin/src/main/resources/ui/admin-web/app/views/clusters/userAccessList.html
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/clusters/userAccessList.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/clusters/userAccessList.html
index 708e68a..c0f6144 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/clusters/userAccessList.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/clusters/userAccessList.html
@@ -50,7 +50,7 @@
</button>
</div>
</th>
- <th colspan="2">
+ <th>
<label for="">{{'clusters.role' | translate}}</label>
<i class="glyphicon glyphicon-question-sign green-icon cursor-pointer" ng-click="showHelpPage()"></i>
<select class="form-control statusfilter"
@@ -71,16 +71,14 @@
<select class="role-select" ng-show="user.editable" ng-model="user.permission_name"
ng-options="role.permission_name as role.permission_label for role in roleValueOptions">
</select>
- </td>
- <td class="role-actions">
- <div class="pull-left" ng-show="user.permission_name != user.original_perm">
+ <span ng-show="user.permission_name != user.original_perm">
<button class="btn btn-default btn-xs cancel" ng-click="cancel(user)">
<span class="glyphicon glyphicon-remove cancel"></span>
</button>
<button class="btn btn-primary btn-xs" ng-click="save(user)">
<span class="glyphicon glyphicon-ok"></span>
</button>
- </div>
+ </span>
</td>
</tr>
</tbody>