Author: pyaschenko Date: 2009-06-03 11:59:14 -0400 (Wed, 03 Jun 2009) New Revision: 14458 Modified: branches/community/3.3.X/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/css/simpleTogglePanel.xcss branches/community/3.3.X/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx branches/community/3.3.X/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java Log: https://jira.jboss.org/jira/browse/RF-7306 Modified: branches/community/3.3.X/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/css/simpleTogglePanel.xcss =================================================================== --- branches/community/3.3.X/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/css/simpleTogglePanel.xcss 2009-06-03 15:46:18 UTC (rev 14457) +++ branches/community/3.3.X/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/css/simpleTogglePanel.xcss 2009-06-03 15:59:14 UTC (rev 14458) @@ -4,7 +4,7 @@ xmlns="http://www.w3.org/1999/xhtml" > <f:verbatim><![CDATA[ -.dr-stglpnl{ +.rich-stglpanel{ border-width : 1px; border-style: solid; padding : 1px; @@ -12,11 +12,11 @@ background-repeat : no-repeat; } -.dr-stglpnl-m{ +.rich-stglpanel-marker-open, .rich-stglpanel-marker-close { padding-right: 3px; } -.dr-stglpnl-h{ +.rich-stglpanel-header{ border-width: 1px; border-style: solid; cursor: pointer; @@ -26,24 +26,24 @@ } -.dr-stglpnl-b{ +.rich-stglpanel-body{ padding : 10px; text-align : left; vertical-align : top; overflow: auto; } -.dr-stglpanel-marker{ +.rich-stglpanel-marker{ float: right; } ]]> </f:verbatim> -<u:selector name=".dr-stglpnl"> +<u:selector name=".rich-stglpanel"> <u:style name="background-color" skin="generalBackgroundColor" /> <u:style name="border-color" skin="panelBorderColor" /> </u:selector> -<u:selector name=".dr-stglpnl-h"> +<u:selector name=".rich-stglpanel-header"> <u:style name="background-color" skin="headerBackgroundColor" /> <u:style name="border-color" skin="headerBackgroundColor" /> <u:style name="font-size" skin="headerSizeFont" /> @@ -51,13 +51,13 @@ <u:style name="font-weight" skin="headerWeightFont" /> <u:style name="font-family" skin="headerFamilyFont" /> </u:selector> -<u:selector name=".dr-stglpnl-b"> +<u:selector name=".rich-stglpanel-body"> <u:style name="background-color" skin="generalBackgroundColor" /> <u:style name="font-size" skin="generalSizeFont" /> <u:style name="color" skin="panelTextColor" /> <u:style name="font-family" skin="generalFamilyFont" /> </u:selector> -<u:selector name=".dr-stglpnl-h"> +<u:selector name=".rich-stglpanel-header"> <u:style name="background-image" > <f:resource f:key="org.richfaces.renderkit.html.GradientA"/> </u:style> Modified: branches/community/3.3.X/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx =================================================================== --- branches/community/3.3.X/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx 2009-06-03 15:46:18 UTC (rev 14457) +++ branches/community/3.3.X/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx 2009-06-03 15:59:14 UTC (rev 14458) @@ -21,7 +21,7 @@ </h:scripts> <div id="#{clientId}" x:passThruWithExclusions="id,value,style,styleClass,class" - class="dr-stglpnl rich-stglpanel #{component.attributes['styleClass']}" + class="rich-stglpanel #{component.attributes['styleClass']}" style="width: #{component.attributes['width']}; #{component.attributes['style']};"> <script type="text/javascript"> @@ -36,11 +36,11 @@ <f:call name="utils.encodeBeginFormIfNessesary"/> <div id="#{clientId}_header" - class="dr-stglpnl-h rich-stglpanel-header #{component.attributes['headerClass']}" + class="rich-stglpanel-header #{component.attributes['headerClass']}" onclick="#{this:getOnClick(context,component)}"> - <div class="dr-stglpanel-marker rich-stglpanel-marker"> - <div id="#{clientId}_switch_on" style="display: #{this:getSwitchOnStatus(context, component)};" class="dr-stglpnl-m rich-stglpnl-marker"> + <div class="rich-stglpanel-marker"> + <div id="#{clientId}_switch_on" style="display: #{this:getSwitchOnStatus(context, component)};" class="rich-stglpanel-marker-close"> <jsp:scriptlet><![CDATA[ if(component.getFacet("closeMarker")!=null && component.getFacet("closeMarker").isRendered()) { ]]></jsp:scriptlet> @@ -52,7 +52,7 @@ ]]></jsp:scriptlet> </div> <div id="#{clientId}_switch_off" - style="display: #{this:getSwitchOffStatus(context, component)};" class="dr-stglpnl-m rich-stglpnl-marker"> + style="display: #{this:getSwitchOffStatus(context, component)};" class="rich-stglpanel-marker-open"> <jsp:scriptlet><![CDATA[ if(component.getFacet("openMarker")!=null && component.getFacet("openMarker").isRendered()) { ]]></jsp:scriptlet> @@ -93,7 +93,7 @@ <f:call name="utils.encodeEndFormIfNessesary"/> <div id="#{clientId}_body" - class="dr-stglpnl-b rich-stglpanel-body #{component.attributes['bodyClass']}" + class="rich-stglpanel-body #{component.attributes['bodyClass']}" style="display : #{this:getdivdisplay(context, component)}; height: #{component.attributes['height']};"> Modified: branches/community/3.3.X/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java =================================================================== --- branches/community/3.3.X/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java 2009-06-03 15:46:18 UTC (rev 14457) +++ branches/community/3.3.X/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java 2009-06-03 15:59:14 UTC (rev 14458) @@ -165,7 +165,6 @@ assertEquals("div", div1.getNodeName()); String classAttr1 = div1.getAttributeValue("class"); - assertTrue(classAttr1.contains("dr-stglpnl")); assertTrue(classAttr1.contains("rich-stglpanel")); HtmlDivision div2 = (HtmlDivision)page.getHtmlElementById(stp1.getClientId(facesContext) + "_header"); @@ -173,7 +172,6 @@ assertEquals("div", div2.getNodeName()); String classAttr2 = div2.getAttributeValue("class"); - assertTrue(classAttr2.contains("dr-stglpnl-h")); assertTrue(classAttr2.contains("rich-stglpanel-header")); HtmlElement div3 = page.getHtmlElementById(stp1.getClientId(facesContext) + "_switch_on");