Author: ilya_shaikovsky Date: 2008-03-27 10:19:04 -0400 (Thu, 27 Mar 2008) New Revision: 7300 Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/ddmenu/Menu.java trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples/topmenu.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolBar/examples/iconBar.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolBar/examples/menus.xhtml Log: http://jira.jboss.com/jira/browse/RF-2598 Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/ddmenu/Menu.java =================================================================== --- trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/ddmenu/Menu.java 2008-03-27 13:30:19 UTC (rev 7299) +++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/ddmenu/Menu.java 2008-03-27 14:19:04 UTC (rev 7300) @@ -23,12 +23,12 @@ this.current="Close"; return null; } - public String doSaveText() { - this.current="Save as Text File"; + public String doSave() { + this.current="Save"; return null; } - public String doSavePDF() { - this.current="Save as PDF File"; + public String doSaveAll() { + this.current="Save All"; return null; } public String doExit() { Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples/topmenu.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples/topmenu.xhtml 2008-03-27 13:30:19 UTC (rev 7299) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples/topmenu.xhtml 2008-03-27 14:19:04 UTC (rev 7300) @@ -1,63 +1,85 @@ <ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <style> + .pic { + margin-bottom: -4px; + margin-right: 2px; + } + </style> <h:form> - + <rich:toolBar> - <rich:dropDownMenu value="File"> - - <rich:menuItem submitMode="ajax" value="New" action="#{ddmenu.doNew}"> + + <rich:dropDownMenu> + <f:facet name="label"> + <h:panelGroup> + <h:graphicImage value="/images/icons/copy.gif" styleClass="pic"/> + <h:outputText value="File"/> + </h:panelGroup> + </f:facet> + <rich:menuItem submitMode="ajax" value="New" + action="#{ddmenu.doNew}" icon="/images/icons/create_doc.gif"> </rich:menuItem> - <rich:menuItem submitMode="ajax" value="Open" action="#{ddmenu.doOpen}"/> + <rich:menuItem submitMode="ajax" value="Open" + action="#{ddmenu.doOpen}" icon="/images/icons/open.gif" /> <rich:menuGroup value="Save As..."> - <rich:menuItem submitMode="ajax" value="Text File" action="#{ddmenu.doSaveText}"/> - <rich:menuItem submitMode="ajax" value="PDF File" action="#{ddmenu.doSavePDF}"/> + <rich:menuItem submitMode="ajax" value="Save" + action="#{ddmenu.doSave}" icon="/images/icons/save.gif" /> + <rich:menuItem submitMode="ajax" value="Save All" + action="#{ddmenu.doSaveAll}" icon="" > + <f:facet name="icon"> + <h:graphicImage value="richfaces/toolBar/images/icons/save_all.gif" /> + </f:facet> + + </rich:menuItem> </rich:menuGroup> - <rich:menuItem submitMode="ajax" value="Close" action="#{ddmenu.doClose}"/> - <rich:menuSeparator id="menuSeparator11"/> - <rich:menuItem submitMode="ajax" value="Exit" action="#{ddmenu.doExit}"/> - + <rich:menuItem submitMode="ajax" value="Close" + action="#{ddmenu.doClose}" /> + <rich:menuSeparator id="menuSeparator11" /> + <rich:menuItem submitMode="ajax" value="Exit" + action="#{ddmenu.doExit}" /> + </rich:dropDownMenu> - + <rich:dropDownMenu> - + <f:facet name="label"> - <h:panelGrid cellpadding="0" cellspacing="0" columns="2" style="vertical-align:middle"> - <h:graphicImage value="/richfaces/toolBar/images/yellow_lamp.gif"/> + <h:panelGrid cellpadding="0" cellspacing="0" columns="2" + style="vertical-align:middle"> <h:outputText value="Links" /> </h:panelGrid> </f:facet> - - <rich:menuItem submitMode="none" onclick="document.location.href='http://labs.jboss.com/jbossrich... - <f:facet name="icon"> - <h:graphicImage value="/richfaces/toolBar/images/webapp_welcome.gif" /> - </f:facet> + + <rich:menuItem submitMode="none" + onclick="document.location.href='http://labs.jboss.com/jbossrich... <h:outputLink value="http://labs.jboss.com/jbossrichfaces/"> <h:outputText value="RichFaces Home Page"></h:outputText> </h:outputLink> </rich:menuItem> - - <rich:menuItem submitMode="none" onclick="document.location.href='http://jboss.com/index.html?mod... - <f:facet name="icon"> - <h:graphicImage value="/richfaces/toolBar/images/timer_task.gif" /> - </f:facet> - <h:outputLink value="http://jboss.com/index.html?module=bb&amp;op=viewforum&am... + + <rich:menuItem submitMode="none" + onclick="document.location.href='http://jboss.com/index.html?mod... + <h:outputLink + value="http://jboss.com/index.html?module=bb&amp;op=viewforum&am... <h:outputText value="RichFaces Forum"></h:outputText> </h:outputLink> </rich:menuItem> - + </rich:dropDownMenu> </rich:toolBar> </h:form> - <img src="images/spacer.gif" width="1" height="5" alt="" border="0"/><br/> + <img src="images/spacer.gif" width="1" height="5" alt="" border="0" /> + <br /> <a4j:outputPanel ajaxRendered="true"> <h:outputText value="Current Selection: "></h:outputText> <h:outputText style="font-weight:bold" value="#{ddmenu.current}"></h:outputText> </a4j:outputPanel> - <br/><img src="images/spacer.gif" width="1" height="25" alt="" border="0"/> + <br /> + <img src="images/spacer.gif" width="1" height="25" alt="" border="0" /> </ui:composition> \ No newline at end of file Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolBar/examples/iconBar.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolBar/examples/iconBar.xhtml 2008-03-27 13:30:19 UTC (rev 7299) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolBar/examples/iconBar.xhtml 2008-03-27 14:19:04 UTC (rev 7300) @@ -5,20 +5,28 @@ xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich"> +<style> + .pic{ + margin-bottom: -4px; + margin-right: 2px; +} + +</style> + <rich:toolBar height="26" itemSeparator="grid"> <rich:toolBarGroup> - <h:graphicImage value="/richfaces/toolBar/images/new.gif" /> - <h:graphicImage value="/richfaces/toolBar/images/webapp_welcome.gif"/> - <h:graphicImage value="/richfaces/toolBar/images/palette_edit.gif"/> + <h:graphicImage value="/images/icons/create_doc.gif" styleClass="pic"/> + <h:graphicImage value="/images/icons/create_folder.gif" styleClass="pic"/> + <h:graphicImage value="/images/icons/copy.gif" styleClass="pic"/> </rich:toolBarGroup> <rich:toolBarGroup> - <h:graphicImage value="/richfaces/toolBar/images/print_edit.gif"/> - <h:graphicImage value="/richfaces/toolBar/images/print.gif"/> - <h:graphicImage value="/richfaces/toolBar/images/print_preview.gif"/> + <h:graphicImage value="/images/icons/save.gif" styleClass="pic"/> + <h:graphicImage value="/images/icons/save_as.gif" styleClass="pic"/> + <h:graphicImage value="/images/icons/save_all.gif" styleClass="pic"/> </rich:toolBarGroup> <rich:toolBarGroup location="right"> - <h:graphicImage value="/richfaces/toolBar/images/yellow_lamp.gif"/> - <h:graphicImage value="/richfaces/toolBar/images/timer_task.gif"/> + <h:graphicImage value="/images/icons/find.gif" styleClass="pic"/> + <h:graphicImage value="/images/icons/filter.gif" styleClass="pic"/> </rich:toolBarGroup> </rich:toolBar> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolBar/examples/menus.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolBar/examples/menus.xhtml 2008-03-27 13:30:19 UTC (rev 7299) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolBar/examples/menus.xhtml 2008-03-27 14:19:04 UTC (rev 7300) @@ -17,16 +17,16 @@ <h:form> <rich:toolBar height="34" itemSeparator="line"> <rich:toolBarGroup> - <h:graphicImage id="edit" value="/richfaces/toolBar/images/print_edit.gif" /> + <h:graphicImage id="edit" value="/images/icons/edit.gif" /> <h:outputLabel value="Edit" for="edit" /> </rich:toolBarGroup> <rich:toolBarGroup> - <h:graphicImage id="print" value="/richfaces/toolBar/images/print.gif" /> - <h:outputLabel value="Print" for="edit" /> + <h:graphicImage id="find" value="/images/icons/find.gif" /> + <h:outputLabel value="Find" for="find" /> </rich:toolBarGroup> <rich:toolBarGroup> - <h:graphicImage id="preview" value="/richfaces/toolBar/images/print_preview.gif" /> - <h:outputLabel value="Preview" for="preview" /> + <h:graphicImage id="filter" value="/images/icons/filter.gif" /> + <h:outputLabel value="Filter" for="filter" /> </rich:toolBarGroup> <rich:toolBarGroup location="right"> <h:inputText styleClass="barsearch" />