Author: sergeyhalipov Date: 2008-02-11 09:05:40 -0500 (Mon, 11 Feb 2008) New Revision: 6006 Modified: trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx Log: http://jira.jboss.com/jira/browse/RF-1866 Modified: trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss =================================================================== --- trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss 2008-02-11 13:59:00 UTC (rev 6005) +++ trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss 2008-02-11 14:05:40 UTC (rev 6006) @@ -53,6 +53,12 @@ left: -32000px; } + .rich-mpnl-controls { + position: absolute; + top: 3px; + right: 3px; + } + </f:verbatim> <u:selector name=".dr-mpnl-spacer, .dr-mpnl-resizer"> Modified: trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx =================================================================== --- trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2008-02-11 13:59:00 UTC (rev 6005) +++ trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2008-02-11 14:05:40 UTC (rev 6006) @@ -112,27 +112,25 @@ </jsp:scriptlet> <div id="#{clientId}ContentDiv" style="position: absolute; z-index: 2; overflow: hidden; #{component.attributes['style']}" class="dr-mpnl-pnl rich-mp-content"> - + <jsp:scriptlet> + <![CDATA[if(component.getFacet("controls")!=null && component.getFacet("controls").isRendered()) {]]> + </jsp:scriptlet> + <div class="dr-mpnl-pnl-text rich-mpnl-text rich-mpnl-controls #{component.attributes['controlsClass']}"> + <u:insertFacet name="controls" /> + </div> + <jsp:scriptlet> + <![CDATA[}]]> + </jsp:scriptlet> + <table style="#{tableStyle}" 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" > - <jsp:scriptlet> - <![CDATA[if(component.getFacet("controls")!=null && component.getFacet("controls").isRendered()) {]]> - </jsp:scriptlet> - <div style="float:right; padding-top: 3px; padding-right: 3px" class="dr-mpnl-pnl-text rich-mpnl-text rich-mpnl-controls #{component.attributes['controlsClass']}"> - <u:insertFacet name="controls" /> - </div> - <jsp:scriptlet> - <![CDATA[}]]> - </jsp:scriptlet> - <div id="#{clientId}Header" style="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> - </td> </tr> <jsp:scriptlet>