Author: eallen
Date: 2011-02-28 19:36:14 +0000 (Mon, 28 Feb 2011)
New Revision: 4561
Modified:
trunk/cumin/python/cumin/grid/negotiator.py
trunk/cumin/python/cumin/grid/scheduler.py
trunk/cumin/python/cumin/grid/slot.py
trunk/cumin/python/cumin/grid/slot.strings
Log:
Remove the checkboxes from some tables that don't need them
Modified: trunk/cumin/python/cumin/grid/negotiator.py
===================================================================
--- trunk/cumin/python/cumin/grid/negotiator.py 2011-02-25 20:10:28 UTC (rev 4560)
+++ trunk/cumin/python/cumin/grid/negotiator.py 2011-02-28 19:36:14 UTC (rev 4561)
@@ -3,7 +3,7 @@
from cumin.objectframe import ObjectFrame, ObjectFrameTask,\
ObjectFrameTaskFeedbackForm
from cumin.objectselector import ObjectSelector, ObjectLinkColumn,\
- MonitorSelfStatColumn
+ MonitorSelfStatColumn, ObjectTable
from wooly import Widget, Attribute, Parameter
from parsley.stringex import rpartition
from cumin.parameters import RosemaryObjectParameter
@@ -53,6 +53,11 @@
self.enable_csv_export(pool)
+ def create_table(self, app, name, cls):
+ # avoid the checkboxes
+ return ObjectTable(app, name, cls)
+
+
class GroupHelper(Widget):
def __init__(self, app, name, negotiator):
super(GroupHelper, self).__init__(app, name)
Modified: trunk/cumin/python/cumin/grid/scheduler.py
===================================================================
--- trunk/cumin/python/cumin/grid/scheduler.py 2011-02-25 20:10:28 UTC (rev 4560)
+++ trunk/cumin/python/cumin/grid/scheduler.py 2011-02-28 19:36:14 UTC (rev 4561)
@@ -106,6 +106,10 @@
self.enable_csv_export(pool)
+ def create_table(self, app, name, cls):
+ # avoid the checkboxes
+ return ObjectTable(app, name, cls)
+
class SchedulerGeneralStatSet(StatSet):
def __init__(self, app, name, object):
super(SchedulerGeneralStatSet, self).__init__(app, name, object)
Modified: trunk/cumin/python/cumin/grid/slot.py
===================================================================
--- trunk/cumin/python/cumin/grid/slot.py 2011-02-25 20:10:28 UTC (rev 4560)
+++ trunk/cumin/python/cumin/grid/slot.py 2011-02-28 19:36:14 UTC (rev 4561)
@@ -35,6 +35,10 @@
self.enable_csv_export(pool)
+ def create_table(self, app, name, cls):
+ # avoid the checkboxes
+ return ObjectTable(app, name, cls)
+
class SlotFrame(ObjectFrame):
def __init__(self, app, name):
cls = app.model.com_redhat_grid.Slot
@@ -336,6 +340,7 @@
el = Element()
el.name = "slot_info"
el.category = category_group
+ el.category_group = category_group
el.count = category_groups[category_group]["_count"]
el.value = "%s.%s" %
(records[plist[0]][groups[level-1]], category_group) # uid
level_list.append(el)
Modified: trunk/cumin/python/cumin/grid/slot.strings
===================================================================
--- trunk/cumin/python/cumin/grid/slot.strings 2011-02-25 20:10:28 UTC (rev 4560)
+++ trunk/cumin/python/cumin/grid/slot.strings 2011-02-28 19:36:14 UTC (rev 4561)
@@ -409,14 +409,14 @@
</div>
[SlotLegend.item_html]
- <dt>{category}</dt>
+ <dt onmouseover="vis_treemap_over('category_group',
'{category}')" onmouseout="vis_treemap_out('category_group',
'{category}')">{category}</dt>
{category_items}
[SlotCategories.html]
{items}
[SlotCategories.item_html]
-<dd onmouseover="vis_treemap_over('{item_title}')"
onmouseout="vis_treemap_out('{item_title}')">
+<dd onmouseover="vis_treemap_over('category',
'{item_title}')" onmouseout="vis_treemap_out('category',
'{item_title}')">
<img src="{item_href}" width="{item_size}"
height="{item_size}" title="{item_title}"
alt="{item_title}"/>
{item_title}