9:10 a.m.
Author: ilya_shaikovsky
Date: 2009-05-14 10:10:29 -0400 (Thu, 14 May 2009)
New Revision: 14211
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/layouts/page/template.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/layouts/usage.xhtml
trunk/ui/assembly/pom.xml
Log:
https://jira.jboss.org/jira/browse/RF-7066
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/layouts/page/template.xhtml
===================================================================
---
trunk/samples/richfaces-demo/src/main/webapp/richfaces/layouts/page/template.xhtml 2009-05-14
12:50:25 UTC (rev 14210)
+++
trunk/samples/richfaces-demo/src/main/webapp/richfaces/layouts/page/template.xhtml 2009-05-14
14:10:29 UTC (rev 14211)
@@ -32,10 +32,10 @@
<rich:layoutPanel position="top" width="100%">
<ui:include src="/richfaces/layouts/page/includes/gridtop.xhtml" />
</rich:layoutPanel>
- <rich:layoutPanel position="left" width="50">
+ <rich:layoutPanel position="left" width="50%">
<ui:include src="/richfaces/layouts/page/includes/gridleft.xhtml" />
</rich:layoutPanel>
- <rich:layoutPanel position="center" width="50">
+ <rich:layoutPanel position="center" width="50%">
<ui:include src="/richfaces/layouts/page/includes/gridcenter.xhtml"
/>
</rich:layoutPanel>
<rich:layoutPanel position="bottom">
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/layouts/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/layouts/usage.xhtml 2009-05-14
12:50:25 UTC (rev 14210)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/layouts/usage.xhtml 2009-05-14
14:10:29 UTC (rev 14211)
@@ -1,29 +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: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">
-<ui:composition template="/templates/component-sample.xhtml">
- <ui:define name="sample">
- <p>A set of layout components designed based on <h:outputLink
- target="blank"
value="http://developer.yahoo.com/yui/layout/">Yahoo
layouts</h:outputLink>.
- </p>
- <p>
- The component set consists of three components. A <b>Page </b>component
for page
- layout definition and <b>Layout/LayoutPanel</b> components for nesting
layout
- grids creation.
- </p>
- <p>
- Since these components are designed to create full page layouts, click on the link
- below to open a page template sample based on them and read
- detailed descriptions.
- </p>
- <h:outputLink target="blank"
- value="#{facesContext.externalContext.requestContextPath}/richfaces/layouts/page/template.jsf">Open
a sample built with layouts components</h:outputLink>
-
- </ui:define>
-
-</ui:composition>
-</html>
+<!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: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">
+<ui:composition template="/templates/component-sample.xhtml">
+ <ui:define name="sample">
+ <p>A set of layout components designed based on <h:outputLink
+ target="blank"
value="http://developer.yahoo.com/yui/layout/">Yahoo
layouts</h:outputLink>.
+ </p>
+ <p>
+ The component set consists of three components. A <b>Page </b>component
for page
+ layout definition and <b>Layout/LayoutPanel</b> components for nesting
layout
+ grids creation.
+ </p>
+ <p>
+ Since these components are designed to create full page layouts, click on the link
+ below to open a page template sample based on them and read
+ detailed descriptions.
+ </p>
+ <h:outputLink target="blank"
+ value="#{facesContext.externalContext.requestContextPath}/richfaces/layouts/page/template.jsf">Open
a sample built with layouts components</h:outputLink>
+<br/>
+ </ui:define>
+
+</ui:composition>
+</html>
Modified: trunk/ui/assembly/pom.xml
===================================================================
--- trunk/ui/assembly/pom.xml 2009-05-14 12:50:25 UTC (rev 14210)
+++ trunk/ui/assembly/pom.xml 2009-05-14 14:10:29 UTC (rev 14211)
@@ -62,7 +62,7 @@
<!--
<templateXpath>/*[local-name()='template']/*</templateXpath>
-->
- <excludeXcss>**/basic.xcss, **/basic_classes.xcss, **/basic_both.xcss,
**/extended.xcss, **/extended_classes.xcss, **/extended_both.xcss, **/skin*.xcss,
**/tiny_mce/**, **/org/richfaces/renderkit/html/css/simple.xcss,
**/org/richfaces/renderkit/html/css/violetRays.xcss </excludeXcss>
+ <excludeXcss>**/basic.xcss, **/basic_classes.xcss, **/basic_both.xcss,
**/extended.xcss, **/extended_classes.xcss, **/extended_both.xcss, **/skin*.xcss,
**/tiny_mce/**, **/org/richfaces/renderkit/html/css/simple.xcss,
**/org/richfaces/renderkit/html/css/violetRays.xcss, **/layout/**/fonts.xcss
</excludeXcss>
<commonStyle>org/richfaces/skin.xcss</commonStyle>
</configuration>
<executions>