Author: Alex.Kolonitsky Date: 2011-01-06 09:24:34 -0500 (Thu, 06 Jan 2011) New Revision: 20910 Modified: trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml trunk/examples/richfaces-showcase/src/main/webapp/richfaces/panelMenu/samples/panelMenu-sample.xhtml trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenu.ecss trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuGroup.js trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-group.xmlunit.xml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-groupDis.xmlunit.xml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topGroup.xmlunit.xml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topGroupDis.xmlunit.xml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup-expanded.xmlunit.xml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup-topGroup.xmlunit.xml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup.xmlunit.xml Log: fix Panel Menu Icons Modified: trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml 2011-01-06 13:47:03 UTC (rev 20909) +++ trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml 2011-01-06 14:24:34 UTC (rev 20910) @@ -36,10 +36,6 @@ <h:outputScript name="qunit/qunit.js"/> <h:outputScript name="qunit/richfaces-qunit.js"/> - <h:outputScript name="PanelMenu.js"/> - <h:outputScript name="PanelMenuItem.js"/> - <h:outputScript name="PanelMenuGroup.js"/> - <h:outputStylesheet name="qunit/qunit.css"/> </ui:define> Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/panelMenu/samples/panelMenu-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/panelMenu/samples/panelMenu-sample.xhtml 2011-01-06 13:47:03 UTC (rev 20909) +++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/panelMenu/samples/panelMenu-sample.xhtml 2011-01-06 14:24:34 UTC (rev 20910) @@ -16,7 +16,7 @@ groupExpandIconLeft="triangleUp" groupCollapseIconLeft="triangleDown" topGroupExpandIconRight="chevronUp" - topGroupCollapseIconRight="chevronUp" itemIconLeft="disc" + topGroupCollapseIconRight="chevronDown" itemIconLeft="disc" itemChangeListener="#{panelMenuBean.updateCurrent}"> <rich:panelMenuGroup label="Group 1"> <rich:panelMenuItem label="Item 1.1" name="Item_1_1" /> Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java 2011-01-06 13:47:03 UTC (rev 20909) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java 2011-01-06 14:24:34 UTC (rev 20910) @@ -106,7 +106,7 @@ writer.startElement(DIV_ELEM, null); writer.writeAttribute(ID_ATTRIBUTE, menuGroup.getClientId(context) + ":hdr", null); writer.writeAttribute(CLASS_ATTRIBUTE, concatClasses(getCssClass(menuGroup, "-hdr"), - getCssClass(menuGroup, "-hdr-" + (menuGroup.isExpanded() ? "exp" : "colps"))), null); + "rf-pm-hdr-" + (menuGroup.isExpanded() ? "exp" : "colps")), null); (menuGroup.isTopItem() ? topHeaderRenderer : headerRenderer).encodeHeader(writer, context, menuGroup); Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenu.ecss =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenu.ecss 2011-01-06 13:47:03 UTC (rev 20909) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenu.ecss 2011-01-06 14:24:34 UTC (rev 20910) @@ -274,7 +274,6 @@ .rf-pm-ico-colps {} .rf-pm-ico-exp {} - .rf-pm-hdr-exp .rf-pm-ico-exp { display: block; } .rf-pm-hdr-exp .rf-pm-ico-colps { display: none; } Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuGroup.js =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuGroup.js 2011-01-06 13:47:03 UTC (rev 20909) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuGroup.js 2011-01-06 14:24:34 UTC (rev 20910) @@ -196,7 +196,7 @@ __expand : function () { this.__content().removeClass("rf-pm-colps").addClass("rf-pm-exp"); - this.__header().removeClass("rf-pm-gr-hdr-colps").addClass("rf-pm-hdr-exp"); + this.__header().removeClass("rf-pm-hdr-colps").addClass("rf-pm-hdr-exp"); this.__setExpandValue(true); }, Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-group.xmlunit.xml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-group.xmlunit.xml 2011-01-06 13:47:03 UTC (rev 20909) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-group.xmlunit.xml 2011-01-06 14:24:34 UTC (rev 20910) @@ -1,6 +1,6 @@ <div id="f:panelMenuGroup" class="rf-pm-gr groupClass"> <input id="f:panelMenuGroup:expanded" name="f:panelMenuGroup:expanded" type="hidden" value="false"/> - <div id="f:panelMenuGroup:hdr" class="rf-pm-gr-hdr rf-pm-gr-hdr-colps"> + <div id="f:panelMenuGroup:hdr" class="rf-pm-gr-hdr rf-pm-hdr-colps"> <table class="rf-pm-gr-gr"> <tbody> <tr> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-groupDis.xmlunit.xml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-groupDis.xmlunit.xml 2011-01-06 13:47:03 UTC (rev 20909) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-groupDis.xmlunit.xml 2011-01-06 14:24:34 UTC (rev 20910) @@ -1,6 +1,6 @@ <div id="f:panelMenuGroup-dis" class="rf-pm-gr groupClass rf-pm-gr-dis groupDisableClass"> <input id="f:panelMenuGroup-dis:expanded" name="f:panelMenuGroup-dis:expanded" type="hidden" value="false"/> - <div id="f:panelMenuGroup-dis:hdr" class="rf-pm-gr-hdr rf-pm-gr-hdr-colps"> + <div id="f:panelMenuGroup-dis:hdr" class="rf-pm-gr-hdr rf-pm-hdr-colps"> <table class="rf-pm-gr-gr"> <tbody> <tr> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topGroup.xmlunit.xml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topGroup.xmlunit.xml 2011-01-06 13:47:03 UTC (rev 20909) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topGroup.xmlunit.xml 2011-01-06 14:24:34 UTC (rev 20910) @@ -1,6 +1,6 @@ <div id="f:panelMenuGroup-top" class="rf-pm-top-gr topGroupClass"> <input id="f:panelMenuGroup-top:expanded" name="f:panelMenuGroup-top:expanded" type="hidden" value="false"/> - <div id="f:panelMenuGroup-top:hdr" class="rf-pm-top-gr-hdr rf-pm-top-gr-hdr-colps"> + <div id="f:panelMenuGroup-top:hdr" class="rf-pm-top-gr-hdr rf-pm-hdr-colps"> <table class="rf-pm-top-gr-gr"> <tbody> <tr> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topGroupDis.xmlunit.xml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topGroupDis.xmlunit.xml 2011-01-06 13:47:03 UTC (rev 20909) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topGroupDis.xmlunit.xml 2011-01-06 14:24:34 UTC (rev 20910) @@ -1,6 +1,6 @@ <div id="f:panelMenuGroup-topDis" class="rf-pm-top-gr topGroupClass rf-pm-top-gr-dis topGroupDisableClass"> <input id="f:panelMenuGroup-topDis:expanded" name="f:panelMenuGroup-topDis:expanded" type="hidden" value="false"/> - <div id="f:panelMenuGroup-topDis:hdr" class="rf-pm-top-gr-hdr rf-pm-top-gr-hdr-colps"> + <div id="f:panelMenuGroup-topDis:hdr" class="rf-pm-top-gr-hdr rf-pm-hdr-colps"> <table class="rf-pm-top-gr-gr"> <tbody> <tr> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup-expanded.xmlunit.xml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup-expanded.xmlunit.xml 2011-01-06 13:47:03 UTC (rev 20909) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup-expanded.xmlunit.xml 2011-01-06 14:24:34 UTC (rev 20910) @@ -1,6 +1,6 @@ <div id="f:panelMenuGroup" class="rf-pm-gr"> <input id="f:panelMenuGroup:expanded" name="f:panelMenuGroup:expanded" type="hidden" value="true"/> - <div id="f:panelMenuGroup:hdr" class="rf-pm-gr-hdr rf-pm-gr-hdr-exp"> + <div id="f:panelMenuGroup:hdr" class="rf-pm-gr-hdr rf-pm-hdr-exp"> <table class="rf-pm-gr-gr"> <tbody> <tr> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup-topGroup.xmlunit.xml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup-topGroup.xmlunit.xml 2011-01-06 13:47:03 UTC (rev 20909) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup-topGroup.xmlunit.xml 2011-01-06 14:24:34 UTC (rev 20910) @@ -1,6 +1,6 @@ <div id="f:panelMenuGroup" class="rf-pm-top-gr"> <input id="f:panelMenuGroup:expanded" name="f:panelMenuGroup:expanded" type="hidden" value="true"/> - <div id="f:panelMenuGroup:hdr" class="rf-pm-top-gr-hdr rf-pm-top-gr-hdr-exp"> + <div id="f:panelMenuGroup:hdr" class="rf-pm-top-gr-hdr rf-pm-hdr-exp"> <table class="rf-pm-top-gr-gr"> <tbody> <tr> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup.xmlunit.xml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup.xmlunit.xml 2011-01-06 13:47:03 UTC (rev 20909) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup.xmlunit.xml 2011-01-06 14:24:34 UTC (rev 20910) @@ -1,6 +1,6 @@ <div id="f:panelMenuGroup" class="rf-pm-gr"> <input id="f:panelMenuGroup:expanded" name="f:panelMenuGroup:expanded" type="hidden" value="false"/> - <div id="f:panelMenuGroup:hdr" class="rf-pm-gr-hdr rf-pm-gr-hdr-colps"> + <div id="f:panelMenuGroup:hdr" class="rf-pm-gr-hdr rf-pm-hdr-colps"> <table class="rf-pm-gr-gr"> <tbody> <tr>