[richfaces-svn-commits] JBoss Rich Faces SVN: r19298 - in trunk/ui/output/ui/src: main/templates and 1 other directories.

Author: amarkhel Date: 2010-09-21 15:47:10 -0400 (Tue, 21 Sep 2010) New Revision: 19298 Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.ecss trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.js trunk/ui/output/ui/src/main/templates/popupPanel.template.xml trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/PopupRendererTest.java Log: RF-9300 Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.ecss =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.ecss 2010-09-21 19:46:37 UTC (rev 19297) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.ecss 2010-09-21 19:47:10 UTC (rev 19298) @@ -1,4 +1,4 @@ -.rf-pp-b { +.rf-pp-btn { outline-style: none; position: absolute; clip: rect(0px 0px 1px 1px); @@ -11,7 +11,7 @@ filter: 'alpha(opacity \5C 3D 10)'; } -.rf-pp-sh { +.rf-pp-shade { position: fixed; width: 100%; height: 100%; @@ -22,18 +22,18 @@ filter: 'alpha(opacity \5C 3D 50)'; } -.rf-pp-shw { +.rf-pp-shdw { background-color: #000000; opacity: 0.1; filter: 'alpha(opacity \5C 3D 10)'; } -.rf-pp-cr { +.rf-pp-cntr { border : '1px solid #{richSkin.panelBorderColor}'; background : '#{richSkin.generalBackgroundColor}'; z-index:100; } -.rf-pp-h { +.rf-pp-hdr { background : "url(#{resource['org.richfaces.renderkit.html.GradientA']})"; repeat-x : 'top left #{richSkin.headerBackgroundColor}'; position : relative; @@ -41,7 +41,7 @@ cursor : move; padding : 2px; } -.rf-pp-h-ct { +.rf-pp-hdr-�nt { overflow : hidden; white-space : nowrap; text-overflow: ellipsis; @@ -52,7 +52,7 @@ padding : 2px; padding-left : 10px; } -.rf-pp-h-cs { +.rf-pp-hdr-cntrls { position : absolute; top : 2px; right : 2px; @@ -65,20 +65,20 @@ z-index:100; } -.rf-pp-ct-sr { +.rf-pp-cnt-scrlr { position : relative; top : 0px; left : 0px; overflow : auto; } -.rf-pp-ct { +.rf-pp-cnt { position : relative; padding : 10px; color : '#{richSkin.generalTextColor}'; font-family : '#{richSkin.generalFamilyFont}'; font-size : '#{richSkin.generalSizeFont}'; } -.rf-pp-hr { +.rf-pp-hndlr { background : red; opacity:0; position : absolute; @@ -86,7 +86,7 @@ filter : 'alpha(opacity \5C 3D 0)'; } -.rf-pp-hr-l { +.rf-pp-hndlr-l { width : 7px; height : 100%; top : 0px; @@ -94,7 +94,7 @@ cursor : w-resize; } -.rf-pp-hr-r { +.rf-pp-hndlr-r { width : 7px; height : 100%; top : 0px; @@ -102,7 +102,7 @@ cursor : w-resize; } -.rf-pp-if { +.rf-pp-ifr { position: absolute; left: 0px; top: 0px; @@ -111,14 +111,14 @@ z-index: -1; } -.rf-pp-hr-t { +.rf-pp-hndlr-t { width : 100%; height : 7px; top : 0px; left : 0px; cursor : n-resize; } -.rf-pp-hr-b { +.rf-pp-hndlr-b { width : 100%; height : 7px; bottom : 0px; @@ -126,28 +126,28 @@ cursor : n-resize; } -.rf-pp-hr-tl { +.rf-pp-hndlr-tl { width : 10px; height : 10px; top : 0px; left : 0px; cursor : nw-resize; } -.rf-pp-hr-tr { +.rf-pp-hndlr-tr { width : 10px; height : 10px; top : 0px; right : 0px; cursor : ne-resize; } -.rf-pp-hr-bl { +.rf-pp-hndlr-bl { width : 10px; height : 10px; bottom : 0px; left : 0px; cursor : ne-resize; } -.rf-pp-hr-br { +.rf-pp-hndlr-br { width : 10px; height : 10px; bottom : 0px; Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.js =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.js 2010-09-21 19:46:37 UTC (rev 19297) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.js 2010-09-21 19:47:10 UTC (rev 19298) @@ -320,7 +320,7 @@ if (this.options.overlapEmbedObjects && !this.iframe) { this.iframe = this.markerId + "IFrame"; $("<iframe src=\"javascript:''\" frameborder=\"0\" scrolling=\"no\" id=\"" + this.iframe + "\" " + - "class=\"rf-pp-if\" style=\"width:" +this.options.width + "px; height:" + this.options.height + "px;\">" + + "class=\"rf-pp-ifr\" style=\"width:" +this.options.width + "px; height:" + this.options.height + "px;\">" + "</iframe>").insertBefore($(':first-child', this.cdiv)[0]); eIframe = $(richfaces.getDomElement(this.iframe)); Modified: trunk/ui/output/ui/src/main/templates/popupPanel.template.xml =================================================================== --- trunk/ui/output/ui/src/main/templates/popupPanel.template.xml 2010-09-21 19:46:37 UTC (rev 19297) +++ trunk/ui/output/ui/src/main/templates/popupPanel.template.xml 2010-09-21 19:47:10 UTC (rev 19298) @@ -24,49 +24,49 @@ onmousedown="#{component.attributes['onmaskmousedown']}" onmousemove="#{component.attributes['onmaskmousemove']}" onmouseover="#{component.attributes['onmaskmouseover']}" - onmouseout="#{component.attributes['onmaskmouseout']}" class="rf-pp-sh"> - <button class="rf-pp-b" id="#{clientId}FirstHref"></button> + onmouseout="#{component.attributes['onmaskmouseout']}" class="rf-pp-shade"> + <button class="rf-pp-btn" id="#{clientId}FirstHref"></button> </div> </c:if> - <div id="#{clientId}_shadow" style="position: #{component.attributes['followByScroll'] ? 'fixed' : 'absolute'};" class="rf-pp-shw"/> - <div id="#{clientId}_container" style="position: #{component.attributes['followByScroll'] ? 'fixed' : 'absolute'};" cdk:passThroughWithExclusions="id style class styleClass" class="rf-pp-cr #{component.attributes['styleClass']}"> + <div id="#{clientId}_shadow" style="position: #{component.attributes['followByScroll'] ? 'fixed' : 'absolute'};" class="rf-pp-shdw"/> + <div id="#{clientId}_container" style="position: #{component.attributes['followByScroll'] ? 'fixed' : 'absolute'};" cdk:passThroughWithExclusions="id style class styleClass" class="rf-pp-cntr #{component.attributes['styleClass']}"> <c:if test="#{component.getFacet('header')!=null and component.getFacet('header').rendered}"> - <div id="#{clientId}_header" class="rf-pp-h #{component.attributes['headerClass']}" > - <div id="#{clientId}_header_content" class="rf-pp-h-ct"> + <div id="#{clientId}_header" class="rf-pp-hdr #{component.attributes['headerClass']}" > + <div id="#{clientId}_header_content" class="rf-pp-hdr-сnt"> <cdk:call expression="renderHeaderFacet(facesContext, component)"/> </div> </div> </c:if> <c:if test="#{component.attributes['header'] != null and (component.getFacet('header')==null or !component.getFacet('header').rendered)}"> - <div id="#{clientId}_header" class="rf-pp-h #{component.attributes['headerClass']}" > - <div id="#{clientId}_header_content" class="rf-pp-h-ct"> + <div id="#{clientId}_header" class="rf-pp-hdr #{component.attributes['headerClass']}" > + <div id="#{clientId}_header_content" class="rf-pp-hdr-сnt"> #{component.attributes['header']} </div> </div> </c:if> <c:if test="#{component.getFacet('controls')!=null and component.getFacet('controls').rendered}"> - <div id="#{clientId}_header_controls" class="rf-pp-h-cs #{component.attributes['controlsClass']}"> + <div id="#{clientId}_header_controls" class="rf-pp-hdr-cntrls #{component.attributes['controlsClass']}"> <cdk:call expression="renderControlsFacet(facesContext, component)"/> </div> </c:if> - <div id="#{clientId}_content_scroller" style="#{getStyleIfTrimmed(component)}" class="rf-pp-ct-sr"> - <div id="#{clientId}_content" class="rf-pp-ct" style="#{component.attributes['style']}"> + <div id="#{clientId}_content_scroller" style="#{getStyleIfTrimmed(component)}" class="rf-pp-cnt-scrlr"> + <div id="#{clientId}_content" class="rf-pp-cnt" style="#{component.attributes['style']}"> <cdk:call expression="renderChildren(facesContext, component)"/> </div> </div> <c:if test="#{component.attributes['resizeable']}"> - <div id="#{clientId}ResizerW" class="rf-pp-hr rf-pp-hr-l"></div> - <div id="#{clientId}ResizerE" class="rf-pp-hr rf-pp-hr-r"></div> - <div id="#{clientId}ResizerN" class="rf-pp-hr rf-pp-hr-t"></div> + <div id="#{clientId}ResizerW" class="rf-pp-hndlr rf-pp-hndlr-l"></div> + <div id="#{clientId}ResizerE" class="rf-pp-hndlr rf-pp-hndlr-r"></div> + <div id="#{clientId}ResizerN" class="rf-pp-hndlr rf-pp-hndlr-t"></div> - <div id="#{clientId}ResizerS" class="rf-pp-hr rf-pp-hr-b"></div> - <div id="#{clientId}ResizerNW" class="rf-pp-hr rf-pp-hr-tl"></div> - <div id="#{clientId}ResizerNE" class="rf-pp-hr rf-pp-hr-tr"></div> - <div id="#{clientId}ResizerSW" class="rf-pp-hr rf-pp-hr-bl"></div> - <div id="#{clientId}ResizerSE" class="rf-pp-hr rf-pp-hr-br"></div> + <div id="#{clientId}ResizerS" class="rf-pp-hndlr rf-pp-hndlr-b"></div> + <div id="#{clientId}ResizerNW" class="rf-pp-hndlr rf-pp-hndlr-tl"></div> + <div id="#{clientId}ResizerNE" class="rf-pp-hndlr rf-pp-hndlr-tr"></div> + <div id="#{clientId}ResizerSW" class="rf-pp-hndlr rf-pp-hndlr-bl"></div> + <div id="#{clientId}ResizerSE" class="rf-pp-hndlr rf-pp-hndlr-br"></div> </c:if> </div> Modified: trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/PopupRendererTest.java =================================================================== --- trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/PopupRendererTest.java 2010-09-21 19:46:37 UTC (rev 19297) +++ trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/PopupRendererTest.java 2010-09-21 19:47:10 UTC (rev 19298) @@ -89,30 +89,30 @@ assertNotNull(panelWithFacet); assertEquals("visibility: hidden;", panelWithFacet.getAttribute("style")); HtmlElement panelShade = panelWithFacet.getElementById("panel_shade"); - assertEquals("rf-pp-sh", panelShade.getAttribute("class")); + assertEquals("rf-pp-shade", panelShade.getAttribute("class")); assertNotNull(panelShade); HtmlElement panelShadow = panelWithFacet.getElementById("panel_shadow"); - assertEquals("rf-pp-shw", panelShadow.getAttribute("class")); + assertEquals("rf-pp-shdw", panelShadow.getAttribute("class")); assertNotNull(panelShadow); HtmlElement panelContainer = panelWithFacet.getElementById("panel_container"); assertNotNull(panelContainer); - assertEquals("rf-pp-cr panelStyle", panelContainer.getAttribute("class")); + assertEquals("rf-pp-cntr panelStyle", panelContainer.getAttribute("class")); HtmlElement panelScroller = panelWithFacet.getElementById("panel_content_scroller"); assertNotNull(panelScroller); - assertEquals("rf-pp-ct-sr", panelScroller.getAttribute("class")); + assertEquals("rf-pp-cnt-scrlr", panelScroller.getAttribute("class")); HtmlElement panelContent = panelWithFacet.getElementById("panel_content"); assertNotNull(panelContent); - assertEquals("rf-pp-ct", panelContent.getAttribute("class")); + assertEquals("rf-pp-cnt", panelContent.getAttribute("class")); assertEquals("The CDK includes", panelContent .getTextContent().trim().substring(0, 16)); HtmlElement panelHeader = panelWithFacet.getElementById("panel_header"); assertNotNull(panelHeader); - assertEquals("rf-pp-h header", panelHeader.getAttribute("class")); + assertEquals("rf-pp-hdr header", panelHeader.getAttribute("class")); //assertEquals("cursor: move;", panelHeader.getAttribute("style")); assertEquals("Write your own custom rich components with built-in AJAX", panelHeader.getTextContent().trim()); HtmlElement panelResizer = panelWithFacet.getElementById("panelResizerN"); assertNotNull(panelResizer); - assertEquals("rf-pp-hr rf-pp-hr-t", panelResizer.getAttribute("class")); + assertEquals("rf-pp-hndlr rf-pp-hndlr-t", panelResizer.getAttribute("class")); assertEquals("cursor: N-resize;", panelResizer.getAttribute("style")); List<HtmlElement> result = page.getElementsByName("script"); HtmlElement button = panelWithFacet.getElementById("button");