Author: sergeyhalipov Date: 2007-03-15 15:50:08 -0400 (Thu, 15 Mar 2007) New Revision: 80 Modified: trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanelBorders.js trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx Log: z-indexes were made relative. Modified: trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss =================================================================== --- trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss 2007-03-15 18:52:17 UTC (rev 79) +++ trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss 2007-03-15 19:50:08 UTC (rev 80) @@ -15,6 +15,9 @@ width: 100%; height: 100%; border-style: none; + background-color: #d0d0d0; + filter: alpha(opacity=50); + opacity: 0.5; } .dr-mpnl-mask { Modified: trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanelBorders.js =================================================================== --- trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanelBorders.js 2007-03-15 18:52:17 UTC (rev 79) +++ trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanelBorders.js 2007-03-15 19:50:08 UTC (rev 80) @@ -32,7 +32,7 @@ Event.observe(document, 'mouseup', this.boundEndDrag); this.modalPanel.cursorDiv.style.cursor = this.id.style.cursor; - this.modalPanel.cursorDiv.style.zIndex = this.modalPanel.baseZIndex + 5; + this.modalPanel.cursorDiv.style.zIndex = 8; this.modalPanel.startDrag(this); }, @@ -83,7 +83,7 @@ this.modalPanel.endDrag(this); vetoes = this.modalPanel.doResizeOrMove(ModalPanel.Sizer.Diff.EMPTY); - this.modalPanel.cursorDiv.style.zIndex = this.modalPanel.baseZIndex - 200; + this.modalPanel.cursorDiv.style.zIndex = -200; }, doPosition: function() { Modified: trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx =================================================================== --- trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-03-15 18:52:17 UTC (rev 79) +++ trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-03-15 19:50:08 UTC (rev 80) @@ -37,14 +37,14 @@ x:passThruWithExclusions="id,style,class" <div class="dr-mpnl-mask-div rich-mpnl-mask-div" id="#{clientId}Div" - style="background-color: #d0d0d0; filter: alpha(opacity=50); opacity: 0.5; z-index: #{component.zindex - 2};"></div> + style="z-index: 1;"></div> <div class="dr-mpnl-mask-div rich-mpnl-mask-div" id="#{clientId}CursorDiv" - style="background-color: #d0d0d0; filter: alpha(opacity=1); opacity: 0.01; z-index: #{component.zindex - 200 }"></div> + style="filter: alpha(opacity=1); opacity: 0.01; z-index: -200"></div> - <div id="#{clientId}CDiv" class="dr-mpnl-panel rich-mpnl_panel" style="z-index: #{component.zindex - 1};"> + <div id="#{clientId}CDiv" class="dr-mpnl-panel rich-mpnl_panel" style="z-index: 2;"> <iframe frameborder="0" scrolling="no" id="#{clientId}IFrame" - style="position: absolute; width: 100%; height: 100%; background-color: white; overflow-y: hidden; z-index: #{component.zindex - 2};"> + style="position: absolute; width: 100%; height: 100%; background-color: white; overflow-y: hidden; z-index: 1;"> </iframe> <jsp:scriptlet> @@ -57,7 +57,7 @@ String style = isHor ? "width: 40px; height: 4px;" : "height: 40px; width: 4px;"; //higher z-index for corner elements - style += "z-index: " + ((i % 3 == 1 ? 0 : 1) + component.getZindex()) + ";"; + style += "z-index: " + (i % 3 == 1 ? 0 : 1) + 3 + ";"; variables.setVariable("resizerStyle", style); ]]> </jsp:scriptlet> @@ -70,15 +70,15 @@ ]]> </jsp:scriptlet> - <div style="position: absolute; width: 100%; height: 100%; overflow: hidden; z-index: #{component.zindex - 1};" + <div style="position: absolute; width: 100%; height: 100%; overflow: hidden; z-index: 2;" class="dr-mpnl-pnl" > <table style="height: 100%; width: 100%;" border="0" cellpadding="0" cellspacing="0"> <jsp:scriptlet> <![CDATA[if(component.getFacet("header")!=null && component.getFacet("header").isRendered()) {]]> </jsp:scriptlet> - <tr style="height: 1%;"> - <td class="dr-mpnl-header rich-mpnl-header-cell" style="position: relative; vertical-align: middle; z-index: #{component.zindex + 2 }" width="100%"> - <div id="#{clientId}Header" style="position: relative;" class="dr-mpnl-pnl-text dr-mpnl-pnl-h rich-mpnl-text rich-mpnl-header #{component.attributes['headerClass']}" + <tr style="height: 1%;"> + <td class="dr-mpnl-header rich-mpnl-header-cell" style="position: relative; vertical-align: middle; z-index: 5;" width="100%"> + <div id="#{clientId}Header" style="position: relative;" class="dr-mpnl-pnl-text dr-mpnl-pnl-h rich-mpnl-text rich-mpnl-header #{component.attributes['headerClass']}" nowrap="nowrap"> <u:insertFacet name="header" /> </div>