Author: ilya_shaikovsky Date: 2010-12-01 05:55:48 -0500 (Wed, 01 Dec 2010) New Revision: 20251 Added: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/toolbar/ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/toolbar/ToolBarBean.java trunk/examples/richfaces-showcase/src/main/webapp/images/icons/arrow.png trunk/examples/richfaces-showcase/src/main/webapp/images/icons/copy.gif trunk/examples/richfaces-showcase/src/main/webapp/images/icons/create_doc.gif trunk/examples/richfaces-showcase/src/main/webapp/images/icons/create_folder.gif trunk/examples/richfaces-showcase/src/main/webapp/images/icons/cut.gif trunk/examples/richfaces-showcase/src/main/webapp/images/icons/delete.gif trunk/examples/richfaces-showcase/src/main/webapp/images/icons/edit.gif trunk/examples/richfaces-showcase/src/main/webapp/images/icons/filter.gif trunk/examples/richfaces-showcase/src/main/webapp/images/icons/find.gif trunk/examples/richfaces-showcase/src/main/webapp/images/icons/ico_new_group.gif trunk/examples/richfaces-showcase/src/main/webapp/images/icons/ico_new_item.gif trunk/examples/richfaces-showcase/src/main/webapp/images/icons/open.gif trunk/examples/richfaces-showcase/src/main/webapp/images/icons/paste.gif trunk/examples/richfaces-showcase/src/main/webapp/images/icons/redo.gif trunk/examples/richfaces-showcase/src/main/webapp/images/icons/reload.gif trunk/examples/richfaces-showcase/src/main/webapp/images/icons/repeat.gif trunk/examples/richfaces-showcase/src/main/webapp/images/icons/save.gif trunk/examples/richfaces-showcase/src/main/webapp/images/icons/save_all.gif trunk/examples/richfaces-showcase/src/main/webapp/images/icons/save_as.gif trunk/examples/richfaces-showcase/src/main/webapp/images/icons/undo.gif trunk/examples/richfaces-showcase/src/main/webapp/images/icons/verify.gif trunk/examples/richfaces-showcase/src/main/webapp/richfaces/toolBar/ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/toolBar/samples/ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/toolBar/samples/toolBar-sample.xhtml trunk/examples/richfaces-showcase/src/main/webapp/richfaces/toolBar/samples/toolBarIcons-sample.xhtml trunk/examples/richfaces-showcase/src/main/webapp/richfaces/toolBar/toolBar.xhtml trunk/examples/richfaces-showcase/src/main/webapp/richfaces/toolBar/toolBarIcons.xhtml Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/components/sh/SyntaxHighlighter.java trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml Log: https://jira.jboss.org/browse/RF-9752 +SH correction. jQuery was missed in dependencies. Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/components/sh/SyntaxHighlighter.java =================================================================== --- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/components/sh/SyntaxHighlighter.java 2010-12-01 10:36:16 UTC (rev 20250) +++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/components/sh/SyntaxHighlighter.java 2010-12-01 10:55:48 UTC (rev 20251) @@ -17,6 +17,7 @@ @FacesComponent(value = "syntaxHighlighter") @ResourceDependencies({ @ResourceDependency(library = "js", name = "shCore.js"), + @ResourceDependency(name = "jquery.js"), @ResourceDependency(library = "css", name = "shCore.css"), @ResourceDependency(library = "css", name = "shThemeDefault.css"), @ResourceDependency(library = "js", name = "shBrushJScript.js"), Added: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/toolbar/ToolBarBean.java =================================================================== --- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/toolbar/ToolBarBean.java (rev 0) +++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/toolbar/ToolBarBean.java 2010-12-01 10:55:48 UTC (rev 20251) @@ -0,0 +1,30 @@ +package org.richfaces.demo.toolbar; + +import java.io.Serializable; + +import javax.faces.bean.ManagedBean; +import javax.faces.bean.ViewScoped; + +@ManagedBean +@ViewScoped +public class ToolBarBean implements Serializable{ + private String groupSeparator; + private String groupItemSeparator; + + public String getGroupItemSeparator() { + return groupItemSeparator; + } + + public void setGroupItemSeparator(String groupItemSeparator) { + this.groupItemSeparator = groupItemSeparator; + } + + public String getGroupSeparator() { + return groupSeparator; + } + + public void setGroupSeparator(String groupSeparator) { + this.groupSeparator = groupSeparator; + } + +} Modified: trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml =================================================================== --- trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml 2010-12-01 10:36:16 UTC (rev 20250) +++ trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml 2010-12-01 10:55:48 UTC (rev 20251) @@ -298,7 +298,7 @@ <group> <name>Trees</name> <demos> - <demo new="true"> + <demo> <id>tree</id> <name>rich:tree</name> <samples> @@ -337,7 +337,7 @@ </sample> </samples> </demo> - <demo new="true"> + <demo> <id>tabPanel</id> <name>rich:tabPanel</name> <samples> @@ -358,7 +358,7 @@ </sample> </samples> </demo> - <demo new="true"> + <demo> <id>collapsiblePanel</id> <name>rich:collapsiblePanel</name> <samples> @@ -406,7 +406,7 @@ </sample> </samples> </demo> - <demo new="true"> + <demo> <id>tooltip</id> <name>rich:tooltip</name> <samples> @@ -418,19 +418,29 @@ </demo> </demos> </group> - <!-- group> + <group> <name>Menus</name> <demos> - <demo> - <id>panelMenu</id> - <name>rich:panelMenu</name> + <demo new="true"> + <id>toolBar</id> + <name>rich:toolBar</name> + <samples> + <sample> + <id>toolBar</id> + <name>Simple Toolbar</name> + </sample> + <sample> + <id>toolBarIcons</id> + <name>Icons Customization</name> + </sample> + </samples> </demo> </demos> - </group--> + </group> <group> <name>Inputs and Selects</name> - <demos> - <demo new="true"> + <demos> + <demo> <id>autocomplete</id> <name>rich:autocomplete</name> <samples> @@ -438,13 +448,13 @@ <id>cachedAjax</id> <name>Autocomplete in Cached Ajax mode</name> </sample> - <sample new="true"> + <sample> <id>clientFilter</id> <name>Custom client filter</name> </sample> </samples> </demo> - <demo new="true"> + <demo> <id>calendar</id> <name>rich:calendar</name> <samples> @@ -484,7 +494,7 @@ </sample> </samples> </demo> - <demo new="true"> + <demo> <id>inplaceSelect</id> <name>rich:inplaceSelect</name> <samples> @@ -494,7 +504,7 @@ </sample> </samples> </demo> - <demo new="true"> + <demo> <id>select</id> <name>rich:select</name> <samples> Added: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/arrow.png =================================================================== (Binary files differ) Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/arrow.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/copy.gif =================================================================== (Binary files differ) Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/copy.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/create_doc.gif =================================================================== (Binary files differ) Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/create_doc.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/create_folder.gif =================================================================== (Binary files differ) Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/create_folder.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/cut.gif =================================================================== (Binary files differ) Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/cut.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/delete.gif =================================================================== (Binary files differ) Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/delete.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/edit.gif =================================================================== (Binary files differ) Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/edit.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/filter.gif =================================================================== (Binary files differ) Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/filter.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/find.gif =================================================================== (Binary files differ) Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/find.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/ico_new_group.gif =================================================================== (Binary files differ) Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/ico_new_group.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/ico_new_item.gif =================================================================== (Binary files differ) Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/ico_new_item.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/open.gif =================================================================== (Binary files differ) Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/open.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/paste.gif =================================================================== (Binary files differ) Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/paste.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/redo.gif =================================================================== (Binary files differ) Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/redo.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/reload.gif =================================================================== (Binary files differ) Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/reload.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/repeat.gif =================================================================== (Binary files differ) Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/repeat.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/save.gif =================================================================== (Binary files differ) Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/save.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/save_all.gif =================================================================== (Binary files differ) Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/save_all.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/save_as.gif =================================================================== (Binary files differ) Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/save_as.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/undo.gif =================================================================== (Binary files differ) Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/undo.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/verify.gif =================================================================== (Binary files differ) Property changes on: trunk/examples/richfaces-showcase/src/main/webapp/images/icons/verify.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/toolBar/samples/toolBar-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/toolBar/samples/toolBar-sample.xhtml (rev 0) +++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/toolBar/samples/toolBar-sample.xhtml 2010-12-01 10:55:48 UTC (rev 20251) @@ -0,0 +1,46 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + 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:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <style> +.pic { + margin-right: 2px; +} + +.barsearch { + height: 14px; + width: 100px; +} + +.barsearchbutton { + border-width: 1px; + background-color: #{ a4jSkin.generalBackgroundColor +} +; +} +</style> + + <rich:toolBar height="26" itemSeparator="grid"> + <rich:toolBarGroup> + <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="/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:inputText styleClass="barsearch" /> + <h:commandButton styleClass="barsearchbutton" onclick="return false;" + value="Search" /> + </rich:toolBarGroup> + </rich:toolBar> + + +</ui:composition> \ No newline at end of file Added: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/toolBar/samples/toolBarIcons-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/toolBar/samples/toolBarIcons-sample.xhtml (rev 0) +++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/toolBar/samples/toolBarIcons-sample.xhtml 2010-12-01 10:55:48 UTC (rev 20251) @@ -0,0 +1,95 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + 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:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + + <h:form> + <h:panelGrid columns="3" width="100%" cellpadding="0" cellspacing="0" + style="margin-bottom : 4px"> + <rich:panel> + <h:panelGrid columns="8"> + <h:outputText value="Group Separator:" /> + <a4j:commandLink value="Line"> + <a4j:param name="gs" value="line" + assignTo="#{toolBarBean.groupSeparator}" /> + </a4j:commandLink> + + <a4j:commandLink value="Grid"> + <a4j:param name="gs" value="grid" + assignTo="#{toolBarBean.groupSeparator}" /> + </a4j:commandLink> + + <a4j:commandLink value="Disc"> + <a4j:param name="gs" value="disc" + assignTo="#{toolBarBean.groupSeparator}" /> + </a4j:commandLink> + + <a4j:commandLink value="Square"> + <a4j:param name="gs" value="square" + assignTo="#{toolBarBean.groupSeparator}" /> + </a4j:commandLink> + + <a4j:commandLink value="None"> + <a4j:param name="gs" value="none" + assignTo="#{toolBarBean.groupSeparator}" /> + </a4j:commandLink> + </h:panelGrid> + </rich:panel> + <h:panelGroup style="padding-left : 4px"> + <br /> + </h:panelGroup> + <rich:panel bodyClass="rich-laguna-panel-no-header"> + <h:panelGrid columns="8"> + <h:outputText value="Group Item Separator:" /> + <a4j:commandLink value="Line"> + <a4j:param name="gs" value="line" + assignTo="#{toolBarBean.groupItemSeparator}" /> + </a4j:commandLink> + + <a4j:commandLink value="Grid"> + <a4j:param name="gs" value="grid" + assignTo="#{toolBarBean.groupItemSeparator}" /> + </a4j:commandLink> + + <a4j:commandLink value="Disc"> + <a4j:param name="gs" value="disc" + assignTo="#{toolBarBean.groupItemSeparator}" /> + </a4j:commandLink> + + <a4j:commandLink value="Square"> + <a4j:param name="gs" value="square" + assignTo="#{toolBarBean.groupItemSeparator}" /> + </a4j:commandLink> + + <a4j:commandLink value="None"> + <a4j:param name="gs" value="none" + assignTo="#{toolBarBean.groupItemSeparator}" /> + </a4j:commandLink> + </h:panelGrid> + </rich:panel> + </h:panelGrid> + </h:form> + <a4j:outputPanel ajaxRendered="true"> + <rich:toolBar id="bar" height="30" + itemSeparator="#{toolBarBean.groupSeparator}"> + <rich:toolBarGroup itemSeparator="#{toolBarBean.groupItemSeparator}"> + <h:outputText value="Group1.1"></h:outputText> + <h:outputText value="Group1.2"></h:outputText> + <h:outputText value="Group1.3"></h:outputText> + </rich:toolBarGroup> + <rich:toolBarGroup itemSeparator="#{toolBarBean.groupItemSeparator}"> + <h:outputText value="Group2.1"></h:outputText> + <h:outputText value="Group2.2"></h:outputText> + </rich:toolBarGroup> + <rich:toolBarGroup location="right" + itemSeparator="#{toolBarBean.groupItemSeparator}"> + <h:outputText value="Group3.1"></h:outputText> + <h:outputText value="Group3.2"></h:outputText> + </rich:toolBarGroup> + </rich:toolBar> + </a4j:outputPanel> + +</ui:composition> \ No newline at end of file Added: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/toolBar/toolBar.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/toolBar/toolBar.xhtml (rev 0) +++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/toolBar/toolBar.xhtml 2010-12-01 10:55:48 UTC (rev 20251) @@ -0,0 +1,29 @@ +<!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:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets"> + +<ui:composition> + <p><b>Toolbar </b>is a horizontal-oriented panel that can be used in + different ways: for top level menu, for information panel and so on. To + create top level menu - just use <b>dropDownMenu </b>or <b>menuItem</b>'s as child + components.</p> + <p>Items on the toolbar can be grouped with ability to define a + separator between different groups and between a member of the same + group. The "<b>location</b>" attribute set to "<b>right</b>" put a group to the right + side of the panel.</p> + + <p>The following example shows how the simple toolbar might look + like:</p> + + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> + +</ui:composition> +</html> \ No newline at end of file Added: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/toolBar/toolBarIcons.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/toolBar/toolBarIcons.xhtml (rev 0) +++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/toolBar/toolBarIcons.xhtml 2010-12-01 10:55:48 UTC (rev 20251) @@ -0,0 +1,20 @@ +<!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:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets"> + +<ui:composition> + <p>There you could check how the default separators could be used:</p> + + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> + <p>Separators could be customized using URI to custom icons in + <b>itemSeparator</b> attribute</p> +</ui:composition> +</html> \ No newline at end of file