YARN-8271. [UI2] Improve labeling of certain tables. Contributed by Yesha Vora.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/89d0b87a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/89d0b87a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/89d0b87a Branch: refs/heads/HDDS-4 Commit: 89d0b87ad324db09f14e00031d20635083d576ed Parents: f3f544b Author: Sunil G <sun...@apache.org> Authored: Mon May 14 20:59:31 2018 +0530 Committer: Sunil G <sun...@apache.org> Committed: Mon May 14 20:59:31 2018 +0530 ---------------------------------------------------------------------- .../hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools.js | 2 +- .../hadoop-yarn-ui/src/main/webapp/app/helpers/node-menu.js | 4 ++-- .../src/main/webapp/app/templates/cluster-overview.hbs | 4 ++-- .../src/main/webapp/app/templates/components/node-menu-panel.hbs | 4 ++-- .../app/templates/components/yarn-queue/capacity-queue-info.hbs | 2 +- .../app/templates/components/yarn-queue/capacity-queue.hbs | 2 +- .../app/templates/components/yarn-queue/fair-queue-info.hbs | 2 +- .../webapp/app/templates/components/yarn-queue/fair-queue.hbs | 2 +- .../hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools.hbs | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/89d0b87a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools.js index b36098b..cb0c8d3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools.js @@ -23,7 +23,7 @@ export default Ember.Controller.extend({ text: "Home", routeName: 'application' }, { - text: "Yarn Tools", + text: "YARN Tools", routeName: 'yarn-tools', }], }); http://git-wip-us.apache.org/repos/asf/hadoop/blob/89d0b87a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-menu.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-menu.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-menu.js index e1eba5a..ace50e6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-menu.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-menu.js @@ -56,11 +56,11 @@ export default Ember.Helper.helper(function(params,hash) { html = html + ' class="active"'; } html = html + '><a href="#/yarn-node-apps/' + hash.nodeId + '/' + hash.nodeAddr + - '">List of Applications</a></li><li'; + '">List of Applications on this Node</a></li><li'; if (hash.path === 'yarn-node-containers') { html = html + ' class="active"'; } html = html + '><a href="#/yarn-node-containers/' +hash.nodeId + '/' + hash.nodeAddr + - '">List of Containers</a></li></ul></ul></div>'; + '">List of Containers on this Node</a></li></ul></ul></div>'; return Ember.String.htmlSafe(html); }); http://git-wip-us.apache.org/repos/asf/hadoop/blob/89d0b87a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/cluster-overview.hbs ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/cluster-overview.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/cluster-overview.hbs index ff4682a..e7752ea 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/cluster-overview.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/cluster-overview.hbs @@ -58,7 +58,7 @@ <div class="col-lg-4 container-fluid"> <div class="panel panel-default"> <div class="panel-heading"> - Finished Apps + Finished Apps From All Users </div> <div class="container-fluid" id="finishedapps-donut-chart"> {{donut-chart data=model.clusterMetrics.firstObject.getFinishedAppsDataForDonutChart @@ -74,7 +74,7 @@ <div class="col-lg-4 container-fluid"> <div class="panel panel-default"> <div class="panel-heading"> - Running Apps + Running Apps From All Users </div> <div class="container-fluid" id="runningapps-donut-chart"> {{donut-chart data=model.clusterMetrics.firstObject.getRunningAppsDataForDonutChart http://git-wip-us.apache.org/repos/asf/hadoop/blob/89d0b87a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/node-menu-panel.hbs ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/node-menu-panel.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/node-menu-panel.hbs index acdff2f..ba48952 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/node-menu-panel.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/node-menu-panel.hbs @@ -29,11 +29,11 @@ {{/link-to}} {{/link-to}} {{#link-to 'yarn-node-apps' tagName="li"}} - {{#link-to 'yarn-node-apps' nodeId encodedAddr}}List of Applications + {{#link-to 'yarn-node-apps' nodeId encodedAddr}}List of Applications on this Node {{/link-to}} {{/link-to}} {{#link-to 'yarn-node-containers' tagName="li"}} - {{#link-to 'yarn-node-containers' nodeId encodedAddr}}List of Containers + {{#link-to 'yarn-node-containers' nodeId encodedAddr}}List of Containers on this Node {{/link-to}} {{/link-to}} {{#if (and nmGpuInfo nmGpuInfo.info.totalGpuDevices)}} http://git-wip-us.apache.org/repos/asf/hadoop/blob/89d0b87a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue-info.hbs ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue-info.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue-info.hbs index a7260bc..11fed76 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue-info.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue-info.hbs @@ -20,7 +20,7 @@ <div class="col-lg-6"> <div class="panel panel-default"> <div class="panel-heading"> - Running Apps: {{model.selected}} + Running Apps From All Users: {{model.selected}} </div> <div id="numapplications-donut-chart"> {{donut-chart data=model.selectedQueue.numOfApplicationsDonutChartData http://git-wip-us.apache.org/repos/asf/hadoop/blob/89d0b87a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue.hbs ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue.hbs index 9ad2a6f..6615b1d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue.hbs @@ -35,7 +35,7 @@ {{yarn-queue-partition-capacity-labels partitionMap=model.selectedQueue.partitionMap queue=model.selectedQueue filteredPartition=filteredPartition}} </div> - <h5> Running Apps </h5> + <h5> Running Apps From All Users in Queue </h5> <div id="numapplications-donut-chart"> {{donut-chart data=model.selectedQueue.numOfApplicationsDonutChartData showLabels=true http://git-wip-us.apache.org/repos/asf/hadoop/blob/89d0b87a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-info.hbs ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-info.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-info.hbs index a770bfe..3e368ae 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-info.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-info.hbs @@ -51,7 +51,7 @@ <div class="col-lg-6 container-fluid"> <div class="panel panel-default"> <div class="panel-heading"> - Running Apps: {{model.selected}} + Running Apps From All Users: {{model.selected}} </div> <div class="container-fluid" id="numapplications-donut-chart"> {{donut-chart data=model.selectedQueue.numOfApplicationsDonutChartData http://git-wip-us.apache.org/repos/asf/hadoop/blob/89d0b87a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue.hbs ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue.hbs index dcc80c1..85670da 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue.hbs @@ -50,7 +50,7 @@ <div class="container-fluid"> <div class="panel panel-default"> <div class="panel-heading"> - Running Apps: {{model.selected}} + Running Apps From All Users: {{model.selected}} </div> <div class="container-fluid" id="numapplications-donut-chart"> {{donut-chart data=model.selectedQueue.numOfApplicationsDonutChartData http://git-wip-us.apache.org/repos/asf/hadoop/blob/89d0b87a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools.hbs ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools.hbs index 2f618fd..3efcf57 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools.hbs @@ -67,7 +67,7 @@ <div class="col-lg-4 container-fluid"> <div class="panel panel-default"> <div class="panel-heading"> - Finished Apps + Finished Apps From All Users </div> <div class="container-fluid" id="finishedapps-donut-chart"> {{donut-chart data=model.clusterMetrics.firstObject.getFinishedAppsDataForDonutChart @@ -84,7 +84,7 @@ <div class="col-lg-4 container-fluid"> <div class="panel panel-default"> <div class="panel-heading"> - Running Apps + Running Apps From All Users </div> <div class="container-fluid" id="runningapps-donut-chart"> {{donut-chart data=model.clusterMetrics.firstObject.getRunningAppsDataForDonutChart --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
