[rhmessaging-commits] rhmessaging commits: r3439 - mgmt/trunk/cumin/python/cumin/messaging.

[rhmessaging-commits at lists.jboss.org]

Author: eallen
Date: 2009-06-09 16:23:15 -0400 (Tue, 09 Jun 2009)
New Revision: 3439

Modified:
   mgmt/trunk/cumin/python/cumin/messaging/queue.py
   mgmt/trunk/cumin/python/cumin/messaging/queue.strings
Log:
Truncate the Queue Name column at the browser instead of in code.

Modified: mgmt/trunk/cumin/python/cumin/messaging/queue.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/messaging/queue.py	2009-06-09 20:22:39 UTC (rev 3438)
+++ mgmt/trunk/cumin/python/cumin/messaging/queue.py	2009-06-09 20:23:15 UTC (rev 3439)
@@ -111,7 +111,7 @@
         def render_content(self, session):
             return "Remove"
 
-    class NameColumn(SqlTableColumn):
+    class NameColumn(ClientTruncateColumn):
         def render_title(self, session, data):
             return "Name"
 
@@ -119,7 +119,7 @@
             queue = Identifiable(data["id"])
             href = self.page.main.messaging.broker.queue.get_href \
                 (session, queue)
-            return fmt_link(href, fmt_shorten(data["name"]))
+            return fmt_link(href, data["name"], link_title=data["name"])
 
     class ConsumersColumn(SqlTableColumn):
         def render_title(self, session, data):
@@ -191,7 +191,7 @@
         col.alignment = "right"
         self.add_column(col)
 
-    class NameColumn(TopTableColumn):
+    class NameColumn(TopClientTruncateColumn):
         def render_title(self, session, data):
             return "Name"
 
@@ -199,13 +199,11 @@
             broker = Identifiable(data["broker_id"])
             queue = Identifiable(data["id"])
 
-            big = self.parent.get_fullpage(session)
             branch = session.branch()
             self.page.main.messaging.broker.object.set(branch, broker)
             self.page.main.messaging.broker.queue.object.set(branch, queue)
             self.page.main.messaging.broker.queue.show(branch)
-            name = big and data["name"] or fmt_shorten(data["name"])
-            return fmt_link(branch.marshal(), name)
+            return fmt_link(branch.marshal(), data["name"], link_title=data["name"])
 
     class EnqueuesColumn(TopTableColumn):
         def render_title(self, session, data):

Modified: mgmt/trunk/cumin/python/cumin/messaging/queue.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/messaging/queue.strings	2009-06-09 20:22:39 UTC (rev 3438)
+++ mgmt/trunk/cumin/python/cumin/messaging/queue.strings	2009-06-09 20:23:15 UTC (rev 3439)
@@ -35,29 +35,34 @@
 {sql_where}
 
 [QueueSet.html]
-<form id="{id}" method="post" action="?" update="{id}.table">
+<form id="{id}" method="post" action="?">
   <ul class="actions">
     <li><a class="nav" href="{add_queue_url}">Add New Queue</a></li>
   </ul>
   <div class="rfloat">{phase}</div>
   {unit}
 
-  <div class="sactions">
-    <h2>Act on Selected Queues:</h2>
-    {purge} {remove}
-  </div>
-  <table id="{id}.table" class="mobjects">
-    <thead>
-      <tr>
-        <th class="setnav" colspan="{column_count}">
-          <div class="rfloat">{page}</div>
-          {count}
-        </th>
-      </tr>
-      <tr>{headers}</tr>
-    </thead>
-    <tbody>{items}</tbody>
-  </table>
+    <div class="sactions">
+      <h2>Act on Selected Queues:</h2>
+      {purge} {remove}
+    </div>
+    <table class="mobjects">
+      <thead>
+        <tr>
+          <th class="setnav">
+            <div class="rfloat">{page}</div>
+            {count}
+          </th>
+        </tr>
+        </thead>
+    </table>
+    <table class="mobjects{extra_class}">
+      <thead>
+        <tr>{headers}</tr>
+      </thead>
+      <tbody>{items}</tbody>
+    </table>
+
   <div>{hidden_inputs}</div>
 </form>