You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2017/05/18 14:01:43 UTC
[02/24] ambari git commit: AMBARI-21034. Ambari 3.0: Outstanding
Cluster admin issues (alexantonenko)
AMBARI-21034. Ambari 3.0: Outstanding Cluster admin issues (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7799fb76
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7799fb76
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7799fb76
Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 7799fb76c892c793803233a859f2b94b0b46d9e8
Parents: b333912
Author: Alex Antonenko <hi...@gmail.com>
Authored: Tue May 16 18:45:08 2017 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Tue May 16 23:53:37 2017 +0300
----------------------------------------------------------------------
.../resources/ui/admin-web/app/views/main.html | 50 +++++++++++++++-----
ambari-web/app/messages.js | 2 +-
2 files changed, 40 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7799fb76/ambari-admin/src/main/resources/ui/admin-web/app/views/main.html
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/main.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/main.html
index d62ae15..3bdb80e 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/main.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/main.html
@@ -18,51 +18,79 @@
<div class="panel panel-default mainpage">
<div class="panel-body">
<h1>{{'main.title' | translate}}</h1>
+
<div ng-if="isLoaded" id="main-operations-boxes" class="row thumbnails">
<p ng-hide="cluster">{{'main.noClusterDescription' | translate}}</p>
+
<p ng-show="cluster">{{'main.hasClusterDescription' | translate}}</p>
- <!--Clusters-->
+ <!--Clusters-->
<div ng-show="cluster" class="col-sm-11 thumbnail">
<h4 class="title">{{'main.operateCluster.title' | translate}}</h4>
+
<div class="description">{{'main.operateCluster.description' | translate}}</div>
<div class="glyphicon glyphicon-cloud"></div>
<div class="buttons">
<span ng-class="{active: isActive('clusters.manageAccess')}">
- <a ng-show="cluster.Clusters.provisioning_state != 'INSTALLED'" href class="btn btn-primary permission-button" ng-disabled="cluster.Clusters.provisioning_state != 'INSTALLED' ">{{'main.operateCluster.manageRoles' | translate}}</a>
- <a ng-show="cluster.Clusters.provisioning_state == 'INSTALLED'" href="#/clusters/{{cluster.Clusters.cluster_name}}/userAccessList" class="btn btn-primary permission-button" ng-disabled="cluster.Clusters.provisioning_state != 'INSTALLED' ">{{'main.operateCluster.manageRoles' | translate}}</a>
+ <a ng-show="cluster.Clusters.provisioning_state != 'INSTALLED'" href class="btn btn-primary permission-button"
+ ng-disabled="cluster.Clusters.provisioning_state != 'INSTALLED' ">{{'main.operateCluster.manageRoles' |
+ translate}}</a>
+ <a ng-show="cluster.Clusters.provisioning_state == 'INSTALLED'"
+ href="#/clusters/{{cluster.Clusters.cluster_name}}/userAccessList"
+ class="btn btn-primary permission-button"
+ ng-disabled="cluster.Clusters.provisioning_state != 'INSTALLED' ">{{'main.operateCluster.manageRoles' |
+ translate}}</a>
</span>
<span>
- <a ng-show="cluster.Clusters.provisioning_state != 'INSTALLED'" href class="btn btn-primary go-dashboard-button" ng-disabled="cluster.Clusters.provisioning_state != 'INSTALLED' ">{{'common.goToDashboard' | translate}}</a>
- <a ng-show="cluster.Clusters.provisioning_state == 'INSTALLED'" href="{{fromSiteRoot('/#/main/dashboard/metrics')}}" class="btn btn-primary go-dashboard-button" ng-disabled="cluster.Clusters.provisioning_state != 'INSTALLED' ">{{'common.goToDashboard' | translate}}</a>
+ <a ng-show="cluster.Clusters.provisioning_state != 'INSTALLED'" href
+ class="btn btn-primary go-dashboard-button"
+ ng-disabled="cluster.Clusters.provisioning_state != 'INSTALLED' ">{{'common.goToDashboard' |
+ translate}}</a>
+ <a ng-show="cluster.Clusters.provisioning_state == 'INSTALLED'"
+ href="{{fromSiteRoot('/#/main/dashboard/metrics')}}" class="btn btn-primary go-dashboard-button"
+ ng-disabled="cluster.Clusters.provisioning_state != 'INSTALLED' ">{{'common.goToDashboard' |
+ translate}}</a>
</span>
</div>
</div>
<div ng-hide="cluster" class="col-sm-11 thumbnail">
<h4 class="title">{{'main.createCluster.title' | translate}}</h4>
+
<div class="description">{{'main.createCluster.description' | translate}}</div>
<div class="glyphicon glyphicon-cloud"></div>
- <div class="buttons"> <a href="{{fromSiteRoot('/#/installer/step0')}}" class="btn btn-primary create-cluster-button">{{'main.createCluster.launchInstallWizard' | translate}}</a></div>
+ <div class="buttons"><a href="{{fromSiteRoot('/#/installer/step0')}}"
+ class="btn btn-primary create-cluster-button">{{'main.createCluster.launchInstallWizard'
+ | translate}}</a></div>
</div>
- <!--Manage Users and groups-->
+ <!--Manage Users and groups-->
<div class="col-sm-5 thumbnail">
<h4 class="title">{{'main.manageUsersAndGroups.title' | translate}}</h4>
+
<div class="description">{{'main.manageUsersAndGroups.description' | translate}}</div>
<div class="glyphicon glyphicon-user"></div>
<div class="buttons">
- <span ng-class="{active: isActive('users.list')}"><link-to route="users.list" class="btn btn-primary userslist-button">{{'common.users' | translate}}</link-to></span>
- <span ng-class="{active: isActive('groups.list')}"><link-to route="groups.list" class="btn btn-primary groupslist-button">{{'common.groups' | translate}}</link-to></span>
+ <span ng-class="{active: isActive('users.list')}"><link-to route="users.list"
+ class="btn btn-primary userslist-button">
+ {{'common.users' | translate}}
+ </link-to></span>
+ <span ng-class="{active: isActive('groups.list')}"><link-to route="groups.list"
+ class="btn btn-primary groupslist-button">
+ {{'common.groups' | translate}}
+ </link-to></span>
</div>
</div>
- <!--Deploy Views-->
+ <!--Deploy Views-->
<div class="col-sm-5 thumbnail">
<h4 class="title">{{'main.deployViews.title' | translate}}</h4>
+
<div class="description">{{'main.deployViews.description' | translate}}</div>
<div class="glyphicon glyphicon-th"></div>
- <div ng-class="{active: isActive('views.list')}" class="buttons"><link-to route="views.list" class="btn btn-primary viewslist-button">{{'common.views' | translate}}</link-to></div>
+ <div ng-class="{active: isActive('views.list')}" class="buttons">
+ <link-to route="views.list" class="btn btn-primary viewslist-button">{{'common.views' | translate}}</link-to>
</div>
</div>
+ </div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7799fb76/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 8f8d981..b8e7728 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -3165,7 +3165,7 @@ Em.I18n.translations = {
'menu.item.dashboard':'Dashboard',
'menu.item.services':'Services',
'menu.item.hosts':'Hosts',
- 'menu.item.admin':'Admin',
+ 'menu.item.admin':'Cluster Admin',
'menu.item.alerts': 'Alerts',
'menu.item.views':'<i class="glyphicon glyphicon-th"></i>',
'menu.item.views.noViews':'No Views',