Author: Alex.Kolonitsky Date: 2011-01-05 07:19:36 -0500 (Wed, 05 Jan 2011) New Revision: 20891 Added: trunk/ui/common/api/src/main/java/org/richfaces/renderkit/util/PanelIcons.java trunk/ui/common/ui/src/main/resources/META-INF/resources/org.richfaces/icons.ecss trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemHeaderRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupHeaderRenderer.java trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/AccordionRendererTest.java trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/accordionItem.xhtml 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.xhtml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/collapsiblePanel.xmlunit.xml Removed: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuIcons.java Modified: trunk/examples/output-demo/src/main/webapp/templates/template.xhtml trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/RendererBase.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelTitledItem.java trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlAccordion.java trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlAccordionItem.java trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlPanelMenu.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionRenderer.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/PanelMenuGroupRenderer.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/PanelMenuRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TableIconsRendererHelper.java trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/accordion.ecss trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/accordionItem.js trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/collapsiblePanel.ecss trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/collapsiblePanelItem.js 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/java/org/richfaces/renderkit/html/CollapsiblePanelRendererTest.java 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-item.xmlunit.xml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-itemDis.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/panelMenu-icons-inheritance-topItem.xmlunit.xml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topItemDis.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-9435, RF-9862 Modified: trunk/examples/output-demo/src/main/webapp/templates/template.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/templates/template.xhtml 2011-01-05 10:40:01 UTC (rev 20890) +++ trunk/examples/output-demo/src/main/webapp/templates/template.xhtml 2011-01-05 12:19:36 UTC (rev 20891) @@ -11,8 +11,22 @@ <meta http-equiv="content-type" content="text/xhtml; charset=UTF-8" /> <h:outputScript library="javax.faces" name="jsf.js" target="head" /> + + <style type="text/css"> + .collapsed { display: none; } + .menu { + background-color:#7fffd4; + } + + .selected { + background-color:blue; + color:white; + } + </style> </h:head> + + <h:body> <ui:insert name="scripts" ></ui:insert> @@ -41,8 +55,8 @@ <tr valign="top"> <td> <h:form id="nav"> - <p>Toggle Panel</p> - <ul> + <p class="menu">Toggle Panel</p> + <ul class="collapsed" > <li> <p>Examples</p> <ul> @@ -61,8 +75,8 @@ </ul> - <p>Accordion</p> - <ul> + <p class="menu">Accordion</p> + <ul class="collapsed" > <li> <p>Examples</p> <ul> @@ -85,8 +99,8 @@ </li> </ul> - <p>Collapsible Panel</p> - <ul> + <p class="menu">Collapsible Panel</p> + <ul class="collapsed"> <li> <p>Examples</p> <ul> @@ -99,8 +113,8 @@ </li> </ul> - <p>Tab Panel</p> - <ul> + <p class="menu">Tab Panel</p> + <ul class="collapsed"> <li> <p>Examples</p> <ul> @@ -113,8 +127,8 @@ </li> </ul> - <p>Panel Menu</p> - <ul> + <p class="menu">Panel Menu</p> + <ul class="collapsed"> <li> <p>Examples</p> <ul> @@ -127,8 +141,8 @@ </li> </ul> - <p>Tooltip</p> - <ul> + <p class="menu">Tooltip</p> + <ul class="collapsed"> <li> <p>Examples</p> <ul> @@ -145,8 +159,8 @@ </li> </ul> - <p>Toolbar</p> - <ul> + <p class="menu">Toolbar</p> + <ul class="collapsed"> <li> <p>Examples</p> <ul> @@ -156,9 +170,9 @@ </ul> </li> </ul> - - <p>DropDown Menu</p> - <ul> + + <p class="menu">DropDown Menu</p> + <ul class="collapsed"> <li> <p>Examples</p> <ul> @@ -167,8 +181,14 @@ </li> </ul> </li> - </ul> + </ul> + <script type="text/javascript"> + $(".menu").click(function () { + $(this).toggleClass("selected"); + $(this).next("ul").toggleClass("collapsed") + }) + </script> </h:form> </td> Copied: trunk/ui/common/api/src/main/java/org/richfaces/renderkit/util/PanelIcons.java (from rev 20872, trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuIcons.java) =================================================================== --- trunk/ui/common/api/src/main/java/org/richfaces/renderkit/util/PanelIcons.java (rev 0) +++ trunk/ui/common/api/src/main/java/org/richfaces/renderkit/util/PanelIcons.java 2011-01-05 12:19:36 UTC (rev 20891) @@ -0,0 +1,37 @@ +package org.richfaces.renderkit.util; + +public enum PanelIcons { + none("rf-ico-none"), + disc("rf-ico-disc"), + grid("rf-ico-grid"), + chevron("rf-ico-chevron"), + chevronUp("rf-ico-chevron-up"), + chevronDown("rf-ico-chevron-down"), + triangle("rf-ico-triangle"), + triangleUp("rf-ico-triangle-up"), + triangleDown("rf-ico-triangle-down"); + + public static final PanelIcons DEFAULT = none; + + private final String cssClass; + + private PanelIcons(String cssClass) { + this.cssClass = cssClass; + } + + public String cssClass() { + return cssClass; + } + + public static PanelIcons getIcon(String attrIconCollapsedValue) { + if (attrIconCollapsedValue == null) { + return null; + } + + try { + return PanelIcons.valueOf(attrIconCollapsedValue); + } catch (IllegalArgumentException e) { + return null; + } + } +} Modified: trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/RendererBase.java =================================================================== --- trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/RendererBase.java 2011-01-05 10:40:01 UTC (rev 20890) +++ trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/RendererBase.java 2011-01-05 12:19:36 UTC (rev 20891) @@ -280,11 +280,11 @@ } } - public String concatClasses(Object... objects) { + public static String concatClasses(Object... objects) { return HtmlUtil.concatClasses(objects); } - public String concatStyles(Object... objects) { + public static String concatStyles(Object... objects) { return HtmlUtil.concatStyles(objects); } } Added: trunk/ui/common/ui/src/main/resources/META-INF/resources/org.richfaces/icons.ecss =================================================================== --- trunk/ui/common/ui/src/main/resources/META-INF/resources/org.richfaces/icons.ecss (rev 0) +++ trunk/ui/common/ui/src/main/resources/META-INF/resources/org.richfaces/icons.ecss 2011-01-05 12:19:36 UTC (rev 20891) @@ -0,0 +1,13 @@ + +.rf-ico-none { width: 16px; height: 16px; } +.rf-ico-chevron { width: 16px; height: 16px; background-image: "url(#{resource['org.richfaces.images:Chevron.png']})" } +.rf-ico-chevron-down { width: 16px; height: 16px; background-image: "url(#{resource['org.richfaces.images:ChevronDown.png']})" } +.rf-ico-chevron-left { width: 16px; height: 16px; background-image: "url(#{resource['org.richfaces.images:ChevronLeft.png']})" } +.rf-ico-chevron-up { width: 16px; height: 16px; background-image: "url(#{resource['org.richfaces.images:ChevronUp.png']})" } +.rf-ico-disc { width: 16px; height: 16px; background-image: "url(#{resource['org.richfaces.images:Disc.png']})" } +.rf-ico-grid { width: 16px; height: 16px; background-image: "url(#{resource['org.richfaces.images:Grid.png']})" } +.rf-ico-spacer { width: 16px; height: 16px; background-image: "url(#{resource['org.richfaces.images:Spacer.png']})" } +.rf-ico-triangle { width: 16px; height: 16px; background-image: "url(#{resource['org.richfaces.images:Triangle.png']})" } +.rf-ico-triangle-down { width: 16px; height: 16px; background-image: "url(#{resource['org.richfaces.images:TriangleDown.png']})" } +.rf-ico-triangle-left { width: 16px; height: 16px; background-image: "url(#{resource['org.richfaces.images:TriangleLeft.png']})" } +.rf-ico-triangle-up { width: 16px; height: 16px; background-image: "url(#{resource['org.richfaces.images:TriangleUp.png']})" } \ No newline at end of file Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelTitledItem.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelTitledItem.java 2011-01-05 10:40:01 UTC (rev 20890) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelTitledItem.java 2011-01-05 12:19:36 UTC (rev 20891) @@ -28,6 +28,8 @@ import javax.faces.context.FacesContext; import java.io.IOException; +import static org.richfaces.renderkit.html.DivPanelRenderer.capitalize; + /** * @author akolonitsky * @since 2010-08-05 @@ -52,6 +54,10 @@ public String abbreviation() { return abbreviation; } + + public String headerClass() { + return "headerClass" + capitalize(this.toString()); + } } protected AbstractTogglePanelTitledItem() { Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlAccordion.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlAccordion.java 2011-01-05 10:40:01 UTC (rev 20890) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlAccordion.java 2011-01-05 12:19:36 UTC (rev 20891) @@ -53,6 +53,13 @@ public enum PropertyKeys { + itemLeftIconActive, + itemLeftIconInactive, + itemLeftIconDisabled, + itemRightIconActive, + itemRightIconInactive, + itemRightIconDisabled, + itemHeaderClassActive, itemHeaderClassDisabled, itemHeaderClassInactive, @@ -85,6 +92,54 @@ return COMPONENT_FAMILY; } + public String getItemLeftIconActive() { + return (String) getStateHelper().eval(PropertyKeys.itemLeftIconActive); + } + + public void setItemLeftIconActive(String itemLeftIconActive) { + getStateHelper().put(PropertyKeys.itemLeftIconActive, itemLeftIconActive); + } + + public String getItemLeftIconInactive() { + return (String) getStateHelper().eval(PropertyKeys.itemLeftIconInactive); + } + + public void setItemLeftIconInactive(String itemLeftIconInactive) { + getStateHelper().put(PropertyKeys.itemLeftIconInactive, itemLeftIconInactive); + } + + public String getItemLeftIconDisabled() { + return (String) getStateHelper().eval(PropertyKeys.itemLeftIconDisabled); + } + + public void setItemLeftIconDisabled(String itemLeftIconDisabled) { + getStateHelper().put(PropertyKeys.itemLeftIconDisabled, itemLeftIconDisabled); + } + + public String getItemRightIconActive() { + return (String) getStateHelper().eval(PropertyKeys.itemRightIconActive); + } + + public void setItemRightIconActive(String itemRightIconActive) { + getStateHelper().put(PropertyKeys.itemRightIconActive, itemRightIconActive); + } + + public String getItemRightIconInactive() { + return (String) getStateHelper().eval(PropertyKeys.itemRightIconInactive); + } + + public void setItemRightIconInactive(String itemRightIconInactive) { + getStateHelper().put(PropertyKeys.itemRightIconInactive, itemRightIconInactive); + } + + public String getItemRightIconDisabled() { + return (String) getStateHelper().eval(PropertyKeys.itemRightIconDisabled); + } + + public void setItemRightIconDisabled(String itemRightIconDisabled) { + getStateHelper().put(PropertyKeys.itemRightIconDisabled, itemRightIconDisabled); + } + public String getWidth() { return (String) getStateHelper().eval(PropertyKeys.width); } Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlAccordionItem.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlAccordionItem.java 2011-01-05 10:40:01 UTC (rev 20890) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlAccordionItem.java 2011-01-05 12:19:36 UTC (rev 20891) @@ -60,6 +60,13 @@ public enum PropertyKeys { + leftIconActive, + leftIconInactive, + leftIconDisabled, + rightIconActive, + rightIconInactive, + rightIconDisabled, + headerClassActive, headerClassDisabled, headerClassInactive, @@ -100,6 +107,54 @@ return (HtmlAccordion) ToggleControl.getEnclosedPanel(this); } + public String getLeftIconActive() { + return (String) getStateHelper().eval(PropertyKeys.leftIconActive, getAccordion().getItemLeftIconActive()); + } + + public void setLeftIconActive(String leftIconActive) { + getStateHelper().put(PropertyKeys.leftIconActive, leftIconActive); + } + + public String getLeftIconInactive() { + return (String) getStateHelper().eval(PropertyKeys.leftIconInactive, getAccordion().getItemLeftIconInactive()); + } + + public void setLeftIconInactive(String leftIconInactive) { + getStateHelper().put(PropertyKeys.leftIconInactive, leftIconInactive); + } + + public String getLeftIconDisabled() { + return (String) getStateHelper().eval(PropertyKeys.leftIconDisabled, getAccordion().getItemLeftIconDisabled()); + } + + public void setLeftIconDisabled(String leftIconDisabled) { + getStateHelper().put(PropertyKeys.leftIconDisabled, leftIconDisabled); + } + + public String getRightIconActive() { + return (String) getStateHelper().eval(PropertyKeys.rightIconActive, getAccordion().getItemRightIconActive()); + } + + public void setRightIconActive(String rightIconActive) { + getStateHelper().put(PropertyKeys.rightIconActive, rightIconActive); + } + + public String getRightIconInactive() { + return (String) getStateHelper().eval(PropertyKeys.rightIconInactive, getAccordion().getItemRightIconInactive()); + } + + public void setRightIconInactive(String rightIconInactive) { + getStateHelper().put(PropertyKeys.rightIconInactive, rightIconInactive); + } + + public String getRightIconDisabled() { + return (String) getStateHelper().eval(PropertyKeys.rightIconDisabled, getAccordion().getItemRightIconDisabled()); + } + + public void setRightIconDisabled(String rightIconDisabled) { + getStateHelper().put(PropertyKeys.rightIconDisabled, rightIconDisabled); + } + public String getHeaderClassActive() { return (String) getStateHelper().eval(PropertyKeys.headerClassActive, getAccordion().getItemHeaderClassActive()); } Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlPanelMenu.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlPanelMenu.java 2011-01-05 10:40:01 UTC (rev 20890) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlPanelMenu.java 2011-01-05 12:19:36 UTC (rev 20891) @@ -24,7 +24,7 @@ package org.richfaces.component.html; import org.richfaces.component.UIPanelMenu; -import org.richfaces.renderkit.html.PanelMenuIcons; +import org.richfaces.renderkit.util.PanelIcons; import javax.faces.component.behavior.ClientBehaviorHolder; import java.util.Arrays; @@ -143,7 +143,7 @@ } public String getItemIconLeft() { - return (String) getStateHelper().eval(PropertyKeys.itemIconLeft, PanelMenuIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(PropertyKeys.itemIconLeft, PanelIcons.DEFAULT.toString()); } public void setItemIconLeft(String itemIconLeft) { @@ -151,7 +151,7 @@ } public String getItemIconRight() { - return (String) getStateHelper().eval(PropertyKeys.itemIconRight, PanelMenuIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(PropertyKeys.itemIconRight, PanelIcons.DEFAULT.toString()); } public void setItemIconRight(String itemIconRight) { @@ -159,7 +159,7 @@ } public String getItemDisableIconLeft() { - return (String) getStateHelper().eval(PropertyKeys.itemDisableIconLeft, PanelMenuIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(PropertyKeys.itemDisableIconLeft, PanelIcons.DEFAULT.toString()); } public void setItemDisableIconLeft(String itemDisableIconLeft) { @@ -167,7 +167,7 @@ } public String getItemDisableIconRight() { - return (String) getStateHelper().eval(PropertyKeys.itemDisableIconRight, PanelMenuIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(PropertyKeys.itemDisableIconRight, PanelIcons.DEFAULT.toString()); } public void setItemDisableIconRight(String itemDisableIconRight) { @@ -191,7 +191,7 @@ } public String getTopItemIconLeft() { - return (String) getStateHelper().eval(PropertyKeys.topItemIconLeft, PanelMenuIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(PropertyKeys.topItemIconLeft, PanelIcons.DEFAULT.toString()); } public void setTopItemIconLeft(String topItemIconLeft) { @@ -199,7 +199,7 @@ } public String getTopItemIconRight() { - return (String) getStateHelper().eval(PropertyKeys.topItemIconRight, PanelMenuIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(PropertyKeys.topItemIconRight, PanelIcons.DEFAULT.toString()); } public void setTopItemIconRight(String topItemIconRight) { @@ -207,7 +207,7 @@ } public String getTopItemDisableIconLeft() { - return (String) getStateHelper().eval(PropertyKeys.topItemDisableIconLeft, PanelMenuIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(PropertyKeys.topItemDisableIconLeft, PanelIcons.DEFAULT.toString()); } public void setTopItemDisableIconLeft(String topItemDisableIconLeft) { @@ -215,7 +215,7 @@ } public String getTopItemDisableIconRight() { - return (String) getStateHelper().eval(PropertyKeys.topItemDisableIconRight, PanelMenuIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(PropertyKeys.topItemDisableIconRight, PanelIcons.DEFAULT.toString()); } public void setTopItemDisableIconRight(String topItemDisableIconRight) { @@ -239,7 +239,7 @@ } public String getGroupExpandIconLeft() { - return (String) getStateHelper().eval(PropertyKeys.groupExpandIconLeft, PanelMenuIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(PropertyKeys.groupExpandIconLeft, PanelIcons.DEFAULT.toString()); } public void setGroupExpandIconLeft(String groupExpandIconLeft) { @@ -247,7 +247,7 @@ } public String getGroupExpandIconRight() { - return (String) getStateHelper().eval(PropertyKeys.groupExpandIconRight, PanelMenuIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(PropertyKeys.groupExpandIconRight, PanelIcons.DEFAULT.toString()); } public void setGroupExpandIconRight(String groupExpandIconRight) { @@ -255,7 +255,7 @@ } public String getGroupCollapseIconLeft() { - return (String) getStateHelper().eval(PropertyKeys.groupCollapseIconLeft, PanelMenuIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(PropertyKeys.groupCollapseIconLeft, PanelIcons.DEFAULT.toString()); } public void setGroupCollapseIconLeft(String groupCollapseIconLeft) { @@ -263,7 +263,7 @@ } public String getGroupCollapseIconRight() { - return (String) getStateHelper().eval(PropertyKeys.groupCollapseIconRight, PanelMenuIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(PropertyKeys.groupCollapseIconRight, PanelIcons.DEFAULT.toString()); } public void setGroupCollapseIconRight(String groupCollapseIconRight) { @@ -271,7 +271,7 @@ } public String getGroupDisableIconLeft() { - return (String) getStateHelper().eval(PropertyKeys.groupDisableIconLeft, PanelMenuIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(PropertyKeys.groupDisableIconLeft, PanelIcons.DEFAULT.toString()); } public void setGroupDisableIconLeft(String groupDisableIconLeft) { @@ -279,7 +279,7 @@ } public String getGroupDisableIconRight() { - return (String) getStateHelper().eval(PropertyKeys.groupDisableIconRight, PanelMenuIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(PropertyKeys.groupDisableIconRight, PanelIcons.DEFAULT.toString()); } public void setGroupDisableIconRight(String groupDisableIconRight) { @@ -303,7 +303,7 @@ } public String getTopGroupExpandIconLeft() { - return (String) getStateHelper().eval(PropertyKeys.topGroupExpandIconLeft, PanelMenuIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(PropertyKeys.topGroupExpandIconLeft, PanelIcons.DEFAULT.toString()); } public void setTopGroupExpandIconLeft(String topGroupExpandIconLeft) { @@ -311,7 +311,7 @@ } public String getTopGroupExpandIconRight() { - return (String) getStateHelper().eval(PropertyKeys.topGroupExpandIconRight, PanelMenuIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(PropertyKeys.topGroupExpandIconRight, PanelIcons.DEFAULT.toString()); } public void setTopGroupExpandIconRight(String topGroupExpandIconRight) { @@ -319,7 +319,7 @@ } public String getTopGroupCollapseIconLeft() { - return (String) getStateHelper().eval(PropertyKeys.topGroupCollapseIconLeft, PanelMenuIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(PropertyKeys.topGroupCollapseIconLeft, PanelIcons.DEFAULT.toString()); } public void setTopGroupCollapseIconLeft(String topGroupCollapseIconLeft) { @@ -327,7 +327,7 @@ } public String getTopGroupCollapseIconRight() { - return (String) getStateHelper().eval(PropertyKeys.topGroupCollapseIconRight, PanelMenuIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(PropertyKeys.topGroupCollapseIconRight, PanelIcons.DEFAULT.toString()); } public void setTopGroupCollapseIconRight(String topGroupCollapseIconRight) { @@ -335,7 +335,7 @@ } public String getTopGroupDisableIconLeft() { - return (String) getStateHelper().eval(PropertyKeys.topGroupDisableIconLeft, PanelMenuIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(PropertyKeys.topGroupDisableIconLeft, PanelIcons.DEFAULT.toString()); } public void setTopGroupDisableIconLeft(String topGroupDisableIconLeft) { @@ -343,7 +343,7 @@ } public String getTopGroupDisableIconRight() { - return (String) getStateHelper().eval(PropertyKeys.topGroupDisableIconRight, PanelMenuIcons.DEFAULT.toString()); + return (String) getStateHelper().eval(PropertyKeys.topGroupDisableIconRight, PanelIcons.DEFAULT.toString()); } public void setTopGroupDisableIconRight(String topGroupDisableIconRight) { Added: 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 (rev 0) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemHeaderRenderer.java 2011-01-05 12:19:36 UTC (rev 20891) @@ -0,0 +1,65 @@ +package org.richfaces.renderkit.html; + +import org.richfaces.component.AbstractTogglePanelTitledItem; +import org.richfaces.component.html.HtmlAccordionItem; +import org.richfaces.renderkit.RendererBase; + +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; +import java.io.IOException; + +import static org.richfaces.renderkit.HtmlConstants.*; +import static org.richfaces.renderkit.html.DivPanelRenderer.attributeAsString; + +class AccordionItemHeaderRenderer extends TableIconsRendererHelper<HtmlAccordionItem> { + + public AccordionItemHeaderRenderer() { + super("header", "rf-ac-itm"); + } + + protected void encodeHeaderIconLeft(ResponseWriter writer, FacesContext context, HtmlAccordionItem panel) throws IOException { + String iconInactive = panel.isDisabled() ? panel.getLeftIconDisabled() : panel.getLeftIconInactive(); + String iconActive = panel.isDisabled() ? panel.getLeftIconDisabled() : panel.getLeftIconActive(); + + encodeTdIcon(writer, context, cssClassPrefix + "-ico", iconInactive, iconActive); + } + + protected void encodeHeaderIconRight(ResponseWriter writer, FacesContext context, HtmlAccordionItem panel) throws IOException { + String iconInactive = panel.isDisabled() ? panel.getRightIconDisabled() : panel.getRightIconInactive(); + String iconActive = panel.isDisabled() ? panel.getRightIconDisabled() : panel.getRightIconActive(); + + //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); + } + + @Override + protected void encodeTdIcon(ResponseWriter writer, FacesContext context, String cssClass, String attrIconCollapsedValue, String attrIconExpandedValue) throws IOException { + writer.startElement(TD_ELEM, null); + writer.writeAttribute(CLASS_ATTRIBUTE, cssClass, null); + + encodeIdIcon(writer, context, attrIconCollapsedValue, cssIconsClassPrefix + "-act"); + encodeIdIcon(writer, context, attrIconExpandedValue, cssIconsClassPrefix + "-inact"); + + writer.endElement(TD_ELEM); + } + + @Override + protected void encodeHeaderTextValue(ResponseWriter writer, FacesContext context, HtmlAccordionItem titledItem) throws IOException { + if (titledItem.isDisabled()) { + encodeHeader(writer, context, titledItem, AbstractTogglePanelTitledItem.HeaderStates.disabled); + } else { + encodeHeader(writer, context, titledItem, AbstractTogglePanelTitledItem.HeaderStates.active); + encodeHeader(writer, context, titledItem, AbstractTogglePanelTitledItem.HeaderStates.inactive); + } + } + + private static void encodeHeader(ResponseWriter writer, FacesContext context, AbstractTogglePanelTitledItem component, + AbstractTogglePanelTitledItem.HeaderStates state) throws IOException { + writer.startElement(DIV_ELEM, component); + writer.writeAttribute(CLASS_ATTRIBUTE, RendererBase.concatClasses("rf-ac-itm-lbl-" + state.abbreviation(), attributeAsString(component, state.headerClass())), null); + + writeFacetOrAttr(writer, context, component, "header", component.getHeaderFacet(state)); + + writer.endElement(DIV_ELEM); + } +} Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemRenderer.java 2011-01-05 10:40:01 UTC (rev 20890) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemRenderer.java 2011-01-05 12:19:36 UTC (rev 20891) @@ -36,24 +36,13 @@ import org.ajax4jsf.javascript.JSObject; import org.richfaces.component.AbstractTogglePanelTitledItem; -import org.richfaces.component.AbstractTogglePanelTitledItem.HeaderStates; +import org.richfaces.component.html.HtmlAccordionItem; import org.richfaces.component.html.HtmlAccordionItem.PropertyKeys; import org.richfaces.renderkit.HtmlConstants; import org.richfaces.renderkit.RenderKitUtils; /** * - * <div id="clientId" class="rf-ac-itm"> - * <div id="clientId:header" class="rf-ac-itm-hdr"> - * <div class="rf-ac-itm-hdr-inact">Level 1</div> - * <div class="rf-ac-itm-hdr-act" >Level 1</div> - * <div class="rf-ac-itm-hdr-dis">Level 1</div> - * </div> - * <div id="clientId:content" class="rf-ac-itm-cnt"> - * Content will be here. - * </div> - * </div> - * * @author akolonitsky * @since 2010-08-05 */ @@ -76,11 +65,13 @@ .generic("onmousemove", PropertyKeys.onheadermousemove.toString(), "headermousemove") .generic("onmouseup", PropertyKeys.onheadermouseup.toString(), "headermouseup"); + private final TableIconsRendererHelper<HtmlAccordionItem> headerRenderer = new AccordionItemHeaderRenderer(); + @Override protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { super.doEncodeBegin(writer, context, component); - encodeHeader(context, component, writer); + encodeHeader(writer, context, (HtmlAccordionItem) component); encodeContentBegin(component, writer); } @@ -92,7 +83,7 @@ @Override protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { - encodeContentEnd(component, writer); + encodeContentEnd(writer, component); super.doEncodeEnd(writer, context, component); } @@ -121,48 +112,20 @@ } } - private void encodeContentEnd(UIComponent component, ResponseWriter responseWriter) throws IOException { - responseWriter.endElement(DIV_ELEM); - } - - private void encodeHeader(FacesContext context, UIComponent component, ResponseWriter writer) throws IOException { - - writer.startElement(DIV_ELEM, component); - writer.writeAttribute(CLASS_ATTRIBUTE, concatClasses("rf-ac-itm-hdr", attributeAsString(component, PropertyKeys.headerClass)), null); - writer.writeAttribute(ID_ATTRIBUTE, component.getClientId() + ":header", null); - renderPassThroughAttributes(context, component, HEADER_ATTRIBUTES); - - AbstractTogglePanelTitledItem titledItem = (AbstractTogglePanelTitledItem) component; - boolean isActive = titledItem.isActive(); - boolean isDisabled = titledItem.isDisabled(); - encodeHeader(context, titledItem, writer, HeaderStates.inactive, !isActive && !isDisabled); - encodeHeader(context, titledItem, writer, HeaderStates.active, isActive && !isDisabled); - encodeHeader(context, titledItem, writer, HeaderStates.disabled, isDisabled); - + private void encodeContentEnd(ResponseWriter writer, UIComponent component) throws IOException { writer.endElement(DIV_ELEM); } - private void encodeHeader(FacesContext facesContext, AbstractTogglePanelTitledItem component, ResponseWriter writer, - HeaderStates state, Boolean isDisplay) throws IOException { - + private void encodeHeader(ResponseWriter writer, FacesContext context, HtmlAccordionItem component) throws IOException { writer.startElement(DIV_ELEM, component); - if (!isDisplay) { - writer.writeAttribute(STYLE_ATTRIBUTE, "display : none", null); - } + String stateCssClass = "rf-ac-itm-hdr-" + (component.isDisabled() ? "dis" : (component.isActive() ? "act" : "inact")); + writer.writeAttribute(CLASS_ATTRIBUTE, concatClasses("rf-ac-itm-hdr", stateCssClass, attributeAsString(component, PropertyKeys.headerClass)), null); - String name = "headerClass" + capitalize(state.toString()); - writer.writeAttribute(CLASS_ATTRIBUTE, concatClasses("rf-ac-itm-hdr-" + state.abbreviation(), attributeAsString(component, name)), null); + writer.writeAttribute(ID_ATTRIBUTE, component.getClientId() + ":header", null); + renderPassThroughAttributes(context, component, HEADER_ATTRIBUTES); - UIComponent headerFacet = component.getHeaderFacet(state); - if (headerFacet != null && headerFacet.isRendered()) { - headerFacet.encodeAll(facesContext); - } else { - Object headerText = component.getAttributes().get("header"); - if (headerText != null && !headerText.equals("")) { - writer.writeText(headerText, null); - } - } + headerRenderer.encodeHeader(writer, context, component); writer.endElement(DIV_ELEM); } Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionRenderer.java 2011-01-05 10:40:01 UTC (rev 20890) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionRenderer.java 2011-01-05 12:19:36 UTC (rev 20891) @@ -46,6 +46,7 @@ @ResourceDependency(name = "richfaces.js"), @ResourceDependency(name = "richfaces-base-component.js"), @ResourceDependency(library = "org.richfaces", name = "accordion.ecss"), + @ResourceDependency(library = "org.richfaces", name = "icons.ecss"), @ResourceDependency(library = "org.richfaces", name = "togglePanel.js"), @ResourceDependency(library = "org.richfaces", name = "accordion.js") }) public class AccordionRenderer extends TogglePanelRenderer { 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-05 10:40:01 UTC (rev 20890) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/CollapsiblePanelRenderer.java 2011-01-05 12:19:36 UTC (rev 20891) @@ -53,28 +53,38 @@ @ResourceDependency(library = "org.richfaces", name = "togglePanelItem.js"), @ResourceDependency(library = "org.richfaces", name = "collapsiblePanel.js"), @ResourceDependency(library = "org.richfaces", name = "collapsiblePanelItem.js"), + @ResourceDependency(library = "org.richfaces", name = "icons.ecss"), @ResourceDependency(library = "org.richfaces", name = "collapsiblePanel.ecss") }) public class CollapsiblePanelRenderer extends TogglePanelRenderer { public static final String SWITCH = "switch"; public static final String BEFORE_SWITCH = "beforeswitch"; - private final TableIconsRendererHelper headerRenderer = new TableIconsRendererHelper("header", "rf-cp", "rf-cp-ico-") { + private final TableIconsRendererHelper<HtmlCollapsiblePanel> headerRenderer = new TableIconsRendererHelper<HtmlCollapsiblePanel>("header", "rf-cp") { - protected void encodeHeaderIconLeft(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { - HtmlCollapsiblePanel panel = (HtmlCollapsiblePanel) component; - - encodeTdIcon(writer, context, cssClassPrefix + "-ico", panel.isExpanded(), + protected void encodeHeaderIconLeft(ResponseWriter writer, FacesContext context, HtmlCollapsiblePanel panel) throws IOException { + encodeTdIcon(writer, context, cssClassPrefix + "-ico", panel.getLeftCollapsedIcon(), panel.getLeftExpandedIcon()); } - protected void encodeHeaderIconRight(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { - HtmlCollapsiblePanel panel = (HtmlCollapsiblePanel) component; - + protected void encodeHeaderIconRight(ResponseWriter writer, FacesContext context, HtmlCollapsiblePanel 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.isExpanded(), + encodeTdIcon(writer, context, cssClassPrefix + "-exp-ico", panel.getRightCollapsedIcon(), panel.getRightExpandedIcon()); } + + @Override + protected void encodeHeaderTextValue(ResponseWriter writer, FacesContext context, HtmlCollapsiblePanel component) throws IOException { + writer.startElement(DIV_ELEM, null); + writer.writeAttribute(CLASS_ATTRIBUTE, cssClassPrefix + "-lbl-exp", null); + writeFacetOrAttr(writer, context, component, text, text + "Expanded"); + writer.endElement(DIV_ELEM); + + writer.startElement(DIV_ELEM, null); + writer.writeAttribute(CLASS_ATTRIBUTE, cssClassPrefix + "-lbl-colps", null); + writeFacetOrAttr(writer, context, component, text, text + "Collapsed"); + writer.endElement(DIV_ELEM); + } }; public TableIconsRendererHelper getHeaderRenderer() { @@ -108,7 +118,7 @@ protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent comp) throws IOException { super.doEncodeBegin(writer, context, comp); - encodeHeader(context, comp, writer); + encodeHeader(writer, context, (HtmlCollapsiblePanel) comp); } @Override @@ -137,10 +147,12 @@ return options; } - private void encodeHeader(FacesContext context, UIComponent component, ResponseWriter writer) throws IOException { - writer.startElement(DIV_ELEM, component); + private void encodeHeader(ResponseWriter writer, FacesContext context, HtmlCollapsiblePanel component) throws IOException { + writer.startElement(DIV_ELEM, null); writer.writeAttribute(ID_ATTRIBUTE, component.getClientId(context) + ":header", null); - writer.writeAttribute(CLASS_ATTRIBUTE, concatClasses("rf-cp-hdr", attributeAsString(component, "headerClass")), null); + writer.writeAttribute(CLASS_ATTRIBUTE, concatClasses("rf-cp-hdr", + "rf-cp-hdr-" + (component.isExpanded() ? "exp" : "colps"), + attributeAsString(component, "headerClass")), null); headerRenderer.encodeHeader(writer, context, component); @@ -204,7 +216,7 @@ } private String getPlaceHolder(String id) { - return "<div id=\"" + id + "\" style=\"display: none\" ></div>"; + return "<div id=\"" + id + "\" style=\"display:none\" ></div>"; } private void encodeContent(ResponseWriter writer, FacesContext context, UIComponent component, boolean visible) throws IOException { Added: 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 (rev 0) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupHeaderRenderer.java 2011-01-05 12:19:36 UTC (rev 20891) @@ -0,0 +1,29 @@ +package org.richfaces.renderkit.html; + +import org.richfaces.component.html.HtmlPanelMenuGroup; + +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; +import java.io.IOException; + +class PanelMenuGroupHeaderRenderer extends TableIconsRendererHelper<HtmlPanelMenuGroup> { + + PanelMenuGroupHeaderRenderer(String cssClassPrefix) { + super("label", cssClassPrefix, "rf-pm-ico"); + } + + protected void encodeHeaderIconLeft(ResponseWriter writer, FacesContext context, HtmlPanelMenuGroup group) throws IOException { + String iconCollapsed = group.isDisabled() ? group.getIconLeftDisabled() : group.getIconLeftCollapsed(); + String iconExpanded = group.isDisabled() ? group.getIconLeftDisabled() : group.getIconLeftExpanded(); + + encodeTdIcon(writer, context, cssClassPrefix + "-ico", iconCollapsed, iconExpanded); + } + + protected void encodeHeaderIconRight(ResponseWriter writer, FacesContext context, HtmlPanelMenuGroup group) throws IOException { + String iconCollapsed = group.isDisabled() ? group.getIconRightDisabled() : group.getIconRightCollapsed(); + String iconExpanded = group.isDisabled() ? group.getIconRightDisabled() : group.getIconRightExpanded(); + + //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); + } +} 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-05 10:40:01 UTC (rev 20890) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java 2011-01-05 12:19:36 UTC (rev 20891) @@ -56,36 +56,9 @@ //TODO nick - shouldn't this be rf-pm-gr-top? private static final String TOP_CSS_CLASS_PREFIX = "rf-pm-top-gr"; - private static class HeaderRenderer extends TableIconsRendererHelper { + private final TableIconsRendererHelper<HtmlPanelMenuGroup> headerRenderer = new PanelMenuGroupHeaderRenderer(CSS_CLASS_PREFIX); + private final TableIconsRendererHelper<HtmlPanelMenuGroup> topHeaderRenderer = new PanelMenuGroupHeaderRenderer(TOP_CSS_CLASS_PREFIX); - public HeaderRenderer(String cssClassPrefix) { - super("label", cssClassPrefix, "rf-pm-ico-"); - } - - protected void encodeHeaderIconLeft(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { - HtmlPanelMenuGroup group = (HtmlPanelMenuGroup) component; - - String iconCollapsed = group.isDisabled() ? group.getIconLeftDisabled() : group.getIconLeftCollapsed(); - String iconExpanded = group.isDisabled() ? group.getIconLeftDisabled() : group.getIconLeftExpanded(); - - encodeTdIcon(writer, context, cssClassPrefix + "-ico", group.isExpanded(), iconCollapsed, iconExpanded); - } - - protected void encodeHeaderIconRight(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { - HtmlPanelMenuGroup group = (HtmlPanelMenuGroup) component; - - String iconCollapsed = group.isDisabled() ? group.getIconRightDisabled() : group.getIconRightCollapsed(); - String iconExpanded = group.isDisabled() ? group.getIconRightDisabled() : group.getIconRightExpanded(); - - //TODO nick - should this be "-ico-exp"? also why expanded icon state is connected with right icon alignment? - encodeTdIcon(writer, context, cssClassPrefix + "-exp-ico", group.isExpanded(), iconCollapsed, iconExpanded); - } - - } - - private final TableIconsRendererHelper headerRenderer = new HeaderRenderer(CSS_CLASS_PREFIX); - private final TableIconsRendererHelper topHeaderRenderer = new HeaderRenderer(TOP_CSS_CLASS_PREFIX); - @Override protected void doDecode(FacesContext context, UIComponent component) { AbstractPanelMenuGroup menuGroup = (AbstractPanelMenuGroup) component; @@ -132,7 +105,8 @@ private void encodeHeader(ResponseWriter writer, FacesContext context, HtmlPanelMenuGroup menuGroup) throws IOException { writer.startElement(DIV_ELEM, null); writer.writeAttribute(ID_ATTRIBUTE, menuGroup.getClientId(context) + ":hdr", null); - writer.writeAttribute(CLASS_ATTRIBUTE, getCssClass(menuGroup, "-hdr"), null); + writer.writeAttribute(CLASS_ATTRIBUTE, concatClasses(getCssClass(menuGroup, "-hdr"), + getCssClass(menuGroup, "-hdr-" + (menuGroup.isExpanded() ? "exp" : "colps"))), null); (menuGroup.isTopItem() ? topHeaderRenderer : headerRenderer).encodeHeader(writer, context, menuGroup); Deleted: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuIcons.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuIcons.java 2011-01-05 10:40:01 UTC (rev 20890) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuIcons.java 2011-01-05 12:19:36 UTC (rev 20891) @@ -1,25 +0,0 @@ -package org.richfaces.renderkit.html; - -public enum PanelMenuIcons { - none("rf-pm-none"), - disc("rf-pm-disc"), - grid("rf-pm-grid"), - chevron("rf-pm-chevron"), - chevronUp("rf-pm-chevron-up"), - chevronDown("rf-pm-chevron-down"), - triangle("rf-pm-triangle"), - triangleUp("rf-pm-triangle-up"), - triangleDown("rf-pm-triangle-down"); - - public static final PanelMenuIcons DEFAULT = none; - - private final String cssClass; - - private PanelMenuIcons(String cssClass) { - this.cssClass = cssClass; - } - - public String cssClass() { - return cssClass; - } -} 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-05 10:40:01 UTC (rev 20890) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java 2011-01-05 12:19:36 UTC (rev 20891) @@ -40,6 +40,7 @@ import org.richfaces.component.html.HtmlPanelMenuItem; import org.richfaces.renderkit.HtmlConstants; import org.richfaces.renderkit.RenderKitUtils; +import org.richfaces.renderkit.util.PanelIcons; /** * @author akolonitsky @@ -107,7 +108,7 @@ public void encodeTdIcon(ResponseWriter writer, FacesContext context, String classPrefix, String attrIconValue) throws IOException { writer.startElement(TD_ELEM, null); try { - PanelMenuIcons icon = PanelMenuIcons.valueOf(attrIconValue); + PanelIcons icon = PanelIcons.valueOf(attrIconValue); writer.writeAttribute(CLASS_ATTRIBUTE, concatClasses(classPrefix, icon.cssClass()), null); } catch (IllegalArgumentException e) { writer.writeAttribute(CLASS_ATTRIBUTE, classPrefix, null); Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java 2011-01-05 10:40:01 UTC (rev 20890) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java 2011-01-05 12:19:36 UTC (rev 20891) @@ -55,6 +55,7 @@ @ResourceDependency(library = "org.richfaces", name = "panelMenu.js"), @ResourceDependency(library = "org.richfaces", name = "panelMenuItem.js"), @ResourceDependency(library = "org.richfaces", name = "panelMenuGroup.js"), + @ResourceDependency(library = "org.richfaces", name = "icons.ecss"), @ResourceDependency(library = "org.richfaces", name = "panelMenu.ecss") }) public class PanelMenuRenderer extends DivPanelRenderer { Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java 2011-01-05 10:40:01 UTC (rev 20890) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java 2011-01-05 12:19:36 UTC (rev 20891) @@ -146,9 +146,8 @@ writer.startElement(TD_ELEM, tab); writer.writeAttribute(ID_ATTRIBUTE, tab.getClientId() + ":header:" + state.toString(), null); renderPassThroughAttributes(context, tab, HEADER_ATTRIBUTES); - String name = "headerClass" + capitalize(state.toString()); writer.writeAttribute(CLASS_ATTRIBUTE, concatClasses("rf-tb-hdr rf-tb-hdr-" + state.abbreviation(), - attributeAsString(tab, HtmlTab.PropertyKeys.headerClass), attributeAsString(tab, name)), null); + attributeAsString(tab, HtmlTab.PropertyKeys.headerClass), attributeAsString(tab, state.headerClass())), null); writer.writeAttribute(STYLE_ATTRIBUTE, concatStyles(isDisplay ? "" : "display : none", attributeAsString(tab, HtmlTab.PropertyKeys.headerStyle.toString())), null); writer.startElement("span", tab); @@ -223,4 +222,3 @@ return AbstractTabPanel.class; } } - 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-05 10:40:01 UTC (rev 20890) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TableIconsRendererHelper.java 2011-01-05 12:19:36 UTC (rev 20891) @@ -1,6 +1,7 @@ package org.richfaces.renderkit.html; import org.richfaces.renderkit.RenderKitUtils; +import org.richfaces.renderkit.util.PanelIcons; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; @@ -9,21 +10,24 @@ import static org.richfaces.component.util.HtmlUtil.concatClasses; import static org.richfaces.renderkit.HtmlConstants.*; -import static org.richfaces.renderkit.html.DivPanelRenderer.styleElement; -public abstract class TableIconsRendererHelper { +public abstract class TableIconsRendererHelper<T extends UIComponent> { protected final String text; protected final String cssClassPrefix; protected final String cssIconsClassPrefix; - public TableIconsRendererHelper(String text, String cssClassPrefix, String cssIconsClassPrefix) { + protected TableIconsRendererHelper(String text, String cssClassPrefix, String cssIconsClassPrefix) { this.text = text; this.cssClassPrefix = cssClassPrefix; this.cssIconsClassPrefix = cssIconsClassPrefix; } - public void encodeHeader(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { + protected TableIconsRendererHelper(String text, String cssClassPrefix) { + this(text, cssClassPrefix, cssClassPrefix + "-ico"); + } + + public void encodeHeader(ResponseWriter writer, FacesContext context, T component) throws IOException { writer.startElement(TABLE_ELEMENT, null); writer.writeAttribute(CLASS_ATTRIBUTE, cssClassPrefix + "-gr", null); writer.startElement(TBODY_ELEMENT, null); @@ -38,68 +42,64 @@ writer.endElement(TABLE_ELEMENT); } - private void encodeHeaderText(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { + protected void encodeHeaderText(ResponseWriter writer, FacesContext context, T component) throws IOException { writer.startElement(TD_ELEM, null); writer.writeAttribute(CLASS_ATTRIBUTE, cssClassPrefix + "-lbl", null); + encodeHeaderTextValue(writer, context, component); + writer.endElement(TD_ELEM); } - protected void encodeHeaderTextValue(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { - UIComponent headerFacet = component.getFacet(text); + protected void encodeHeaderTextValue(ResponseWriter writer, FacesContext context, T component) throws IOException { + writeFacetOrAttr(writer, context, component, text, text); + } + + public static void writeFacetOrAttr(ResponseWriter writer, FacesContext context, UIComponent component, String attr, String facetName) throws IOException { + writeFacetOrAttr(writer, context, component, attr, component.getFacet(facetName)); + } + + public static void writeFacetOrAttr(ResponseWriter writer, FacesContext context, UIComponent component, String attr, UIComponent headerFacet) throws IOException { if (headerFacet != null && headerFacet.isRendered()) { headerFacet.encodeAll(context); } else { - Object label = component.getAttributes().get(text); + Object label = component.getAttributes().get(attr); if (label != null && !label.equals("")) { writer.writeText(label, null); } } } - protected abstract void encodeHeaderIconLeft(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException; + protected abstract void encodeHeaderIconLeft(ResponseWriter writer, FacesContext context, T component) throws IOException; - protected abstract void encodeHeaderIconRight(ResponseWriter writer, FacesContext context, UIComponent menuItem) throws IOException; + protected abstract void encodeHeaderIconRight(ResponseWriter writer, FacesContext context, T menuItem) throws IOException; - protected void encodeTdIcon(ResponseWriter writer, FacesContext context, String cssClass, boolean isExpanded, String attrIconCollapsedValue, String attrIconExpandedValue) throws IOException { + protected void encodeTdIcon(ResponseWriter writer, FacesContext context, String cssClass, String attrIconCollapsedValue, String attrIconExpandedValue) throws IOException { writer.startElement(TD_ELEM, null); writer.writeAttribute(CLASS_ATTRIBUTE, cssClass, null); - encodeIdIcon(writer, context, isExpanded, attrIconCollapsedValue, cssIconsClassPrefix + "colps"); - encodeIdIcon(writer, context, !isExpanded, attrIconExpandedValue, cssIconsClassPrefix + "exp"); + encodeIdIcon(writer, context, attrIconCollapsedValue, cssIconsClassPrefix + "-colps"); + encodeIdIcon(writer, context, attrIconExpandedValue, cssIconsClassPrefix + "-exp"); writer.endElement(TD_ELEM); } - protected void encodeIdIcon(ResponseWriter writer, FacesContext context, boolean isExpanded, String attrIconValue, String styleClass) throws IOException { + protected void encodeIdIcon(ResponseWriter writer, FacesContext context, String attrIconValue, String styleClass) throws IOException { if (attrIconValue == null || attrIconValue.trim().length() <= 0) { - encodeDivIcon(writer, isExpanded, PanelMenuIcons.none, styleClass); + encodeDivIcon(writer, PanelIcons.none, styleClass); } else { - PanelMenuIcons icon = getIcon(attrIconValue); + PanelIcons icon = PanelIcons.getIcon(attrIconValue); if (icon != null) { - encodeDivIcon(writer, isExpanded, icon, styleClass); + encodeDivIcon(writer, icon, styleClass); } else { encodeImage(writer, context, attrIconValue); } } } - protected PanelMenuIcons getIcon(String attrIconCollapsedValue) { - if (attrIconCollapsedValue == null) { - return null; - } - - try { - return PanelMenuIcons.valueOf(attrIconCollapsedValue); - } catch (IllegalArgumentException e) { - return null; - } - } - - public static void encodeDivIcon(ResponseWriter writer, boolean isDisplay, PanelMenuIcons icon, String styleClass) throws IOException { + public static void encodeDivIcon(ResponseWriter writer, PanelIcons icon, String styleClass) throws IOException { writer.startElement(DIV_ELEM, null); writer.writeAttribute(CLASS_ATTRIBUTE, concatClasses(styleClass, icon.cssClass()), null); - writer.writeAttribute(STYLE_ATTRIBUTE, styleElement("display", isDisplay ? "none" : "block"), null); writer.endElement(DIV_ELEM); } Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/accordion.ecss =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/accordion.ecss 2011-01-05 10:40:01 UTC (rev 20890) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/accordion.ecss 2011-01-05 12:19:36 UTC (rev 20891) @@ -26,10 +26,6 @@ min-height: 0px; } -.rf-ac-itm-hdr-act {} -.rf-ac-itm-hdr-inact {} -.rf-ac-itm-hdr-dis {} - .rf-ac-itm-cnt { border-bottom-width: 1px; border-bottom-style: solid; @@ -40,3 +36,33 @@ padding: 10px; } +.rf-ac-itm-hdr-act {} +.rf-ac-itm-hdr-inact {} +.rf-ac-itm-hdr-dis {} + + +.rf-ac-itm-gr { width: 100%} + +.rf-ac-itm-ico { width: 16px; height: 16px;} +.rf-ac-itm-exp-ico { width: 16px; height: 16px;} +.rf-ac-itm-ico-act {} +.rf-ac-itm-ico-inact {} + +.rf-ac-itm-lbl {} +.rf-ac-itm-lbl-act {} +.rf-ac-itm-lbl-inact {} + +.rf-ac-itm-hdr-act .rf-ac-itm-ico-act { display: block; } +.rf-ac-itm-hdr-act .rf-ac-itm-ico-inact { display: none; } +.rf-ac-itm-hdr-act .rf-ac-itm-lbl-act { display: block; } +.rf-ac-itm-hdr-act .rf-ac-itm-lbl-inact { display: none; } + +.rf-ac-itm-hdr-inact .rf-ac-itm-ico-act { display: none; } +.rf-ac-itm-hdr-inact .rf-ac-itm-ico-inact { display: block; } +.rf-ac-itm-hdr-inact .rf-ac-itm-lbl-act { display: none; } +.rf-ac-itm-hdr-inact .rf-ac-itm-lbl-inact { display: block; } + +.rf-ac-itm-hdr-dis .rf-ac-itm-ico-act { display: none; } +.rf-ac-itm-hdr-dis .rf-ac-itm-ico-inact { display: block; } +.rf-ac-itm-hdr-dis .rf-ac-itm-lbl-act { display: none; } +.rf-ac-itm-hdr-dis .rf-ac-itm-lbl-inact { display: block; } Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/accordionItem.js =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/accordionItem.js 2011-01-05 10:40:01 UTC (rev 20890) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/accordionItem.js 2011-01-05 12:19:36 UTC (rev 20891) @@ -66,12 +66,7 @@ * @return {jQuery Object} * */ __header : function (state) { - var res = $(rf.getDomElement(this.id + ":header")); - if (state) { - return res.find(".rf-ac-itm-hdr-" + state); - } - - return res; + return $(rf.getDomElement(this.id + ":header")); }, /** @@ -97,8 +92,7 @@ } this.__content().show(); - this.__header("inact").hide(); - this.__header("act").show(); + this.__header().addClass("rf-ac-itm-hdr-act").removeClass("rf-ac-itm-hdr-inact"); return this.__fireEnter(); }, @@ -134,8 +128,7 @@ } this.__content().hide(); - this.__header("act").hide(); - this.__header("inact").show(); + this.__header().removeClass("rf-ac-itm-hdr-act").addClass("rf-ac-itm-hdr-inact"); return true; }, Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/collapsiblePanel.ecss =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/collapsiblePanel.ecss 2011-01-05 10:40:01 UTC (rev 20890) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/collapsiblePanel.ecss 2011-01-05 12:19:36 UTC (rev 20891) @@ -30,4 +30,25 @@ color:'#{richSkin.generalTextColor}'; font-family:'#{richSkin.generalFamilyFont}'; padding:10px; -} \ No newline at end of file +} + +.rf-cp-gr { width: 100%} + +.rf-cp-ico { width: 16px; height: 16px;} +.rf-cp-exp-ico { width: 16px; height: 16px;} +.rf-cp-ico-colps {} +.rf-cp-ico-exp {} + +.rf-cp-lbl {} +.rf-cp-lbl-colps {} +.rf-cp-lbl-exp {} + +.rf-cp-hdr-exp .rf-cp-ico-exp { display: block; } +.rf-cp-hdr-exp .rf-cp-ico-colps { display: none; } +.rf-cp-hdr-exp .rf-cp-lbl-exp { display: block; } +.rf-cp-hdr-exp .rf-cp-lbl-colps { display: none; } + +.rf-cp-hdr-colps .rf-cp-ico-exp { display: none; } +.rf-cp-hdr-colps .rf-cp-ico-colps { display: block; } +.rf-cp-hdr-colps .rf-cp-lbl-exp { display: none; } +.rf-cp-hdr-colps .rf-cp-lbl-colps { display: block; } Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/collapsiblePanelItem.js =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/collapsiblePanelItem.js 2011-01-05 10:40:01 UTC (rev 20890) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/collapsiblePanelItem.js 2011-01-05 12:19:36 UTC (rev 20891) @@ -28,18 +28,20 @@ init : function (componentId, options) { rf.ui.TogglePanelItem.call(this, componentId, options); + + this.headerClass = "rf-cp-hdr-" + this.__state(); }, __enter : function () { - rf.getDomElement(this.id).style.display = "block"; - this.__header(this.__state()).show(); + this.__content().show(); + this.__header().addClass(this.headerClass); return true; }, __leave : function () { - rf.getDomElement(this.id).style.display = "none"; - this.__header(this.__state()).hide(); + this.__content().hide(); + this.__header().removeClass(this.headerClass); return true; }, @@ -48,13 +50,12 @@ return this.getName() === "true" ? "exp" : "colps"; }, - __header : function (state) { - var res = $(rf.getDomElement(this.togglePanelId + ":header")); - if (state) { - return res.find(".rf-cp-hdr-" + state); - } + __content : function () { + return $(rf.getDomElement(this.id)); + }, - return res; + __header : function () { + return $(rf.getDomElement(this.togglePanelId + ":header")); } }); })(jQuery, RichFaces); 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-05 10:40:01 UTC (rev 20890) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenu.ecss 2011-01-05 12:19:36 UTC (rev 20891) @@ -270,18 +270,13 @@ .rf-pm-ico-colps {} .rf-pm-ico-exp {} +.rf-pm-ico {} +.rf-pm-ico-colps {} +.rf-pm-ico-exp {} -/* Icons */ -.rf-pm-chevron { width: 16px; height: 16px; background-image: "url(#{resource['org.richfaces.images:Chevron.png']})" } -.rf-pm-chevron-down { width: 16px; height: 16px; background-image: "url(#{resource['org.richfaces.images:ChevronDown.png']})" } -.rf-pm-chevron-left { width: 16px; height: 16px; background-image: "url(#{resource['org.richfaces.images:ChevronLeft.png']})" } -.rf-pm-chevron-up { width: 16px; height: 16px; background-image: "url(#{resource['org.richfaces.images:ChevronUp.png']})" } -.rf-pm-disc { width: 16px; height: 16px; background-image: "url(#{resource['org.richfaces.images:Disc.png']})" } -.rf-pm-grid { width: 16px; height: 16px; background-image: "url(#{resource['org.richfaces.images:Grid.png']})" } -.rf-pm-none { width: 16px; height: 16px; } -.rf-pm-spacer { width: 16px; height: 16px; background-image: "url(#{resource['org.richfaces.images:Spacer.png']})" } -.rf-pm-triangle { width: 16px; height: 16px; background-image: "url(#{resource['org.richfaces.images:Triangle.png']})" } -.rf-pm-triangle-down { width: 16px; height: 16px; background-image: "url(#{resource['org.richfaces.images:TriangleDown.png']})" } -.rf-pm-triangle-left { width: 16px; height: 16px; background-image: "url(#{resource['org.richfaces.images:TriangleLeft.png']})" } -.rf-pm-triangle-up { width: 16px; height: 16px; background-image: "url(#{resource['org.richfaces.images:TriangleUp.png']})" } \ No newline at end of file +.rf-pm-hdr-exp .rf-pm-ico-exp { display: block; } +.rf-pm-hdr-exp .rf-pm-ico-colps { display: none; } + +.rf-pm-hdr-colps .rf-pm-ico-exp { display: none; } +.rf-pm-hdr-colps .rf-pm-ico-colps { display: block; } 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-05 10:40:01 UTC (rev 20890) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/panelMenuGroup.js 2011-01-05 12:19:36 UTC (rev 20891) @@ -196,10 +196,8 @@ __expand : function () { this.__content().removeClass("rf-pm-colps").addClass("rf-pm-exp"); - var header = this.__header(); - header.find(".rf-pm-ico-colps").hide(); - header.find(".rf-pm-ico-exp").show(); - + this.__header().removeClass("rf-pm-gr-hdr-colps").addClass("rf-pm-hdr-exp"); + this.__setExpandValue(true); }, @@ -222,9 +220,7 @@ __collapse : function () { this.__content().addClass("rf-pm-colps").removeClass("rf-pm-exp"); - var header = this.__header(); - header.find(".rf-pm-ico-exp").hide(); - header.find(".rf-pm-ico-colps").show(); + this.__header().addClass("rf-pm-hdr-colps").removeClass("rf-pm-hdr-exp"); this.__setExpandValue(false); }, Added: trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/AccordionRendererTest.java =================================================================== --- trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/AccordionRendererTest.java (rev 0) +++ trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/AccordionRendererTest.java 2011-01-05 12:19:36 UTC (rev 20891) @@ -0,0 +1,14 @@ +package org.richfaces.renderkit.html; + +import org.junit.Test; +import org.xml.sax.SAXException; + +import java.io.IOException; + +public class AccordionRendererTest extends RendererTestBase { + + @Test + public void testAccordionItem() throws IOException, SAXException { + doTest("accordionItem", "f:item"); + } +} Modified: trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/CollapsiblePanelRendererTest.java =================================================================== --- trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/CollapsiblePanelRendererTest.java 2011-01-05 10:40:01 UTC (rev 20890) +++ trunk/ui/output/ui/src/test/java/org/richfaces/renderkit/html/CollapsiblePanelRendererTest.java 2011-01-05 12:19:36 UTC (rev 20891) @@ -9,6 +9,6 @@ @Test public void testEmpty() throws IOException, SAXException { -// doTest("panelMenuGroup", "f:panelMenuGroup"); + doTest("collapsiblePanel", "f:panel"); } } Added: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/accordionItem.xhtml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/accordionItem.xhtml (rev 0) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/accordionItem.xhtml 2011-01-05 12:19:36 UTC (rev 20891) @@ -0,0 +1,47 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!-- + JBoss, Home of Professional Open Source + Copyright ${year}, Red Hat, Inc. and individual contributors + by the @authors tag. See the copyright.txt in the distribution for a + full listing of individual contributors. + + This is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of + the License, or (at your option) any later version. + + This software is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this software; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA, or see the FSF site: http://www.fsf.org. +--> + + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:fn="http://java.sun.com/jsp/jstl/functions" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:pn="http://richfaces.org/pn" + xmlns:rich="http://richfaces.org/rich"> + + <h:head> + <title>Richfaces MenuItem Test</title> + </h:head> + +<h:body> + <h:form id="f"> + <pn:accordion> + <pn:accordionItem id="item"></pn:accordionItem> + </pn:accordion> + </h:form> +</h:body> +</html> + + Added: 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 (rev 0) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/accordionItem.xmlunit.xml 2011-01-05 12:19:36 UTC (rev 20891) @@ -0,0 +1,26 @@ +<div class="rf-ac-itm" id="f:item"> + <div id="f:item:header" class="rf-ac-itm-hdr rf-ac-itm-hdr-act"> + <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"></div> + <div class="rf-ac-itm-ico-inact rf-ico-none"></div> + </td> + </tr> + </tbody> + </table> + </div> + <div id="f:item:content" class="rf-ac-itm-cnt"></div> + <script type="text/javascript">new + Text + </script> +</div> \ No newline at end of file Added: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/collapsiblePanel.xhtml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/collapsiblePanel.xhtml (rev 0) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/collapsiblePanel.xhtml 2011-01-05 12:19:36 UTC (rev 20891) @@ -0,0 +1,45 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!-- + JBoss, Home of Professional Open Source + Copyright ${year}, Red Hat, Inc. and individual contributors + by the @authors tag. See the copyright.txt in the distribution for a + full listing of individual contributors. + + This is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of + the License, or (at your option) any later version. + + This software is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this software; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA, or see the FSF site: http://www.fsf.org. +--> + + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:fn="http://java.sun.com/jsp/jstl/functions" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:pn="http://richfaces.org/pn" + xmlns:rich="http://richfaces.org/rich"> + + <h:head> + <title>Richfaces MenuItem Test</title> + </h:head> + +<h:body> + <h:form id="f"> + <pn:collapsiblePanel id="panel"></pn:collapsiblePanel> + </h:form> +</h:body> +</html> + + Added: 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 (rev 0) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/collapsiblePanel.xmlunit.xml 2011-01-05 12:19:36 UTC (rev 20891) @@ -0,0 +1,28 @@ +<div class="rf-cp rf-tgp" id="f:panel"> + <input type="hidden" name="f:panel-value" id="f:panel-value" value="true"></input> + <div class="rf-cp-hdr rf-cp-hdr-exp" id="f:panel:header"> + <table class="rf-cp-gr"> + <tbody> + <tr> + <td class="rf-cp-ico"> + <div class="rf-cp-ico-colps rf-ico-none"></div> + <div class="rf-cp-ico-exp rf-ico-none"></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"></div> + <div class="rf-cp-ico-exp rf-ico-none"></div> + </td> + </tr> + </tbody> + </table> + </div> + <div id="f:panel:content" class="rf-cp-b" style="display:block"></div> + <div id="f:panel:empty" style="display:none"></div> + <script type="text/javascript"> + Text + </script> +</div> \ No newline at end of file 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-05 10:40:01 UTC (rev 20890) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-group.xmlunit.xml 2011-01-05 12:19:36 UTC (rev 20891) @@ -1,17 +1,17 @@ <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"> + <div id="f:panelMenuGroup:hdr" class="rf-pm-gr-hdr rf-pm-gr-hdr-colps"> <table class="rf-pm-gr-gr"> <tbody> <tr> <td class="rf-pm-gr-ico"> - <div class="rf-pm-ico-colps rf-pm-triangle-down" style="display:block"></div> - <div class="rf-pm-ico-exp rf-pm-disc" style="display:none"></div> + <div class="rf-pm-ico-colps rf-ico-triangle-down"></div> + <div class="rf-pm-ico-exp rf-ico-disc"></div> </td> <td class="rf-pm-gr-lbl"></td> <td class="rf-pm-gr-exp-ico"> - <div class="rf-pm-ico-colps rf-pm-triangle-up" style="display:block"></div> - <div class="rf-pm-ico-exp rf-pm-disc" style="display:none"></div> + <div class="rf-pm-ico-colps rf-ico-triangle-up"></div> + <div class="rf-pm-ico-exp rf-ico-disc"></div> </td> </tr> </tbody> 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-05 10:40:01 UTC (rev 20890) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-groupDis.xmlunit.xml 2011-01-05 12:19:36 UTC (rev 20891) @@ -1,17 +1,17 @@ <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"> + <div id="f:panelMenuGroup-dis:hdr" class="rf-pm-gr-hdr rf-pm-gr-hdr-colps"> <table class="rf-pm-gr-gr"> <tbody> <tr> <td class="rf-pm-gr-ico"> - <div class="rf-pm-ico-colps rf-pm-chevron-down" style="display:block"></div> - <div class="rf-pm-ico-exp rf-pm-chevron-down" style="display:none"></div> + <div class="rf-pm-ico-colps rf-ico-chevron-down"></div> + <div class="rf-pm-ico-exp rf-ico-chevron-down"></div> </td> <td class="rf-pm-gr-lbl"></td> <td class="rf-pm-gr-exp-ico"> - <div class="rf-pm-ico-colps rf-pm-chevron-up" style="display:block"></div> - <div class="rf-pm-ico-exp rf-pm-chevron-up" style="display:none"></div> + <div class="rf-pm-ico-colps rf-ico-chevron-up"></div> + <div class="rf-pm-ico-exp rf-ico-chevron-up"></div> </td> </tr> </tbody> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-item.xmlunit.xml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-item.xmlunit.xml 2011-01-05 10:40:01 UTC (rev 20890) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-item.xmlunit.xml 2011-01-05 12:19:36 UTC (rev 20891) @@ -2,9 +2,9 @@ <table class="rf-pm-itm-gr"> <tbody> <tr> - <td class="rf-pm-itm-ico rf-pm-triangle-down"></td> + <td class="rf-pm-itm-ico rf-ico-triangle-down"></td> <td class="rf-pm-itm-lbl">panelMenuItem</td> - <td class="rf-pm-itm-exp-ico rf-pm-triangle-up"></td> + <td class="rf-pm-itm-exp-ico rf-ico-triangle-up"></td> </tr> </tbody> </table> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-itemDis.xmlunit.xml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-itemDis.xmlunit.xml 2011-01-05 10:40:01 UTC (rev 20890) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-itemDis.xmlunit.xml 2011-01-05 12:19:36 UTC (rev 20891) @@ -2,9 +2,9 @@ <table class="rf-pm-itm-gr"> <tbody> <tr> - <td class="rf-pm-itm-ico rf-pm-chevron-down"></td> + <td class="rf-pm-itm-ico rf-ico-chevron-down"></td> <td class="rf-pm-itm-lbl">panelMenuItem</td> - <td class="rf-pm-itm-exp-ico rf-pm-chevron-up"></td> + <td class="rf-pm-itm-exp-ico rf-ico-chevron-up"></td> </tr> </tbody> </table> 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-05 10:40:01 UTC (rev 20890) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topGroup.xmlunit.xml 2011-01-05 12:19:36 UTC (rev 20891) @@ -1,17 +1,17 @@ <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"> + <div id="f:panelMenuGroup-top:hdr" class="rf-pm-top-gr-hdr rf-pm-top-gr-hdr-colps"> <table class="rf-pm-top-gr-gr"> <tbody> <tr> <td class="rf-pm-top-gr-ico"> - <div class="rf-pm-ico-colps rf-pm-triangle" style="display:block"></div> - <div class="rf-pm-ico-exp rf-pm-disc" style="display:none"></div> + <div class="rf-pm-ico-colps rf-ico-triangle"></div> + <div class="rf-pm-ico-exp rf-ico-disc"></div> </td> <td class="rf-pm-top-gr-lbl"></td> <td class="rf-pm-top-gr-exp-ico"> - <div class="rf-pm-ico-colps rf-pm-triangle" style="display:block"></div> - <div class="rf-pm-ico-exp rf-pm-disc" style="display:none"></div> + <div class="rf-pm-ico-colps rf-ico-triangle"></div> + <div class="rf-pm-ico-exp rf-ico-disc"></div> </td> </tr> </tbody> 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-05 10:40:01 UTC (rev 20890) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topGroupDis.xmlunit.xml 2011-01-05 12:19:36 UTC (rev 20891) @@ -1,17 +1,17 @@ <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"> + <div id="f:panelMenuGroup-topDis:hdr" class="rf-pm-top-gr-hdr rf-pm-top-gr-hdr-colps"> <table class="rf-pm-top-gr-gr"> <tbody> <tr> <td class="rf-pm-top-gr-ico"> - <div class="rf-pm-ico-colps rf-pm-chevron" style="display:block"></div> - <div class="rf-pm-ico-exp rf-pm-chevron" style="display:none"></div> + <div class="rf-pm-ico-colps rf-ico-chevron"></div> + <div class="rf-pm-ico-exp rf-ico-chevron"></div> </td> <td class="rf-pm-top-gr-lbl"></td> <td class="rf-pm-top-gr-exp-ico"> - <div class="rf-pm-ico-colps rf-pm-chevron" style="display:block"></div> - <div class="rf-pm-ico-exp rf-pm-chevron" style="display:none"></div> + <div class="rf-pm-ico-colps rf-ico-chevron"></div> + <div class="rf-pm-ico-exp rf-ico-chevron"></div> </td> </tr> </tbody> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topItem.xmlunit.xml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topItem.xmlunit.xml 2011-01-05 10:40:01 UTC (rev 20890) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topItem.xmlunit.xml 2011-01-05 12:19:36 UTC (rev 20891) @@ -2,9 +2,9 @@ <table class="rf-pm-top-itm-gr"> <tbody> <tr> - <td class="rf-pm-top-itm-ico rf-pm-triangle"></td> + <td class="rf-pm-top-itm-ico rf-ico-triangle"></td> <td class="rf-pm-top-itm-lbl">panelMenuItem</td> - <td class="rf-pm-top-itm-exp-ico rf-pm-triangle"></td> + <td class="rf-pm-top-itm-exp-ico rf-ico-triangle"></td> </tr> </tbody> </table> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topItemDis.xmlunit.xml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topItemDis.xmlunit.xml 2011-01-05 10:40:01 UTC (rev 20890) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance-topItemDis.xmlunit.xml 2011-01-05 12:19:36 UTC (rev 20891) @@ -2,9 +2,9 @@ <table class="rf-pm-top-itm-gr"> <tbody> <tr> - <td class="rf-pm-top-itm-ico rf-pm-chevron"></td> + <td class="rf-pm-top-itm-ico rf-ico-chevron"></td> <td class="rf-pm-top-itm-lbl">panelMenuItem</td> - <td class="rf-pm-top-itm-exp-ico rf-pm-chevron"></td> + <td class="rf-pm-top-itm-exp-ico rf-ico-chevron"></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-05 10:40:01 UTC (rev 20890) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup-expanded.xmlunit.xml 2011-01-05 12:19:36 UTC (rev 20891) @@ -1,17 +1,17 @@ <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"> + <div id="f:panelMenuGroup:hdr" class="rf-pm-gr-hdr rf-pm-gr-hdr-exp"> <table class="rf-pm-gr-gr"> <tbody> <tr> <td class="rf-pm-gr-ico"> - <div class="rf-pm-ico-colps rf-pm-none" style="display:none"></div> - <div class="rf-pm-ico-exp rf-pm-none" style="display:block"></div> + <div class="rf-pm-ico-colps rf-ico-none"></div> + <div class="rf-pm-ico-exp rf-ico-none"></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-pm-none" style="display:none"></div> - <div class="rf-pm-ico-exp rf-pm-none" style="display:block"></div> + <div class="rf-pm-ico-colps rf-ico-none"></div> + <div class="rf-pm-ico-exp rf-ico-none"></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-05 10:40:01 UTC (rev 20890) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup-topGroup.xmlunit.xml 2011-01-05 12:19:36 UTC (rev 20891) @@ -1,17 +1,17 @@ <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"> + <div id="f:panelMenuGroup:hdr" class="rf-pm-top-gr-hdr rf-pm-top-gr-hdr-exp"> <table class="rf-pm-top-gr-gr"> <tbody> <tr> <td class="rf-pm-top-gr-ico"> - <div class="rf-pm-ico-colps rf-pm-none" style="display:none"></div> - <div class="rf-pm-ico-exp rf-pm-none" style="display:block"></div> + <div class="rf-pm-ico-colps rf-ico-none"></div> + <div class="rf-pm-ico-exp rf-ico-none"></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-pm-none" style="display:none"></div> - <div class="rf-pm-ico-exp rf-pm-none" style="display:block"></div> + <div class="rf-pm-ico-colps rf-ico-none"></div> + <div class="rf-pm-ico-exp rf-ico-none"></div> </td> </tr> </tbody> @@ -23,4 +23,4 @@ </script> </div> -</div> \ No newline at end of file +</div> 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-05 10:40:01 UTC (rev 20890) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup.xmlunit.xml 2011-01-05 12:19:36 UTC (rev 20891) @@ -1,17 +1,17 @@ <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"> + <div id="f:panelMenuGroup:hdr" class="rf-pm-gr-hdr rf-pm-gr-hdr-colps"> <table class="rf-pm-gr-gr"> <tbody> <tr> <td class="rf-pm-gr-ico"> - <div class="rf-pm-ico-colps rf-pm-none" style="display:block"></div> - <div class="rf-pm-ico-exp rf-pm-none" style="display:none"></div> + <div class="rf-pm-ico-colps rf-ico-none"></div> + <div class="rf-pm-ico-exp rf-ico-none"></div> </td> <td class="rf-pm-gr-lbl"></td> <td class="rf-pm-gr-exp-ico"> - <div class="rf-pm-ico-colps rf-pm-none" style="display:block"></div> - <div class="rf-pm-ico-exp rf-pm-none" style="display:none"></div> + <div class="rf-pm-ico-colps rf-ico-none"></div> + <div class="rf-pm-ico-exp rf-ico-none"></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-05 10:40:01 UTC (rev 20890) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuItem.xmlunit.xml 2011-01-05 12:19:36 UTC (rev 20891) @@ -2,9 +2,9 @@ <table class="rf-pm-itm-gr"> <tbody> <tr> - <td class="rf-pm-itm-ico rf-pm-none"></td> + <td class="rf-pm-itm-ico rf-ico-none"></td> <td class="rf-pm-itm-lbl">My MY Item</td> - <td class="rf-pm-itm-exp-ico rf-pm-none"></td> + <td class="rf-pm-itm-exp-ico rf-ico-none"></td> </tr> </tbody> </table>