Author: A.Skokov Date: 2007-05-15 10:17:36 -0400 (Tue, 15 May 2007) New Revision: 766 Modified: trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx Log: http://jira.jboss.com/jira/browse/RF-181 fixed Modified: trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx =================================================================== --- trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-05-15 13:42:18 UTC (rev 765) +++ trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-05-15 14:17:36 UTC (rev 766) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<f:template - xmlns:f="http:/jsf.exadel.com/template" - xmlns:c=" http://java.sun.com/jsf/core" +<f:template + xmlns:f="http:/jsf.exadel.com/template" + xmlns:c=" http://java.sun.com/jsf/core" xmlns:ui=" http://ajax4jsf.org/cdk/ui" xmlns:u=" http://ajax4jsf.org/cdk/u" xmlns:x=" http://ajax4jsf.org/cdk/x" @@ -9,9 +9,9 @@ xmlns:vcp=" http://ajax4jsf.org/cdk/vcp" class="org.richfaces.renderkit.html.ModalPanelRenderer" baseclass="org.richfaces.renderkit.ModalPanelRendererBase" - component="org.richfaces.component.UIModalPanel" + component="org.richfaces.component.UIModalPanel" - + <h:styles> /org/richfaces/renderkit/html/css/modalPanel.xcss </h:styles> @@ -19,43 +19,43 @@ new org.ajax4jsf.framework.resource.PrototypeScript(), /org/richfaces/renderkit/html/scripts/utils.js, /org/richfaces/renderkit/html/scripts/modalPanel.js, - /org/richfaces/renderkit/html/scripts/modalPanelBorders.js, + /org/richfaces/renderkit/html/scripts/modalPanelBorders.js, /org/richfaces/renderkit/html/scripts/browser_info.js </h:scripts> - + <f:clientid var="clientId"/> - + <div id="#{clientId}" style="display: none;" - + <f:call name="checkOptions" /> - + <div id="#{clientId}Container" style="position: absolute; display: none; z-index: #{component.zindex};" class="rich-modalpanel" x:passThruWithExclusions="id,style,class" - <div class="dr-mpnl-mask-div rich-mpnl-mask-div" id="#{clientId}Div" + <div class="dr-mpnl-mask-div rich-mpnl-mask-div" id="#{clientId}Div" style="z-index: 1;"></div> - <div class="dr-mpnl-mask-div rich-mpnl-mask-div" id="#{clientId}CursorDiv" + <div class="dr-mpnl-mask-div rich-mpnl-mask-div" id="#{clientId}CursorDiv" style="filter: alpha(opacity=1); opacity: 0.01; z-index: -200"></div> - + <div id="#{clientId}CDiv" class="dr-mpnl-panel rich-mpnl_panel" style="width: 1px; height: 1px; z-index: 2;"> - + <jsp:scriptlet> <![CDATA[ if (component.isResizeable()) { for (int i = 0; i < RESIZERS.length; i++) { - variables.setVariable("resizer", RESIZERS[i]); - + variables.setVariable("resizer", RESIZERS[i]); + boolean isHor = i / 3 % 2 == 0; 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) + 3 + ";"; variables.setVariable("resizerStyle", style); - ]]> + ]]> </jsp:scriptlet> <div id="#{clientId}Resizer#{resizer}" class="dr-mpnl-resizer rich-mpnl-resizer" style="#{resizerStyle}"> </div> @@ -63,26 +63,25 @@ <![CDATA[ } } - ]]> + ]]> </jsp:scriptlet> - - <div id="#{clientId}ShadowDiv" class="dr-mpnl-shadow rich-mpnl-shadow" - style="#{component.shadowStyle}" > - </div> - + + <div id="#{clientId}ShadowDiv" class="dr-mpnl-shadow rich-mpnl-shadow" + style="#{component.shadowStyle}" > + </div> + <div style="position: absolute; overflow: hidden; z-index: 2;" class="dr-mpnl-pnl" id="#{clientId}ContentDiv"> <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%;"> + <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"> + <div id="#{clientId}Header" style="position: relative; white-space: nowrap;" class="dr-mpnl-pnl-text dr-mpnl-pnl-h rich-mpnl-text rich-mpnl-header #{component.attributes['headerClass']}"> <u:insertFacet name="header" /> </div> - + <jsp:scriptlet> <![CDATA[if(component.getFacet("controls")!=null && component.getFacet("controls").isRendered()) {]]> </jsp:scriptlet> @@ -107,28 +106,28 @@ </table> </div> </div> - + <f:clientid var="clientId"/> - + <script type="text/javascript"> - new ModalPanel('#{clientId}', + new ModalPanel('#{clientId}', { width: #{component.width}, height: #{component.height}, - + minWidth: #{component.minWidth}, minHeight: #{component.minHeight}, - + resizeable: #{component.resizeable}, moveable: #{component.moveable}, - + left: "#{component.left}", top: "#{component.top}", - + zindex: #{component.zindex} }); </script> </div> </div> - + </f:template> \ No newline at end of file