[richfaces-svn-commits] JBoss Rich Faces SVN: r15967 - in branches/community/3.3.X/samples/richfaces-demo/src/main/webapp: richfaces and 1 other directories.

[richfaces-svn-commits at lists.jboss.org]

Author: nbelaevski
Date: 2009-11-22 21:22:47 -0500 (Sun, 22 Nov 2009)
New Revision: 15967

Modified:
   branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml
   branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml
   branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/templates/include/components-group.xhtml
Log:
Examples: merged from 3.3.x_jsf2 branch

Modified: branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml
===================================================================
--- branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml	2009-11-23 02:18:12 UTC (rev 15966)
+++ branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml	2009-11-23 02:22:47 UTC (rev 15967)
@@ -60,7 +60,12 @@
 		<param-name>org.richfaces.LoadScriptStrategy</param-name>
 		<param-value>ALL</param-value>
 	</context-param>
+	<context-param>
+		<param-name>javax.faces.DISABLE_FACELET_JSF_VIEWHANDLER</param-name>
+		<param-value>true</param-value>
+	</context-param>
 
+
 	<listener>
 		<listener-class>
 			org.jboss.seam.servlet.SeamListener

Modified: branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml
===================================================================
--- branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml	2009-11-23 02:18:12 UTC (rev 15966)
+++ branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/richfaces/dataTable.xhtml	2009-11-23 02:22:47 UTC (rev 15967)
@@ -15,7 +15,7 @@
 			<rich:tab label="Extended Data Model" name="dataModel">
 				<ui:include src="/richfaces/dataTable/extended-data-model.xhtml"/>
 			</rich:tab>			 
-			<rich:tab label="Modifiable Data Model" name="modifiableDataModel">
+			<rich:tab actionListener="#{conversation.start()}" label="Modifiable Data Model" name="modifiableDataModel">
 				<ui:include src="/richfaces/dataTable/modifiableModel.xhtml"/>
 			</rich:tab>			 
 			<rich:tab label="Edit Table with ModalPanel" name="editDataTable">

Modified: branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/templates/include/components-group.xhtml
===================================================================
--- branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/templates/include/components-group.xhtml	2009-11-23 02:18:12 UTC (rev 15966)
+++ branches/community/3.3.X/samples/richfaces-demo/src/main/webapp/templates/include/components-group.xhtml	2009-11-23 02:22:47 UTC (rev 15967)
@@ -7,16 +7,16 @@
 <ui:composition>
 <table border="0" cellpadding="0" cellspacing="1">
 	<tbody> 
-		<a4j:repeat var="component" value="#{components}">
-			<tr class="#{component.current?'active':'unactive'}" onmouseover="this.className='active'" onmouseout="this.className='#{component.current?'active':'unactive'}'">
-				<td class="ico"><div style="width: 16px;height: 16px;"><h:graphicImage value="#{component.iconImage}" width="16" height="16" alt="" border="0" /><h:graphicImage value="/images/icons/ico_new_item.gif" rendered="#{component.newComponent}" style="position:relative; top:-6px; left:10px;" alt="" width="10" height="10"/></div></td>
-				<td class="text #{component.newComponent?'bold':''}" width="100%">
-					<h:outputLink style="display:block;height:20px" value="#{component.contextRelativeDemoLocation}">
+		<a4j:repeat var="component2" value="#{components}">
+			<tr class="#{component2.current?'active':'unactive'}" onmouseover="this.className='active'" onmouseout="this.className='#{component2.current?'active':'unactive'}'">
+				<td class="ico"><div style="width: 16px;height: 16px;"><h:graphicImage value="#{component2.iconImage}" width="16" height="16" alt="" border="0" /><h:graphicImage value="/images/icons/ico_new_item.gif" rendered="#{component2.newComponent}" style="position:relative; top:-6px; left:10px;" alt="" width="10" height="10"/></div></td>
+				<td class="text #{component2.newComponent?'bold':''}" width="100%">
+					<h:outputLink style="display:block;height:20px" value="#{component2.contextRelativeDemoLocation}">
 						<span style="display:block;padding-top:3px;text-decoration : none; color : #000000;">
-							#{component.name}
+							#{component2.name}
 						</span>
-						<f:param value="#{component.id}" name="c"/>
-						<f:param value="#{component.activeTab}" name="tab"/>
+						<f:param value="#{component2.id}" name="c"/>
+						<f:param value="#{component2.activeTab}" name="tab"/>
 					</h:outputLink>
 				</td> 
 			</tr>