Author: eallen
Date: 2011-04-06 19:10:26 +0000 (Wed, 06 Apr 2011)
New Revision: 4690
Modified:
trunk/cumin/python/cumin/grid/scheduler.py
trunk/cumin/python/cumin/grid/scheduler.strings
Log:
Rename radio button to Performance
Remove the text stats
Put rates in separate graph
Modified: trunk/cumin/python/cumin/grid/scheduler.py
===================================================================
--- trunk/cumin/python/cumin/grid/scheduler.py 2011-04-05 19:44:12 UTC (rev 4689)
+++ trunk/cumin/python/cumin/grid/scheduler.py 2011-04-06 19:10:26 UTC (rev 4690)
@@ -168,18 +168,18 @@
self.add_child(charts)
chart = self.TitledChart(app, "submitted", scheduler)
- chart.title = "Submitted"
- chart.stats = ("JobsSubmitted", "JobSubmissionRate",
"JobsSubmittedCum")
+ chart.title = "Submitted/started/completed"
+ chart.stats = ("JobsSubmitted", "JobsStarted",
"JobsCompleted")
charts.add_child(chart)
chart = self.TitledChart(app, "started", scheduler)
- chart.title = "Started"
- chart.stats = ("JobsStarted", "JobStartRate",
"JobsStartedCum")
+ chart.title = "Rates"
+ chart.stats = ("JobSubmissionRate", "JobStartRate",
"JobCompletionRate")
charts.add_child(chart)
chart = self.TitledChart(app, "completed", scheduler)
- chart.title = "Completed"
- chart.stats = ("JobsCompleted", "JobCompletionRate",
"JobsCompletedCum")
+ chart.title = "Cumulative"
+ chart.stats = ("JobsSubmittedCum", "JobsStartedCum",
"JobsCompletedCum")
charts.add_child(chart)
chart = self.TitledChart(app, "exited", scheduler)
@@ -203,7 +203,7 @@
charts.add_child(chart)
def render_title(self, session):
- return "Job start stats"
+ return "Performance"
class TitledChart(StatFlashChart):
def __init__(self, app, name, scheduler):
Modified: trunk/cumin/python/cumin/grid/scheduler.strings
===================================================================
--- trunk/cumin/python/cumin/grid/scheduler.strings 2011-04-05 19:44:12 UTC (rev 4689)
+++ trunk/cumin/python/cumin/grid/scheduler.strings 2011-04-06 19:10:26 UTC (rev 4690)
@@ -14,27 +14,19 @@
</table>
[SchedulerOverviewCycle.css]
-table.SchedulerOverviewCycle ul.WidgetSet {
+div.SchedulerOverviewCycle ul.WidgetSet {
padding: 0;
margin: 0;
list-style: none;
}
-table.SchedulerOverviewCycle ul.WidgetSet li {
+div.SchedulerOverviewCycle ul.WidgetSet li {
display: inline;
+ float: left;
}
[SchedulerOverviewCycle.html]
-<table class="SchedulerOverviewCycle twocol">
- <tbody>
- <tr>
- <td>
- {stats}
- </td>
- <td>
- {charts}
- </td>
- </tr>
- </tbody>
-</table>
-
+<div class="{class}">
+ {charts}
+</div>
+<div style="clear:both;"></div>
Show replies by date