|
From: <sv...@ze...> - 2008-06-03 19:10:33
|
Author: ian
Date: 2008-06-03 14:45:21 -0400 (Tue, 03 Jun 2008)
New Revision: 9402
Modified:
branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/dialogmacros.pt
branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/javascript/zenoss-utils.js
Log:
* Backported r9357 into the branch
Modified: branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/dialogmacros.pt
===================================================================
--- branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/dialogmacros.pt 2008-06-03 18:43:30 UTC (rev 9401)
+++ branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/dialogmacros.pt 2008-06-03 18:45:21 UTC (rev 9402)
@@ -1,7 +1,7 @@
<!--============Basic dialog box wrapper===============-->
<tal:block metal:define-macro="dialog">
<div id="dialog" class="dialog" style="visibility:hidden;position:absolute">
-<div id="dialog_innercontent" style="visibility:visible">
+<div id="dialog_innercontent">
<tal:block metal:define-slot="dialog_content">
This is a dialog box.
</tal:block>
Modified: branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/javascript/zenoss-utils.js
===================================================================
--- branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/javascript/zenoss-utils.js 2008-06-03 18:43:30 UTC (rev 9401)
+++ branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/javascript/zenoss-utils.js 2008-06-03 18:45:21 UTC (rev 9402)
@@ -919,9 +919,10 @@
setStyle(this.box, {
'position':'absolute',
'z-index':'5001',
- 'visibility':'visible',
'display':'none'});
+ setStyle('dialog_innercontent', {'visibility':'visible'});
setStyle('dialog_content', {'visibility':'visible'});
+ setStyle(this.box, {'visibility':'visible'});
},
addLoadEvent: function(id, func) {
if (!(id in this.loadEvents)) this.loadEvents[id] = [];
|