[richfaces-svn-commits] JBoss Rich Faces SVN: r14457 - in branches/community/3.3.X/ui/panelbar/src: main/templates and 1 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Wed Jun 3 11:46:18 EDT 2009
Author: konstantin.mishin
Date: 2009-06-03 11:46:18 -0400 (Wed, 03 Jun 2009)
New Revision: 14457
Modified:
branches/community/3.3.X/ui/panelbar/src/main/resources/org/richfaces/renderkit/html/css/panelbar.xcss
branches/community/3.3.X/ui/panelbar/src/main/templates/panelBar.jspx
branches/community/3.3.X/ui/panelbar/src/main/templates/panelBarItem.jspx
branches/community/3.3.X/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java
Log:
RF-7300
Modified: branches/community/3.3.X/ui/panelbar/src/main/resources/org/richfaces/renderkit/html/css/panelbar.xcss
===================================================================
--- branches/community/3.3.X/ui/panelbar/src/main/resources/org/richfaces/renderkit/html/css/panelbar.xcss 2009-06-03 15:17:23 UTC (rev 14456)
+++ branches/community/3.3.X/ui/panelbar/src/main/resources/org/richfaces/renderkit/html/css/panelbar.xcss 2009-06-03 15:46:18 UTC (rev 14457)
@@ -4,33 +4,33 @@
xmlns="http://www.w3.org/1999/xhtml" >
<f:verbatim><![CDATA[
-.dr-pnlbar{
+.rich-panelbar{
border : 1px solid;
padding : 1px;
}
-.dr-pnlbar-int{
+.rich-panelbar-interior {
border-bottom : 0px !important;
}
-.dr-pnlbar-h{
+.rich-panelbar-header{
border : 0px solid red;
padding : 0px 1px 1px 5px;
cursor : pointer;
}
-.dr-pnlbar-h-act{
+.rich-panelbar-header-act{
border : 0px solid red;
padding : 0px 1px 1px 5px;
cursor : pointer;
}
-.dr-pnlbar-c{
+.rich-panelbar-content{
padding : 10px;
text-align : left;
vertical-align : top;
}
-.dr-pnlbar-b{
+.rich-panelbar-b{
border-top-width: 0px !important;
border-left-width: 0px !important;
border-right-width: 0px !important;
@@ -39,11 +39,11 @@
]]></f:verbatim>
-<u:selector name=".dr-pnlbar">
+<u:selector name=".rich-panelbar">
<u:style name="border-color" skin="headerBackgroundColor" />
</u:selector>
-<u:selector name=".dr-pnlbar-h">
+<u:selector name=".rich-panelbar-header">
<u:style name="background-image" >
<f:resource f:key="org.richfaces.renderkit.html.GradientA"/>
</u:style>
@@ -57,7 +57,7 @@
<u:style name="font-family" skin="headerFamilyFont" />
</u:selector>
-<u:selector name=".dr-pnlbar-h-act">
+<u:selector name=".rich-panelbar-header-act">
<u:style name="background-image" >
<f:resource f:key="org.richfaces.renderkit.html.GradientA"/>
</u:style>
@@ -72,14 +72,14 @@
</u:selector>
-<u:selector name=".dr-pnlbar-c">
+<u:selector name=".rich-panelbar-content">
<u:style name="color" skin="generalTextColor" />
<u:style name="font-size" skin="preferableDataSizeFont" />
<u:style name="font-family" skin="preferableDataFamilyFont" />
</u:selector>
-<u:selector name=".dr-pnlbar-int">
+<u:selector name=".rich-panelbar-interior">
<u:style name="background-color" skin="generalBackgroundColor" />
</u:selector>
Modified: branches/community/3.3.X/ui/panelbar/src/main/templates/panelBar.jspx
===================================================================
--- branches/community/3.3.X/ui/panelbar/src/main/templates/panelBar.jspx 2009-06-03 15:17:23 UTC (rev 14456)
+++ branches/community/3.3.X/ui/panelbar/src/main/templates/panelBar.jspx 2009-06-03 15:46:18 UTC (rev 14457)
@@ -14,7 +14,7 @@
<f:clientid var="clientId" />
- <div id="#{clientId}" class="dr-pnlbar rich-panelbar dr-pnlbar-b #{component.attributes['styleClass']}" style="padding: 0px; #{this:height(context, component)} #{this:width(context, component)} #{component.attributes['style']}">
+ <div id="#{clientId}" class="rich-panelbar rich-panelbar-b #{component.attributes['styleClass']}" style="padding: 0px; #{this:height(context, component)} #{this:width(context, component)} #{component.attributes['style']}">
<vcp:body>
<f:call name="renderChildren"/>
</vcp:body>
Modified: branches/community/3.3.X/ui/panelbar/src/main/templates/panelBarItem.jspx
===================================================================
--- branches/community/3.3.X/ui/panelbar/src/main/templates/panelBarItem.jspx 2009-06-03 15:17:23 UTC (rev 14456)
+++ branches/community/3.3.X/ui/panelbar/src/main/templates/panelBarItem.jspx 2009-06-03 15:46:18 UTC (rev 14457)
@@ -13,8 +13,8 @@
<c:object var="panel" value="#{component.panel}" type="javax.faces.component.UIComponent" />
- <div id="#{clientId}" class="dr-pnlbar rich-panelbar dr-pnlbar-int rich-panelbar-interior #{panel.attributes['styleClass']}" style="#{panel.attributes['style']}">
- <div class="dr-pnlbar-h rich-panelbar-header #{panel.attributes['headerClass']} #{component.attributes['headerClass']}"
+ <div id="#{clientId}" class="rich-panelbar rich-panelbar-interior #{panel.attributes['styleClass']}" style="#{panel.attributes['style']}">
+ <div class="rich-panelbar-header #{panel.attributes['headerClass']} #{component.attributes['headerClass']}"
style="#{panel.attributes['headerStyle']};#{component.attributes['headerStyle']}">
<jsp:scriptlet><![CDATA[
if(component.getFacet("label")!=null && component.getFacet("label").isRendered()) {
@@ -28,7 +28,7 @@
}
]]></jsp:scriptlet>
</div>
- <div class="dr-pnlbar-h-act rich-panelbar-header-act #{panel.attributes['headerClass']} #{component.attributes['headerClass']} #{panel.attributes['headerClassActive']} #{component.attributes['headerClassActive']}"
+ <div class="rich-panelbar-header-act #{panel.attributes['headerClass']} #{component.attributes['headerClass']} #{panel.attributes['headerClassActive']} #{component.attributes['headerClassActive']}"
style="#{panel.attributes['headerStyle']};#{component.attributes['headerStyle']};#{panel.attributes['headerStyleActive']};#{component.attributes['headerStyleActive']};display: none;">
<jsp:scriptlet><![CDATA[
@@ -45,7 +45,7 @@
</div>
<div style="display: none; width: 100%;" class="rich-panelbar-content-exterior">
- <table cellpadding="0" cellspacing="0" width="100%" style="height: 100%;"><tbody><tr><td class="dr-pnlbar-c rich-panelbar-content #{panel.attributes['contentClass']} #{component.attributes['contentClass']}"
+ <table cellpadding="0" cellspacing="0" width="100%" style="height: 100%;"><tbody><tr><td class="rich-panelbar-content #{panel.attributes['contentClass']} #{component.attributes['contentClass']}"
style="#{panel.attributes['contentStyle']};#{component.attributes['contentStyle']}">
<vcp:body>
<f:call name="renderChildren" />
Modified: branches/community/3.3.X/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java
===================================================================
--- branches/community/3.3.X/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java 2009-06-03 15:17:23 UTC (rev 14456)
+++ branches/community/3.3.X/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java 2009-06-03 15:46:18 UTC (rev 14457)
@@ -168,7 +168,7 @@
assertNotNull(div);
assertEquals("div", div.getNodeName());
String classAttr = div.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-pnlbar rich-panelbar dr-pnlbar-b"));
+ assertTrue(classAttr.contains("rich-panelbar"));
assertTrue(classAttr.contains("panelBarStyleClass"));
classAttr = div.getAttributeValue("style");
assertTrue(classAttr.contains("width: 500px;"));
@@ -186,7 +186,7 @@
assertNotNull(div);
assertEquals("div", div.getNodeName());
classAttr = div.getAttributeValue("class");
- assertTrue(classAttr.contains("dr-pnlbar rich-panelbar dr-pnlbar-int rich-panelbar-interior"));
+ assertTrue(classAttr.contains("rich-panelbar rich-panelbar-interior"));
assertTrue(classAttr.contains("panelBarStyleClass"));
classAttr = div.getAttributeValue("style");
assertTrue(classAttr.contains("panelBarHeaderStyle"));
More information about the richfaces-svn-commits
mailing list