Author: msorokin Date: 2009-04-30 13:05:16 -0400 (Thu, 30 Apr 2009) New Revision: 13976 Modified: trunk/test-applications/richfaces-docs/web/src/main/webapp/colorPicker.xhtml trunk/test-applications/richfaces-docs/web/src/main/webapp/fileUpload.xhtml trunk/test-applications/richfaces-docs/web/src/main/webapp/home.xhtml trunk/test-applications/richfaces-docs/web/src/main/webapp/layout.xhtml trunk/test-applications/richfaces-docs/web/src/main/webapp/richPage.xhtml Log: new components Modified: trunk/test-applications/richfaces-docs/web/src/main/webapp/colorPicker.xhtml =================================================================== --- trunk/test-applications/richfaces-docs/web/src/main/webapp/colorPicker.xhtml 2009-04-30 17:02:02 UTC (rev 13975) +++ trunk/test-applications/richfaces-docs/web/src/main/webapp/colorPicker.xhtml 2009-04-30 17:05:16 UTC (rev 13976) @@ -19,7 +19,7 @@ <f:facet name="header">rich:colorPicker</f:facet> <h:form> - <rich:colorPicker value="#F0F8FF" onbeforeshow="alert('I\'am colorPicker')"/> + <rich:colorPicker value="#F0F8FF" colorMode="rgb" flat="true" /> </h:form> <h:outputText value="#{colorPicker.value}" /> </rich:panel> Modified: trunk/test-applications/richfaces-docs/web/src/main/webapp/fileUpload.xhtml =================================================================== --- trunk/test-applications/richfaces-docs/web/src/main/webapp/fileUpload.xhtml 2009-04-30 17:02:02 UTC (rev 13975) +++ trunk/test-applications/richfaces-docs/web/src/main/webapp/fileUpload.xhtml 2009-04-30 17:05:16 UTC (rev 13976) @@ -26,11 +26,12 @@ immediateUpload="true"/> +<rich:panel> <ui:repeat value="#{fileUpload.strFilesDirs}" var="files"> <img src="img/fileUploadImages/#{files}" width="200" height="200" /> </ui:repeat> +</rich:panel> - </rich:panel> Modified: trunk/test-applications/richfaces-docs/web/src/main/webapp/home.xhtml =================================================================== --- trunk/test-applications/richfaces-docs/web/src/main/webapp/home.xhtml 2009-04-30 17:02:02 UTC (rev 13975) +++ trunk/test-applications/richfaces-docs/web/src/main/webapp/home.xhtml 2009-04-30 17:05:16 UTC (rev 13976) @@ -25,8 +25,13 @@ </p> +<rich:layout> +<rich:layoutPanel position="center"><p>center</p></rich:layoutPanel> +<rich:layoutPanel position="left"><p>left</p></rich:layoutPanel> +</rich:layout> + </rich:panel> Modified: trunk/test-applications/richfaces-docs/web/src/main/webapp/layout.xhtml =================================================================== --- trunk/test-applications/richfaces-docs/web/src/main/webapp/layout.xhtml 2009-04-30 17:02:02 UTC (rev 13975) +++ trunk/test-applications/richfaces-docs/web/src/main/webapp/layout.xhtml 2009-04-30 17:05:16 UTC (rev 13976) @@ -22,22 +22,39 @@ <h3>Listing 1: top, left, center, right, bottom</h3> <rich:layout> - <rich:layoutPanel position="top"> - <!--top--> + <rich:layoutPanel position="top"> + <p>top</p> </rich:layoutPanel> <rich:layoutPanel position="left"> - <!--left--> + <p>left</p> </rich:layoutPanel> <rich:layoutPanel position="center"> - <!--center--> + <rich:layout> + <rich:layoutPanel position="top"> + <p>top1</p> + </rich:layoutPanel> + <rich:layoutPanel position="left"> + <p>left1</p> + </rich:layoutPanel> + <rich:layoutPanel position="center"> + <p>center1</p> </rich:layoutPanel> <rich:layoutPanel position="right"> - <!--right--> + <p>right1</p> </rich:layoutPanel> <rich:layoutPanel position="bottom"> - <!--bottom--> + <p>bottom1</p> + </rich:layoutPanel> </rich:layout> + </rich:layoutPanel> + <rich:layoutPanel position="right"> + <p>right</p> + </rich:layoutPanel> + <rich:layoutPanel position="bottom"> + <p>bottom</p> +</rich:layoutPanel> +</rich:layout> <h3>Listing 2: center</h3> @@ -51,7 +68,20 @@ </rich:layout> + <h3>Listing 3: left + right</h3> +<rich:layout> + <rich:layoutPanel position="left"> + <p>left</p> +</rich:layoutPanel> + + +<rich:layoutPanel position="right"> + <p>right</p> +</rich:layoutPanel> + +</rich:layout> + <table class="tableofattributes" cellpadding="0" cellspacing="0"> Modified: trunk/test-applications/richfaces-docs/web/src/main/webapp/richPage.xhtml =================================================================== --- trunk/test-applications/richfaces-docs/web/src/main/webapp/richPage.xhtml 2009-04-30 17:02:02 UTC (rev 13975) +++ trunk/test-applications/richfaces-docs/web/src/main/webapp/richPage.xhtml 2009-04-30 17:05:16 UTC (rev 13976) @@ -5,40 +5,67 @@ xmlns:ui="http://java.sun.com/jsf/facelets"> -<rich:page sidebarPosition="left" sidebarWidth="300" - theme="" title="advisory" markupType="" pageTitle="Gleb is back" contentType="text/html; charset=UTF-8" > - - <f:facet name="pageHeader" > - <title>Page Title 2</title> -<link href="stylesheet/theme.css" rel="stylesheet" type="text/css" /> +<rich:page sidebarPosition="left" sidebarWidth="300" title="advisory" pageTitle="Page Title" +theme="simple" + > + <f:facet name="pageHeader" > </f:facet> <f:facet name="header" > <ui:include src="layout/menu.xhtml"> <ui:param name="projectName" value="RichFaces Docs"/> + + <!--Header--> </ui:include> </f:facet> <f:facet name="subheader" > -<p>Subheader</p> + <!--Subheader--> </f:facet> <f:facet name="sidebar"> <ui:include src="layout/mainMenu.xhtml" /> +<!--Side panel--> + </f:facet> - <p>body content</p> - <ul> -<li>Some text</li> -<li>Some text</li> -<li>Some text</li> -<li>Some text</li> -<li>Some text</li> - </ul> - + +<rich:layout> + + <rich:layoutPanel position="top"> + + <!--Top--> + + </rich:layoutPanel> + + <rich:layoutPanel position="left"> + + <!--Left--> + + </rich:layoutPanel> + + <rich:layoutPanel position="center"> + + <!--Center--> + + </rich:layoutPanel> + + <rich:layoutPanel position="right"> + + <!--Right--> + + </rich:layoutPanel> + + <rich:layoutPanel position="bottom"> + + <!--Bottom--> + + </rich:layoutPanel> + +</rich:layout> <f:facet name="footer"> - footer content + <!--Footer--> </f:facet> </rich:page>