r5229 - in trunk/cumin/python/cumin: grid inventory

Author: croberts
Date: 2012-02-24 19:31:11 +0000 (Fri, 24 Feb 2012)
New Revision: 5229

Modified:
   trunk/cumin/python/cumin/grid/slot.strings
   trunk/cumin/python/cumin/inventory/system.py
   trunk/cumin/python/cumin/inventory/system.strings
Log:
Addressing BZ 772105 by adjusting the HTML and CSS for the display of the slotvis and
legend on the Inventory-> System page.

Modified: trunk/cumin/python/cumin/grid/slot.strings
===================================================================
--- trunk/cumin/python/cumin/grid/slot.strings	2012-02-24 19:26:56 UTC (rev 5228)
+++ trunk/cumin/python/cumin/grid/slot.strings	2012-02-24 19:31:11 UTC (rev 5229)
@@ -369,7 +369,7 @@
     background-image: url(resource?name=shade1.png);
 }
 div.SlotLegend {
-    margin: 0 0 0 8em;
+    margin: 0 0 0 2em;
     width: 12em;
 }
 div.SlotLegend dl {

Modified: trunk/cumin/python/cumin/inventory/system.py
===================================================================
--- trunk/cumin/python/cumin/inventory/system.py	2012-02-24 19:26:56 UTC (rev 5228)
+++ trunk/cumin/python/cumin/inventory/system.py	2012-02-24 19:31:11 UTC (rev 5229)
@@ -267,10 +267,10 @@
         return sess.marshal()
 
     def render_slot_chart_width(self, session):
-        return 400
+        return 250
 
     def render_slot_chart_height(self, session):
-        return 400
+        return 250
 
 class SystemSlotMapPage(SlotMapPage):
     def __init__(self, app, name):

Modified: trunk/cumin/python/cumin/inventory/system.strings
===================================================================
--- trunk/cumin/python/cumin/inventory/system.strings	2012-02-24 19:26:56 UTC (rev 5228)
+++ trunk/cumin/python/cumin/inventory/system.strings	2012-02-24 19:31:11 UTC (rev 5229)
@@ -49,12 +49,26 @@
     visibility: hidden;
 }
 
+.system_slot_legend {
+	float: right;
+	width: 150px;
+}
+
+.system_slot_vis {
+	float: left;
+	width: 250px;
+}
+
 [SystemSlotFlashVis.html]
 <div id="SystemSlotFlashVis">
   <h2>Slots</h2>
-    <div class="StatValueChart" id="{id}">
-      <div id="{id}_chart"></div>
-      {slot_legend}
+    <div class="StatValueChart SlotVisChart {fullpageable}"
id="{id}">
+      <h2>{title}</h2>
+      <div class="slot_visualization">
+            <div class="system_slot_vis"
id="{id}_chart"></div>
+			<div class="slot_legend system_slot_legend">{slot_legend}</div>

+      </div>
+      <div style="clear:both;"></div>      
     </div>
 </div>
 <script type="text/javascript">