YARN-8271. [UI2] Improve labeling of certain tables. Contributed by Yesha Vora.
This commit is contained in:
parent
f3f544b004
commit
89d0b87ad3
|
@ -23,7 +23,7 @@ export default Ember.Controller.extend({
|
|||
text: "Home",
|
||||
routeName: 'application'
|
||||
}, {
|
||||
text: "Yarn Tools",
|
||||
text: "YARN Tools",
|
||||
routeName: 'yarn-tools',
|
||||
}],
|
||||
});
|
||||
|
|
|
@ -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);
|
||||
});
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)}}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue