Author: SeanRogers Date: 2011-03-15 00:28:33 -0400 (Tue, 15 Mar 2011) New Revision: 22214 Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dropDownMenu/sideMenu.xhtml trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dropDownMenu/topMenu.xhtml trunk/examples/richfaces-showcase/src/main/webapp/richfaces/panelMenu/panelMenu.xhtml trunk/examples/richfaces-showcase/src/main/webapp/richfaces/toolBar/toolBar.xhtml trunk/examples/richfaces-showcase/src/main/webapp/richfaces/toolBar/toolBarIcons.xhtml Log: Revised showcase text for Menus: RFPL-1218 Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dropDownMenu/sideMenu.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dropDownMenu/sideMenu.xhtml 2011-03-15 02:18:30 UTC (rev 22213) +++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dropDownMenu/sideMenu.xhtml 2011-03-15 04:28:33 UTC (rev 22214) @@ -5,8 +5,8 @@ xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> - <p>Instead of grouping menus in toolbar - you can just place a - block of them horizontally or vertiсally how it is shown below.</p> + <p>Instead of grouping menus in a toolbar, you can place a + block of them horizontally or vertiсally, as shown below.</p> <ui:include src="#{demoNavigator.sampleIncludeURI}" /> <ui:include src="/templates/includes/source-view.xhtml"> <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> @@ -14,10 +14,12 @@ <ui:param name="openLabel" value="View Source" /> <ui:param name="hideLabel" value="Hide Source" /> </ui:include> + <!-- <p>Pay attention that the default directions is not really convenient in that case. And we will work to add its customization support in nearest time. Demo will be updated with the changes after that.</p> + --> </ui:composition> -</html> \ No newline at end of file +</html> Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dropDownMenu/topMenu.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dropDownMenu/topMenu.xhtml 2011-03-15 02:18:30 UTC (rev 22213) +++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dropDownMenu/topMenu.xhtml 2011-03-15 04:28:33 UTC (rev 22214) @@ -5,9 +5,9 @@ xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> - <p><b>rich:dropDownMenu</b> is a component that allows to organize - the hierarchical menu similar to one that almost every desktop - application has.</p> + <p>The <b>rich:dropDownMenu</b> component provides + hierarchical menu systems similar to those found in many desktop + applications.</p> <ui:include src="#{demoNavigator.sampleIncludeURI}" /> <ui:include src="/templates/includes/source-view.xhtml"> <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> @@ -15,19 +15,21 @@ <ui:param name="openLabel" value="View Source" /> <ui:param name="hideLabel" value="Hide Source" /> </ui:include> - <p>The drop-down menu has a label that always appears on the page - and invisible panel that appears with a particular client side event (<i>mouseover, - click etc</i>). The event is defined with an <b>showEvent</b> attribute.</p> - <p>Drop-down menu can contains a set of menuItem's, menuGroup's and - menuSeparator's. Group plays a role of label for secondary levels on - the menu. Separator is represented with horizontal lines between the - items or groups. An item is an active element that might produce Ajax + <p>The drop-down menu has a label that always appears on the page, + and an invisible panel that appears after a set client-side event. + Use the <b>showEvent</b> attribute to define the event, such as <i>mouseover</i> + or <i>click</i>.</p> + <p>Drop-down menus can contain a set of <b>rich:menuItem</b> components, + <b>rich:menuGroup</b> components, and + <b>rich:menuSeparator</b> components. Menu groups are used for secondary levels on + the menu. Menu separators are represented with horizontal lines between + items or groups. Menu items are active elements that might produce Ajax or non-Ajax requests. The submission mode is defined with <b>mode</b> - attribute of the menu that has three possible options - "<i>server</i>", - "<i>ajax</i>" or "<i>client</i>". Mode "<i>client</i>" does not produce - any request, but allows you to provide your own functionality inside - the menu item with an inline content. Mode could be overriden for - concrete item</p> + attribute, which has three possible options: <i>server</i>, + <i>ajax</i>, or <i>client</i>. The <i>client</i> mode does not submit + a request, but allows you to provide your own functionality inside + the menu item with any in-line content. The <b>mode</b> attribute can be over-ridden in + child items.</p> </ui:composition> -</html> \ No newline at end of file +</html> Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/panelMenu/panelMenu.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/panelMenu/panelMenu.xhtml 2011-03-15 02:18:30 UTC (rev 22213) +++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/panelMenu/panelMenu.xhtml 2011-03-15 04:28:33 UTC (rev 22214) @@ -5,10 +5,11 @@ xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> - <p>The <b>rich:panelMenu</b> component is used to define a - collapsible side-menu panel. The component has a pre-defined skinable - look-n-feel. You can customize it with styles and a set of component - attributes. The folowing demo shows the example of rich:panelMenu</p> + <p>The <b>rich:panelMenu</b> component is used to create a + collapsible side-menu panel. The component has a pre-defined + look and feel which can be skinned. You can customize it with styles and + a set of component + attributes. This example demonstrates basic use of the <b>rich:panelMenu</b> component.</p> <ui:include src="#{demoNavigator.sampleIncludeURI}" /> <ui:include src="/templates/includes/source-view.xhtml"> @@ -17,27 +18,28 @@ <ui:param name="openLabel" value="View Source" /> <ui:param name="hideLabel" value="Hide Source" /> </ui:include> - <p>That menu uses parent component <b>itemChangeListener</b> to - output current selection but you could use <b>action/actionListener</b> - pair at <b>panelMenuItem</b>'s as usually to perform navigation and - process ActionEvent from them</p> - <p>Switching mode could be chosen with the <b>itemMode</b> - attribute for all panelMenu items except ones where this attribute was - redefined.</p> - <p>The <b>groupMode</b> attribute defines the submission modes for - all collapsing/expanding panelMenu groups except ones where this - attribute was redefined.</p> - <p>The <b>itemMode </b>and <b>groupMode </b>attributes could be - used with three possible parameters:</p> + + <p>The menu uses the parent component <b>itemChangeListener</b> to + output the current selection. Alternatively, you could use an <b>action</b> and <b>actionListener</b> + pair at each <b>rich:panelMenuItem</b> component to perform the navigation and + process any <b>ActionEvent</b> events from there.</p> + <p>Specify the item switching mode at the <b>rich:panelMenu</b> level with the <b>itemMode</b> + attribute. The attribute can be redefined on child <b>rich:panelMenuItem</b> components, + and is used instead of the global setting.</p> + <p>Specify the group switching mode at the <b>rich:panelMenu</b> level with the <b>groupMode</b> + attribute. The attribute can be redefined on child <b>rich:panelMenuGroup</b> components, + and is used instead of the global setting.</p> + <p>The <b>itemMode</b> and <b>groupMode</b> attributes can be set + to three possible values:</p> <ul> - <li><b>server</b> (default) - The common submission of the form - is performed and a page is completely refreshed.</li> - <li><b>ajax</b> - An Ajax form submission is performed, and - additionally specified elements in the "reRender" attribute are - reRendered</li> - <li><b>client</b> Items don't fire any submits itself. Behavior - is completely defined by the components nested to items. Groups expand + <li><b>server</b> (default): A common submission of the form + is performed and the page is completely refreshed.</li> + <li><b>ajax</b>: An Ajax form submission is performed. + Additionally, elements specified in the <b>render</b> attribute are + rendered</li> + <li><b>client</b>: No form submission is performed. The behavior + is completely defined by the components nested in the menu items. Groups expand on the client side.</li> </ul> </ui:composition> -</html> \ No newline at end of file +</html> Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/toolBar/toolBar.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/toolBar/toolBar.xhtml 2011-03-15 02:18:30 UTC (rev 22213) +++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/toolBar/toolBar.xhtml 2011-03-15 04:28:33 UTC (rev 22214) @@ -5,17 +5,16 @@ 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 + <p>The <b>rich:toolbar</b> component is a horizontal panel that can be used in + a number of ways, such as a top level menu, an information panel, and so on. To + create a top level menu, use the <b>rich:dropDownMenu</b> or <b>rich:menuItem</b> components 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>Items on the toolbar can be grouped using a + separator between different groups and between members of the same + group. Use the <b>location="right"</b> to position a group to the right-side + of the panel.</p> - <p>The following example shows how the simple toolbar might look - like:</p> + <p>The example shows how a simple toolbar might be used.</p> <ui:include src="#{demoNavigator.sampleIncludeURI}" /> <ui:include src="/templates/includes/source-view.xhtml"> @@ -26,4 +25,4 @@ </ui:include> </ui:composition> -</html> \ No newline at end of file +</html> Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/toolBar/toolBarIcons.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/toolBar/toolBarIcons.xhtml 2011-03-15 02:18:30 UTC (rev 22213) +++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/toolBar/toolBarIcons.xhtml 2011-03-15 04:28:33 UTC (rev 22214) @@ -5,7 +5,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> - <p>There you could check how the default separators could be used:</p> + <p>This example demonstrates how the default separators are used.</p> <ui:include src="#{demoNavigator.sampleIncludeURI}" /> <ui:include src="/templates/includes/source-view.xhtml"> @@ -14,7 +14,7 @@ <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> + <p>The appearance of the separators can be customized using URI with the + <b>itemSeparator</b> attribute.</p> </ui:composition> -</html> \ No newline at end of file +</html>