Author: abelevich Date: 2007-08-30 09:47:25 -0400 (Thu, 30 Aug 2007) New Revision: 2608 Modified: trunk/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx Log: fix RF-763 Modified: trunk/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx =================================================================== --- trunk/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx 2007-08-30 13:24:36 UTC (rev 2607) +++ trunk/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx 2007-08-30 13:47:25 UTC (rev 2608) @@ -31,47 +31,48 @@ <f:call name="utils.encodeBeginFormIfNessesary"/> <div id="#{clientId}_header" class="dr-stglpnl-h rich-stglpanel-header #{component.attributes['headerClass']}" - style="float: right;" onclick="#{this:getOnClick(context,component)}"> - + + <div style="float: right"> + <div id="#{clientId}_switch_on" style="padding-right: 15px; display: #{this:getSwitchOnStatus(context, component)};"> + <jsp:scriptlet><![CDATA[ + if(component.getFacet("closeMarker")!=null && component.getFacet("closeMarker").isRendered()) { + ]]></jsp:scriptlet> + <u:insertFacet name="closeMarker" /> + <jsp:scriptlet><![CDATA[ + } else { + writer.write("&#171;"); + } + ]]></jsp:scriptlet> + </div> + <div id="#{clientId}_switch_off" + style="padding-right: 15px; display: #{this:getSwitchOffStatus(context, component)};"> + <jsp:scriptlet><![CDATA[ + if(component.getFacet("openMarker")!=null && component.getFacet("openMarker").isRendered()) { + ]]></jsp:scriptlet> + <u:insertFacet name="openMarker" /> + <jsp:scriptlet><![CDATA[ + } else { + writer.write("&#187;"); + } + ]]></jsp:scriptlet> + </div> + </div> + <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="padding-right: 15px; display: #{this:getSwitchOnStatus(context, component)};"> - <jsp:scriptlet><![CDATA[ - if(component.getFacet("closeMarker")!=null && component.getFacet("closeMarker").isRendered()) { - ]]></jsp:scriptlet> - <u:insertFacet name="closeMarker" /> - <jsp:scriptlet><![CDATA[ - } else { - writer.write("&#171;"); - } - ]]></jsp:scriptlet> - </div> - <div id="#{clientId}_switch_off" - style="padding-right: 15px; display: #{this:getSwitchOffStatus(context, component)};"> - <jsp:scriptlet><![CDATA[ - if(component.getFacet("openMarker")!=null && component.getFacet("openMarker").isRendered()) { - ]]></jsp:scriptlet> - <u:insertFacet name="openMarker" /> - <jsp:scriptlet><![CDATA[ - } else { - writer.write("&#187;"); - } - ]]></jsp:scriptlet> - </div> + 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> + <jsp:scriptlet> <![CDATA[if((component.getSwitchType()!=null) && (component.getSwitchType().equals(component.CLIENT_SWITCH_TYPE)==true)){]]> </jsp:scriptlet>