Author: A.Skokov Date: 2007-06-07 06:37:20 -0400 (Thu, 07 Jun 2007) New Revision: 1067 Modified: trunk/richfaces/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx Log: http://jira.jboss.com/jira/browse/RF-255 Modified: trunk/richfaces/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx =================================================================== --- trunk/richfaces/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx 2007-06-07 09:11:40 UTC (rev 1066) +++ trunk/richfaces/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx 2007-06-07 10:37:20 UTC (rev 1067) @@ -34,7 +34,19 @@ style="position : relative;" onclick="#{this:getOnClick(context,component)}"> - #{component.attributes['label']} <jsp:scriptlet><![CDATA[writer.write("&nbsp;");]]></jsp:scriptlet> + <jsp:scriptlet><![CDATA[ + if(component.getFacet("header")!=null && component.getFacet("header").isRendered()) { + ]]></jsp:scriptlet> + <u:insertFacet name="header" /> + <jsp:scriptlet><![CDATA[ + } else { + ]]></jsp:scriptlet> + #{component.attributes['label']} + <jsp:scriptlet><![CDATA[ + writer.write("&nbsp;"); + } + ]]></jsp:scriptlet> + <div id="#{clientId}_switch_on" style="position : absolute; top: 0px; right: 5px; display: #{this:getSwitchOnStatus(context, component)};"> <jsp:scriptlet><![CDATA[ @@ -43,7 +55,7 @@ <u:insertFacet name="closeMarker" /> <jsp:scriptlet><![CDATA[ } else { - writer.write("&#171;"); + writer.write("&#171;"); } ]]></jsp:scriptlet> </div> @@ -52,10 +64,10 @@ <jsp:scriptlet><![CDATA[ if(component.getFacet("openMarker")!=null && component.getFacet("openMarker").isRendered()) { ]]></jsp:scriptlet> - <u:insertFacet name="openMarker" /> + <u:insertFacet name="openMarker" /> <jsp:scriptlet><![CDATA[ } else { - writer.write("&#187;"); + writer.write("&#187;"); } ]]></jsp:scriptlet> </div> @@ -80,7 +92,7 @@ <tr> <td class="dr-stglpnl-b rich-stglpanel-body #{component.attributes['bodyClass']}"> <vcp:body> - <f:call name="renderChildren" /> + <f:call name="renderChildren" /> </vcp:body> </td> </tr>