Author: amarkhel
Date: 2010-09-21 15:46:37 -0400 (Tue, 21 Sep 2010)
New Revision: 19297
Modified:
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panel.ecss
trunk/ui/output/ui/src/main/templates/panel.template.xml
trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/PanelRendererTest.java
Log:
RF-9297
Modified:
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panel.ecss
===================================================================
---
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panel.ecss 2010-09-21
19:46:09 UTC (rev 19296)
+++
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panel.ecss 2010-09-21
19:46:37 UTC (rev 19297)
@@ -6,7 +6,7 @@
padding:1px;
}
-.rf-p-hr{
+.rf-p-hdr{
background-color:'#{richSkin.headerBackgroundColor}';
border-color:'#{richSkin.headerBackgroundColor}';
font-size:'#{richSkin.headerSizeFont}';
Modified: trunk/ui/output/ui/src/main/templates/panel.template.xml
===================================================================
--- trunk/ui/output/ui/src/main/templates/panel.template.xml 2010-09-21 19:46:09 UTC (rev
19296)
+++ trunk/ui/output/ui/src/main/templates/panel.template.xml 2010-09-21 19:46:37 UTC (rev
19297)
@@ -17,13 +17,13 @@
<div cdk:passThroughWithExclusions="id,value,styleClass,class"
id="#{clientId}" class="rf-p
#{component.attributes['styleClass']}">
<c:choose>
<c:when test="#{component.getFacet('header') != null and
component.getFacet('header').rendered}">
- <div id="#{clientId}_header" class="rf-p-hr
#{component.attributes['headerClass']}">
+ <div id="#{clientId}_header" class="rf-p-hdr
#{component.attributes['headerClass']}">
<!-- <cc:renderFacet name="header" />-->
<cdk:call expression="renderHeaderFacet(facesContext, component)"
/>
</div>
</c:when>
<c:when test="#{component.attributes['header']!= null and not
component.attributes['header'].equals('')}">
- <div id="#{clientId}_header" class="rf-p-hr
#{component.attributes['headerClass']}">
+ <div id="#{clientId}_header" class="rf-p-hdr
#{component.attributes['headerClass']}">
#{component.attributes['header']}
</div>
</c:when>
Modified:
trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/PanelRendererTest.java
===================================================================
---
trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/PanelRendererTest.java 2010-09-21
19:46:09 UTC (rev 19296)
+++
trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/PanelRendererTest.java 2010-09-21
19:46:37 UTC (rev 19297)
@@ -130,7 +130,7 @@
assertNotNull(nestedPanelContainer.getElementById("nestedPanelContainer_header"));
assertEquals("||||",
nestedPanelContainer.getElementById("nestedPanelContainer_header").getTextContent().trim());
HtmlElement nestedPanelContainerHeader =
page.getElementById("nestedPanelContainer_header");
- assertEquals("rf-p-hr outpanelHeader",
nestedPanelContainerHeader.getAttribute("class"));
+ assertEquals("rf-p-hdr outpanelHeader",
nestedPanelContainerHeader.getAttribute("class"));
assertEquals("Benefits of Usin", nestedPanelContainer
.getElementById("nestedPanelContainer_body")
.getTextContent().trim().substring(0, 16));