Author: msorokin
Date: 2009-03-30 04:39:16 -0400 (Mon, 30 Mar 2009)
New Revision: 13278
Modified:
trunk/test-applications/richfaces-docs/web/src/main/webapp/layout.xhtml
trunk/test-applications/richfaces-docs/web/src/main/webapp/page.xhtml
Log:
https://jira.jboss.org/jira/browse/RF-6419https://jira.jboss.org/jira/bro...
added new features
Modified: trunk/test-applications/richfaces-docs/web/src/main/webapp/layout.xhtml
===================================================================
--- trunk/test-applications/richfaces-docs/web/src/main/webapp/layout.xhtml 2009-03-30
08:38:11 UTC (rev 13277)
+++ trunk/test-applications/richfaces-docs/web/src/main/webapp/layout.xhtml 2009-03-30
08:39:16 UTC (rev 13278)
@@ -17,71 +17,31 @@
<rich:panel>
- <f:facet name="header">Layout Components: rich:page, rich:layout,
rich:layoutPanel </f:facet>
+ <f:facet name="header">Layout Components: rich:layout and
rich:layoutPanel </f:facet>
+
-<h3>Case 1: rich:page + rich:layout + rich:layoutPanel</h3>
-
-<rich:page sidebarPosition="left" style="border: 1px solid black"
sidebarWidth="300" theme="#{layout.theme}"
pageTitle="Rich:page">
- <f:facet name="header">
- header
- </f:facet>
- <f:facet name="sidebar">
-menu stuff
- </f:facet>
- <rich:layout >
-
- <rich:layoutPanel position="left"
width="33*">
- <rich:layoutPanel position="left"
width="33*">
- <p> inner left part of the body</p>
-
-
- </rich:layoutPanel>
-
-
-
- <rich:layoutPanel position="center"
width="33*">
- <p>inner left part of the body</p>
- </rich:layoutPanel>
-
-
- </rich:layoutPanel>
-
-
-
- <rich:layoutPanel position="center"
width="33*">
- <p> left part of the body</p>
- </rich:layoutPanel>
-
-
-
- </rich:layout>
- <f:facet name="footer">
- footer
- </f:facet>
- </rich:page>
-
-
- <h3>Case 2: rich:page + rich:layout + rich:layoutPanel</h3>
-
-
+ <rich:layout>
+ <rich:layoutPanel position="right">
+ <p>right</p>
+ <rich:layout>
- <rich:layout style="border 1px solid black">
+ <rich:layoutPanel position="top">
+ <p>top</p>
+ </rich:layoutPanel>
+ <rich:layoutPanel position="center">
+ <p> center - bottom</p>
+ </rich:layoutPanel>
+ </rich:layout>
+ </rich:layoutPanel>
+
+ <rich:layoutPanel position="center">
+ <p> center-left</p>
+ </rich:layoutPanel>
+ </rich:layout>
- <rich:layoutPanel position="left" >
- <p> left part of the body</p>
- </rich:layoutPanel>
- <rich:layoutPanel position="center" >
- <p> right part of the body</p>
- </rich:layoutPanel>
- <rich:layoutPanel position="right" >
- <p> right part of the body</p>
- </rich:layoutPanel>
-
-
- </rich:layout>
-
-
-
+
+
+
<table class="tableofattributes" cellpadding="0"
cellspacing="0">
<thead>
@@ -102,15 +62,7 @@
Theme
</td>
<td>
- <h:form>
- <h:selectOneMenu value="#{layout.theme}"
onchange="submit()">
- <f:selectItem itemLabel="Default" itemValue="" />
- <f:selectItem itemLabel="simple" itemValue="simple"
/>
- <f:selectItem itemLabel="csszend" itemValue="csszend" />
-
-
- </h:selectOneMenu>
- </h:form>
+
</td>
</tr>
Modified: trunk/test-applications/richfaces-docs/web/src/main/webapp/page.xhtml
===================================================================
--- trunk/test-applications/richfaces-docs/web/src/main/webapp/page.xhtml 2009-03-30
08:38:11 UTC (rev 13277)
+++ trunk/test-applications/richfaces-docs/web/src/main/webapp/page.xhtml 2009-03-30
08:39:16 UTC (rev 13278)
@@ -17,19 +17,55 @@
<rich:panel>
+ <p>A page with the rich:page component can be found <a
href="richPage.xhtml"
style="display:inline">here</a>.</p>
<f:facet name="header">Layout Components: rich:page, rich:layout,
rich:layoutPanel </f:facet>
-<h3>Case 1: Simple variant</h3>
+<h3>Listing 1: pageTitle, markupType and pageHeader facet</h3>
-<rich:page width="600px">
-<p>some content</p>
+<rich:page markupType="#{page.markupType}"
pageTitle="#{page.pageTitle}" contentType="text/html; charset=UTF-8"
>
+ <f:facet name="pageHeader" title="advisory" >
+ <meta content="The rich:page component" name="keywords" />
+ <link rel="shortcut icon" href="/images/favicon.ico"/>
+ <link href="/css/style.css" rel="stylesheet"
type="text/css" />
+ <script type="text/javascript"
src="/js/menu.js"></script>
+ </f:facet>
+ <!-- page content -->
+ <p> page content </p>
</rich:page>
+
+
-<h3>Case 2: with facets</h3>
+<h3>Listing 2: facets "header", "sidebar" and
"footer"</h3>
-<rich:page sidebarPosition="right" sidebarWidth="300"
bodyClass="bodyClass">
+<rich:page sidebarPosition="right" sidebarWidth="300">
<f:facet name="header" >
+ header content
+
+ </f:facet>
+
+ <f:facet name="sidebar">
+side bar content
+ </f:facet>
+ <p>body content</p>
+
+ <f:facet name="footer">
+ footer content
+ </f:facet>
+ </rich:page>
+
+
+<h3>Listing 3: with classes attributes</h3>
+
+
+
+ <rich:page sidebarPosition="right" sidebarWidth="300"
+bodyClass="myBodyClass"
+footerClass="myFooterClass"
+headerClass="myHeaderClass"
+sidebarClass="mySidebarClass"
+>
+ <f:facet name="header" >
header content
</f:facet>
@@ -43,11 +79,36 @@
footer content
</f:facet>
</rich:page>
+
+
+
+ <h3>Listing 4: t</h3>
+
+
+
+ <rich:page sidebarPosition="right" sidebarWidth="300"
+theme="#{page.theme}"
+>
+ <f:facet name="header" >
+ header content
+
+ </f:facet>
+
+ <f:facet name="sidebar">
+side bar content
+ </f:facet>
+ <p>body content</p>
+
+ <f:facet name="footer">
+ footer content
+ </f:facet>
+ </rich:page>
-
-
-<table class="tableofattributes" cellpadding="0"
cellspacing="0">
+
+
+
+<table class="tableofattributes" cellpadding="0"
cellspacing="0" >
<thead>
@@ -67,7 +128,7 @@
</td>
<td>
<h:form>
- <h:selectOneMenu value="#{layout.theme}"
onchange="submit()">
+ <h:selectOneMenu value="#{page.theme}"
onchange="submit()">
<f:selectItem itemLabel="Default" itemValue="" />
<f:selectItem itemLabel="simple" itemValue="simple"
/>
<f:selectItem itemLabel="csszend" itemValue="csszend" />
@@ -79,6 +140,36 @@
</tr>
+ <tr>
+ <td>
+ markupType
+ </td>
+ <td>
+ <h:form>
+ <h:selectOneMenu value="#{page.markupType}"
onchange="submit()">
+ <f:selectItem itemLabel="html" itemValue="html"
/>
+ <f:selectItem itemLabel="xhtml" itemValue="xhtml"
/>
+ <f:selectItem itemLabel="html-transitional"
itemValue="html-transitional" />
+ <f:selectItem itemLabel="html-3.2" itemValue="html-3.2" />
+
+ </h:selectOneMenu>
+ </h:form>
+ </td>
+ </tr>
+
+
+ <tr>
+ <td>
+ page title
+ </td>
+ <td>
+ <h:form>
+ <h:inputText value="#{page.pageTitle}"
onchange="submit()"/>
+ </h:form>
+ </td>
+ </tr>
+
+
</tbody>