[seam-commits] Seam SVN: r14116 - in branches/community/Seam_2_3/examples/icefaces: icefaces-web/src/main/webapp and 1 other directory.

Author: jguglielmin Date: 2011-06-03 14:06:29 -0400 (Fri, 03 Jun 2011) New Revision: 14116 Modified: branches/community/Seam_2_3/examples/icefaces/icefaces-ejb/src/main/resources/import.sql branches/community/Seam_2_3/examples/icefaces/icefaces-web/src/main/webapp/book.xhtml branches/community/Seam_2_3/examples/icefaces/icefaces-web/src/main/webapp/main.xhtml Log: JBSEAM-4815 Modified: branches/community/Seam_2_3/examples/icefaces/icefaces-ejb/src/main/resources/import.sql =================================================================== --- branches/community/Seam_2_3/examples/icefaces/icefaces-ejb/src/main/resources/import.sql 2011-06-03 10:23:08 UTC (rev 14115) +++ branches/community/Seam_2_3/examples/icefaces/icefaces-ejb/src/main/resources/import.sql 2011-06-03 18:06:29 UTC (rev 14116) @@ -19,4 +19,4 @@ insert into Hotel (id, price, name, address, city, state, zip, country) values (18, 460, 'Ritz Carlton', 'Peachtree Rd, Buckhead', 'Atlanta', 'GA', '30326', 'USA') insert into Hotel (id, price, name, address, city, state, zip, country) values (19, 220, 'Swissotel', '68 Market Street', 'Sydney', 'NSW', '2000', 'Australia') insert into Hotel (id, price, name, address, city, state, zip, country) values (20, 250, 'Meli� White House', 'Albany Street', 'Regents Park London', '', 'NW13UP', 'Great Britain') -insert into Hotel (id, price, name, address, city, state, zip, country) values (21, 210, 'Hotel Allegro', '171 West Randolph Street', 'Chicago', 'IL', '60601', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (21, 210, 'Hotel Allegro', '171 West Randolph Street', 'Chicago', 'IL', '60601', 'USA') \ No newline at end of file Modified: branches/community/Seam_2_3/examples/icefaces/icefaces-web/src/main/webapp/book.xhtml =================================================================== --- branches/community/Seam_2_3/examples/icefaces/icefaces-web/src/main/webapp/book.xhtml 2011-06-03 10:23:08 UTC (rev 14115) +++ branches/community/Seam_2_3/examples/icefaces/icefaces-web/src/main/webapp/book.xhtml 2011-06-03 18:06:29 UTC (rev 14116) @@ -88,11 +88,11 @@ <f:selectItem itemLabel="Dec" itemValue="12"/> </ice:selectOneMenu> <ice:selectOneMenu id="creditCardExpiryYear" value="#{booking.creditCardExpiryYear}"> - <f:selectItem itemLabel="2007" itemValue="2007"/> - <f:selectItem itemLabel="2008" itemValue="2008"/> - <f:selectItem itemLabel="2009" itemValue="2009"/> - <f:selectItem itemLabel="2010" itemValue="2010"/> <f:selectItem itemLabel="2011" itemValue="2011"/> + <f:selectItem itemLabel="2012" itemValue="2012"/> + <f:selectItem itemLabel="2013" itemValue="2013"/> + <f:selectItem itemLabel="2014" itemValue="2014"/> + <f:selectItem itemLabel="2015" itemValue="2015"/> </ice:selectOneMenu> </s:decorate> Modified: branches/community/Seam_2_3/examples/icefaces/icefaces-web/src/main/webapp/main.xhtml =================================================================== --- branches/community/Seam_2_3/examples/icefaces/icefaces-web/src/main/webapp/main.xhtml 2011-06-03 10:23:08 UTC (rev 14115) +++ branches/community/Seam_2_3/examples/icefaces/icefaces-web/src/main/webapp/main.xhtml 2011-06-03 18:06:29 UTC (rev 14116) @@ -48,26 +48,26 @@ <h:outputText id="NoHotelsFoundMessage" value="No Hotels Found" rendered="#{hotels != null and hotels.rowCount==0}"/> <ice:outputText value="Search Results"/> <ice:dataTable id="hotels" value="#{hotels}" var="hot" rendered="#{hotels.rowCount>0}"> - <h:column> + <ice:column> <f:facet name="header">Name</f:facet> <ice:outputText id="name" value="#{hot.name}" onmouseovereffect="#{highlight}"/> - </h:column> - <h:column> + </ice:column> + <ice:column> <f:facet name="header">Address</f:facet> <ice:outputText id="address" value="#{hot.address}" onmouseovereffect="#{highlight}"/> - </h:column> - <h:column> + </ice:column> + <ice:column> <f:facet name="header">City, State</f:facet> <ice:outputText id="city" value="#{hot.city}, #{hot.state}, #{hot.country}" onmouseovereffect="#{highlight}"/> - </h:column> - <h:column> + </ice:column> + <ice:column> <f:facet name="header">Zip</f:facet> <ice:outputText id="zip" value="#{hot.zip}" onmouseovereffect="#{highlight}"/> - </h:column> - <h:column> + </ice:column> + <ice:column> <f:facet name="header">Action</f:facet> <s:link id="viewHotel" value="View Hotel" action="#{hotelBooking.selectHotel(hot)}"/> - </h:column> + </ice:column> </ice:dataTable> <s:link id="moreResults" value="More results" action="#{hotelSearch.nextPage}" rendered="#{hotelSearch.nextPageAvailable}"/> </div> @@ -80,34 +80,34 @@ <ice:form id="bookings"> <h:outputText value="No Bookings Found" rendered="#{bookings.rowCount==0}"/> <ice:dataTable id="bookings" value="#{bookings}" var="book" rendered="#{bookings.rowCount>0}"> - <h:column> + <ice:column> <f:facet name="header">Name</f:facet> <ice:outputText id="name" value="#{book.hotel.name}" onmouseovereffect="#{highlight}"/> - </h:column> - <h:column> + </ice:column> + <ice:column> <f:facet name="header">Address</f:facet> <ice:outputText id="address" value="#{book.hotel.address}" onmouseovereffect="#{highlight}"/> - </h:column> - <h:column> + </ice:column> + <ice:column> <f:facet name="header">City, State</f:facet> <ice:outputText id="city" value="#{book.hotel.city}, #{book.hotel.state}" onmouseovereffect="#{highlight}"/> - </h:column> - <h:column> + </ice:column> + <ice:column> <f:facet name="header">Check in date</f:facet> <h:outputText id="checkIn" value="#{book.checkinDate}" onmouseovereffect="#{highlight}"/> - </h:column> - <h:column> + </ice:column> + <ice:column> <f:facet name="header">Check out date</f:facet> <h:outputText id="checkOut" value="#{book.checkoutDate}" onmouseovereffect="#{highlight}"/> - </h:column> - <h:column> + </ice:column> + <ice:column> <f:facet name="header">Confirmation number</f:facet> <ice:outputText id="confirmation" value="#{book.id}" onmouseovereffect="#{highlight}"/> - </h:column> - <h:column> + </ice:column> + <ice:column> <f:facet name="header">Action</f:facet> <ice:commandLink id="cancel" value="Cancel" action="#{bookingList.cancel}"/> - </h:column> + </ice:column> </ice:dataTable> </ice:form> </div>