You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/05/13 04:36:32 UTC
svn commit: r169920 [2/2] - in /incubator/beehive/trunk/samples/petstoreWeb:
./ src/org/apache/beehive/samples/petstore/controls/
src/org/apache/beehive/samples/petstore/controls/data/
src/org/apache/beehive/samples/petstore/resources/
test-src/org/apache/beehive/samples/petstore/test/ web/
web/WEB-INF/tags/beehive/petstore/ web/account/addresses/
web/account/create/ web/account/edit/ web/auth/ web/checkout/ web/search/
web/shop/ web/site/ web/webappRoot/
Modified: incubator/beehive/trunk/samples/petstoreWeb/web/account/edit/listOrders.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/web/account/edit/listOrders.jsp?rev=169920&r1=169919&r2=169920&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/web/account/edit/listOrders.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/web/account/edit/listOrders.jsp Thu May 12 19:36:31 2005
@@ -22,48 +22,53 @@
<%@ taglib prefix="beehive-petstore" tagdir="/WEB-INF/tags/beehive/petstore"%>
<netui-data:declarePageInput name="orders" type="org.apache.beehive.samples.petstore.model.Order[]" required="false"/>
+<netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
<netui-template:template templatePage="/site/template.jsp">
- <netui-template:section name="leftnav">
- <netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
- <beehive-petstore:catalogNav action="rootSharedFlow.globalShop" labelValue="${bundle.view.mainMenuLabel}"/>
- </netui-template:section>
+
+ <netui-template:setAttribute name="title" value="${bundle.view.myOrders}" />
+
+ <netui-template:section name="topMenu">
+ <beehive-petstore:accountNavHeader />
+ </netui-template:section>
+
<netui-template:section name="body">
- <netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
- <p/>
- <center>
- <netui:span styleClass="boldlabel" value="${bundle.view.myOrders}"/>
- <p/>
- <netui-data:repeater dataSource="pageInput.orders" defaultText="<br/><br/>No orders found<br/><br/>">
- <netui-data:repeaterHeader>
- <table class="tablegreen">
- <tr class="rowgrey" valign="top">
- <th>${bundle.view.orderId}</th>
- <th>${bundle.view.orderDate}</th>
- <th>${bundle.view.orderPrice}</th>
- </tr>
- </netui-data:repeaterHeader>
- <netui-data:repeaterItem>
- <tr valign="top" class="rowyellow">
- <td class="celldata">
- <netui:anchor action="viewOrder" value="${container.item.orderId}">
- <netui:parameter name="orderId" value="${container.item.orderId}"/>
- </netui:anchor>
- </td>
- <td class="celldata">
- <netui:span value="${container.item.orderDate}" defaultValue=" "/>
- </td>
- <td class="celldata">
- <netui:span value="${container.item.totalPrice}" defaultValue=" ">
- <netui:formatNumber pattern="${bundle.view.priceFormat}"/>
- </netui:span>
- </td>
- </tr>
- </netui-data:repeaterItem>
- <netui-data:repeaterFooter>
- </table>
- </netui-data:repeaterFooter>
- </netui-data:repeater>
- </center>
+ <!-- Turn off the leftnav -->
+ <style> #leftnav {display: none;} </style>
+
+ <center>
+ <netui:span styleClass="boldlabel" value="${bundle.view.myOrders}"/>
+ <netui-data:repeater dataSource="pageInput.orders" defaultText="<br/><br/>No orders found<br/><br/>">
+ <netui-data:repeaterHeader>
+ <table class="tableborder" cellpadding="0" cellspacing="1">
+ <tr class="rowgrey" valign="top">
+ <td>${bundle.view.orderId}</td>
+ <td>${bundle.view.orderDate}</td>
+ <td>${bundle.view.orderPrice}</td>
+ </tr>
+ </netui-data:repeaterHeader>
+ <netui-data:repeaterItem>
+ <tr valign="top" class="rowltgrey">
+ <td>
+ <netui:anchor action="viewOrder" value="${container.item.orderId}">
+ <netui:parameter name="orderId" value="${container.item.orderId}"/>
+ </netui:anchor>
+ </td>
+ <td>
+ <netui:span value="${container.item.orderDate}" defaultValue=" "/>
+ </td>
+ <td>
+ <netui:span value="${container.item.totalPrice}" defaultValue=" ">
+ <netui:formatNumber pattern="${bundle.view.priceFormat}"/>
+ </netui:span>
+ </td>
+ </tr>
+ </netui-data:repeaterItem>
+ <netui-data:repeaterFooter>
+ </table>
+ </netui-data:repeaterFooter>
+ </netui-data:repeater>
+ </center>
+ <br/>
</netui-template:section>
</netui-template:template>
Modified: incubator/beehive/trunk/samples/petstoreWeb/web/auth/Controller.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/web/auth/Controller.java?rev=169920&r1=169919&r2=169920&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/web/auth/Controller.java (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/web/auth/Controller.java Thu May 12 19:36:31 2005
@@ -70,9 +70,15 @@
}
)
protected Forward securityCheck(SecurityCheckForm form)
- throws InvalidIdentifierException, NoSuchAccountException
+ throws NoSuchAccountException, InvalidIdentifierException
{
- _sharedFlow.handleLogin(form.getj_username());
+ try
+ {
+ _sharedFlow.handleLogin(form.getj_username());
+ } catch (NoSuchAccountException e)
+ {
+ // ignore during login
+ }
if(!_sharedFlow.isUserLoggedIn())
return new Forward("failure");
Modified: incubator/beehive/trunk/samples/petstoreWeb/web/auth/login.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/web/auth/login.jsp?rev=169920&r1=169919&r2=169920&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/web/auth/login.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/web/auth/login.jsp Thu May 12 19:36:31 2005
@@ -20,48 +20,50 @@
<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
+<netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
+
<netui-template:template templatePage="/site/template.jsp">
- <netui-template:section name="leftnav">
-
- </netui-template:section>
-<!-- Turn off the header menu -->
-<style>
-#main_menu {visibility: hidden;}
-</style>
+
+ <netui-template:setAttribute name="title" value="${bundle.view.signinLabel}" />
+
+ <!-- Turn off the leftnav -->
+ <style> #leftnav {display: none;} </style>
<netui-template:section name="body">
- <netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
- <%-- set focus on the username box--%>
- <script language="javascript">
- <!--
- document.forms[1].j_username.focus();
- -->
- </script> <center>
- <netui:form action="securityCheck">
- <table align="center" border="0">
- <tr>
- <td colspan="2"><b>${bundle.view.enterUsernamePassword}</b><br/></td>
- </tr>
- <tr>
- <td>${bundle.view.usernameLoginLabel}:</td>
- <td>
- <input type="text" name="j_username" value="beehive">
- </td>
- </tr>
- <tr>
- <td>${bundle.view.passwordLoginLabel}:</td>
- <td>
- <input type="password" name="j_password" value="beehive">
- </td>
- </tr>
- <tr>
- <td colspan="2" align="center">
- <netui:button value="${bundle.view.buttonSubmit}" />
- </td>
- </tr>
- </table>
- </netui:form>
- <netui:anchor value="${bundle.view.buttonRegisterNow}" action="rootSharedFlow.globalViewCreateAccount"/>
- </center>
- </netui-template:section>
+
+ <%-- set focus on the username box--%>
+ <script language="javascript">
+ <!--
+ document.forms[1].j_username.focus();
+ -->
+ </script>
+ <br/>
+ <center>
+ <netui:form action="securityCheck">
+ <table>
+ <tr>
+ <td colspan="2"><b>${bundle.view.enterUsernamePassword}</b><br/></td>
+ </tr>
+ <tr>
+ <td>${bundle.view.usernameLoginLabel}:</td>
+ <td>
+ <input type="text" name="j_username" value="beehive">
+ </td>
+ </tr>
+ <tr>
+ <td>${bundle.view.passwordLoginLabel}:</td>
+ <td>
+ <input type="password" name="j_password" value="beehive">
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" align="center">
+ <netui:button value="${bundle.view.buttonSubmit}" />
+ </td>
+ </tr>
+ </table>
+ </netui:form>
+ <netui:anchor value="${bundle.view.buttonRegisterNow}" action="rootSharedFlow.globalViewCreateAccount"/>
+ </center>
+ </netui-template:section>
</netui-template:template>
Modified: incubator/beehive/trunk/samples/petstoreWeb/web/auth/loginError.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/web/auth/loginError.jsp?rev=169920&r1=169919&r2=169920&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/web/auth/loginError.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/web/auth/loginError.jsp Thu May 12 19:36:31 2005
@@ -20,20 +20,23 @@
<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
+<netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
+
<netui-template:template templatePage="/site/template.jsp">
- <netui-template:section name="leftnav">
-
- </netui-template:section>
+
+ <netui-template:setAttribute name="title" value="${bundle.view.signinLabel}" />
+
<netui-template:section name="body">
- <netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
- <p/>
- <center>
- <p>
- <b>${bundle.view.loginErrorMessage}</b>
+
+ <!-- Turn off the leftnav -->
+ <style> #leftnav {display: none;} </style>
+ <center>
+ <br/>
+ <netui:span styleClass="boldlabel" value="${bundle.view.loginErrorMessage}" /><br/><br/>
<b><netui:anchor href="login.jsp">${bundle.view.loginLabel}</netui:anchor></b>
<b><netui:anchor action="rootSharedFlow.globalViewCreateAccount.do">${bundle.view.createAccountLabel}</netui:anchor></b>
- </p>
- </center>
+ </center>
+ <br/>
</netui-template:section>
</netui-template:template>
Modified: incubator/beehive/trunk/samples/petstoreWeb/web/checkout/confirm.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/web/checkout/confirm.jsp?rev=169920&r1=169919&r2=169920&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/web/checkout/confirm.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/web/checkout/confirm.jsp Thu May 12 19:36:31 2005
@@ -22,20 +22,32 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ taglib prefix="beehive-petstore" tagdir="/WEB-INF/tags/beehive/petstore" %>
+<netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
+
<netui-template:template templatePage="/site/template.jsp">
-<!-- Turn off the header menu -->
-<style>
-#main_menu {visibility: hidden;}
-</style>
+ <netui-template:setAttribute name="title" value="${bundle.view.newOrderLabel}" />
+
+ <%-- do not show any top menu --%>
+ <netui-template:section name="topMenu" />
+
<netui-template:section name="body">
- <netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
- <center>
- <netui:span styleClass="boldlabel" value="${bundle.view.confirmMessage}"/>
- </center>
- <beehive-petstore:orderSummary />
- <center>
- <netui:anchor action="viewCreateOrder" value="<< ${bundle.view.buttonPrevious}" />
- <netui:anchor action="confirm" value="${bundle.view.buttonContinue} >>"/>
- </center>
+
+ <!-- Turn off the leftnav -->
+ <style> #leftnav {display: none;} </style>
+
+ <center>
+ <netui:span styleClass="boldlabel" value="${bundle.view.confirmMessage}"/>
+ <br/><br/>
+ <beehive-petstore:orderSummary />
+
+ <br/>
+ <netui:anchor action="viewCreateOrder" styleClass="navigation">
+ <img src="${pageContext.request.contextPath}/images/arrow_back.gif" border=0 /> ${bundle.view.buttonPrevious}
+ </netui:anchor>
+
+ <netui:anchor action="confirm" styleClass="navigation">
+ ${bundle.view.buttonContinue} <img src="${pageContext.request.contextPath}/images/arrow_forward.gif" border=0 />
+ </netui:anchor>
+ </center>
</netui-template:section>
</netui-template:template>
Modified: incubator/beehive/trunk/samples/petstoreWeb/web/checkout/newOrder.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/web/checkout/newOrder.jsp?rev=169920&r1=169919&r2=169920&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/web/checkout/newOrder.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/web/checkout/newOrder.jsp Thu May 12 19:36:31 2005
@@ -20,104 +20,119 @@
<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+
<netui-data:declarePageInput name="creditCardTypes" type="java.util.List"/>
<netui-data:declarePageInput name="addresses" type="org.apache.beehive.samples.petstore.model.Addresses"/>
+<netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
<netui-template:template templatePage="/site/template.jsp">
-<!-- Turn off the header menu -->
-<style>
-#main_menu {visibility: hidden;}
-</style>
+
+ <netui-template:setAttribute name="title" value="${bundle.view.checkoutStep1}" />
+
+ <%-- do not show any top menu --%>
+ <netui-template:section name="topMenu" />
<netui-template:section name="body">
- <netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
- <netui:span styleClass="boldlabel" value="${bundle.view.checkoutStep1}"/>
- <netui:form action="viewConfirm">
+ <!-- Turn off the leftnav -->
+ <style> #leftnav {display: none;} </style>
+
<center>
- <table border=0 cellpadding=1 cellspacing=1 bgcolor=#FFFF88>
- <tr bgcolor=#FFFF88>
- <td colspan=2>
- <font color=green size=4><B>${bundle.view.paymentDetailsLabel}</B></font>
- </td>
- </tr>
- <tr bgcolor=#FFFF88>
- <td>${bundle.view.cardTypeLabel}:
- </td>
- <td>
- <netui:select dataSource="actionForm.order.cardType" optionsDataSource="${pageInput.creditCardTypes}"/>
- </td>
- </tr>
- <tr bgcolor=#FFFF88>
- <td>${bundle.view.cardNumberLabel}:
- </td>
- <td>
- <netui:textBox dataSource="actionForm.order.creditCard"/>
- <netui:error key="creditCard"/>
- <br/>
- <font color=red size=2>Note: be sure to use an invalid number.</font></td>
- </tr>
- <tr bgcolor=#FFFF88>
- <td>${bundle.view.expirationDateLabel}:
- </td>
- <td>
- <netui:textBox dataSource="actionForm.order.exprDate"/>
- <netui:error key="expirationDate"/>
- </td>
- </tr>
- <tr bgcolor=#FFFF88>
- <td colspan=2><br/><font color=green size=4><B>${bundle.view.billingAddressLabel}</B></font> - <netui:anchor action="rootSharedFlow.globalViewAddresses.do">Create New</netui:anchor></td>
- </tr>
- <tr bgcolor=#FFFF88>
- <td colspan=2><netui:radioButtonGroup dataSource="actionForm.order.billingAddress">
- <table cellspacing="10" cellpadding="10"><tr>
- <netui-data:repeater dataSource="pageInput.addresses">
- <td class="cellgrey" valign="top"><netui:radioButtonOption value="${container.item.addressId}">${container.item.name}</netui:radioButtonOption><br/>
- <netui:span value="${container.item.addr1}" />
- <c:if test="${container.item.addr2 != ''}">
+ <netui:form action="viewConfirm">
+ <table>
+ <tr><td>
+ <netui:span styleClass="boldlabel" value="${bundle.view.paymentDetailsLabel}"/>
+ <table class="tableborder" cellpadding="0" cellspacing="1">
+ <tr>
+ <td class="cellgrey">${bundle.view.cardTypeLabel}:</td>
+ <td class="cellltgrey">
+ <netui:select dataSource="actionForm.order.cardType" optionsDataSource="${pageInput.creditCardTypes}"/>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" class="cellgrey">${bundle.view.cardNumberLabel}:</td>
+ <td class="cellltgrey">
+ <netui:textBox dataSource="actionForm.order.creditCard"/>
+ <netui:error key="creditCard"/>
+ <br/>
+ <font color=red size=2>Note: be sure to use an invalid number.</font></td>
+ </tr>
+ <tr>
+ <td class="cellgrey">${bundle.view.expirationDateLabel}:</td>
+ <td class="cellltgrey">
+ <netui:textBox dataSource="actionForm.order.exprDate"/>
+ <netui:error key="expirationDate"/>
+ </td>
+ </tr>
+ </table>
+
+ <br/>
+ <netui:span styleClass="boldlabel" value="${bundle.view.billingAddressLabel}"/>
+ <table class="tableborder" cellpadding="3" cellspacing="0">
+ <tr>
+ <td colspan=2><netui:radioButtonGroup dataSource="actionForm.order.billingAddress">
+ <table cellspacing="10" cellpadding="10"><tr>
+ <netui-data:repeater dataSource="pageInput.addresses">
+ <td class="cellgrey" style="text-align: left;" valign="top">
+ <netui:radioButtonOption value="${container.item.addressId}"> <b>${container.item.name}</b></netui:radioButtonOption><br/>
+ <netui:span value="${container.item.addr1}" />
+ <c:if test="${container.item.addr2 != ''}">
+ <br/>
+ </c:if>
+ <netui:span value="${container.item.addr2}" /><br/>
+ <netui:span value="${container.item.city}" />,
+ <netui:span value="${container.item.state}" />
+ <netui:span value="${container.item.zip}" /><br/>
+ <netui:span value="${container.item.country}" /><br/>
+ <netui:span value="${container.item.phone}" />
+ </td>
+ </netui-data:repeater>
+ </tr></table>
+ </netui:radioButtonGroup>
+ <netui:error key="billingAddress"/>
+ </td>
+ </tr>
+ </table>
+
+ <br/>
+ <netui:span styleClass="boldlabel" value="${bundle.view.shippingAddressLabel}"/>
+ <table class="tableborder" cellpadding="3" cellspacing="0">
+ <tr>
+ <td colspan=2><netui:radioButtonGroup dataSource="actionForm.order.shippingAddress">
+ <table cellspacing="10" cellpadding="10"><tr>
+ <netui-data:repeater dataSource="pageInput.addresses">
+ <td class="cellgrey" style="text-align: left;" valign="top">
+ <netui:radioButtonOption value="${container.item.addressId}"> <b>${container.item.name}</b></netui:radioButtonOption><br/>
+ <netui:span value="${container.item.addr1}" />
+ <c:if test="${container.item.addr2 != ''}">
<br/>
- </c:if>
- <netui:span value="${container.item.addr2}" /><br/>
- <netui:span value="${container.item.city}" />,
- <netui:span value="${container.item.state}" />
- <netui:span value="${container.item.zip}" /><br/>
- <netui:span value="${container.item.country}" /><br/>
- <netui:span value="${container.item.phone}" />
- </td>
- </netui-data:repeater>
- </tr></table>
- </netui:radioButtonGroup>
- <netui:error key="billingAddress"/>
- </td>
- </tr>
- <tr bgcolor=#FFFF88>
- <td colspan=2><br/><font color=green size=4><B>${bundle.view.shippingAddressLabel}</B></font> - <netui:anchor action="rootSharedFlow.globalViewAddresses.do">Create New</netui:anchor></td>
- </tr>
- <tr bgcolor=#FFFF88>
- <td colspan=2><netui:radioButtonGroup dataSource="actionForm.order.shippingAddress">
- <table cellspacing="10" cellpadding="10"><tr>
- <netui-data:repeater dataSource="pageInput.addresses">
- <td class="cellgrey" valign="top"><netui:radioButtonOption value="${container.item.addressId}">${container.item.name}</netui:radioButtonOption><br/>
- <netui:span value="${container.item.addr1}" />
- <c:if test="${container.item.addr2 != ''}">
- <br/>
- </c:if>
- <netui:span value="${container.item.addr2}" /><br/>
- <netui:span value="${container.item.city}" />,
- <netui:span value="${container.item.state}" />
- <netui:span value="${container.item.zip}" /><br/>
- <netui:span value="${container.item.country}" /><br/>
- <netui:span value="${container.item.phone}" />
- </td>
- </netui-data:repeater>
- </tr></table>
- </netui:radioButtonGroup>
- <netui:error key="shippingAddress"/>
- </td>
- </tr>
- </table>
- <p/>
- <netui:button value="${bundle.view.buttonContinue} >>" />
+ </c:if>
+ <netui:span value="${container.item.addr2}" /><br/>
+ <netui:span value="${container.item.city}" />,
+ <netui:span value="${container.item.state}" />
+ <netui:span value="${container.item.zip}" /><br/>
+ <netui:span value="${container.item.country}" /><br/>
+ <netui:span value="${container.item.phone}" />
+ </td>
+ </netui-data:repeater>
+ </tr></table>
+ </netui:radioButtonGroup>
+ <netui:error key="shippingAddress"/>
+ </td>
+ </tr>
+ </table>
+ <br/>
+ <center>
+ <netui:anchor styleClass="navigation" action="rootSharedFlow.globalViewCart">
+ <img src="${pageContext.request.contextPath}/images/arrow_back.gif" border=0 /> ${bundle.view.buttonUpdateCart}
+ </netui:anchor>
+
+ <netui:anchor styleClass="navigation" formSubmit="true">
+ ${bundle.view.buttonContinue} <img src="${pageContext.request.contextPath}/images/arrow_forward.gif" border=0 />
+ </netui:anchor>
+ </center>
+ </td></tr>
+ </table>
</center>
</netui:form>
</netui-template:section>
Modified: incubator/beehive/trunk/samples/petstoreWeb/web/checkout/viewCart.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/web/checkout/viewCart.jsp?rev=169920&r1=169919&r2=169920&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/web/checkout/viewCart.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/web/checkout/viewCart.jsp Thu May 12 19:36:31 2005
@@ -21,73 +21,85 @@
<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
<%@ taglib prefix="beehive-petstore" tagdir="/WEB-INF/tags/beehive/petstore" %>
-<!-- Turn off the header menu -->
-<style>
-#main_menu {visibility: hidden;}
-</style>
+<netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
<netui-template:template templatePage="/site/template.jsp">
+ <netui-template:setAttribute name="title" value="${bundle.view.checkoutSummaryLabel}" />
+
+ <%-- do not show any top menu --%>
+ <netui-template:section name="topMenu" />
+
<netui-template:section name="body">
- <netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
- <center>
- <netui:span styleClass="boldlabel" value="${bundle.view.checkoutSummaryLabel}"/>
- <br/>
- <table class="tablegreen">
- <tr class="rowgrey">
- <td class="celldata"><b>${bundle.view.itemIdLabel}</b></td>
- <td class="celldata"><b>${bundle.view.productIdLabel}</b></td>
- <td class="celldata"><b>${bundle.view.descriptionLabel}</b></td>
- <td class="celldata"><b>${bundle.view.inStockLabel}</b></td>
- <td class="celldata"><b>${bundle.view.quantityLabel}</b></td>
- <td class="celldata"><b>${bundle.view.listPriceLabel}</b></td>
- <td class="celldata"><b>${bundle.view.totalCostLabel}</b></td>
- </tr>
- <netui-data:repeater dataSource="sharedFlow.rootSharedFlow.cart.lineItems">
- <tr class="rowyellow">
- <td class="celldata">
- <b>
- <netui:anchor href="viewItem.do">
- <netui:parameter name="itemId" value="${container.item.item.itemId}"/>
- <netui:span value="${container.item.item.itemId}"/>
- </netui:anchor>
- </b>
- </td>
- <td class="celldata">
- <netui:span value="${container.item.item.productId}"/>
- </td>
- <td class="celldata">
- <netui:span value="${container.item.item.attr1}"/>
- <netui:span value="${container.item.item.productName}"/>
- </td>
- <td align="center">
- <netui:span value="${container.item.inStock}"/>
- </td>
- <td align="center">
- <netui:span value="${container.item.quantity}"/>
- </td>
- <td align="right">
- <netui:span value="${container.item.item.listPrice}">
- <netui:formatNumber pattern="${bundle.view.priceFormat}"/>
- </netui:span>
- </td>
- <td align="right">
- <netui:span value="${container.item.total}">
- <netui:formatNumber pattern="${bundle.view.priceFormat}"/>
- </netui:span>
- </td>
- </tr>
- </netui-data:repeater>
- <tr class="rowyellow">
- <td class="celldata" colspan="7" align="right">
- <b>Sub Total: <netui:span value="${sharedFlow.rootSharedFlow.cart.subTotal}">
- <netui:formatNumber pattern="${bundle.view.priceFormat}"/>
- </netui:span> </b> <br/>
- </td>
- </tr>
- </table>
- <br/>
- <netui:anchor action="createNewOrder" value="${bundle.view.buttonContinue} >>" />
- </center> </netui-template:section>
+ <!-- Turn off the leftnav -->
+ <style> #leftnav {display: none;} </style>
+
+ <center>
+ <netui:span styleClass="boldlabel" value="${bundle.view.checkoutSummaryLabel}"/>
+ <br/>
+ <table class="tableborder" cellpadding="3" cellspacing="1">
+ <tr class="rowgrey">
+ <td><b>${bundle.view.itemIdLabel}</b></td>
+ <td><b>${bundle.view.productIdLabel}</b></td>
+ <td><b>${bundle.view.descriptionLabel}</b></td>
+ <td><b>${bundle.view.inStockLabel}</b></td>
+ <td><b>${bundle.view.quantityLabel}</b></td>
+ <td><b>${bundle.view.listPriceLabel}</b></td>
+ <td><b>${bundle.view.totalCostLabel}</b></td>
+ </tr>
+ <netui-data:repeater dataSource="sharedFlow.rootSharedFlow.cart.lineItems">
+ <tr class="rowltgrey">
+ <td>
+ <b>
+ <netui:anchor href="viewItem.do">
+ <netui:parameter name="itemId" value="${container.item.item.itemId}"/>
+ <netui:span value="${container.item.item.itemId}"/>
+ </netui:anchor>
+ </b>
+ </td>
+ <td>
+ <netui:span value="${container.item.item.productId}"/>
+ </td>
+ <td>
+ <netui:span value="${container.item.item.attr1}"/>
+ <netui:span value="${container.item.item.productName}"/>
+ </td>
+ <td align="center">
+ <netui:span value="${container.item.inStock}"/>
+ </td>
+ <td align="center">
+ <netui:span value="${container.item.quantity}"/>
+ </td>
+ <td align="right">
+ <netui:span value="${container.item.item.listPrice}">
+ <netui:formatNumber pattern="${bundle.view.priceFormat}"/>
+ </netui:span>
+ </td>
+ <td align="right">
+ <netui:span value="${container.item.total}">
+ <netui:formatNumber pattern="${bundle.view.priceFormat}"/>
+ </netui:span>
+ </td>
+ </tr>
+ </netui-data:repeater>
+ <tr class="rowyellow">
+ <td colspan="7" align="right">
+ <b>Sub Total: <netui:span value="${sharedFlow.rootSharedFlow.cart.subTotal}">
+ <netui:formatNumber pattern="${bundle.view.priceFormat}"/>
+ </netui:span> </b> <br/>
+ </td>
+ </tr>
+ </table>
+ <br/>
+ <netui:anchor styleClass="navigation" action="rootSharedFlow.globalViewCart">
+ <img src="${pageContext.request.contextPath}/images/arrow_back.gif" border=0 /> ${bundle.view.buttonUpdateCart}
+ </netui:anchor>
+
+ <netui:anchor styleClass="navigation" action="createNewOrder">
+ ${bundle.view.buttonContinue} <img src="${pageContext.request.contextPath}/images/arrow_forward.gif" border=0 />
+ </netui:anchor>
+ </center>
+ <br/>
+ </netui-template:section>
</netui-template:template>
Modified: incubator/beehive/trunk/samples/petstoreWeb/web/checkout/viewOrder.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/web/checkout/viewOrder.jsp?rev=169920&r1=169919&r2=169920&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/web/checkout/viewOrder.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/web/checkout/viewOrder.jsp Thu May 12 19:36:31 2005
@@ -25,21 +25,30 @@
<netui-data:declarePageInput name="order" type="org.apache.beehive.samples.petstore.model.Order"/>
<netui-data:declarePageInput name="lineItems" type="org.apache.beehive.samples.petstore.model.LineItem[]"/>
<netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
+<netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.account" name="account"/>
<netui-template:template templatePage="/site/template.jsp">
- <netui-template:section name="leftnav">
- <beehive-petstore:catalogNav action="rootSharedFlow.globalShop" labelValue="${bundle.view.mainMenuLabel}"/>
- </netui-template:section>
+
+ <netui-template:setAttribute name="title" value="${bundle.view.myOrders}" />
+
+ <netui-template:section name="topMenu">
+ <beehive-petstore:accountNavHeader />
+ </netui-template:section>
+
<netui-template:section name="body">
- <netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.account" name="account"/>
- <br/>
+ <!-- Turn off the leftnav -->
+ <style> #leftnav {display: none;} </style>
+
+ <center>
<c:if test="${pageInput.order.status == 'new'}">
<center>
<b>${bundle.view.orderSubmittedMessage}</b>
</center>
</c:if>
- <br/>
- <beehive-petstore:orderSummary/><p/>
- <netui:anchor action="viewOrders"><b>${bundle.account.listOrdersLabel}</b></netui:anchor>
+ <beehive-petstore:orderSummary/>
+ <netui:anchor action="viewOrders" styleClass="navigation">
+ <img src="${pageContext.request.contextPath}/images/arrow.gif" border=0 /> ${bundle.account.listOrdersLabel}
+ </netui:anchor>
+ </center>
</netui-template:section>
</netui-template:template>
Modified: incubator/beehive/trunk/samples/petstoreWeb/web/index.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/web/index.jsp?rev=169920&r1=169919&r2=169920&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/web/index.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/web/index.jsp Thu May 12 19:36:31 2005
@@ -19,43 +19,38 @@
<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
-<%@ taglib prefix="beehive-petstore" tagdir="/WEB-INF/tags/beehive/petstore" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
-<netui:html>
- <head>
- <title>
- ${bundle.view.indexTitle}
- </title>
- <link rel="stylesheet" href="${pageContext.request.contextPath}/site/default.css" type="text/css"/>
- <meta content="text/html; charset=windows-1252" http-equiv=Content-Type>
- </head>
- <netui:body>
- <beehive-petstore:headerMenu contextPath="${pageContext.request.contextPath}"/>
- <center>
- <table border="0" cellSpacing="100" width="100%">
- <tbody>
- <tr>
- <td width="100%">
- <p align="center">
- <netui:span styleClass="boldlabel" value="${bundle.view.welcome}"/>
- <br/>
- <netui:anchor tagId="enter" href="shop/Controller.jpf">
- ${bundle.view.enterTheStore}
- </netui:anchor>
- <br/><br/>
- <c:if test="${pageContext.request.serverName == 'localhost'}">
+
+<netui-template:template templatePage="/site/template.jsp">
+
+ <netui-template:setAttribute name="title" value="${bundle.view.welcomeTitle}" />
+
+ <%-- do not show any top menu --%>
+ <netui-template:section name="topMenu" />
+
+ <netui-template:section name="body">
+
+ <!-- Turn off the left nav -->
+ <style> #leftnav {display: none;} </style>
+
+ <table cellSpacing="50" width="100%">
+ <tr>
+ <td align="center">
+ <netui:span styleClass="boldlabel" value="${bundle.view.welcome}"/>
+ <br/>
+ <netui:anchor tagId="enter" href="shop/Controller.jpf">${bundle.view.enterTheStore}</netui:anchor>
+ <br/><br/><br/>
+ <c:if test="${pageContext.request.serverName == 'localhost'}">
<b>${bundle.view.adminTitle}</b><br>
<netui:anchor tagId="initDB" action="initDB">${bundle.view.adminInit}</netui:anchor><br/>
<netui:anchor action="stopDB">${bundle.view.adminStop}</netui:anchor><br/>
<netui:label value="${requestScope.message}" />
</c:if>
- </td>
- </tr>
- </tbody>
+ </td>
+ </tr>
</table>
- </center>
- <beehive-petstore:copyright contextPath="${pageContext.request.contextPath}"/>
- </netui:body>
-</netui:html>
+
+ </netui-template:section>
+</netui-template:template>
Modified: incubator/beehive/trunk/samples/petstoreWeb/web/search/index.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/web/search/index.jsp?rev=169920&r1=169919&r2=169920&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/web/search/index.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/web/search/index.jsp Thu May 12 19:36:31 2005
@@ -19,26 +19,23 @@
<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
-<netui-data:declarePageInput name="searchResults" type="org.apache.beehive.samples.petstore.model.Product[]" required="false"/>
-
-
+<netui-data:declarePageInput name="searchResults" type="org.apache.beehive.samples.petstore.model.Product[]" required="false"/>
+<netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
+<netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.search" name="search"/>
<netui-template:template templatePage="/site/template.jsp">
<netui-template:section name="leftnav">
</netui-template:section>
+
<netui-template:section name="body">
- <netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
- <netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.search" name="search"/>
-
- <center>
<netui:span styleClass="boldlabel" value="${bundle.search.searchResultsLabel}"/>
<netui-data:repeater dataSource="pageInput.searchResults" defaultText="<br/><br/>${bundle.search.noSearchResults}<br/><br/>">
<netui-data:repeaterHeader>
- <table class="tablegreen">
+ <table class="tableborder" cellpadding="0" cellspacing="1">
<tr class="rowgrey">
<td> </td>
<td><b>${bundle.view.productIdLabel}</b></td>
@@ -47,13 +44,13 @@
</tr>
</netui-data:repeaterHeader>
<netui-data:repeaterItem>
- <tr class="rowyellow">
- <td class="celldata">
+ <tr class="rowltgrey">
+ <td>
<netui:imageAnchor action="rootSharedFlow.globalViewProductById"border="0" src="${pageContext.request.contextPath}/images/${container.item.image}">
<netui:parameter name="productId" value="${container.item.productId}"/>
</netui:imageAnchor>
</td>
- <td class="celldata">
+ <td>
<b>
<netui:anchor action="rootSharedFlow.globalViewProductById">
<netui:parameter name="productId" value="${container.item.productId}"/>
@@ -61,10 +58,10 @@
</netui:anchor>
</b>
</td>
- <td class="celldata">
+ <td>
<netui:span value="${container.item.name}"/>
</td>
- <td class="celldata">
+ <td>
<netui:span value="${container.item.description}"/>
</td>
</tr>
@@ -73,8 +70,5 @@
</table>
</netui-data:repeaterFooter>
</netui-data:repeater>
- </p>
- <netui:anchor action="done" styleClass="boldanchor">${bundle.search.searchDoneLabel}</netui:anchor>
- </center>
</netui-template:section>
</netui-template:template>
Modified: incubator/beehive/trunk/samples/petstoreWeb/web/shop/cart.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/web/shop/cart.jsp?rev=169920&r1=169919&r2=169920&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/web/shop/cart.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/web/shop/cart.jsp Thu May 12 19:36:31 2005
@@ -22,107 +22,103 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
<%@ taglib prefix="beehive-petstore" tagdir="/WEB-INF/tags/beehive/petstore" %>
+
<netui-data:declarePageInput name="myList" type="org.apache.beehive.samples.petstore.model.Product[]" required="false"/>
+<netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
<netui-template:template templatePage="/site/template.jsp">
+
+ <netui-template:setAttribute name="title" value="${bundle.view.shoppingCartLabel}" />
+
<netui-template:section name="leftnav">
- <netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
<beehive-petstore:catalogNav action="begin" labelValue="${bundle.view.mainMenuLabel}"/>
- <br/>
- <c:choose>
- <c:when test="${sharedFlow.rootSharedFlow.account != null}">
- <c:if test="${sharedFlow.rootSharedFlow.account.myListOpt == true}">
- <beehive-petstore:productFavorites/>
- </c:if>
- </c:when>
- <c:otherwise>
-
- </c:otherwise>
- </c:choose>
+ <c:if test="${sharedFlow.rootSharedFlow.account != null}">
+ <c:if test="${sharedFlow.rootSharedFlow.account.myListOpt == true}">
+ <beehive-petstore:productFavorites/>
+ </c:if>
+ </c:if>
</netui-template:section>
<netui-template:section name="body">
- <center>
- <netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
- <netui:errors/>
- <netui:span styleClass="boldlabel" value="${bundle.view.shoppingCartLabel}"/>
- <netui:form action="updateCartQuantities" tagId="cart">
- <table class="tablegreen">
- <tr class="rowgrey">
- <td class="celldata"><b>${bundle.view.itemIdLabel}</b></td>
- <td class="celldata"><b>${bundle.view.productIdLabel}</b></td>
- <td class="celldata"><b>${bundle.view.descriptionLabel}</b></td>
- <td class="celldata"><b>${bundle.view.inStockLabel} </b></td>
- <td class="celldata"><b>${bundle.view.quantityLabel}</b></td>
- <td class="celldata"><b>${bundle.view.listPriceLabel}</b></td>
- <td class="celldata"><b>${bundle.view.totalCostLabel}</b></td>
- <td class="celldata"> </td>
- </tr>
- <c:choose>
- <c:when test="${actionForm.cart.lineItems != null && fn:length(actionForm.cart.lineItems) > 0}">
- <netui-data:repeater dataSource="actionForm.cart.lineItems">
- <tr class="rowyellow">
- <td class="celldata">
- <b>
- <netui:anchor action="viewItem">
- <netui:parameter name="itemId" value="${container.item.item.itemId}"/>
- <netui:span value="${container.item.item.itemId}"/>
- </netui:anchor>
- </b>
- </td>
- <td class="celldata"><netui:span value="${container.item.item.productId}"/></td>
- <td class="celldata">
- <netui:span value="${container.item.item.attr1}"/>
- <netui:span value="${container.item.item.productName}"/>
- </td>
- <td class="celldata">
- <netui:span value="${container.item.inStock}"/>
- </td>
- <td align="center">
- <netui:textBox size="3" dataSource="container.item.quantity"/>
- <br/>
- <netui:error key="invalidQuantity${container.index}"/>
- </td>
- <td align="right">
- <netui:span value="${container.item.item.listPrice}">
- <netui:formatNumber pattern="${bundle.view.priceFormat}"/>
- </netui:span>
- </td>
- <td align="right">
- <netui:span value="${container.item.total}">
- <netui:formatNumber pattern="${bundle.view.priceFormat}"/>
- </netui:span>
- </td>
- <td class="celldata">
- <netui:anchor action="removeItemFromCart" value="${bundle.view.buttonRemove}">
- <netui:parameter name="workingItemId" value="${container.item.item.itemId}" />
- </netui:anchor>
- </td>
- </tr>
- </netui-data:repeater>
- <tr class="rowyellow">
- <td class="celldata" colspan="7" align="right">
- <b>${bundle.view.subTotalLabel}:
- <netui:span value="${actionForm.cart.subTotal}">
- <netui:formatNumber pattern="${bundle.view.priceFormat}"/>
- </netui:span> </b><br />
- <netui:button value="${bundle.view.buttonUpdateCart}" />
- </td>
- <td class="celldata"> </td>
- </tr>
- </c:when>
- <c:otherwise>
- <tr class="rowyellow">
- <td class="celldata" colspan="8"><b>${bundle.view.emptyCartMessage}.</b></td>
- </tr>
- </c:otherwise>
- </c:choose>
- </table>
- <c:if test="${actionForm.cart.lineItems != null && fn:length(actionForm.cart.lineItems) > 0}">
- <br/>
- <netui:anchor value="${bundle.view.buttonProceedToCheckout} >>" action="checkout" />
- </c:if>
- </netui:form>
- </center>
+ <netui:errors/>
+ <netui:span styleClass="boldlabel" value="${bundle.view.shoppingCartLabel}"/>
+ <netui:form action="updateCartQuantities" tagId="cart">
+ <table class="tableborder" cellpadding="3" cellspacing="1">
+ <tr class="rowgrey">
+ <td><b>${bundle.view.itemIdLabel}</b></td>
+ <td><b>${bundle.view.productIdLabel}</b></td>
+ <td><b>${bundle.view.descriptionLabel}</b></td>
+ <td><b>${bundle.view.inStockLabel} </b></td>
+ <td><b>${bundle.view.quantityLabel}</b></td>
+ <td><b>${bundle.view.listPriceLabel}</b></td>
+ <td><b>${bundle.view.totalCostLabel}</b></td>
+ <td> </td>
+ </tr>
+ <c:choose>
+ <c:when test="${actionForm.cart.lineItems != null && fn:length(actionForm.cart.lineItems) > 0}">
+ <netui-data:repeater dataSource="actionForm.cart.lineItems">
+ <tr class="rowltgrey">
+ <td>
+ <b>
+ <netui:anchor action="viewItem">
+ <netui:parameter name="itemId" value="${container.item.item.itemId}"/>
+ <netui:span value="${container.item.item.itemId}"/>
+ </netui:anchor>
+ </b>
+ </td>
+ <td><netui:span value="${container.item.item.productId}"/></td>
+ <td>
+ <netui:span value="${container.item.item.attr1}"/>
+ <netui:span value="${container.item.item.productName}"/>
+ </td>
+ <td>
+ <netui:span value="${container.item.inStock}"/>
+ </td>
+ <td align="center">
+ <netui:textBox size="3" dataSource="container.item.quantity"/>
+ <br/>
+ <netui:error key="invalidQuantity${container.index}"/>
+ </td>
+ <td align="right">
+ <netui:span value="${container.item.item.listPrice}">
+ <netui:formatNumber pattern="${bundle.view.priceFormat}"/>
+ </netui:span>
+ </td>
+ <td align="right">
+ <netui:span value="${container.item.total}">
+ <netui:formatNumber pattern="${bundle.view.priceFormat}"/>
+ </netui:span>
+ </td>
+ <td>
+ <netui:anchor action="removeItemFromCart" value="${bundle.view.buttonRemove}">
+ <netui:parameter name="workingItemId" value="${container.item.item.itemId}" />
+ </netui:anchor>
+ </td>
+ </tr>
+ </netui-data:repeater>
+ <tr>
+ <td colspan="8" align="right">
+ <b>${bundle.view.subTotalLabel}:
+ <netui:span value="${actionForm.cart.subTotal}">
+ <netui:formatNumber pattern="${bundle.view.priceFormat}"/>
+ </netui:span> </b><br />
+ <netui:button value="${bundle.view.buttonUpdateCart}" />
+ </td>
+ </tr>
+ </c:when>
+ <c:otherwise>
+ <tr>
+ <td colspan="8"><b>${bundle.view.emptyCartMessage}.</b></td>
+ </tr>
+ </c:otherwise>
+ </c:choose>
+ </table>
+ <c:if test="${actionForm.cart.lineItems != null && fn:length(actionForm.cart.lineItems) > 0}">
+ <br/>
+ <netui:anchor action="checkout" styleClass="navigation">
+ ${bundle.view.buttonProceedToCheckout} <img src="${pageContext.request.contextPath}/images/arrow_forward.gif" border=0 />
+ </netui:anchor>
+ </c:if>
+ </netui:form>
</netui-template:section>
</netui-template:template>
Modified: incubator/beehive/trunk/samples/petstoreWeb/web/shop/category.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/web/shop/category.jsp?rev=169920&r1=169919&r2=169920&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/web/shop/category.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/web/shop/category.jsp Thu May 12 19:36:31 2005
@@ -24,41 +24,39 @@
<netui-data:declarePageInput name="products" type="org.apache.beehive.samples.petstore.model.Product[]" required="false"/>
<netui-data:declarePageInput name="category" type="org.apache.beehive.samples.petstore.model.Category"/>
+<netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
<netui-template:template templatePage="/site/template.jsp">
+ <netui-template:setAttribute name="title" value="${pageInput.category.name}" />
+
<netui-template:section name="leftnav">
- <netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
<beehive-petstore:catalogNav action="begin" labelValue="${bundle.view.mainMenuLabel}"/>
</netui-template:section>
<netui-template:section name="body">
- <netui:errors/>
- <center>
- <netui:span styleClass="boldlabel" value="${pageInput.category.name}"/>
- <br/>
- <netui:span styleClass="meditaliclabel" value="(${pageInput.category.description})"/>
- <br/>
- <br/>
- <table class="tablegreen">
- <tr class="rowgrey">
- <td><b>${bundle.view.productIdLabel}</b></td>
- <td><b>${bundle.view.nameLabel}</b></td>
- <td><b>${bundle.view.descriptionLabel}</b></td>
- </tr>
- <netui-data:repeater dataSource="pageInput.products">
- <tr class="rowyellow">
- <td class="celldata"><b>
- <netui:anchor action="viewProduct">
- <font color="black"><netui:span value="${container.item.productId}"/></font>
- <netui:parameter name="productId" value="${container.item.productId}"/>
- </netui:anchor>
- </b></td>
- <td class="celldata"><netui:span value="${container.item.name}"/></td>
- <td class="celldata"><netui:span value="${container.item.description}"/></td>
- </tr>
- </netui-data:repeater>
- </table>
- </center>
+ <netui:errors/>
+ <netui:span styleClass="boldlabel" value="${pageInput.category.name}"/>
+ <br/>
+ <netui:span styleClass="meditaliclabel" value="(${pageInput.category.description})"/>
+ <br/>
+ <table class="tableborder" cellpadding="0" cellspacing="1">
+ <tr class="rowgrey">
+ <td><b>${bundle.view.productIdLabel}</b></td>
+ <td><b>${bundle.view.nameLabel}</b></td>
+ <td><b>${bundle.view.descriptionLabel}</b></td>
+ </tr>
+ <netui-data:repeater dataSource="pageInput.products">
+ <tr class="rowltgrey">
+ <td><netui:anchor action="viewProduct" value="${container.item.productId}">
+ <netui:parameter name="productId" value="${container.item.productId}"/>
+ </netui:anchor>
+ </td>
+ <td><netui:span value="${container.item.name}"/></td>
+ <td><netui:span value="${container.item.description}"/></td>
+ </tr>
+ </netui-data:repeater>
+ </table>
+ <br/>
</netui-template:section>
</netui-template:template>
Modified: incubator/beehive/trunk/samples/petstoreWeb/web/shop/index.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/web/shop/index.jsp?rev=169920&r1=169919&r2=169920&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/web/shop/index.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/web/shop/index.jsp Thu May 12 19:36:31 2005
@@ -22,14 +22,15 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<netui-data:declarePageInput name="categories" type="org.apache.beehive.samples.petstore.model.Category[]"/>
+<netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
<netui-template:template templatePage="/site/template.jsp">
+ <netui-template:setAttribute name="title" value="${bundle.view.homeTitle}" />
+
<netui-template:section name="leftnav">
- <netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
- <table class="tablegreenborder" style="border-width:1px;border-style:solid" width="200">
- <tbody>
- <tr class="rowyellow">
+ <table class="tableborder" bgcolor="#eeeeee" width="200">
+ <tr>
<td>
<c:if test="${sharedFlow.rootSharedFlow.account != null}">
<netui:span styleClass="meditaliclabel" value="${bundle.view.welcomeLabel} ${sharedFlow.rootSharedFlow.account.firstName}"/>!
@@ -38,7 +39,7 @@
</td>
</tr>
<netui-data:repeater dataSource="pageInput.categories">
- <tr class="rowyellow">
+ <tr>
<td>
<netui:anchor action="viewCategory" value="${container.item.name}">
<netui:parameter name="catId" value="${container.item.catId}"/>
@@ -48,22 +49,20 @@
</td>
</tr>
</netui-data:repeater>
- </tbody>
</table>
</netui-template:section>
<netui-template:section name="body">
- <netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
<netui:errors/>
<map name="beehivepetstoremap">
<area alt="Birds" coords="72,2,280,250" href="rootSharedFlow.globalViewCategory.do?catId=BIRDS" shape="RECT" />
<area alt="Fish" coords="2,180,72,250" href="rootSharedFlow.globalViewCategory.do?catId=FISH" shape="RECT" />
<area alt="Dogs" coords="60,250,130,320" href="rootSharedFlow.globalViewCategory.do?catId=DOGS" shape="RECT" />
<area alt="Reptiles" coords="140,270,210,340" href="rootSharedFlow.globalViewCategory.do?catId=REPTILES" shape="RECT" />
- <area alt="Cats" coords="225,240,295,310" href="rootSharedFlow.globalViewCategory.do?catId=CATS" shape="RECT" />
- <area alt="Birds" coords="280,180,350,250" href="rootSharedFlow.globalViewCategory.do?catId=BIRDS" shape="RECT" />
+ <area alt="Birds" coords="225,240,295,310" href="rootSharedFlow.globalViewCategory.do?catId=BIRDS" shape="RECT" />
+ <area alt="Cats" coords="280,180,350,250" href="rootSharedFlow.globalViewCategory.do?catId=CATS" shape="RECT" />
</map>
- <img vspace="10" hspace="15" border="0" height="347" width="357" src="${pageContext.request.contextPath}/images/splash.gif"
+ <img vspace="10" border="0" height="347" width="357" src="${pageContext.request.contextPath}/images/splash.gif"
align="center" usemap="#beehivepetstoremap"/>
</netui-template:section>
Modified: incubator/beehive/trunk/samples/petstoreWeb/web/shop/item.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/web/shop/item.jsp?rev=169920&r1=169919&r2=169920&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/web/shop/item.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/web/shop/item.jsp Thu May 12 19:36:31 2005
@@ -21,44 +21,39 @@
<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ taglib prefix="beehive-petstore" tagdir="/WEB-INF/tags/beehive/petstore" %>
+
<netui-data:declarePageInput name="item" type="org.apache.beehive.samples.petstore.model.Item"/>
<netui-data:declarePageInput name="product" type="org.apache.beehive.samples.petstore.model.Product"/>
+<netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
+<netui-template:template templatePage="/site/template.jsp">
+ <netui-template:setAttribute name="title" value="${pageInput.item.attr1} ${pageInput.product.name}" />
-
-<netui-template:template templatePage="/site/template.jsp">
<netui-template:section name="leftnav">
<beehive-petstore:catalogNav action="viewProduct"
paramName="productId" paramValue="${pageInput.product.productId}"
labelValue="${pageInput.product.name}"/>
</netui-template:section>
+
<netui-template:section name="body">
- <netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
- <netui:errors/>
- <center>
- <table class="tablegreen" width="60%">
- <tr class="rowyellow">
- <td rowspan="6" class="cellwhite">
- <netui:image src="${pageContext.request.contextPath}/images/${pageInput.product.image}"/>
- </td>
- <td class="cellgrey" width="100%">
+ <netui:errors/>
+ <netui:span styleClass="boldlabel" value="${pageInput.item.attr1} ${pageInput.product.name}"/>
+ <br/>
+ <netui:span styleClass="meditaliclabel" value="${pageInput.product.description}"/>
+ <br/>
+
+ <table class="tableborder" cellpadding="0" cellspacing="1">
+ <tr class="rowgrey">
+ <td colspan=2>
<b><netui:span value="${pageInput.item.itemId}"/></b>
</td>
</tr>
- <tr class="rowyellow">
- <td class="celldata">
- <span class="boldlabel">
- <netui:span value="${pageInput.item.attr1}"/>
- <netui:span value="${pageInput.product.name}"/>
- </span>
+ <tr>
+ <td class="cellltgrey">
+ <netui:image src="${pageContext.request.contextPath}/images/${pageInput.product.image}"/>
</td>
- </tr>
- <tr class="rowyellow">
- <td class="celldata"><netui:span styleClass="meditaliclabel" value="${pageInput.product.description}"/></td>
- </tr>
- <tr class="rowyellow">
- <td class="celldata">
+ <td class="cellltgrey">
<c:choose>
<c:when test="${pageInput.item.qty <= 0}">
<netui:span styleClass="error" value="${bundle.view.backOrderedMessage}."/>
@@ -66,26 +61,17 @@
<c:otherwise>
<netui:span value="${pageInput.item.qty} ${bundle.view.inStockMessage}"/>
</c:otherwise>
- </c:choose>
- </td>
- </tr>
- <tr class="rowyellow">
- <td class="celldata">
+ </c:choose><br/>
<netui:span value="${pageInput.item.listPrice}">
<netui:formatNumber pattern="${bundle.view.priceFormat}"/>
</netui:span>
- </td>
- </tr>
- <tr class="rowyellow">
- <td class="celldata">
- <netui:form action="addItemToCart" tagId="addToCart" method="get">
- <input type="hidden" name="workingItemId" value="${pageInput.item.itemId}"/>
- <netui:button value="${bundle.view.buttonAddToCart}" />
- </netui:form>
+ <br/>
+ <netui:anchor action="addItemToCart">
+ <netui:parameter name="workingItemId" value="${pageInput.item.itemId}"/>
+ ${bundle.view.buttonAddToCart} <img src="${pageContext.request.contextPath}/images/cart.gif" border="0" />
+ </netui:anchor>
</td>
</tr>
</table>
- </center>
- </div>
</netui-template:section>
</netui-template:template>
Modified: incubator/beehive/trunk/samples/petstoreWeb/web/shop/product.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/web/shop/product.jsp?rev=169920&r1=169919&r2=169920&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/web/shop/product.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/web/shop/product.jsp Thu May 12 19:36:31 2005
@@ -23,26 +23,26 @@
<netui-data:declarePageInput name="items" type="org.apache.beehive.samples.petstore.model.Item[]"/>
<netui-data:declarePageInput name="product" type="org.apache.beehive.samples.petstore.model.Product"/>
+<netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
<netui-template:template templatePage="/site/template.jsp">
+
+ <netui-template:setAttribute name="title" value="${pageInput.product.name}" />
+
<netui-template:section name="leftnav">
<beehive-petstore:catalogNav action="viewCategory"
paramName="catId"
paramValue="${pageInput.product.category}"
labelValue="${pageInput.product.category}"/>
</netui-template:section>
- <netui-template:section name="body">
- <netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
-
- <netui:errors/>
- <center>
- <netui:span styleClass="boldlabel" value="${pageInput.product.name}"/>
+ <netui-template:section name="body">
+ <netui:errors/>
+ <netui:span styleClass="boldlabel" value="${pageInput.product.name}"/>
<br/>
<netui:span styleClass="meditaliclabel" value="(${pageInput.product.description})"/>
<br/>
- <br/>
- <table class="tablegreen">
+ <table class="tableborder" cellpadding="0" cellspacing="1">
<tr class="rowgrey">
<td><b>${bundle.view.itemIdLabel}</b></td>
<td><b>${bundle.view.productIdLabel}</b></td>
@@ -51,32 +51,32 @@
<td> </td>
</tr>
<netui-data:repeater dataSource="pageInput.items">
- <tr class="rowyellow">
- <td class="celldata">
+ <tr class="rowltgrey">
+ <td>
<netui:anchor action="viewItem">
<netui:parameter name="itemId" value="${container.item.itemId}"/>
<b><netui:span value="${container.item.itemId}"/></b>
</netui:anchor>
</td>
- <td class="celldata"><netui:span value="${container.item.productId}"/></td>
- <td class="celldata">
+ <td><netui:span value="${container.item.productId}"/></td>
+ <td>
<netui:span value="${container.item.attr1}"/>
<netui:span value="${pageInput.product.name}"/>
</td>
- <td class="celldata">
+ <td>
<netui:span value="${container.item.listPrice}">
<netui:formatNumber pattern="${bundle.view.priceFormat}"/>
</netui:span>
</td>
- <td class="celldata">
- <netui:form action="addItemToCart" method="get">
- <input type="hidden" name="workingItemId" value="${container.item.itemId}"/>
- <netui:button value="${bundle.view.buttonAddToCart}" />
- </netui:form>
+ <td>
+ <netui:anchor action="addItemToCart">
+ <netui:parameter name="workingItemId" value="${container.item.itemId}"/>
+ ${bundle.view.buttonAddToCart} <img src="${pageContext.request.contextPath}/images/cart.gif" border="0" />
+ </netui:anchor>
</td>
</tr>
</netui-data:repeater>
</table>
- </center>
+ <br/>
</netui-template:section>
</netui-template:template>
Added: incubator/beehive/trunk/samples/petstoreWeb/web/site/categoryMenu.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/web/site/categoryMenu.jsp?rev=169920&view=auto
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/web/site/categoryMenu.jsp (added)
+++ incubator/beehive/trunk/samples/petstoreWeb/web/site/categoryMenu.jsp Thu May 12 19:36:31 2005
@@ -0,0 +1,6 @@
+<%@page contentType="text/html;charset=UTF-8" language="java"%>
+<%@ taglib prefix="beehive-petstore" tagdir="/WEB-INF/tags/beehive/petstore" %>
+
+<%-- start category nav --%>
+<beehive-petstore:categoryNavHeader />
+<%-- end category nav --%>
Propchange: incubator/beehive/trunk/samples/petstoreWeb/web/site/categoryMenu.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/beehive/trunk/samples/petstoreWeb/web/site/default.css
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/web/site/default.css?rev=169920&r1=169919&r2=169920&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/web/site/default.css (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/web/site/default.css Thu May 12 19:36:31 2005
@@ -1,99 +1,128 @@
body {
- background-color:#ffffff;
+background-color: #ffffff;
+font-family: Arial, Verdana;
+font-size: 14px;
+font-style: normal;
+font-weight: normal;
+margin: 0px;
}
-table.tablegreen {
- background-color: #008800;
- left-margin: auto;
- right-margin: auto;
+A:link, A:visited, A:active {
+font-size: 14px;
+color: blue;
+text-decoration: none;
+font-family: Arial, Verdana;
}
-/*
-todo: these table / cell / row styles need to be refactored so that the
- background and border colors are easier to manage
- */
-table.tablegreenborder {
- border-width: 5px;
- border-style: solid;
- border-color: #008800;
- background-color: #ffff88;
+A:hover {
+color: red;
+text-decoration: underline;
}
-tr.rowyellow {
- background-color: #ffff88;
+A.boldanchor:link, A.boldanchor:visited, A.boldanchor:active {
+font-size: 18px;
+color: black;
+font-weight: bold;
}
-tr.rowgrey {
- background-color: #cccccc;
+A.toolbar:link, A.toolbar:visited, A.toolbar:active {
+font-size: 12px;
+color: black;
+border: solid #f1f1f1 4px;
}
-td.celldata {
- padding: 3px;
- border-spacing: 2px;
+A.toolbar:hover {
+background-color: #a5a5a5;
+text-decoration: none;
+border: solid #a5a5a5 4px;
}
-td.cellwhite {
- background-color: #ffffff;
+table.tableborder {
+margin-top: 10px;
+}
+
+tr.rowltgrey td {
+padding: 4px;
+background-color: #e5e5e5;
+border-bottom: solid #cccccc 1px;
+border-right: solid #cccccc 1px;
+text-align: center;
+}
+
+tr.rowltgrey td a {
+font-weight: bold;
+}
+
+tr.rowgrey td {
+background-color: #cccccc;
+font-weight: bold;
+text-align: center;
+padding: 4px;
+border-bottom: solid #4c4c4c 1px;
}
td.cellgrey {
- background-color: #cccccc;
+padding: 4px;
+background-color: #dddddd;
+font-size: 14px;
+text-align: right;
+border-bottom: solid #bbbbbb 1px;
+width: 175px;
+}
+
+td.cellltgrey {
+padding: 2px;
+background-color: #eeeeee;
+border-bottom: solid #bbbbbb 1px;
}
-span.boldlabel {
- font-size: large;
- font-weight: bold;
+a.navigation {
+font-weight: bold;
}
-a.boldanchor:link {
- font-size: large;
- font-weight: bold;
- text-decoration: none;
- color: #000000;
-}
-
-a.boldanchor:visited {
- font-size: large;
- font-weight: bold;
- text-decoration: none;
- color: #000000;
+span.boldlabel {
+font-size: 22px;
+font-weight: bold;
}
span.smalllabel {
- font-size: small;
- font-weight: bold;
+font-size: small;
+font-weight: bold;
}
span.meditaliclabel {
- font-size: medium;
- font-style: italic;
+font-size: 16px;
+font-style: italic;
}
span.boldlabelgreen {
- font-size: large;
- font-weight: bold;
- color: #00ff00;
+font-size: large;
+font-weight: bold;
+color: #00ff00;
}
span.error {
- font-color: #ff0000;
- font-size: 2;
- font-style: italic;
+font-color: #ff0000;
+font-size: 2;
+font-style: italic;
}
#leftnav {
- float: left;
- left: 5px;
- top: 120px;
+margin-left: 10px;
+}
+
+#footer {
+width: 100%;
+clear: both;
}
-#main {
- left: 200px;
- top: 120px;
- text-align: center;
+table.toolbar {
+border-top: solid #999999 1px;
+border-bottom: solid #999999 1px;
+background-color: #f1f1f1;
}
-#footer {
- width: 100%;
- clear: both;
+td.separator {
+color: #999999;
+font-size: 8px;
}
Modified: incubator/beehive/trunk/samples/petstoreWeb/web/site/template.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/web/site/template.jsp?rev=169920&r1=169919&r2=169920&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/web/site/template.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/web/site/template.jsp Thu May 12 19:36:31 2005
@@ -27,33 +27,33 @@
<netui:html>
<head>
<title>
- ${bundle.view.indexTitle}
+ <%-- Set the title based on the title attribute --%>
+ ${bundle.view.indexTitle} - <netui-template:attribute name="title"/>
</title>
<link rel="stylesheet" href="${pageContext.request.contextPath}/site/default.css" type="text/css"/>
</head>
<netui:body>
+ <%-- Always show the header --%>
<beehive-petstore:headerMenu contextPath="${pageContext.request.contextPath}" />
- <br/>
- <div>
- <%-- Include the template's "leftnav" section --%>
- <div id="leftnav">
- <%-- @bug: when the defaultPage is included, it ends up at the top of the page instead of in-line --%>
- <netui-template:includeSection name="leftnav" defaultPage="/site/emptyLeftNav.jsp"/>
- <br/>
- </div>
- <%-- Include the template's "body" section --%>
- <div id="main">
- <div id="main_menu">
- <beehive-petstore:categoryNavHeader contextPath="${pageContext.request.contextPath}"/>
- <br/>
- </div>
- <netui-template:includeSection name="body"/>
- </div>
- <div id="footer">
- <%-- dynamically display the banner --%>
- <beehive-petstore:footer contextPath="${pageContext.request.contextPath}"/>
- <beehive-petstore:copyright contextPath="${pageContext.request.contextPath}"/>
- </div>
+
+ <%-- The top menu may be the category menu (default), the account menu, or neither --%>
+ <netui-template:includeSection name="topMenu" defaultPage="/site/categoryMenu.jsp" />
+
+ <table cellpadding="5" cellspacing="0" width="100%">
+ <tr><td valign="top" width="250" id="leftnav">
+ <%-- Include the template's "leftnav" section --%>
+ <netui-template:includeSection name="leftnav" defaultPage="/site/emptyLeftNav.jsp"/>
+ </td>
+ <td valign="top"><br/>
+ <%-- Include the template's "body" section --%>
+ <netui-template:includeSection name="body"/>
+ </td>
+ </tr>
+ </table>
+ <div id="footer">
+ <%-- dynamically display the banner --%>
+ <beehive-petstore:footer contextPath="${pageContext.request.contextPath}"/>
+ <beehive-petstore:copyright contextPath="${pageContext.request.contextPath}"/>
</div>
</netui:body>
</netui:html>
Modified: incubator/beehive/trunk/samples/petstoreWeb/web/webappRoot/SharedFlow.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/web/webappRoot/SharedFlow.java?rev=169920&r1=169919&r2=169920&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/web/webappRoot/SharedFlow.java (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/web/webappRoot/SharedFlow.java Thu May 12 19:36:31 2005
@@ -52,6 +52,7 @@
@Jpf.SimpleAction(name="globalViewProductById", path="/shop/viewProduct.do"),
@Jpf.SimpleAction(name="globalViewAddresses", path="/account/addresses/begin.do"),
@Jpf.SimpleAction(name="globalViewCreateAccount", path="/account/create/Controller.jpf"),
+ @Jpf.SimpleAction(name="globalViewOrders", path="/account/edit/listOrders.do"),
@Jpf.SimpleAction(name="globalCheckOut", path="/checkout/createNewOrder.do")
}
)