Author: pyaschenko Date: 2009-06-02 10:23:20 -0400 (Tue, 02 Jun 2009) New Revision: 14441 Modified: branches/community/3.3.X/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss branches/community/3.3.X/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js branches/community/3.3.X/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx branches/community/3.3.X/ui/modal-panel/src/test/java/org/richfaces/component/ModalPanelComponentTest.java Log: https://jira.jboss.org/jira/browse/RF-7298 Modified: branches/community/3.3.X/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss =================================================================== --- branches/community/3.3.X/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss 2009-06-02 14:21:38 UTC (rev 14440) +++ branches/community/3.3.X/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss 2009-06-02 14:23:20 UTC (rev 14441) @@ -5,16 +5,16 @@ xmlns="http://www.w3.org/1999/xhtml"> <f:verbatim> - .dr-mpnl-ovf-hd { + .rich-mpnl-ovf-hd { overflow: hidden; } - .dr-mpnl-trim { + .rich-mpnl-trim { position: relative; z-index: 0; } - .dr-mpnl-iframe { + .rich-mpnl-iframe { position: absolute; left: 0px; top: 0px; @@ -23,7 +23,7 @@ z-index: -1; } - .dr-mpnl-mask-div { + .rich-mpnl-mask-div { position: fixed; top: 0; left: 0; @@ -36,20 +36,16 @@ background-color: #d0d0d0; } - .dr-mpnl-mask-div-opaque { + .rich-mpnl-mask-div-opaque { filter: alpha(opacity=50); opacity: 0.5; } - .dr-mpnl-mask-div-transparent { + .rich-mpnl-mask-div-transparent { background-color: transparent; } - - .dr-mpnl-mask { - - } - .dr-mpnl-panel { + .rich-mpnl-panel { position: fixed; margin: 0px; padding: 0px; @@ -59,7 +55,7 @@ top: 0px; } - .dr-mpnl-resizer { + .rich-mpnl-resizer { line-height: 1px; font-size: 1px; position: absolute; @@ -68,14 +64,14 @@ opacity: 0.5;*/ } - .dr-mpnl-header { + .rich-mpnl-header-cell { height: 20px; width: 100%; vertical-align: middle; z-index: 5; } - .dr-mpnl-pnl-button { + .rich-mpnl-button { outline-style: none; position: absolute; border: 10px solid red; @@ -101,7 +97,7 @@ } </f:verbatim> - <u:selector name=".dr-mpnl-spacer, .dr-mpnl-resizer"> + <u:selector name=".rich-mpnl-spacer, .rich-mpnl-resizer"> <u:style name="background-image"> <f:resource f:key="/org/richfaces/renderkit/html/images/spacer.gif"/> </u:style> @@ -109,14 +105,14 @@ <f:verbatim> <![CDATA[ -.dr-mpnl-pnl { +.rich-mpnl-content { border-width: 1px; border-style: solid; padding : 1px; background-color: inherit; } -.dr-mpnl-pnl-h{ +.rich-mpnl-header{ padding : 2px; border-width: 1px; border-style: solid; @@ -124,11 +120,11 @@ background-repeat : repeat-x; } -.dr-mpnl-pnl-b{ +.rich-mpnl-body{ padding : 10px; } -.dr-mpnl-shadow { +.rich-mpnl-shadow { position: absolute; height: 100%; width: 100%; @@ -141,11 +137,11 @@ ]]> </f:verbatim> -<u:selector name=".dr-mpnl-pnl"> +<u:selector name=".rich-mpnl-content"> <u:style name="background-color" skin="generalBackgroundColor" /> <u:style name="border-color" skin="panelBorderColor" /> </u:selector> -<u:selector name=".dr-mpnl-pnl-h"> +<u:selector name=".rich-mpnl-header"> <u:style name="background-color" skin="headerBackgroundColor" /> <u:style name="border-color" skin="headerBackgroundColor" /> <u:style name="background-image" > @@ -155,20 +151,20 @@ </u:selector> -<u:selector name=".dr-mpnl-pnl-text"> +<u:selector name=".rich-mpnl-text"> <u:style name="font-size" skin="headerSizeFont" /> <u:style name="color" skin="headerTextColor" /> <u:style name="font-weight" skin="headerWeightFont" /> <u:style name="font-family" skin="headerFamilyFont" /> </u:selector> -<u:selector name=".dr-mpnl-pnl-b"> +<u:selector name=".rich-mpnl-body"> <u:style name="font-size" skin="generalSizeFont" /> <u:style name="color" skin="generalTextColor" /> <u:style name="font-family" skin="generalFamilyFont" /> </u:selector> -<u:selector name=".dr-mpnl-shadow"> +<u:selector name=".rich-mpnl-shadow"> <u:style name="background-color" skin="shadowBackgroundColor" /> </u:selector> Modified: branches/community/3.3.X/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js =================================================================== --- branches/community/3.3.X/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2009-06-02 14:21:38 UTC (rev 14440) +++ branches/community/3.3.X/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2009-06-02 14:23:20 UTC (rev 14441) @@ -539,7 +539,7 @@ this.iframe = this.id.id + "IFrame"; new Insertion.Top(eCdiv, "<iframe src=\"javascript:''\" frameborder=\"0\" scrolling=\"no\" id=\"" + this.iframe + "\" " + - "class=\"dr-mpnl-iframe\" style=\"width: 1px; height: 1px;\">" + + "class=\"rich-mpnl-iframe\" style=\"width: 1px; height: 1px;\">" + "</iframe>"); eIframe = $(this.iframe); Modified: branches/community/3.3.X/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx =================================================================== --- branches/community/3.3.X/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2009-06-02 14:21:38 UTC (rev 14440) +++ branches/community/3.3.X/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2009-06-02 14:23:20 UTC (rev 14441) @@ -39,7 +39,7 @@ class="rich-modalpanel #{component.attributes['styleClass']}" x:passThruWithExclusions="id,style,class,styleClass" - <div class="dr-mpnl-mask-div dr-mpnl-mask-div-opaque rich-mpnl-mask-div" id="#{clientId}Div" + <div class="rich-mpnl-mask-div rich-mpnl-mask-div-opaque" id="#{clientId}Div" style="z-index: 1;" onclick="#{component.attributes['onmaskclick']}" ondblclick="#{component.attributes['onmaskdblclick']}" @@ -50,13 +50,13 @@ onmouseover="#{component.attributes['onmaskmouseover']}" onmouseout="#{component.attributes['onmaskmouseout']}"> - <button class="dr-mpnl-pnl-button" id="#{clientId}FirstHref"></button> + <button class="rich-mpnl-button" id="#{clientId}FirstHref"></button> </div> - <div class="dr-mpnl-panel rich-mpnl_panel" > + <div class="rich-mpnl_panel" > <div id="#{clientId}CDiv" style="position: absolute; left: 0px; top: 0px; z-index: 9;" class="rich-mp-container"> - <div id="#{clientId}ShadowDiv" class="dr-mpnl-shadow rich-mpnl-shadow" + <div id="#{clientId}ShadowDiv" class="rich-mpnl-shadow" style="#{component.shadowStyle}" > </div> @@ -90,23 +90,23 @@ /* overflow: hidden; */ - divClass = "dr-mpnl-ovf-hd"; + divClass = "rich-mpnl-ovf-hd"; if (component.isTrimOverlayedElements()) { /* position: relative; z-index: 0; */ - divClass += " dr-mpnl-trim"; + divClass += " rich-mpnl-trim"; } } ]]> </jsp:scriptlet> - <div id="#{clientId}ContentDiv" style="#{component.attributes['style']}" class="#{divClass} dr-mpnl-pnl rich-mp-content"> + <div id="#{clientId}ContentDiv" style="#{component.attributes['style']}" class="#{divClass} rich-mpnl-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']}"> + <div class="rich-mpnl-text rich-mpnl-controls #{component.attributes['controlsClass']}"> <u:insertFacet name="controls" /> </div> <jsp:scriptlet> @@ -118,8 +118,8 @@ <![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" > - <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']}"> + <td class="rich-mpnl-header-cell" > + <div id="#{clientId}Header" style="white-space: nowrap;" class="rich-mpnl-text rich-mpnl-header #{component.attributes['headerClass']}"> <u:insertFacet name="header" /> </div> </td> @@ -128,7 +128,7 @@ <![CDATA[}]]> </jsp:scriptlet> <tr style="height: 99%"> - <td class="dr-mpnl-pnl-b rich-mpnl-body" valign="top"> + <td class="rich-mpnl-body" valign="top"> <vcp:body> <f:call name="renderChildren" /> </vcp:body> @@ -152,7 +152,7 @@ variables.setVariable("resizerStyle", style); ]]> </jsp:scriptlet> - <div id="#{clientId}Resizer#{resizer}" class="dr-mpnl-resizer rich-mpnl-resizer" style="#{resizerStyle}"> + <div id="#{clientId}Resizer#{resizer}" class="rich-mpnl-resizer" style="#{resizerStyle}"> </div> <jsp:scriptlet> <![CDATA[ @@ -163,10 +163,10 @@ </div> </div> - <div class="dr-mpnl-mask-div dr-mpnl-mask-div-transparent rich-mpnl-mask-div" id="#{clientId}CursorDiv" + <div class="rich-mpnl-mask-div rich-mpnl-mask-div-transparent" id="#{clientId}CursorDiv" style="z-index: -200;"> - <button class="dr-mpnl-pnl-button" id="#{clientId}LastHref"></button> + <button class="rich-mpnl-button" id="#{clientId}LastHref"></button> </div> <script type="text/javascript"> Modified: branches/community/3.3.X/ui/modal-panel/src/test/java/org/richfaces/component/ModalPanelComponentTest.java =================================================================== --- branches/community/3.3.X/ui/modal-panel/src/test/java/org/richfaces/component/ModalPanelComponentTest.java 2009-06-02 14:21:38 UTC (rev 14440) +++ branches/community/3.3.X/ui/modal-panel/src/test/java/org/richfaces/component/ModalPanelComponentTest.java 2009-06-02 14:23:20 UTC (rev 14441) @@ -117,12 +117,11 @@ HtmlElement htmlContentDiv = renderedView.getHtmlElementById(modalPanel.getClientId(facesContext) + "ContentDiv"); assertNotNull(htmlContentDiv); - assertTrue(htmlContentDiv.getAttributeValue("class").contains("rich-mp-content")); + assertTrue(htmlContentDiv.getAttributeValue("class").contains("rich-mpnl-content")); HtmlElement header = renderedView.getHtmlElementById(modalPanel.getClientId(facesContext) + "Header"); assertNotNull(header); - assertTrue(header.getAttributeValue("class").contains("dr-mpnl-pnl-text dr-mpnl-pnl-h")); assertTrue(header.getAttributeValue("class").contains("rich-mpnl-text")); assertTrue(header.getAttributeValue("class").contains("rich-mpnl-header")); @@ -131,7 +130,7 @@ for (int i = 0; i < resizers.length; i++) { HtmlElement resizer = renderedView.getHtmlElementById(modalPanel.getClientId(facesContext) + "Resizer" + resizers[i]); assertNotNull(resizer); - assertTrue(resizer.getAttributeValue("class").contains("dr-mpnl-resizer rich-mpnl-resizer")); + assertTrue(resizer.getAttributeValue("class").contains("rich-mpnl-resizer")); } }