[rhmessaging-commits] rhmessaging commits: r3839 - in mgmt/trunk/cumin: python/cumin/inventory and 1 other directories.
Author: eallen
Date: 2010-02-03 16:28:47 -0500 (Wed, 03 Feb 2010)
New Revision: 3839
Modified:
mgmt/trunk/cumin/python/cumin/grid/pool.strings
mgmt/trunk/cumin/python/cumin/grid/slot.py
mgmt/trunk/cumin/python/cumin/inventory/system.strings
mgmt/trunk/cumin/resources/slots.swf
Log:
Fixed the label position on the flash slot vis.
Restored the transition animations.
Modified: mgmt/trunk/cumin/python/cumin/grid/pool.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/grid/pool.strings 2010-02-03 18:37:21 UTC (rev 3838)
+++ mgmt/trunk/cumin/python/cumin/grid/pool.strings 2010-02-03 21:28:47 UTC (rev 3839)
@@ -69,10 +69,15 @@
function updatePoolSlotVis(id, loadType) {
var chart = cumin.getFlashChart(id);
if ((chart != null) && (typeof chart.src != "undefined")) {
- if (typeof chart.load != "undefined")
- chart.load(chart.src, false);
- else
- wooly.log("load not definded for " + id);
+ if (typeof loadType != "undefined") {
+ if (typeof chart.reload != "undefined")
+ chart.reload(chart.src, false);
+ } else {
+ if (typeof chart.load != "undefined")
+ chart.load(chart.src, false);
+ else
+ wooly.log("load not defined for " + id);
+ }
}
}
function vis_loaded(data) {
Modified: mgmt/trunk/cumin/python/cumin/grid/slot.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/grid/slot.py 2010-02-03 18:37:21 UTC (rev 3838)
+++ mgmt/trunk/cumin/python/cumin/grid/slot.py 2010-02-03 21:28:47 UTC (rev 3839)
@@ -305,8 +305,9 @@
for activityState in activityStates:
el = Element()
el.name = "slot_info"
- el.value = activityState
+ el.a_s = activityState
el.count = activityStates[activityState]
+ el.value = "%s.%s" % (records[plist[0]][groups[level-1]],
activityState) # uid
level_list.append(el)
return level_list
Modified: mgmt/trunk/cumin/python/cumin/inventory/system.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/inventory/system.strings 2010-02-03 18:37:21 UTC (rev
3838)
+++ mgmt/trunk/cumin/python/cumin/inventory/system.strings 2010-02-03 21:28:47 UTC (rev
3839)
@@ -96,10 +96,15 @@
function updateSystemSlotVis(id, loadType) {
var chart = cumin.getFlashChart(id);
if ((chart != null) && (typeof chart.src != "undefined")) {
- if (typeof chart.load != "undefined")
- chart.load(chart.src, false);
- else
- wooly.log("load not definded for " + id);
+ if (typeof loadType != "undefined") {
+ if (typeof chart.reload != "undefined")
+ chart.reload(chart.src, false);
+ } else {
+ if (typeof chart.load != "undefined")
+ chart.load(chart.src, false);
+ else
+ wooly.log("load not defined for " + id);
+ }
}
}
function vis_loaded(data) {
Modified: mgmt/trunk/cumin/resources/slots.swf
===================================================================
(Binary files differ)