[richfaces-svn-commits] JBoss Rich Faces SVN: r14436 - in branches/community/3.3.X/ui/panel/src: main/templates and 1 other directories.

[richfaces-svn-commits at lists.jboss.org]

Author: konstantin.mishin
Date: 2009-06-02 10:16:31 -0400 (Tue, 02 Jun 2009)
New Revision: 14436

Modified:
   branches/community/3.3.X/ui/panel/src/main/resources/org/richfaces/renderkit/html/css/panel.xcss
   branches/community/3.3.X/ui/panel/src/main/templates/panel.jspx
   branches/community/3.3.X/ui/panel/src/test/java/org/richfaces/component/PanelComponentTest.java
Log:
RF-7297

Modified: branches/community/3.3.X/ui/panel/src/main/resources/org/richfaces/renderkit/html/css/panel.xcss
===================================================================
--- branches/community/3.3.X/ui/panel/src/main/resources/org/richfaces/renderkit/html/css/panel.xcss	2009-06-02 14:15:40 UTC (rev 14435)
+++ branches/community/3.3.X/ui/panel/src/main/resources/org/richfaces/renderkit/html/css/panel.xcss	2009-06-02 14:16:31 UTC (rev 14436)
@@ -4,13 +4,13 @@
    xmlns="http://www.w3.org/1999/xhtml" >
    <f:verbatim>
 <![CDATA[
-.dr-pnl{
+.rich-panel{
    border-width: 1px;
    border-style: solid;
    padding : 1px;
 }
    
-.dr-pnl-h{
+.rich-panel-header{
    padding : 2px;
    border-width: 1px;
    border-style: solid;
@@ -18,16 +18,16 @@
    background-repeat : repeat-x;
 }
 
-.dr-pnl-b{
+.rich-panel-body{
    padding : 10px;
 } 
 ]]>
 </f:verbatim>
-<u:selector name=".dr-pnl">
+<u:selector name=".rich-panel">
 	<u:style name="background-color" skin="generalBackgroundColor" />
 	<u:style name="border-color" skin="panelBorderColor" />
 </u:selector>
-<u:selector name=".dr-pnl-h">
+<u:selector name=".rich-panel-header">
 	<u:style name="background-color" skin="headerBackgroundColor" />
 	<u:style name="border-color" skin="headerBackgroundColor" />
 	<u:style name="font-size" skin="headerSizeFont" />
@@ -38,7 +38,7 @@
     	   <f:resource f:key="org.richfaces.renderkit.html.GradientA"/>
         </u:style>
 </u:selector>
-<u:selector name=".dr-pnl-b">
+<u:selector name=".rich-panel-body">
 	<u:style name="font-size" skin="generalSizeFont" />
 	<u:style name="color" skin="generalTextColor" />
     <u:style name="font-family" skin="generalFamilyFont" />

Modified: branches/community/3.3.X/ui/panel/src/main/templates/panel.jspx
===================================================================
--- branches/community/3.3.X/ui/panel/src/main/templates/panel.jspx	2009-06-02 14:15:40 UTC (rev 14435)
+++ branches/community/3.3.X/ui/panel/src/main/templates/panel.jspx	2009-06-02 14:16:31 UTC (rev 14436)
@@ -11,23 +11,23 @@
 
 	<f:clientid var="clientId"/>
         <h:styles>css/panel.xcss</h:styles>
-        <div id="#{clientId}" x:passThruWithExclusions="id,value,styleClass,class" class="dr-pnl rich-panel #{component.attributes['styleClass']}">
+        <div id="#{clientId}" x:passThruWithExclusions="id,value,styleClass,class" class="rich-panel #{component.attributes['styleClass']}">
 		<jsp:scriptlet>
 			<![CDATA[if(component.getFacet("header")!=null && component.getFacet("header").isRendered()) {]]>
 		</jsp:scriptlet>
-		   <div id="#{clientId}_header" class="dr-pnl-h rich-panel-header #{component.attributes['headerClass']}">
+		   <div id="#{clientId}_header" class="rich-panel-header #{component.attributes['headerClass']}">
 	              <u:insertFacet name="header" />
         	   </div>
 		<jsp:scriptlet>
 			<![CDATA[} else if (null != component.getHeader() && !"".equals(component.getHeader())) { ]]>
 		</jsp:scriptlet>
-			<div id="#{clientId}_header" class="dr-pnl-h rich-panel-header #{component.attributes['headerClass']}">
+			<div id="#{clientId}_header" class="rich-panel-header #{component.attributes['headerClass']}">
 	              #{component.attributes['header']}
         	   </div>
 		<jsp:scriptlet>
 			<![CDATA[}]]>
 		</jsp:scriptlet>
-		<div id="#{clientId}_body" class="dr-pnl-b rich-panel-body #{component.attributes['bodyClass']}">
+		<div id="#{clientId}_body" class="rich-panel-body #{component.attributes['bodyClass']}">
 			<vcp:body>
 				<f:call name="renderChildren" />
 			</vcp:body>

Modified: branches/community/3.3.X/ui/panel/src/test/java/org/richfaces/component/PanelComponentTest.java
===================================================================
--- branches/community/3.3.X/ui/panel/src/test/java/org/richfaces/component/PanelComponentTest.java	2009-06-02 14:15:40 UTC (rev 14435)
+++ branches/community/3.3.X/ui/panel/src/test/java/org/richfaces/component/PanelComponentTest.java	2009-06-02 14:16:31 UTC (rev 14436)
@@ -120,7 +120,7 @@
      */
     public void testRenderAttributes() throws Exception
     {
-    	Object[][] attributes ={{"style","xxx","style","xxx"},{"onclick","alert()","onclick","alert()"},{"styleClass","yyy","class","dr-pnl rich-panel yyy"}};
+    	Object[][] attributes ={{"style","xxx","style","xxx"},{"onclick","alert()","onclick","alert()"},{"styleClass","yyy","class","rich-panel yyy"}};
     	UIComponent text = createComponent(HtmlOutputText.COMPONENT_TYPE, HtmlOutputText.class.getName(), null, null , null);
     	htmlPanel.getFacets().put("header", text);
     	for (int i = 0; i < attributes.length; i++) {