Author: SergeySmirnov Date: 2007-07-12 17:38:37 -0400 (Thu, 12 Jul 2007) New Revision: 1613 Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/component-sample.xhtml trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml trunk/samples/richfaces-demo/src/main/webapp/templates/include/dynamic-css.xhtml trunk/samples/richfaces-demo/src/main/webapp/templates/include/footer.xhtml trunk/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml trunk/samples/richfaces-demo/src/main/webapp/templates/include/references.xhtml Log: avoiding problem with extra html inside the templates Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/component-sample.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/templates/component-sample.xhtml 2007-07-12 18:15:30 UTC (rev 1612) +++ trunk/samples/richfaces-demo/src/main/webapp/templates/component-sample.xhtml 2007-07-12 21:38:37 UTC (rev 1613) @@ -4,6 +4,8 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:rich="http://richfaces.ajax4jsf.org/rich"> -<ui:insert name="sample"/> -<ui:insert name="sources"/> + <ui:composition> + <ui:insert name="sample"/> + <ui:insert name="sources"/> + </ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml 2007-07-12 18:15:30 UTC (rev 1612) +++ trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml 2007-07-12 21:38:37 UTC (rev 1613) @@ -4,6 +4,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/ajax" xmlns:rich="http://richfaces.ajax4jsf.org/rich"> +<ui:composition> <rich:panel styleClass="panel_menu"> <table border="0" cellpadding="3" cellspacing="1"> <tbody> @@ -23,5 +24,6 @@ </tbody> </table> </rich:panel> +</ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/include/dynamic-css.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/templates/include/dynamic-css.xhtml 2007-07-12 18:15:30 UTC (rev 1612) +++ trunk/samples/richfaces-demo/src/main/webapp/templates/include/dynamic-css.xhtml 2007-07-12 21:38:37 UTC (rev 1613) @@ -3,6 +3,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/ajax"> +<ui:composition> <style type="text/css"> body{ background-image : url(${facesContext.externalContext.requestContextPath}/images/page_bg.gif); @@ -26,5 +27,6 @@ background-image : url(${facesContext.externalContext.requestContextPath}/images/tabpanel_custom/tab_active_bg.gif); } </style> +</ui:composition> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/include/footer.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/templates/include/footer.xhtml 2007-07-12 18:15:30 UTC (rev 1612) +++ trunk/samples/richfaces-demo/src/main/webapp/templates/include/footer.xhtml 2007-07-12 21:38:37 UTC (rev 1613) @@ -3,6 +3,8 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/ajax"> +<ui:composition> Footer will be here +</ui:composition>> </html> Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml 2007-07-12 18:15:30 UTC (rev 1612) +++ trunk/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml 2007-07-12 21:38:37 UTC (rev 1613) @@ -4,6 +4,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/ajax" xmlns:rich="http://richfaces.ajax4jsf.org/rich"> +<ui:composition> <div class="page_brick"></div> <table class="top_navbar" cellpadding="0" cellspacing="0" border="0"> <tbody> @@ -127,4 +128,5 @@ </tbody> </table> </h:form> +</ui:composition> </html> \ No newline at end of file Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/include/references.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/templates/include/references.xhtml 2007-07-12 18:15:30 UTC (rev 1612) +++ trunk/samples/richfaces-demo/src/main/webapp/templates/include/references.xhtml 2007-07-12 21:38:37 UTC (rev 1613) @@ -4,6 +4,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/ajax" xmlns:rich="http://richfaces.ajax4jsf.org/rich"> +<ui:composition> <rich:panel styleClass="panel_documents"> <strong>#{componentNavigator.currentComponent.name}</strong> <ul> @@ -12,5 +13,6 @@ <li><h:outputLink value="#{componentNavigator.currentComponent.javaDocLocation}">Component Class Documentation</h:outputLink></li> </ul> </rich:panel> +</ui:composition> </html>