[jboss-cvs] JBossAS SVN: r97788 - in projects/snowdrop/examples/trunk/sportsclub: sportsclub-reservations-web/src/main/webapp/WEB-INF and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Dec 14 10:31:13 EST 2009
Author: lvlcek at redhat.com
Date: 2009-12-14 10:31:12 -0500 (Mon, 14 Dec 2009)
New Revision: 97788
Modified:
projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/web.xml
projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/includes/header.xhtml
projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/layout/template.xhtml
projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/reservationSearch.xhtml
projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/src/main/webapp/searchForm.xhtml
Log:
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/web.xml 2009-12-14 15:00:26 UTC (rev 97787)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/WEB-INF/web.xml 2009-12-14 15:31:12 UTC (rev 97788)
@@ -26,12 +26,12 @@
<param-name>javax.faces.STATE_SAVING_METHOD</param-name>
<param-value>server</param-value>
</context-param>
- <!--
+
<context-param>
<param-name>org.richfaces.SKIN</param-name>
- <param-value>lagune</param-value>
+ <param-value>wine</param-value>
</context-param>
- -->
+
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>/WEB-INF/spring-beans.xml</param-value>
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/includes/header.xhtml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/includes/header.xhtml 2009-12-14 15:00:26 UTC (rev 97787)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/includes/header.xhtml 2009-12-14 15:31:12 UTC (rev 97788)
@@ -1,10 +1,20 @@
<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">
+ 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">
<rich:panel>
- <h:outputText value="Sports Club Reservations"/>
+
+ <h:outputText value="Sports Club Reservations"/>
+ <br/>
+ <h:outputLink id="home" value="/sportsclub/index.jsf">
+ <h:outputText value="Home"/>
+ </h:outputLink>
+ <f:verbatim>&nbsp;&nbsp;</f:verbatim>
+ <h:outputLink id="subscriptions" value="/sportsclub/subscriptions/">
+ <h:outputText value="Subscriptions"/>
+ </h:outputLink>
+
</rich:panel>
</ui:composition>
\ No newline at end of file
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/layout/template.xhtml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/layout/template.xhtml 2009-12-14 15:00:26 UTC (rev 97787)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/layout/template.xhtml 2009-12-14 15:31:12 UTC (rev 97788)
@@ -18,11 +18,11 @@
<body class="main-body">
- <div style="width: 100%; height: 116px; left: 0px;">
+ <div style="width: 100%; height: 82px; left: 0px;">
<ui:include src="/includes/header.xhtml"/>
</div>
- <div style="height: 100%; width: 800px" id="content" class="clearfix">
+ <div style="height: 100%; width: 800px" id="content" class="clearfix" align="center">
<ui:insert name="content"/>
</div>
Modified: 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-14 15:00:26 UTC (rev 97787)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/reservationSearch.xhtml 2009-12-14 15:31:12 UTC (rev 97788)
@@ -9,7 +9,7 @@
<ui:define name="content">
<rich:panel>
- <f:facet name="header">Display reservations in the following date range (dates are optional)</f:facet>
+ <f:facet name="header">Display reservations</f:facet>
<h:form>
from:
<rich:calendar value="#{reservationSearch.fromDate}"/>
@@ -18,13 +18,22 @@
<h:commandButton id="submit" value="Display Reservations"
action="#{reservationSearch.searchReservations}"/> <!-- reRender="searchResults"-->
<br/>
- Equipment Type:
- <h:selectManyCheckbox id="equipmentTypes" value="#{reservationSearch.selectedEquipmentTypes}"
- layout="lineDirection" converter="#{equipmentTypeConverter}">
- <f:selectItems value="#{referenceData.equipmentTypes}"/>
- <a4j:support event="onchange" action="#{reservationSearch.equipmentTypeCheckboxChanged}"
- reRender="searchResults"/>
- </h:selectManyCheckbox>
+ <table>
+ <tr>
+ <td>
+ Equipment Type:
+ </td>
+ <td>
+ <h:selectManyCheckbox id="equipmentTypes"
+ value="#{reservationSearch.selectedEquipmentTypes}"
+ layout="lineDirection" converter="#{equipmentTypeConverter}">
+ <f:selectItems value="#{referenceData.equipmentTypes}"/>
+ <a4j:support event="onchange" action="#{reservationSearch.equipmentTypeCheckboxChanged}"
+ reRender="searchResults"/>
+ </h:selectManyCheckbox>
+ </td>
+ </tr>
+ </table>
</h:form>
</rich:panel>
@@ -34,9 +43,11 @@
<rich:panel header="Search results">
<rich:extendedDataTable id="searchResultsTable" value="#{reservationSearch}"
- var="reservation" rows="5" selectionMode="single"
- enableContextMenu="true"
- tableState="#{reservationSearch.tableState.tableState}">
+ var="reservation" selectionMode="single"
+ enableContextMenu="true"
+ height="250px"
+ rows="5"
+ tableState="#{reservationSearch.tableState.tableState}">
<rich:column label="Reservation #">
<f:facet name="header">
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/src/main/webapp/searchForm.xhtml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/src/main/webapp/searchForm.xhtml 2009-12-14 15:00:26 UTC (rev 97787)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/src/main/webapp/searchForm.xhtml 2009-12-14 15:31:12 UTC (rev 97788)
@@ -21,10 +21,12 @@
<a4j:outputPanel id="searchResults">
<h:form>
<rich:panel header="Search results" rendered="#{accountSearch.searchInfoAvailable}">
- <rich:extendedDataTable id="searchResultsTable" value="#{accountSearch}" var="account" rows="5"
+ <rich:extendedDataTable id="searchResultsTable" value="#{accountSearch}" var="account"
selectionMode="single"
selection="#{accountSearch.selection}"
enableContextMenu="true"
+ rows="5"
+ height="300px"
tableState="#{accountSearch.tableState}">
<a4j:support event="onselectionchange" reRender="accountData"/>
<rich:column label="Account #">
More information about the jboss-cvs-commits
mailing list