Author: abelevich Date: 2011-01-26 09:38:58 -0500 (Wed, 26 Jan 2011) New Revision: 21233 Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemHeaderRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/CollapsiblePanelRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupHeaderRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TableIconsRendererHelper.java trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/accordionItem.xmlunit.xml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/collapsiblePanel.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 trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuItem.xmlunit.xml Log: RF-10243 switchable panels: add new icon type and change defaults in CollapsiblePanel and Accordion Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java 2011-01-26 13:29:40 UTC (rev 21232) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java 2011-01-26 14:38:58 UTC (rev 21233) @@ -241,7 +241,7 @@ @Attribute(generate = false) public String getItemLeftIcon() { - return (String) getStateHelper().eval(Properties.itemLeftIcon, PanelIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(Properties.itemLeftIcon, PanelIcons.transparent.toString()); } public void setItemLeftIcon(String itemLeftIcon) { @@ -250,7 +250,7 @@ @Attribute(generate = false) public String getItemRightIcon() { - return (String) getStateHelper().eval(Properties.itemRightIcon, PanelIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(Properties.itemRightIcon, PanelIcons.transparent.toString()); } public void setItemRightIcon(String itemRightIcon) { @@ -259,7 +259,7 @@ @Attribute(generate = false) public String getItemLeftIconDisabled() { - return (String) getStateHelper().eval(Properties.itemLeftIconDisabled, PanelIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(Properties.itemLeftIconDisabled, PanelIcons.transparent.toString()); } public void setItemLeftIconDisabled(String itemLeftIconDisabled) { @@ -268,7 +268,7 @@ @Attribute(generate = false) public String getItemRightIconDisabled() { - return (String) getStateHelper().eval(Properties.itemRightIconDisabled, PanelIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(Properties.itemRightIconDisabled, PanelIcons.transparent.toString()); } public void setItemRightIconDisabled(String itemRightIconDisabled) { @@ -283,7 +283,7 @@ @Attribute(generate = false) public String getTopItemLeftIcon() { - return (String) getStateHelper().eval(Properties.topItemLeftIcon, PanelIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(Properties.topItemLeftIcon, PanelIcons.transparent.toString()); } public void setTopItemLeftIcon(String topItemLeftIcon) { @@ -292,7 +292,7 @@ @Attribute(generate = false) public String getTopItemRightIcon() { - return (String) getStateHelper().eval(Properties.topItemRightIcon, PanelIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(Properties.topItemRightIcon, PanelIcons.transparent.toString()); } public void setTopItemRightIcon(String topItemRightIcon) { @@ -301,7 +301,7 @@ @Attribute(generate = false) public String getTopItemLeftIconDisabled() { - return (String) getStateHelper().eval(Properties.topItemLeftIconDisabled, PanelIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(Properties.topItemLeftIconDisabled, PanelIcons.transparent.toString()); } public void setTopItemLeftIconDisabled(String topItemLeftIconDisabled) { @@ -310,7 +310,7 @@ @Attribute(generate = false) public String getTopItemRightIconDisabled() { - return (String) getStateHelper().eval(Properties.topItemRightIconDisabled, PanelIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(Properties.topItemRightIconDisabled, PanelIcons.transparent.toString()); } public void setTopItemRightIconDisabled(String topItemRightIconDisabled) { @@ -325,7 +325,7 @@ @Attribute(generate = false) public String getGroupLeftIconExpanded() { - return (String) getStateHelper().eval(Properties.groupLeftIconExpanded, PanelIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(Properties.groupLeftIconExpanded, PanelIcons.transparent.toString()); } public void setGroupLeftIconExpanded(String groupLeftIconExpanded) { @@ -334,7 +334,7 @@ @Attribute(generate = false) public String getGroupRightIconExpanded() { - return (String) getStateHelper().eval(Properties.groupRightIconExpanded, PanelIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(Properties.groupRightIconExpanded, PanelIcons.transparent.toString()); } public void setGroupRightIconExpanded(String groupRightIconExpanded) { @@ -343,7 +343,7 @@ @Attribute(generate = false) public String getGroupLeftIconCollapsed() { - return (String) getStateHelper().eval(Properties.groupLeftIconCollapsed, PanelIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(Properties.groupLeftIconCollapsed, PanelIcons.transparent.toString()); } public void setGroupLeftIconCollapsed(String groupLeftIconCollapsed) { @@ -352,7 +352,7 @@ @Attribute(generate = false) public String getGroupRightIconCollapsed() { - return (String) getStateHelper().eval(Properties.groupRightIconCollapsed, PanelIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(Properties.groupRightIconCollapsed, PanelIcons.transparent.toString()); } public void setGroupRightIconCollapsed(String groupRightIconCollapsed) { @@ -361,7 +361,7 @@ @Attribute(generate = false) public String getGroupLeftIconDisabled() { - return (String) getStateHelper().eval(Properties.groupLeftIconDisabled, PanelIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(Properties.groupLeftIconDisabled, PanelIcons.transparent.toString()); } public void setGroupLeftIconDisabled(String groupLeftIconDisabled) { @@ -370,7 +370,7 @@ @Attribute(generate = false) public String getGroupRightIconDisabled() { - return (String) getStateHelper().eval(Properties.groupRightIconDisabled, PanelIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(Properties.groupRightIconDisabled, PanelIcons.transparent.toString()); } public void setGroupRightIconDisabled(String groupRightIconDisabled) { @@ -385,7 +385,7 @@ @Attribute(generate = false) public String getTopGroupLeftIconExpanded() { - return (String) getStateHelper().eval(Properties.topGroupLeftIconExpanded, PanelIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(Properties.topGroupLeftIconExpanded, PanelIcons.transparent.toString()); } public void setTopGroupLeftIconExpanded(String topGroupLeftIconExpanded) { @@ -394,7 +394,7 @@ @Attribute(generate = false) public String getTopGroupRightIconExpanded() { - return (String) getStateHelper().eval(Properties.topGroupRightIconExpanded, PanelIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(Properties.topGroupRightIconExpanded, PanelIcons.transparent.toString()); } public void setTopGroupRightIconExpanded(String topGroupRightIconExpanded) { @@ -403,7 +403,7 @@ @Attribute(generate = false) public String getTopGroupLeftIconCollapsed() { - return (String) getStateHelper().eval(Properties.topGroupLeftIconCollapsed, PanelIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(Properties.topGroupLeftIconCollapsed, PanelIcons.transparent.toString()); } public void setTopGroupLeftIconCollapsed(String topGroupLeftIconCollapsed) { @@ -412,7 +412,7 @@ @Attribute(generate = false) public String getTopGroupRightIconCollapsed() { - return (String) getStateHelper().eval(Properties.topGroupRightIconCollapsed, PanelIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(Properties.topGroupRightIconCollapsed, PanelIcons.transparent.toString()); } public void setTopGroupRightIconCollapsed(String topGroupRightIconCollapsed) { @@ -421,7 +421,7 @@ @Attribute(generate = false) public String getTopGroupLeftIconDisabled() { - return (String) getStateHelper().eval(Properties.topGroupLeftIconDisabled, PanelIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(Properties.topGroupLeftIconDisabled, PanelIcons.transparent.toString()); } public void setTopGroupLeftIconDisabled(String topGroupLeftIconDisabled) { @@ -430,7 +430,7 @@ @Attribute(generate = false) public String getTopGroupRightIconDisabled() { - return (String) getStateHelper().eval(Properties.topGroupRightIconDisabled, PanelIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(Properties.topGroupRightIconDisabled, PanelIcons.transparent.toString()); } public void setTopGroupRightIconDisabled(String topGroupRightIconDisabled) { Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemHeaderRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemHeaderRenderer.java 2011-01-26 13:29:40 UTC (rev 21232) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemHeaderRenderer.java 2011-01-26 14:38:58 UTC (rev 21233) @@ -36,16 +36,24 @@ //TODO nick - should this be "-ico-exp"? also why expanded icon state is connected with right icon alignment? encodeTdIcon(writer, context, cssClassPrefix + "-exp-ico", iconInactive, iconActive, panel.isDisabled() ? State.headerDisabled : State.header); } - + @Override protected void encodeTdIcon(ResponseWriter writer, FacesContext context, String cssClass, String attrIconCollapsedValue, String attrIconExpandedValue, PanelIcons.State state) throws IOException { - writer.startElement(TD_ELEM, null); - writer.writeAttribute(CLASS_ATTRIBUTE, cssClass, null); + if (isIconRendered(attrIconCollapsedValue) || + isIconRendered(attrIconExpandedValue)) { + writer.startElement(TD_ELEM, null); + writer.writeAttribute(CLASS_ATTRIBUTE, cssClass, null); - encodeIdIcon(writer, context, attrIconCollapsedValue, cssIconsClassPrefix + "-act", state); - encodeIdIcon(writer, context, attrIconExpandedValue, cssIconsClassPrefix + "-inact", state); + if (isIconRendered(attrIconCollapsedValue)) { + encodeIdIcon(writer, context, attrIconCollapsedValue, cssIconsClassPrefix + "-act", state); + } + + if (isIconRendered(attrIconExpandedValue)) { + encodeIdIcon(writer, context, attrIconExpandedValue, cssIconsClassPrefix + "-inact", state); + } - writer.endElement(TD_ELEM); + writer.endElement(TD_ELEM); + } } @Override Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/CollapsiblePanelRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/CollapsiblePanelRenderer.java 2011-01-26 13:29:40 UTC (rev 21232) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/CollapsiblePanelRenderer.java 2011-01-26 14:38:58 UTC (rev 21233) @@ -66,16 +66,25 @@ public static final String BEFORE_SWITCH = "beforeswitch"; private final TableIconsRendererHelper<AbstractCollapsiblePanel> headerRenderer = new TableIconsRendererHelper<AbstractCollapsiblePanel>("header", "rf-cp") { - + protected void encodeHeaderLeftIcon(ResponseWriter writer, FacesContext context, AbstractCollapsiblePanel panel) throws IOException { + String leftIconCollapsed = panel.getLeftIconCollapsed(); + if (leftIconCollapsed == null || leftIconCollapsed.trim().length() == 0) { + leftIconCollapsed = PanelIcons.chevronUp.toString(); + } + String leftIconExpanded = panel.getLeftIconExpanded(); + if (leftIconExpanded == null || leftIconExpanded.trim().length() == 0) { + leftIconExpanded = PanelIcons.chevronDown.toString(); + } + encodeTdIcon(writer, context, cssClassPrefix + "-ico", - panel.getLeftIconCollapsed(), panel.getLeftIconExpanded(), PanelIcons.State.header); + leftIconCollapsed, leftIconExpanded, PanelIcons.State.header); } protected void encodeHeaderRightIcon(ResponseWriter writer, FacesContext context, AbstractCollapsiblePanel panel) throws IOException { //TODO nick - should this be "-ico-exp"? also why expanded icon state is connected with right icon alignment? encodeTdIcon(writer, context, cssClassPrefix + "-exp-ico", - panel.getRightIconCollapsed(), panel.getRightIconExpanded(), PanelIcons.State.header); + panel.getRightIconCollapsed(), panel.getRightIconExpanded(), PanelIcons.State.header); } @Override Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupHeaderRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupHeaderRenderer.java 2011-01-26 13:29:40 UTC (rev 21232) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupHeaderRenderer.java 2011-01-26 14:38:58 UTC (rev 21233) @@ -27,6 +27,14 @@ String iconCollapsed = group.isDisabled() ? group.getLeftIconDisabled() : group.getLeftIconCollapsed(); String iconExpanded = group.isDisabled() ? group.getLeftIconDisabled() : group.getLeftIconExpanded(); + if (iconCollapsed == null || iconCollapsed.trim().length() == 0) { + iconCollapsed = PanelIcons.transparent.toString(); + } + + if (iconExpanded == null || iconExpanded.trim().length() == 0) { + iconExpanded = PanelIcons.transparent.toString(); + } + encodeTdIcon(writer, context, cssClassPrefix + "-ico", iconCollapsed, iconExpanded, getState(group)); } @@ -34,6 +42,13 @@ String iconCollapsed = group.isDisabled() ? group.getRightIconDisabled() : group.getRightIconCollapsed(); String iconExpanded = group.isDisabled() ? group.getRightIconDisabled() : group.getRightIconExpanded(); + if (iconCollapsed == null || iconCollapsed.trim().length() == 0) { + iconCollapsed = PanelIcons.transparent.toString(); + } + + if (iconExpanded == null || iconExpanded.trim().length() == 0) { + iconExpanded = PanelIcons.transparent.toString(); + } //TODO nick - should this be "-ico-exp"? also why expanded icon state is connected with right icon alignment? encodeTdIcon(writer, context, cssClassPrefix + "-exp-ico", iconCollapsed, iconExpanded, getState(group)); } Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java 2011-01-26 13:29:40 UTC (rev 21232) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java 2011-01-26 14:38:58 UTC (rev 21233) @@ -103,6 +103,9 @@ String icon = menuItem.isDisabled() ? menuItem.getRightIconDisabled() : menuItem.getRightIcon(); String cssClasses = concatClasses(classPrefix + "-exp-ico", menuItem.getLeftIconClass()); + if (icon == null || icon.trim().length() == 0) { + icon = PanelIcons.transparent.toString(); + } encodeTdIcon(writer, context, cssClasses, icon, getState(menuItem)); } @@ -110,11 +113,26 @@ String icon = menuItem.isDisabled() ? menuItem.getLeftIconDisabled() : menuItem.getLeftIcon(); String cssClasses = concatClasses(classPrefix + "-ico", menuItem.getLeftIconClass()); + if (icon == null || icon.trim().length() == 0) { + icon = PanelIcons.transparent.toString(); + } encodeTdIcon(writer, context, cssClasses, icon, getState(menuItem)); } - + + private boolean isIconRendered(String attrIconValue) { + if (attrIconValue != null && attrIconValue.trim().length() > 0 && + !PanelIcons.none.toString().equals(attrIconValue)) { + return true; + } + return false; + } + //TODO nick - the same as in PanelMenuGroupRenderer public void encodeTdIcon(ResponseWriter writer, FacesContext context, String classPrefix, String attrIconValue, PanelIcons.State state) throws IOException { + if (!isIconRendered(attrIconValue)) { + return; + } + writer.startElement(TD_ELEM, null); try { PanelIcons icon = PanelIcons.valueOf(attrIconValue); Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TableIconsRendererHelper.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TableIconsRendererHelper.java 2011-01-26 13:29:40 UTC (rev 21232) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TableIconsRendererHelper.java 2011-01-26 14:38:58 UTC (rev 21233) @@ -84,15 +84,31 @@ protected abstract void encodeHeaderRightIcon(ResponseWriter writer, FacesContext context, T menuItem) throws IOException; protected void encodeTdIcon(ResponseWriter writer, FacesContext context, String cssClass, String attrIconCollapsedValue, String attrIconExpandedValue, PanelIcons.State state) throws IOException { - writer.startElement(TD_ELEM, null); - writer.writeAttribute(CLASS_ATTRIBUTE, cssClass, null); + if (isIconRendered(attrIconCollapsedValue) || + isIconRendered(attrIconExpandedValue)) { - encodeIdIcon(writer, context, attrIconCollapsedValue, cssIconsClassPrefix + "-colps", state); - encodeIdIcon(writer, context, attrIconExpandedValue, cssIconsClassPrefix + "-exp", state); + writer.startElement(TD_ELEM, null); + writer.writeAttribute(CLASS_ATTRIBUTE, cssClass, null); + + if (isIconRendered(attrIconCollapsedValue)) { + encodeIdIcon(writer, context, attrIconCollapsedValue, cssIconsClassPrefix + "-colps", state); + } + if (isIconRendered(attrIconExpandedValue)) { + encodeIdIcon(writer, context, attrIconExpandedValue, cssIconsClassPrefix + "-exp", state); + } + + writer.endElement(TD_ELEM); + } + } - writer.endElement(TD_ELEM); + protected boolean isIconRendered(String attrIconValue) { + if (attrIconValue != null && attrIconValue.trim().length() > 0 && + !PanelIcons.none.toString().equals(attrIconValue)) { + return true; + } + return false; } - + protected void encodeIdIcon(ResponseWriter writer, FacesContext context, String attrIconValue, String styleClass, PanelIcons.State state) throws IOException { if (attrIconValue == null || attrIconValue.trim().length() <= 0) { encodeDivIcon(writer, PanelIcons.none, styleClass, state); Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/accordionItem.xmlunit.xml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/accordionItem.xmlunit.xml 2011-01-26 13:29:40 UTC (rev 21232) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/accordionItem.xmlunit.xml 2011-01-26 14:38:58 UTC (rev 21233) @@ -3,18 +3,10 @@ <table class="rf-ac-itm-gr"> <tbody> <tr> - <td class="rf-ac-itm-ico"> - <div class="rf-ac-itm-ico-act rf-ico-none"></div> - <div class="rf-ac-itm-ico-inact rf-ico-none"></div> - </td> <td class="rf-ac-itm-lbl"> <div class="rf-ac-itm-lbl-act">item</div> <div class="rf-ac-itm-lbl-inact">item</div> </td> - <td class="rf-ac-itm-exp-ico"> - <div class="rf-ac-itm-ico-act rf-ico-none-hdr"></div> - <div class="rf-ac-itm-ico-inact rf-ico-none-hdr"></div> - </td> </tr> </tbody> </table> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/collapsiblePanel.xmlunit.xml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/collapsiblePanel.xmlunit.xml 2011-01-26 13:29:40 UTC (rev 21232) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/collapsiblePanel.xmlunit.xml 2011-01-26 14:38:58 UTC (rev 21233) @@ -8,17 +8,13 @@ <tbody> <tr> <td class="rf-cp-ico"> - <div class="rf-cp-ico-colps rf-ico-none-hdr"></div> - <div class="rf-cp-ico-exp rf-ico-none-hdr"></div> + <div class="rf-cp-ico-colps rf-ico-chevron-up-hdr"></div> + <div class="rf-cp-ico-exp rf-ico-chevron-down-hdr"></div> </td> <td class="rf-cp-lbl"> <div class="rf-cp-lbl-exp"></div> <div class="rf-cp-lbl-colps"></div> </td> - <td class="rf-cp-exp-ico"> - <div class="rf-cp-ico-colps rf-ico-none-hdr"></div> - <div class="rf-cp-ico-exp rf-ico-none-hdr"></div> - </td> </tr> </tbody> </table> 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-26 13:29:40 UTC (rev 21232) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup-expanded.xmlunit.xml 2011-01-26 14:38:58 UTC (rev 21233) @@ -5,13 +5,13 @@ <tbody> <tr> <td class="rf-pm-gr-ico"> - <div class="rf-pm-ico-colps rf-ico-none"></div> - <div class="rf-pm-ico-exp rf-ico-none"></div> + <div class="rf-pm-ico-colps rf-ico-transparent"></div> + <div class="rf-pm-ico-exp rf-ico-transparent"></div> </td> <td class="rf-pm-gr-lbl">Group Label</td> <td class="rf-pm-gr-exp-ico"> - <div class="rf-pm-ico-colps rf-ico-none"></div> - <div class="rf-pm-ico-exp rf-ico-none"></div> + <div class="rf-pm-ico-colps rf-ico-transparent"></div> + <div class="rf-pm-ico-exp rf-ico-transparent"></div> </td> </tr> </tbody> 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-26 13:29:40 UTC (rev 21232) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup-topGroup.xmlunit.xml 2011-01-26 14:38:58 UTC (rev 21233) @@ -5,13 +5,13 @@ <tbody> <tr> <td class="rf-pm-top-gr-ico"> - <div class="rf-pm-ico-colps rf-ico-none-hdr"></div> - <div class="rf-pm-ico-exp rf-ico-none-hdr"></div> + <div class="rf-pm-ico-colps rf-ico-transparent-hdr"></div> + <div class="rf-pm-ico-exp rf-ico-transparent-hdr"></div> </td> <td class="rf-pm-top-gr-lbl">Group Label</td> <td class="rf-pm-top-gr-exp-ico"> - <div class="rf-pm-ico-colps rf-ico-none-hdr"></div> - <div class="rf-pm-ico-exp rf-ico-none-hdr"></div> + <div class="rf-pm-ico-colps rf-ico-transparent-hdr"></div> + <div class="rf-pm-ico-exp rf-ico-transparent-hdr"></div> </td> </tr> </tbody> 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-26 13:29:40 UTC (rev 21232) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup.xmlunit.xml 2011-01-26 14:38:58 UTC (rev 21233) @@ -5,13 +5,13 @@ <tbody> <tr> <td class="rf-pm-gr-ico"> - <div class="rf-pm-ico-colps rf-ico-none"></div> - <div class="rf-pm-ico-exp rf-ico-none"></div> + <div class="rf-pm-ico-colps rf-ico-transparent"></div> + <div class="rf-pm-ico-exp rf-ico-transparent"></div> </td> <td class="rf-pm-gr-lbl"></td> <td class="rf-pm-gr-exp-ico"> - <div class="rf-pm-ico-colps rf-ico-none"></div> - <div class="rf-pm-ico-exp rf-ico-none"></div> + <div class="rf-pm-ico-colps rf-ico-transparent"></div> + <div class="rf-pm-ico-exp rf-ico-transparent"></div> </td> </tr> </tbody> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuItem.xmlunit.xml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuItem.xmlunit.xml 2011-01-26 13:29:40 UTC (rev 21232) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuItem.xmlunit.xml 2011-01-26 14:38:58 UTC (rev 21233) @@ -2,9 +2,9 @@ <table class="rf-pm-itm-gr"> <tbody> <tr> - <td class="rf-pm-itm-ico rf-ico-none"></td> + <td class="rf-pm-itm-ico rf-ico-transparent"></td> <td class="rf-pm-itm-lbl">My MY Item</td> - <td class="rf-pm-itm-exp-ico rf-ico-none"></td> + <td class="rf-pm-itm-exp-ico rf-ico-transparent"></td> </tr> </tbody> </table>