[jboss-cvs] JBossAS SVN: r97890 - in projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp: WEB-INF and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Dec 16 07:59:18 EST 2009
Author: lvlcek at redhat.com
Date: 2009-12-16 07:59:17 -0500 (Wed, 16 Dec 2009)
New Revision: 97890
Added:
projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/createReservation.xhtml
projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/searchReservation.xhtml
Removed:
projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/reservationCreate.xhtml
projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/reservationSearch.xhtml
Modified:
projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/faces-config.xml
Log:
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/faces-config.xml 2009-12-16 12:57:38 UTC (rev 97889)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/faces-config.xml 2009-12-16 12:59:17 UTC (rev 97890)
@@ -8,21 +8,23 @@
<view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
<el-resolver>org.springframework.web.jsf.el.SpringBeanFacesELResolver</el-resolver>
</application>
-
+
+ <!--
<converter>
<converter-id>equipmentTypeConverter</converter-id>
<converter-class>org.jboss.snowdrop.samples.sportsclub.jsf.beans.EquipmentTypeConverter</converter-class>
</converter>
-
+ -->
+
<navigation-rule>
<from-view-id>*</from-view-id>
<navigation-case>
<from-outcome>create</from-outcome>
- <to-view-id>/reservationCreate.xhtml</to-view-id>
+ <to-view-id>/createReservation.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>search</from-outcome>
- <to-view-id>/reservationSearch.xhtml</to-view-id>
+ <to-view-id>/searchReservation.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
Copied: projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/createReservation.xhtml (from rev 97876, projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/reservationCreate.xhtml)
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/createReservation.xhtml (rev 0)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/createReservation.xhtml 2009-12-16 12:59:17 UTC (rev 97890)
@@ -0,0 +1,38 @@
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:rich="http://richfaces.org/rich"
+ xmlns:a4j="http://richfaces.org/a4j"
+ template="layout/template.xhtml">
+ <ui:define name="content">
+ <rich:panel>
+ <h:form>
+ <h:panelGrid columns="2" >
+ <h:outputLabel value="Equipment"/>
+ <rich:inplaceInput defaultLabel="Click to enter" value="#{reservationCreate.reservation.equipment.name}"/>
+ <h:outputLabel value="Account"/>
+ <rich:inplaceInput defaultLabel="Click to enter" value="#{reservationCreate.reservation.account.person.name.firstName}"/>
+ <h:outputLabel value="From"/>
+ <!--rich:inplaceInput defaultLabel="Click to enter" value="#{reservationCreate.reservation.from}"/-->
+ <rich:calendar id="from" value="#{reservationCreate.reservation.from}"/>
+ <h:outputLabel value="To"/>
+ <rich:calendar id="to" value="#{reservationCreate.reservation.to}"/>
+ <!--rich:inplaceInput defaultLabel="Click to enter" value="#{reservationCreate.reservation.to}"/-->
+ <!--<h:outputLabel value="Billing"/>-->
+ <!--<rich:inplaceSelect defaultLabel="Click to select"-->
+ <!--value="#{accountCreate.billingType}">-->
+ <!--<f:converter converterId="enumConverter" />-->
+ <!--<f:selectItems value="#{accountCreate.billingTypeItems}"/>-->
+ <!--</rich:inplaceSelect>-->
+ <!--<h:outputLabel value="Membership"/>-->
+ <!--<rich:inplaceSelect defaultLabel="Click to select" value="#{accountCreate.membershipType}">-->
+ <!--<f:selectItems value="#{accountCreate.selectableMembershipCodes}"/>-->
+ <!--</rich:inplaceSelect>-->
+ </h:panelGrid>
+ <h:commandButton value="Save" action="#{reservationCreate.create}"/>
+ </h:form>
+ </rich:panel>
+
+ </ui:define>
+</ui:composition>
\ No newline at end of file
Deleted: projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/reservationCreate.xhtml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/reservationCreate.xhtml 2009-12-16 12:57:38 UTC (rev 97889)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/reservationCreate.xhtml 2009-12-16 12:59:17 UTC (rev 97890)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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" xml:lang="en" lang="en">
-<head>
- <title></title>
-</head>
-<body>
-
-</body>
-</html>
\ No newline at end of file
Deleted: projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/reservationSearch.xhtml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/reservationSearch.xhtml 2009-12-16 12:57:38 UTC (rev 97889)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/reservationSearch.xhtml 2009-12-16 12:59:17 UTC (rev 97890)
@@ -1,107 +0,0 @@
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:rich="http://richfaces.org/rich"
- xmlns:a4j="http://richfaces.org/a4j"
- template="layout/template.xhtml">
-
- <ui:define name="content">
-
- <rich:panel>
- <f:facet name="header">Filter reservations</f:facet>
- <h:form>
- from:
- <rich:calendar id="from" value="#{reservationSearch.reservationSearchOptions.fromDate}">
- <a4j:support event="onchanged" reRender="searchResults"/>
- </rich:calendar>
- to:
- <rich:calendar id="to" value="#{reservationSearch.reservationSearchOptions.toDate}">
- <a4j:support event="onchanged" reRender="searchResults"/>
- </rich:calendar>
- <br/>
- <table>
- <tr>
- <td>
- Equipment Type:
- </td>
- <td>
- <h:selectManyCheckbox id="equipmentTypes"
- value="#{reservationSearch.reservationSearchOptions.selectedEquipmentTypes}"
- layout="lineDirection" converter="#{equipmentTypeConverter}">
- <f:selectItems value="#{referenceData.equipmentTypes}"/>
- <a4j:support event="onchange" action="#{reservationSearch.equipmentTypeCheckboxChanged}"
- reRender="searchResults"/>
- </h:selectManyCheckbox>
- </td>
- </tr>
- </table>
- <br/>
- <a4j:status id="commonstatus" startText="Retrieving data..." stopText=""/>
-
- </h:form>
- </rich:panel>
-
- <a4j:outputPanel id="searchResults">
- <h:form>
- <rich:panel header="Search results">
-
- <rich:extendedDataTable id="searchResultsTable" value="#{reservationSearch}"
- var="reservation" selectionMode="single"
- enableContextMenu="true"
- height="250px"
- rows="5"
- tableState="#{reservationSearch.tableState.tableState}">
-
- <rich:column label="Reservation #">
- <f:facet name="header">
- <h:outputText value="Reservation #"/>
- </f:facet>
- <h:outputText value="#{reservation.id}"/>
- </rich:column>
-
- <rich:column label="Equipment Type">
- <f:facet name="header">
- <h:outputText value="Equipment Type"/>
- </f:facet>
- <h:outputText value="#{reservation.equipment.equipmentType}"/>
- </rich:column>
-
- <rich:column label="Equipment Description">
- <f:facet name="header">
- <h:outputText value="Equipment Description"/>
- </f:facet>
- <h:outputText value="#{reservation.equipment.name}: #{reservation.equipment.description}"/>
- </rich:column>
-
- <rich:column label="From">
- <f:facet name="header">
- <h:outputText value="From"/>
- </f:facet>
- <h:outputText value="#{reservation.from}">
- <f:convertDateTime dateStyle="long" type="both"/>
- </h:outputText>
- </rich:column>
-
- <rich:column label="To">
- <f:facet name="header">
- <h:outputText value="To"/>
- </f:facet>
- <h:outputText value="#{reservation.to}">
- <f:convertDateTime dateStyle="long" type="both"/>
- </h:outputText>
- </rich:column>
-
- <f:facet name="footer">
- <rich:datascroller id="scroller" for="searchResultsTable" maxPages="5"
- page="#{reservationSearch.currentPage}"/>
- </f:facet>
-
- </rich:extendedDataTable>
- </rich:panel>
- </h:form>
- </a4j:outputPanel>
-
- </ui:define>
-
-</ui:composition>
\ No newline at end of file
Copied: projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/searchReservation.xhtml (from rev 97876, projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/reservationSearch.xhtml)
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/searchReservation.xhtml (rev 0)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/searchReservation.xhtml 2009-12-16 12:59:17 UTC (rev 97890)
@@ -0,0 +1,107 @@
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:rich="http://richfaces.org/rich"
+ xmlns:a4j="http://richfaces.org/a4j"
+ template="layout/template.xhtml">
+
+ <ui:define name="content">
+
+ <rich:panel>
+ <f:facet name="header">Filter reservations</f:facet>
+ <h:form>
+ from:
+ <rich:calendar id="from" value="#{reservationSearch.reservationSearchOptions.fromDate}">
+ <a4j:support event="onchanged" reRender="searchResults"/>
+ </rich:calendar>
+ to:
+ <rich:calendar id="to" value="#{reservationSearch.reservationSearchOptions.toDate}">
+ <a4j:support event="onchanged" reRender="searchResults"/>
+ </rich:calendar>
+ <br/>
+ <table>
+ <tr>
+ <td>
+ Equipment Type:
+ </td>
+ <td>
+ <h:selectManyCheckbox id="equipmentTypes"
+ value="#{reservationSearch.reservationSearchOptions.selectedEquipmentTypes}"
+ layout="lineDirection" converter="#{equipmentTypeConverter}">
+ <f:selectItems value="#{referenceData.equipmentTypes}"/>
+ <a4j:support event="onchange" action="#{reservationSearch.equipmentTypeCheckboxChanged}"
+ reRender="searchResults"/>
+ </h:selectManyCheckbox>
+ </td>
+ </tr>
+ </table>
+ <br/>
+ <a4j:status id="commonstatus" startText="Retrieving data..." stopText=""/>
+
+ </h:form>
+ </rich:panel>
+
+ <a4j:outputPanel id="searchResults">
+ <h:form>
+ <rich:panel header="Search results">
+
+ <rich:extendedDataTable id="searchResultsTable" value="#{reservationSearch}"
+ var="reservation" selectionMode="single"
+ enableContextMenu="true"
+ height="250px"
+ rows="5"
+ tableState="#{reservationSearch.tableState.tableState}">
+
+ <rich:column label="Reservation #">
+ <f:facet name="header">
+ <h:outputText value="Reservation #"/>
+ </f:facet>
+ <h:outputText value="#{reservation.id}"/>
+ </rich:column>
+
+ <rich:column label="Equipment Type">
+ <f:facet name="header">
+ <h:outputText value="Equipment Type"/>
+ </f:facet>
+ <h:outputText value="#{reservation.equipment.equipmentType}"/>
+ </rich:column>
+
+ <rich:column label="Equipment Description">
+ <f:facet name="header">
+ <h:outputText value="Equipment Description"/>
+ </f:facet>
+ <h:outputText value="#{reservation.equipment.name}: #{reservation.equipment.description}"/>
+ </rich:column>
+
+ <rich:column label="From">
+ <f:facet name="header">
+ <h:outputText value="From"/>
+ </f:facet>
+ <h:outputText value="#{reservation.from}">
+ <f:convertDateTime dateStyle="long" type="both"/>
+ </h:outputText>
+ </rich:column>
+
+ <rich:column label="To">
+ <f:facet name="header">
+ <h:outputText value="To"/>
+ </f:facet>
+ <h:outputText value="#{reservation.to}">
+ <f:convertDateTime dateStyle="long" type="both"/>
+ </h:outputText>
+ </rich:column>
+
+ <f:facet name="footer">
+ <rich:datascroller id="scroller" for="searchResultsTable" maxPages="5"
+ page="#{reservationSearch.currentPage}"/>
+ </f:facet>
+
+ </rich:extendedDataTable>
+ </rich:panel>
+ </h:form>
+ </a4j:outputPanel>
+
+ </ui:define>
+
+</ui:composition>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list