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 2004/10/24 04:09:21 UTC
svn commit: rev 55409 - in incubator/beehive/trunk/samples/petstoreWeb: . WEB-INF/src/org/apache/beehive/samples/petstore/controls WEB-INF/src/org/apache/beehive/samples/petstore/resources WEB-INF/tags/beehive/petstore account/create account/edit auth images search shop site
Author: ekoneil
Date: Sat Oct 23 19:09:20 2004
New Revision: 55409
Removed:
incubator/beehive/trunk/samples/petstoreWeb/images/sign-in.gif
incubator/beehive/trunk/samples/petstoreWeb/images/sign-out.gif
incubator/beehive/trunk/samples/petstoreWeb/images/sign-outHL.gif
Modified:
incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/controls/CatalogControlImpl.jcs
incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/resources/view.properties
incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/tags/beehive/petstore/accountFields.tag
incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/tags/beehive/petstore/catalogNav.tag
incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/tags/beehive/petstore/categoryNavHeader.tag
incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/tags/beehive/petstore/headerMenu.tag
incubator/beehive/trunk/samples/petstoreWeb/account/create/create.jsp
incubator/beehive/trunk/samples/petstoreWeb/account/edit/Controller.jpf
incubator/beehive/trunk/samples/petstoreWeb/account/edit/edit.jsp
incubator/beehive/trunk/samples/petstoreWeb/account/edit/listOrders.jsp
incubator/beehive/trunk/samples/petstoreWeb/auth/login.jsp
incubator/beehive/trunk/samples/petstoreWeb/help.jsp
incubator/beehive/trunk/samples/petstoreWeb/search/index.jsp
incubator/beehive/trunk/samples/petstoreWeb/shop/cart.jsp
incubator/beehive/trunk/samples/petstoreWeb/shop/category.jsp
incubator/beehive/trunk/samples/petstoreWeb/shop/index.jsp
incubator/beehive/trunk/samples/petstoreWeb/shop/product.jsp
incubator/beehive/trunk/samples/petstoreWeb/site/default.css
Log:
Various petstore fixes.
- style cleanup
- fix invalid JSP 2.0 expression Jonathan reported
- break dependence on icons that say the category names (the WSM sample still depends on these)
- remove unused icons
Modified: incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/controls/CatalogControlImpl.jcs
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/controls/CatalogControlImpl.jcs (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/controls/CatalogControlImpl.jcs Sat Oct 23 19:09:20 2004
@@ -98,6 +98,10 @@
}
// catId, catName, catImage, catDescription
+ // @todo: need to whack the image names here --
+ // these are icons of the text "Fish" and so on; clearly these don't
+ // work for i18n. <g>
+ // -- ekoneil
String[][] categoryDataArray = new String[][]
{
{"FISH", "Fish", "fish_icon.gif", "Saltwater, Freshwater"},
Modified: incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/resources/view.properties
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/resources/view.properties (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/resources/view.properties Sat Oct 23 19:09:20 2004
@@ -80,4 +80,15 @@
# /index.jsp
#
enterTheStore=Enter the Store
-welcome=Welcome to the Beehive Pet Store!
\ No newline at end of file
+welcome=Welcome to the Beehive Pet Store!
+
+fishCategory=Fish
+dogsCategory=Dogs
+reptilesCategory=Reptiles
+catsCategory=Cats
+birdsCategory=Birds
+
+signinLabel=Sign In
+signoffLabel=Sign Out
+searchLabel=Search
+myAccountLabel=My Account
\ No newline at end of file
Modified: incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/tags/beehive/petstore/accountFields.tag
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/tags/beehive/petstore/accountFields.tag (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/tags/beehive/petstore/accountFields.tag Sat Oct 23 19:09:20 2004
@@ -2,8 +2,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ tag body-content="empty" %>
-<%@ attribute name="languages" required="false" %>
-<%@ attribute name="categoryNames" required="true" %>
+<%@ attribute name="languages" required="false" type="java.lang.String[]"%>
+<%@ attribute name="categoryNames" required="true" type="java.lang.String[]"%>
<%--
This tag also implicitly expects that the "actionForm" and "bundle"
objects are passed in explicitly.
@@ -94,7 +94,9 @@
</td>
</tr>
</table>
+
<netui:span styleClass="boldlabel" value="${bundle.default.profileInformation}"/>
+
<table class="tablegreen">
<tr class="rowyellow">
<td class="celldata"><netui:span value="${bundle.default.languagePreference}:"/></td>
@@ -121,3 +123,7 @@
</td>
</tr>
</table>
+
+<netui-data:repeater dataSource="pageInput.categoryNames">
+ <br/>${container.item}
+</netui-data:repeater>
\ No newline at end of file
Modified: incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/tags/beehive/petstore/catalogNav.tag
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/tags/beehive/petstore/catalogNav.tag (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/tags/beehive/petstore/catalogNav.tag Sat Oct 23 19:09:20 2004
@@ -11,7 +11,7 @@
<table class="tablegreen" align="left">
<tr class="rowyellow">
<td>
- <netui:anchor action="${action}">
+ <netui:anchor action="${action}" styleClass="boldanchor">
<c:if test="${paramName != null && paramValue != null}">
<netui:parameter name="${paramName}" value="${paramValue}"/>
</c:if>
Modified: incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/tags/beehive/petstore/categoryNavHeader.tag
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/tags/beehive/petstore/categoryNavHeader.tag (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/tags/beehive/petstore/categoryNavHeader.tag Sat Oct 23 19:09:20 2004
@@ -1,30 +1,45 @@
<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
-
-<%@ tag body-content="empty" %>
-<%@ attribute name="contextPath" required="true" %>
+<%@ tag body-content="empty"%>
+<%@ attribute name="contextPath" required="true"%>
<center>
-<netui:imageAnchor action="globalViewCategory" border="0" src="${contextPath}/images/sm_fish.gif">
+
+<%--
+ todo: need to get the category list here and use a repeater
+ to render each of the category links with a lookup
+ to find the readable name for a category given an id
+ --%>
+<netui:anchor action="globalViewCategory" styleClass="boldanchor">
+ Fish
<netui:parameter name="catId" value="FISH"/>
-</netui:imageAnchor>
+</netui:anchor>
+
<netui:image border="0" src="${contextPath}/images/separator.gif"/>
-<netui:imageAnchor action="globalViewCategory" border="0" src="${contextPath}/images/sm_dogs.gif">
+<netui:anchor action="globalViewCategory" styleClass="boldanchor">
+ Dogs
<netui:parameter name="catId" value="DOGS"/>
-</netui:imageAnchor>
+</netui:anchor>
+
<netui:image border="0" src="${contextPath}/images/separator.gif"/>
-<netui:imageAnchor action="globalViewCategory" border="0" src="${contextPath}/images/sm_reptiles.gif">
+<netui:anchor action="globalViewCategory" styleClass="boldanchor">
+ Reptiles
<netui:parameter name="catId" value="REPTILES"/>
-</netui:imageAnchor>
+</netui:anchor>
+
<netui:image border="0" src="${contextPath}/images/separator.gif"/>
-<netui:imageAnchor action="globalViewCategory" border="0" src="${contextPath}/images/sm_cats.gif">
+<netui:anchor action="globalViewCategory" styleClass="boldanchor">
+ Cats
<netui:parameter name="catId" value="CATS"/>
-</netui:imageAnchor>
+</netui:anchor>
+
<netui:image border="0" src="${contextPath}/images/separator.gif"/>
-<netui:imageAnchor action="globalViewCategory" border="0" src="${contextPath}/images/sm_birds.gif">
+<netui:anchor action="globalViewCategory" styleClass="boldanchor">
+ Birds
<netui:parameter name="catId" value="BIRDS"/>
-</netui:imageAnchor>
+</netui:anchor>
+
</center>
Modified: incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/tags/beehive/petstore/headerMenu.tag
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/tags/beehive/petstore/headerMenu.tag (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/tags/beehive/petstore/headerMenu.tag Sat Oct 23 19:09:20 2004
@@ -4,14 +4,19 @@
<%@ tag body-content="empty" %>
<%@ attribute name="contextPath" required="true" %>
+<%--
+ todo: switch the hard-coded strings below to strings in a resource bundle
+ seems that there's a bug in the ${bundle} implicit object that
+ prevents this from working correctly...
+ - ekoneil
+ --%>
<table background="${contextPath}/images/bkg-topbar.gif" border="0" cellspacing="0" cellpadding="5" width="100%">
- <tbody>
<tr>
- <td>
+ <td align="left" width="60%">
<%-- shop --%>
- <netui:imageAnchor action="globalShop" border="0" src="${contextPath}/images/logo-topbar.gif"/>
+ <netui:imageAnchor action="globalShop" border="0" src="${contextPath}/images/logo-topbar.gif" height="60" width="287"/>
</td>
- <td valign="top" align="right" nowrap>
+ <td valign="top" align="right" nowrap="nowrap">
<br clear="all"/>
<%-- view cart --%>
<netui:imageAnchor action="globalViewCart" border="0" src="${contextPath}/images/cart.gif"/>
@@ -19,25 +24,32 @@
<c:choose>
<c:when test="${sharedFlow.account == null}">
<%-- sharedFlow.signon --%>
- <netui:imageAnchor action="signon" border="0" src="${pageContext.request.contextPath}/images/sign-in.gif"/>
+ <netui:anchor styleClass="boldanchor" action="signon">
+ Sign In
+ </netui:anchor>
</c:when>
<c:otherwise>
<%-- sharedFlow.signoff --%>
- <netui:imageAnchor action="signoff" border="0" src="${pageContext.request.contextPath}/images/sign-out.gif"/>
+ <netui:anchor styleClass="boldanchor" action="signoff">
+ Sign Out
+ </netui:anchor>
<netui:image border="0" src="${pageContext.request.contextPath}/images/separator.gif"/>
- <netui:imageAnchor action="globalEditAccount" border="0" src="${pageContext.request.contextPath}/images/my_account.gif"/>
+ <netui:anchor styleClass="boldanchor" action="globalEditAccount">
+ My Account
+ </netui:anchor>
</c:otherwise>
</c:choose>
<netui:image border="0" src="${contextPath}/images/separator.gif"/>
<netui:imageAnchor action="globalShowHelp" border="0" src="${contextPath}/images/help.gif"/>
</td>
- <td valign="top" align="left" nowrap>
+ <td valign="top" align="left" border="0">
<br clear="all"/>
<netui:form action="search">
<netui:textBox dataSource="actionForm.keyword" size="14"/>
- <netui:imageButton src="${contextPath}/images/search.gif"/>
+ <netui:anchor styleClass="boldanchor" formSubmit="true">
+ Search
+ </netui:anchor>
</netui:form>
- </td>
+ <td>
</tr>
-</tbody>
</table>
Modified: incubator/beehive/trunk/samples/petstoreWeb/account/create/create.jsp
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/account/create/create.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/account/create/create.jsp Sat Oct 23 19:09:20 2004
@@ -4,14 +4,14 @@
<%@ 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="categoryNames" type="java.util.List"/>
<netui-data:declarePageInput name="languages" type="java.lang.String[]"/>
-
-
-
<netui-template:template templatePage="/site/template.jsp">
- <netui-template:section name="leftnav"> </netui-template:section>
+ <netui-template:section name="leftnav">
+
+ </netui-template:section>
<netui-template:section name="body">
<netui:errors/>
<netui:form action="createAccount">
@@ -53,7 +53,7 @@
</td>
</tr>
</table>
- <beehive-petstore:accountFields categoryNames="${pageInput.accountFields" languages="${pageInput.languages}"/>
+ <beehive-petstore:accountFields categoryNames="${pageInput.accountFields}" languages="${pageInput.languages}"/>
</td>
</tr>
</table>
Modified: incubator/beehive/trunk/samples/petstoreWeb/account/edit/Controller.jpf
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/account/edit/Controller.jpf (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/account/edit/Controller.jpf Sat Oct 23 19:09:20 2004
@@ -65,7 +65,7 @@
type = java.lang.String[].class,
required = true),
@Jpf.ActionOutput(name = "categoryNames",
- type = java.util.List.class,
+ type = java.lang.String[].class,
required = true)
})
}
Modified: incubator/beehive/trunk/samples/petstoreWeb/account/edit/edit.jsp
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/account/edit/edit.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/account/edit/edit.jsp Sat Oct 23 19:09:20 2004
@@ -4,7 +4,7 @@
<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
<%@ taglib prefix="beehive-petstore" tagdir="/WEB-INF/tags/beehive/petstore" %>
-<netui-data:declarePageInput name="categoryNames" type="java.util.List"/>
+<netui-data:declarePageInput name="categoryNames" type="java.lang.String[]"/>
<netui-data:declarePageInput name="languages" type="java.lang.String[]"/>
<netui-template:template templatePage="/site/template.jsp">
@@ -37,7 +37,7 @@
</td>
</tr>
</table>
- <beehive-petstore:accountFields categoryNames="${pageInput.accountFields}" languages="${pageInput.languages}"/>
+ <beehive-petstore:accountFields categoryNames="${pageInput.categoryNames}" languages="${pageInput.languages}"/>
</td>
</tr>
<tr>
Modified: incubator/beehive/trunk/samples/petstoreWeb/account/edit/listOrders.jsp
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/account/edit/listOrders.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/account/edit/listOrders.jsp Sat Oct 23 19:09:20 2004
@@ -2,43 +2,48 @@
<%@ 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 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-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="globalShop" labelValue="${bundle.view.mainMenuLabel}"/> </netui-template:section>
+ <netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
+ <beehive-petstore:catalogNav action="globalShop" labelValue="${bundle.view.mainMenuLabel}"/>
+ </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}"/>
+ <center>
+ <netui:span styleClass="boldlabel" value="${bundle.view.myOrders}"/>
<p/>
- <netui-data:repeater dataSource="pageInput.orders" defaultText="No orders found">
+ <netui-data:repeater dataSource="pageInput.orders" defaultText="<br/><br/>No orders found<br/><br/>">
<netui-data:repeaterHeader>
- <table class="tablebody" border="1">
- <tr class="tablehead" valign="top">
+ <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">
- <td>
+ <tr valign="top" class="rowyellow">
+ <td class="celldata">
<netui:label value="${container.item.orderId}"/>
</td>
- <td>
+ <td class="celldata">
<netui:span value="${container.item.orderDate}" defaultValue=" "/>
</td>
- <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:repeaterFooter>
+ </table>
+ </netui-data:repeaterFooter>
</netui-data:repeater>
</center>
</netui-template:section>
Modified: incubator/beehive/trunk/samples/petstoreWeb/auth/login.jsp
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/auth/login.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/auth/login.jsp Sat Oct 23 19:09:20 2004
@@ -2,8 +2,12 @@
<%@ 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-template:template templatePage="/site/template.jsp">
- <netui-template:section name="leftnav"> </netui-template:section>
+ <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"/>
<%-- set focus on the username box--%>
@@ -15,22 +19,18 @@
<netui:form action="securityCheck">
<table align="center" border="0">
<tr>
- <td colspan="2">${bundle.view.enterUsernamePassword}<br />
-
- </td>
+ <td colspan="2">${bundle.view.enterUsernamePassword}<br/></td>
</tr>
<tr>
- <td>${bundle.view.usernameLoginLabel}:
- </td>
+ <td>${bundle.view.usernameLoginLabel}:</td>
<td>
- <input type="text" name="j_username" value="java">
+ <input type="text" name="j_username" value="beehive">
</td>
</tr>
<tr>
- <td>${bundle.view.passwordLoginLabel}:
- </td>
+ <td>${bundle.view.passwordLoginLabel}:</td>
<td>
- <input type="password" name="j_password" value="java">
+ <input type="password" name="j_password" value="beehive">
</td>
</tr>
<tr>
@@ -40,7 +40,7 @@
</tr>
</table>
</netui:form>
- <%-- this is defined in the global app but isn't picked up --%>
- <netui:imageAnchor action="globalViewCreateAccount" border="0" src="${pageContext.request.contextPath}/images/button_register_now.gif"/>
- </center> </netui-template:section>
+ <netui:imageAnchor action="globalViewCreateAccount" border="0" src="${pageContext.request.contextPath}/images/button_register_now.gif"/>
+ </center>
+ </netui-template:section>
</netui-template:template>
Modified: incubator/beehive/trunk/samples/petstoreWeb/help.jsp
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/help.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/help.jsp Sat Oct 23 19:09:20 2004
@@ -11,7 +11,7 @@
<table border=0 cellSpacing=0 height="85%" width="100%">
<tbody>
<tr>
- <td>This space intentionall left blank.</td>
+ <td>This space intentionally left blank.</td>
</tr>
</tbody>
</table>
Modified: incubator/beehive/trunk/samples/petstoreWeb/search/index.jsp
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/search/index.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/search/index.jsp Sat Oct 23 19:09:20 2004
@@ -19,7 +19,7 @@
<center>
<netui:span styleClass="boldlabel" value="${bundle.search.searchResultsLabel}"/>
- <netui-data:repeater dataSource="pageInput.searchResults" defaultText="${bundle.search.noSearchResults}">
+ <netui-data:repeater dataSource="pageInput.searchResults" defaultText="<br/><br/>${bundle.search.noSearchResults}<br/><br/>">
<netui-data:repeaterHeader>
<table class="tablegreen">
<tr class="rowgrey">
@@ -57,7 +57,7 @@
</netui-data:repeaterFooter>
</netui-data:repeater>
</p>
- <netui:anchor action="done">${bundle.search.searchDoneLabel}</netui:anchor>
+ <netui:anchor action="done" styleClass="boldanchor">${bundle.search.searchDoneLabel}</netui:anchor>
</center>
</netui-template:section>
</netui-template:template>
Modified: incubator/beehive/trunk/samples/petstoreWeb/shop/cart.jsp
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/shop/cart.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/shop/cart.jsp Sat Oct 23 19:09:20 2004
@@ -90,11 +90,6 @@
</td>
</tr>
</netui-data:repeater>
- </c:when> <c:otherwise>
- <tr class="rowyellow">
- <td class="celldata" colspan="8"><b>${bundle.view.emptyCartMessage}.</b></td>
- </tr>
- </c:otherwise> </c:choose>
<tr class="rowyellow">
<td class="celldata" colspan="7" align="right">
<b>${bundle.view.subTotalLabel}:
@@ -105,6 +100,13 @@
</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/>
Modified: incubator/beehive/trunk/samples/petstoreWeb/shop/category.jsp
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/shop/category.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/shop/category.jsp Sat Oct 23 19:09:20 2004
@@ -4,24 +4,24 @@
<%@ 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="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-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="begin" labelValue="${bundle.view.mainMenuLabel}"/> </netui-template:section>
+ <beehive-petstore:catalogNav action="begin" labelValue="${bundle.view.mainMenuLabel}"/>
+ </netui-template:section>
<netui-template:section name="body">
<netui:errors/>
+ <p>
<center>
<netui:span styleClass="boldlabel" value="${pageInput.category.name}"/>
<br/>
- <font size="2"><i>(<netui:span value="${pageInput.category.description}"/>)</i></font>
+ <netui:span styleClass="meditaliclabel" value="(${pageInput.category.description})"/>
<br/>
<br/>
<table class="tablegreen">
@@ -43,5 +43,7 @@
</tr>
</netui-data:repeater>
</table>
- </center> </netui-template:section>
+ </center>
+ </p>
+ </netui-template:section>
</netui-template:template>
Modified: incubator/beehive/trunk/samples/petstoreWeb/shop/index.jsp
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/shop/index.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/shop/index.jsp Sat Oct 23 19:09:20 2004
@@ -3,14 +3,14 @@
<%@ 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="categories" type="org.apache.beehive.samples.petstore.model.Category[]"/>
-
+<netui-data:declarePageInput name="categories" type="org.apache.beehive.samples.petstore.model.Category[]"/>
<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"/>
- <table class="tablegreen" width="200">
+ <table class="tablegreenborder" style="border-width:1px;border-style:solid" width="200">
<tbody>
<tr class="rowyellow">
<td>
@@ -24,7 +24,7 @@
<tr class="rowyellow">
<td>
<netui:imageAnchor action="viewCategory" border="0" src="${pageContext.request.contextPath}/images/${container.item.image}">
- <netui:parameter name="catId" value="${container.item.catId}"/>
+ <netui:parameter name="catId" value="${container.item.catId}"/>
</netui:imageAnchor>
<br/>
<netui:span styleClass="meditaliclabel" value="${container.item.description}"/>
@@ -34,9 +34,9 @@
</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="globalViewCategory.do?catId=BIRDS" shape="RECT" />
@@ -46,6 +46,8 @@
<area alt="Cats" coords="225,240,295,310" href="globalViewCategory.do?catId=CATS" shape="RECT" />
<area alt="Birds" coords="280,180,350,250" href="globalViewCategory.do?catId=BIRDS" shape="RECT" />
</map>
- <img vspace="10" hspace="15" border="0" height="347" width="357" src="${pageContext.request.contextPath}/images/splash.gif" align="center" usemap="#beehivepetstoremap"/>
+ <img vspace="10" hspace="15" border="0" height="347" width="357" src="${pageContext.request.contextPath}/images/splash.gif"
+ align="center" usemap="#beehivepetstoremap"/>
</netui-template:section>
+
</netui-template:template>
Modified: incubator/beehive/trunk/samples/petstoreWeb/shop/product.jsp
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/shop/product.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/shop/product.jsp Sat Oct 23 19:09:20 2004
@@ -2,26 +2,29 @@
<%@ 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 prefix="beehive-petstore" tagdir="/WEB-INF/tags/beehive/petstore"%>
+
<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-template:template templatePage="/site/template.jsp">
<netui-template:section name="leftnav">
- <beehive-petstore:catalogNav action="viewCategory" paramName="catId" paramValue="${pageInput.product.category}"
- labelValue="${pageInput.product.category}"/>
+ <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}"/>
<br/>
- <netui:span styleClass="meditaliclabel" value="{${pageInput.product.description})"/>
+ <netui:span styleClass="meditaliclabel" value="(${pageInput.product.description})"/>
+ <br/>
+ <br/>
<table class="tablegreen">
<tr class="rowgrey">
<td><b>${bundle.view.itemIdLabel}</b></td>
Modified: incubator/beehive/trunk/samples/petstoreWeb/site/default.css
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/site/default.css (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/site/default.css Sat Oct 23 19:09:20 2004
@@ -8,6 +8,17 @@
right-margin: auto;
}
+/*
+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;
+}
+
tr.rowyellow {
background-color: #ffff88;
}
@@ -32,6 +43,20 @@
span.boldlabel {
font-size: large;
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.smalllabel {