[rhmessaging-commits] rhmessaging commits: r3652 - in mgmt/trunk/cumin/python/cumin: usergrid and 1 other directory.

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2009-09-28 17:27:04 -0400 (Mon, 28 Sep 2009)
New Revision: 3652

Modified:
   mgmt/trunk/cumin/python/cumin/main.py
   mgmt/trunk/cumin/python/cumin/main.strings
   mgmt/trunk/cumin/python/cumin/stat.py
   mgmt/trunk/cumin/python/cumin/usergrid/widgets.py
   mgmt/trunk/cumin/python/cumin/usergrid/widgets.strings
Log:
Change formatting for overview views

Modified: mgmt/trunk/cumin/python/cumin/main.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/main.py	2009-09-28 18:44:17 UTC (rev 3651)
+++ mgmt/trunk/cumin/python/cumin/main.py	2009-09-28 21:27:04 UTC (rev 3652)
@@ -143,9 +143,6 @@
     def __init__(self, app, name):
         super(OverviewView, self).__init__(app, name)
 
-        heading = self.Heading(app, "heading")
-        self.add_child(heading)
-
         notice = self.ManagementServerNotice(app, "notice")
         self.add_child(notice)
 

Modified: mgmt/trunk/cumin/python/cumin/main.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/main.strings	2009-09-28 18:44:17 UTC (rev 3651)
+++ mgmt/trunk/cumin/python/cumin/main.strings	2009-09-28 21:27:04 UTC (rev 3652)
@@ -15,8 +15,6 @@
 
 [OverviewView.html]
 <div class="oblock OverviewView">
-  {heading}
-
   {notice}
 
   <table>

Modified: mgmt/trunk/cumin/python/cumin/stat.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/stat.py	2009-09-28 18:44:17 UTC (rev 3651)
+++ mgmt/trunk/cumin/python/cumin/stat.py	2009-09-28 21:27:04 UTC (rev 3652)
@@ -80,12 +80,8 @@
         return list()
 
     def do_get_items(self, session):
-        items = list()
+        return zip(self.stats, self.get_values(session))
 
-        values = self.get_values(session)
-
-        return zip(self.stats, values)
-
     def render_item_title(self, session, item):
         stat, value = item
         return stat.get_title(session)

Modified: mgmt/trunk/cumin/python/cumin/usergrid/widgets.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/usergrid/widgets.py	2009-09-28 18:44:17 UTC (rev 3651)
+++ mgmt/trunk/cumin/python/cumin/usergrid/widgets.py	2009-09-28 21:27:04 UTC (rev 3652)
@@ -55,22 +55,12 @@
     def __init__(self, app, name, user):
         super(OverviewView, self).__init__(app, name)
 
-        heading = self.Heading(app, "heading")
-        self.add_child(heading)
-
         self.stats = UserJobStatSet(self.app, "jobs", user)
         self.add_child(self.stats)
 
         self.stats = UserSlotStatSet(self.app, "slots", user)
         self.add_child(self.stats)
 
-    class Heading(CuminHeading):
-        def render_title(self, session):
-            return "Overview"
-
-        def render_icon_href(self, session):
-            return "resource?name=action-36.png"
-
 class UserSubmissionSet(SubmissionSet):
     def __init__(self, app, name, user):
         super(UserSubmissionSet, self).__init__(app, name)

Modified: mgmt/trunk/cumin/python/cumin/usergrid/widgets.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/usergrid/widgets.strings	2009-09-28 18:44:17 UTC (rev 3651)
+++ mgmt/trunk/cumin/python/cumin/usergrid/widgets.strings	2009-09-28 21:27:04 UTC (rev 3652)
@@ -1,13 +1,26 @@
+[OverviewView.css]
+table.OverviewView h2 > img {
+    margin: 0 0.2em 0 0;
+    vertical-align: bottom;
+}
+
 [OverviewView.html]
-{heading}
-
-<table class="twocol">
+<table class="twocol OverviewView">
   <tbody>
     <tr>
       <td>
-        <h2>Jobs</h2>
+        <h2>
+          <img src="resource?name=job-20.png"/>
+          Jobs
+        </h2>
+
         {jobs}
-        <h2>Slots</h2>
+
+        <h2>
+          <img src="resource?name=pool-20.png"/>
+          Slots
+        </h2>
+
         {slots}
       </td>
       <td>