PBR-497 Verify Showcase overrides for RichFaces 4.3.0.Final

portletbridge · Feb 25, 2013 · d3ae85d · d3ae85d
1 parent 799d589
commit d3ae85d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 59 deletions.
diff --git a/examples/richfaces-showcase/src/main/webapp/richfaces/contextmenu/samples/tree-sample.xhtml b/examples/richfaces-showcase/src/main/webapp/richfaces/contextmenu/samples/tree-sample.xhtml
@@ -20,10 +20,10 @@
             <rich:treeNode type="country">
                 #{node.name}
             </rich:treeNode>
-            <rich:treeNode type="company" icon="#{portletRes['/images/tree/disc.gif']}">
+            <rich:treeNode type="company" iconExpanded="#{portletRes['/images/tree/disc.gif']}" iconCollapsed="#{portletRes['/images/tree/disc.gif']}">
                 #{node.name}
             </rich:treeNode>
-            <rich:treeNode type="cd" icon="#{portletRes['/images/tree/song.gif']}">
+            <rich:treeNode type="cd" iconLeaf="#{portletRes['/images/tree/song.gif']}">
                 #{node.artist} - #{node.name} - #{node.year}
             </rich:treeNode>
         </rich:tree>

diff --git a/...aces-showcase/src/main/webapp/richfaces/dataScroller/samples/simpleScrolling-sample.xhtml b/...aces-showcase/src/main/webapp/richfaces/dataScroller/samples/simpleScrolling-sample.xhtml
diff --git a/...ces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/edt-sorting-sample.xhtml b/...ces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/edt-sorting-sample.xhtml
@@ -6,14 +6,14 @@
 	xmlns:a4j="http://richfaces.org/a4j"
 	xmlns:rich="http://richfaces.org/rich">
 	<h:form>
-		<fieldset><legend>Sorting Options</legend> 
+		<fieldset><legend>Sorting Options</legend>
 			<h:panelGrid columns="2">
 				<h:outputText value="Multiple Sorting:" />
 				<h:selectBooleanCheckbox value="#{carsSortingBean.multipleSorting}"
 					valueChangeListener="#{carsSortingBean.modeChanged}">
 					<a4j:ajax event="click" render="table @this" />
 				</h:selectBooleanCheckbox>
-			</h:panelGrid> 
+			</h:panelGrid>
 		<a4j:commandButton execute="@this" value="Reset Sorting"
 			action="#{carsSortingBean.reset}" render="table" /></fieldset>
 		<rich:extendedDataTable value="#{carsBean.allInventoryItems}"
@@ -24,7 +24,8 @@
 				<h:outputText value="Cars marketplace" />
 			</f:facet>
 			<rich:column sortBy="#{car.vendor}"
-				sortOrder="#{carsSortingBean.sortsOrders['vendor']}">
+				         sortOrder="#{carsSortingBean.sortsOrders['vendor']}"
+                         sortType="custom">
 				<f:facet name="header">
 					<h:panelGrid columns="2">
 						<a4j:commandLink execute="@this" value="Vendor" render="table"
@@ -40,7 +41,8 @@
 				<h:outputText value="#{car.vendor}" />
 			</rich:column>
 			<rich:column sortBy="#{car.model}"
-				sortOrder="#{carsSortingBean.sortsOrders['model']}">
+                         sortOrder="#{carsSortingBean.sortsOrders['model']}"
+                         sortType="custom">
 				<f:facet name="header">
 					<h:panelGrid columns="2">
 						<a4j:commandLink execute="@this" value="Model" render="table"
@@ -56,7 +58,8 @@
 				<h:outputText value="#{car.model}" />
 			</rich:column>
 			<rich:column sortBy="#{car.price}"
-				sortOrder="#{carsSortingBean.sortsOrders['price']}">
+                         sortOrder="#{carsSortingBean.sortsOrders['price']}"
+                         sortType="custom">
 				<f:facet name="header">
 					<h:panelGrid columns="2">
 						<a4j:commandLink execute="@this" value="Price" render="table"
@@ -72,7 +75,8 @@
 				<h:outputText value="#{car.price}" />
 			</rich:column>
 			<rich:column sortBy="#{car.mileage}"
-				sortOrder="#{carsSortingBean.sortsOrders['mileage']}">
+                         sortOrder="#{carsSortingBean.sortsOrders['mileage']}"
+                         sortType="custom">
 				<f:facet name="header">
 					<h:panelGrid columns="2">
 						<a4j:commandLink execute="@this" value="Mileage" render="table"