[rhmessaging-commits] rhmessaging commits: r3977 - mgmt/newdata/cumin/python/cumin.
Author: eallen
Date: 2010-05-19 14:35:46 -0400 (Wed, 19 May 2010)
New Revision: 3977
Modified:
mgmt/newdata/cumin/python/cumin/objectframe.py
mgmt/newdata/cumin/python/cumin/objectframe.strings
Log:
Use two column of task links if there are more than 6 tasks
Modified: mgmt/newdata/cumin/python/cumin/objectframe.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/objectframe.py 2010-05-19 14:52:46 UTC (rev 3976)
+++ mgmt/newdata/cumin/python/cumin/objectframe.py 2010-05-19 18:35:46 UTC (rev 3977)
@@ -117,14 +117,33 @@
self.link = ObjectTasksLink(app, "link")
self.add_child(self.link)
- def render_links(self, session):
+ self.table_tmpl = WidgetTemplate(self, "table_html")
+
+ def do_render(self, session):
+ if len(self.frame.tasks) > 6:
+ writer = Writer()
+ self.table_tmpl.render(writer, session)
+ return writer.to_string()
+ else:
+ return super(ObjectTasks, self).do_render(session)
+
+ def render_links1(self, session):
+ return self.render_task_links(session, 0)
+
+ def render_links2(self, session):
+ return self.render_task_links(session, 6)
+
+ def render_task_links(self, session, start):
writer = Writer()
-
- for task in self.frame.tasks:
+ end = min(start + 6, len(self.frame.tasks))
+ for task in self.frame.tasks[start:end]:
writer.write(self.link.render(session, task))
return writer.to_string()
+ def render_links(self, session):
+ return self.render_task_links(session, 0)
+
class ObjectTasksLink(Link):
def render_href(self, session, task):
return task.get_href(session)
@@ -230,6 +249,10 @@
tasks = SummaryTasks(app, "tasks", self.object)
self.add_child(tasks)
+ def render_wide(self, session):
+ if len(self.frame.tasks) > 6:
+ return "wide"
+
class Attributes(SummaryAttributes):
def get_attributes(self, session):
return self.frame.summary_attributes
Modified: mgmt/newdata/cumin/python/cumin/objectframe.strings
===================================================================
--- mgmt/newdata/cumin/python/cumin/objectframe.strings 2010-05-19 14:52:46 UTC (rev
3976)
+++ mgmt/newdata/cumin/python/cumin/objectframe.strings 2010-05-19 18:35:46 UTC (rev
3977)
@@ -55,11 +55,28 @@
[ObjectAttributesEntry.html]
<tr><th>{name}</th><td>{value}</td></tr>
+[ObjectTasks.css]
+table.ObjectTasks {
+ float:right;
+}
+table.ObjectTasks td {
+ vertical-align: top;
+}
+
[ObjectTasks.html]
<ul class="{class}">
{links}
</ul>
+[ObjectTasks.table_html]
+<table class="{class}">
+ <tbody>
+ <tr><td><ul
class="{class}">{links1}</ul></td>
+ <td><ul class="{class}">{links2}</ul></td>
+ </tr>
+ </tbody>
+</table>
+
[ObjectTasksLink.html]
<li><a href="{href}">{content}</a></li>
@@ -126,6 +143,9 @@
width: 40em;
font-size: 0.9em;
}
+div.ObjectViewSummary.wide {
+ width: 55em;
+}
[ObjectView.html]
{context}
@@ -144,10 +164,10 @@
</div>
[ObjectViewSummary.html]
-<div class="{class}">
+<div class="{class} {wide}">
{tasks}
{attributes}
-</div>
+</div><div style="clear:both;"></div>
[ObjectViewContext.html]
<div class="{class}">{links}</div>