svnno****@sourc*****
svnno****@sourc*****
2007年 10月 12日 (金) 16:13:40 JST
Revision: 622
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=622
Author: shinsuke
Date: 2007-10-12 16:13:39 +0900 (Fri, 12 Oct 2007)
Log Message:
-----------
fixed minor problems. put portlet-msg class in html files.
Modified Paths:
--------------
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/PagingResultPage.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/cart/ProductListPage.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutCompletePage.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java
pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/signup/label.properties
pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/portlet.xml
pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressConfirm.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressEdit.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressList.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerConfirm.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerEdit.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerList.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodEdit.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodList.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderConfirm.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderList.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryEdit.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryList.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/manufacturerEdit.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/manufacturerList.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productConfirm.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productEdit.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productList.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/cart/productList.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutComplete.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/paymentSelect.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userAddressSelect.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productDetails.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productList.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupComplete.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupConfirm.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html
-------------- next part --------------
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/PagingResultPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/PagingResultPage.java 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/PagingResultPage.java 2007-10-12 07:13:39 UTC (rev 622)
@@ -22,6 +22,9 @@
private List<Map<String, Object>> pageNumberItems;
public int getStartRecordCount() {
+ if (getAllRecordCount() == 0) {
+ return 0;
+ }
return (getCurrentPageNumber() - 1) * getPageSize() + 1;
}
@@ -154,4 +157,8 @@
public boolean isCurrentPage() {
return pageNumber == currentPageNumber;
}
+
+ public boolean isEmptyRecord() {
+ return getAllRecordCount() == 0;
+ }
}
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/cart/ProductListPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/cart/ProductListPage.java 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/cart/ProductListPage.java 2007-10-12 07:13:39 UTC (rev 622)
@@ -197,4 +197,8 @@
public void setLogin(boolean login) {
this.login = login;
}
+
+ public boolean isEmptyProducts() {
+ return productItems == null || productItems.isEmpty();
+ }
}
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutCompletePage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutCompletePage.java 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutCompletePage.java 2007-10-12 07:13:39 UTC (rev 622)
@@ -2,6 +2,8 @@
import java.io.Serializable;
+import jp.sf.pal.pompei.util.UrlBuilderUtil;
+
public class CheckoutCompletePage implements Serializable {
/**
@@ -19,4 +21,7 @@
this.orderFormNumber = orderFormNumber;
}
+ public String getProductListLinkHref() {
+ return UrlBuilderUtil.createProductListUrl();
+ }
}
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java 2007-10-12 07:13:39 UTC (rev 622)
@@ -123,7 +123,7 @@
List<Map<String, Object>> pageNumberItems = new ArrayList<Map<String, Object>>();
for (int i : pageNumberArray) {
Map<String, Object> map = new HashMap<String, Object>();
- map.put("pageNumber", new Integer(i));
+ map.put("pageNumber", Integer.valueOf(i));
pageNumberItems.add(map);
}
getProductListPage().setPageNumberItems(pageNumberItems);
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java 2007-10-12 07:13:39 UTC (rev 622)
@@ -188,4 +188,12 @@
}
return "";
}
+
+ public String getThumbnailByThumbnailSrc() {
+ return getThumbnailSrc();
+ }
+
+ public String getThumbnailByListWithImageSrc() {
+ return getThumbnailSrc();
+ }
}
Modified: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/signup/label.properties
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/signup/label.properties 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/signup/label.properties 2007-10-12 07:13:39 UTC (rev 622)
@@ -1,3 +1,16 @@
+secondaryPostcode=\u90f5\u4fbf\u756a\u53f7\u306e\u4e0b4\u6841
+lastnameDescription=\u540d\u5b57[\u30d5\u30ea\u30ac\u30ca]
+lastname=\u540d\u5b57
+streetAddress=\u305d\u308c\u4ee5\u964d\u306e\u4f4f\u6240
+city=\u90e1\u5e02\u533a (\u5cf6\u3001\u56fd)
+userName=\u3054\u5e0c\u671b\u306e\u30e6\u30fc\u30b6\u30fcID
+emailAddress=\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9
+firstname=\u540d\u524d
+emailAddressConfirm=\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9(\u78ba\u8a8d)
+firstnameDescription=\u540d\u524d[\u30d5\u30ea\u30ac\u30ca]
+primaryPostcode=\u90f5\u4fbf\u756a\u53f7\u306e\u4e0a3\u6841
+userSecretAnswer=\u79d8\u5bc6\u306e\u7b54\u3048
+
M=\u7537\u6027
F=\u5973\u6027
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/portlet.xml
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/portlet.xml 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/portlet.xml 2007-10-12 07:13:39 UTC (rev 622)
@@ -474,7 +474,7 @@
</supports>
<supported-locale>en</supported-locale>
<supported-locale>ja</supported-locale>
- <resource-bundle>jp.sf.pal.pompei.web.signup.signupEdit</resource-bundle>
+ <resource-bundle>jp.sf.pal.pompei.web.user.signup.SignupEdit</resource-bundle>
<portlet-info>
<title>Customer Signup</title>
<short-title>Signup</short-title>
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressConfirm.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressConfirm.html 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressConfirm.html 2007-10-12 07:13:39 UTC (rev 622)
@@ -7,6 +7,9 @@
</head>
<body>
<form id="form" method="post">
+<div class="portlet-msg">
+ <span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
+</div>
<table>
<tr style="dummy" height="20px">
<th>住所ID</th><td><span id="addressBookId">住所ID</span></td>
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressEdit.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressEdit.html 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressEdit.html 2007-10-12 07:13:39 UTC (rev 622)
@@ -7,6 +7,9 @@
</head>
<body>
<form id="form" method="post">
+<div class="portlet-msg">
+ <span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
+</div>
<table>
<tr style="dummy" height="20px">
<th>住所ID</th><td><input type="text" id="addressBookId" /></td>
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressList.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressList.html 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressList.html 2007-10-12 07:13:39 UTC (rev 622)
@@ -7,6 +7,9 @@
</head>
<body>
<form id="form" method="post">
+<div class="portlet-msg">
+ <span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
+</div>
<table>
<thead>
<tr style="dummy" height="20px">
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerConfirm.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerConfirm.html 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerConfirm.html 2007-10-12 07:13:39 UTC (rev 622)
@@ -10,10 +10,10 @@
<input type="hidden" id="mode" />
<input type="hidden" id="customerId" />
<input type="hidden" id="addressBookId" />
- <div>
- <span id="allMessages"></span>
+ <div class="portlet-msg">
+ <span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
</div>
- <div>
+ <div>
<div class="portlet-section-header">ユーザー登録情報</div>
<table>
<tbody>
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerEdit.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerEdit.html 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerEdit.html 2007-10-12 07:13:39 UTC (rev 622)
@@ -10,8 +10,8 @@
<input type="hidden" id="mode" />
<input type="hidden" id="customerId" />
<input type="hidden" id="addressBookId" />
- <div>
- <span id="allMessages"></span>
+ <div class="portlet-msg">
+ <span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
</div>
<div>
<div class="portlet-section-header">ユーザー登録情報</div>
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerList.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerList.html 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerList.html 2007-10-12 07:13:39 UTC (rev 622)
@@ -16,6 +16,9 @@
</div>
<hr />
-->
+<div class="portlet-msg">
+ <span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
+</div>
<table border="1">
<thead>
<tr>
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodEdit.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodEdit.html 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodEdit.html 2007-10-12 07:13:39 UTC (rev 622)
@@ -7,8 +7,8 @@
</head>
<body>
<form id="form" method="post">
- <div>
- <span id="allMessages"></span>
+ <div class="portlet-msg">
+ <span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
</div>
<input type="hidden" id="mode" />
<input type="hidden" id="targetId" />
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodList.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodList.html 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodList.html 2007-10-12 07:13:39 UTC (rev 622)
@@ -17,8 +17,8 @@
}
--></script>
<form id="deliveryMethodListForm" method="post"><input type="hidden" id="mode" /><input type="hidden" id="targetId" />
- <div>
- <span id="allMessages"></span>
+ <div class="portlet-msg">
+ <span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
</div>
<table border="1">
<thead>
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderConfirm.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderConfirm.html 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderConfirm.html 2007-10-12 07:13:39 UTC (rev 622)
@@ -12,7 +12,7 @@
<div style="width:100%;">
<center>
<div style="width:80%;text-align: left;">
- <div>
+ <div class="portlet-msg">
<span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
</div>
<br/>
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.html 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.html 2007-10-12 07:13:39 UTC (rev 622)
@@ -12,7 +12,7 @@
<div style="width:100%;">
<center>
<div style="width:80%;text-align: left;">
- <div>
+ <div class="portlet-msg">
<span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
</div>
<br />
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderList.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderList.html 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderList.html 2007-10-12 07:13:39 UTC (rev 622)
@@ -10,7 +10,7 @@
<div style="width: 100%;">
<center>
<div style="width: 80%;">
- <div>
+ <div class="portlet-msg">
<span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
</div>
<div style="width: 100%;">
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryEdit.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryEdit.html 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryEdit.html 2007-10-12 07:13:39 UTC (rev 622)
@@ -11,7 +11,9 @@
</div>
<hr/>
<form id="form" method="post">
-<div><span id="allMessages"></span></div>
+<div class="portlet-msg">
+ <span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
+</div>
<input type="hidden" id="mode" />
<input type="hidden" id="targetId" />
<input type="hidden" id="parentId" />
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryList.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryList.html 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryList.html 2007-10-12 07:13:39 UTC (rev 622)
@@ -23,6 +23,9 @@
</div>
<hr/>
<form id="categoryListForm" method="post"><input type="hidden" id="mode" /><input type="hidden" id="targetId" />
+<div class="portlet-msg">
+ <span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
+</div>
<input type="hidden" id="parentId" />
<table border="1">
<thead>
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/manufacturerEdit.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/manufacturerEdit.html 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/manufacturerEdit.html 2007-10-12 07:13:39 UTC (rev 622)
@@ -8,7 +8,9 @@
<body>
<form id="form" method="post">
<input type="hidden" id="manufacturerId"/>
-<div><span id="allMessages"></span></div>
+<div class="portlet-msg">
+ <span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
+</div>
<table border="1">
<tr style="dummy" height="20px">
<th><label>メーカー名</label></th>
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/manufacturerList.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/manufacturerList.html 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/manufacturerList.html 2007-10-12 07:13:39 UTC (rev 622)
@@ -19,6 +19,9 @@
-->
</script>
<form id="form" method="post"><input type="hidden" id="mode" /><input type="hidden" id="targetId" />
+<div class="portlet-msg">
+ <span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
+</div>
<table border="1">
<thead>
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productConfirm.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productConfirm.html 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productConfirm.html 2007-10-12 07:13:39 UTC (rev 622)
@@ -8,6 +8,9 @@
<body>
下記の内容で登録します。よろしければ登録ボタンを押して下さい。
<form id="form" method="post">
+<div class="portlet-msg">
+ <span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
+</div>
<table border="1">
<tr style="dummy" height="20px">
<th>商品名</th><td><span id="productsName">商品名</span></td>
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productEdit.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productEdit.html 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productEdit.html 2007-10-12 07:13:39 UTC (rev 622)
@@ -11,7 +11,9 @@
</div>
<hr/>
<form id="form" method="post" enctype="multipart/form-data">
-<div><span id="allMessages"></span></div>
+<div class="portlet-msg">
+ <span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
+</div>
<input type="hidden" id="mode" />
<input type="hidden" id="targetId" />
<input type="hidden" id="parentId" />
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productList.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productList.html 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productList.html 2007-10-12 07:13:39 UTC (rev 622)
@@ -9,7 +9,7 @@
<form id="form" method="post">
<input type="hidden" id="parentId" />
-<div>
+<div class="portlet-msg">
<span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
</div>
<div id="breadcrumbItems">
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/cart/productList.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/cart/productList.html 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/cart/productList.html 2007-10-12 07:13:39 UTC (rev 622)
@@ -9,92 +9,102 @@
<form id="form" method="post">
<div id="isUser" style="width: 100%;">
<center>
- <div style="width: 80%;text-align: left;">
- <div style="font-size: 14pt;">
- <label>ショッピングカート</label>
+ <div id="isNotEmptyProducts" style="width: 80%;text-align: left;">
+ <div style="font-size: 14pt;">
+ <label>ショッピングカート</label>
+ </div>
+ <table border="1" style="width: 100%;" cellspacing="0">
+ <thead>
+ <tr>
+ <th align="center" style="color: black;background-color: #fff1a1;">
+ <label>商品名</label>
+ </th>
+ <th align="center" width="100" style="color: black;background-color: #fff1a1;">
+ <label>単価</label>
+ </th>
+ <th align="center" width="60" style="color: black;background-color: #fff1a1;">
+ <label>数量</label>
+ </th>
+ <th align="center" width="100" style="color: black;background-color: #fff1a1;">
+ <label>小計</label>
+ </th>
+ <th align="center" width="50" style="color: black;background-color: #fff1a1;">
+ <label>消費税</label>
+ </th>
+ <th align="center" width="40" style="color: black;background-color: #fff1a1;">
+ <label>送料</label>
+ </th>
+ <th align="center" width="50" style="color: black;background-color: #fff1a1;">
+ <label>代引料</label>
+ </th>
+ <th style="color: black;background-color: #fff1a1;"> </th>
+ </tr>
+ </thead>
+ <tbody id="productItems">
+ <tr>
+ <td align="left">
+ <span id="productName">XXX 01MAX</span><br />
+ <label>コード:</label><span id="productCode">MX-XXX</span><br />
+ <label>型番:</label><span id="productModel">MX-XXX</span>
+ </td>
+ <td align="right">
+ <b style="color: #990000;">
+ <span id="productPrice">30,000</span>
+ </b>
+ </td>
+ <td align="center">
+ <span id="quantity">1</span>
+ </td>
+ <td align="right">
+ <b style="color: #990000;">
+ <span id="finalPrice">30,000</span>
+ </b>
+ </td>
+ <th align="center">
+ <label>別</label>
+ </th>
+ <th align="center">
+ <label>別</label>
+ </th>
+ <th align="center">
+ <label>別</label>
+ </th>
+ <td align="center">
+ <a id="goProductDelete" href="./productList.html?customerBasketId=0&fixed_mode=delete" onclick="if(confirm('削除します。よろしいですか？')){return true;}else{return false;}">削除</a>
+ </td>
+ </tr>
+ </tbody>
+ <tfoot>
+ <tr>
+ <td colspan="3" align="right">
+ <label>商品代金小計</label>
+ </td>
+ <td align="right">
+ <b style="color: #990000;">
+ <span id="totalPrice">10000</span>
+ </b>
+ </td>
+ <td colspan="4" align="right">
+ <input type="submit" id="doUpdate" value="カートを更新する" />
+ </td>
+ </tr>
+ </tfoot>
+ </table>
+ <br/>
+ <br/>
+ <div style="width: 100%;text-align: center;">
+ <strong><a id="orderLink" href=""><span style="font-size: 14pt;">購入手続きへ</span></a></strong>
+ <hr style="border-top: 1px dashed #999999;height: 1px;color: #ffffff;" size="1" noshade="noshade" />
+ <a id="productListLink" href="">お買物を続ける</a>
+ </div>
</div>
- <table border="1" style="width: 100%;" cellspacing="0">
- <thead>
- <tr>
- <th align="center" style="color: black;background-color: #fff1a1;">
- <label>商品名</label>
- </th>
- <th align="center" width="100" style="color: black;background-color: #fff1a1;">
- <label>単価</label>
- </th>
- <th align="center" width="60" style="color: black;background-color: #fff1a1;">
- <label>数量</label>
- </th>
- <th align="center" width="100" style="color: black;background-color: #fff1a1;">
- <label>小計</label>
- </th>
- <th align="center" width="50" style="color: black;background-color: #fff1a1;">
- <label>消費税</label>
- </th>
- <th align="center" width="40" style="color: black;background-color: #fff1a1;">
- <label>送料</label>
- </th>
- <th align="center" width="50" style="color: black;background-color: #fff1a1;">
- <label>代引料</label>
- </th>
- <th style="color: black;background-color: #fff1a1;"> </th>
- </tr>
- </thead>
- <tbody id="productItems">
- <tr>
- <td align="left"><span id="productName">XXX 01MAX</span><br />
- <label>コード:</label><span id="productCode">MX-XXX</span><br />
- <label>型番:</label><span id="productModel">MX-XXX</span>
- </td>
- <td align="right">
- <b style="color: #990000;">
- <span id="productPrice">30,000</span>
- </b>
- </td>
- <td align="center">
- <span id="quantity">1</span>
- </td>
- <td align="right">
- <b style="color: #990000;">
- <span id="finalPrice">30,000</span>
- </b>
- </td>
- <th align="center">
- <label>別</label>
- </th>
- <th align="center">
- <label>別</label>
- </th>
- <th align="center">
- <label>別</label>
- </th>
- <td align="center">
- <a id="goProductDelete" href="./productList.html?customerBasketId=0&fixed_mode=delete" onclick="if(confirm('削除します。よろしいですか？')){return true;}else{return false;}">削除</a>
- </td>
- </tr>
- </tbody>
- <tfoot>
- <tr>
- <td colspan="3" align="right">
- <label>商品代金小計</label>
- </td>
- <td align="right">
- <b style="color: #990000;">
- <span id="totalPrice">10000</span>
- </b>
- </td>
- <td colspan="4" align="right">
- <input type="submit" id="doUpdate" value="カートを更新する" />
- </td>
- </tr>
- </tfoot>
- </table>
- </div>
- <div style="width: 80%;margin-top: 20px;">
- <a id="orderLink" href="">購入手続きへ</a>
+ <div id="isEmptyProducts" style="width: 80%;text-align: left;">
+ <div style="width: 100%; padding: 10px;">
+ <label>カートに商品が入っていません。</label>
+ </div>
<hr style="border-top: 1px dashed #999999;height: 1px;color: #ffffff;" size="1" noshade="noshade" />
<div>
- <a id="productListLink" href="">お買物を続ける</a>
+ <a id="productListLink-empty" href="">お買物を続ける</a>
</div>
</div>
</center>
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutComplete.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutComplete.html 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutComplete.html 2007-10-12 07:13:39 UTC (rev 622)
@@ -10,22 +10,22 @@
<center>
<table border="0" width="80%">
<tr>
- <td align="center" bgcolor="#a7a596">1. 会員情報の確認</td>
+ <td class="order-step-selected">1. 会員情報の確認</td>
<td>></td>
- <td align="center" bgcolor="#a7a596">2. お届け先の選択</td>
+ <td class="order-step-selected">2. お届け先の選択</td>
<td>></td>
- <td align="center" bgcolor="#a7a596">3. 支払方法とお届け方法の選択</td>
+ <td class="order-step-selected">3. 支払方法とお届け方法の選択</td>
<td>></td>
- <td align="center" bgcolor="#a7a596">4. ご注文内容の確認</td>
+ <td class="order-step-selected">4. ご注文内容の確認</td>
<td>></td>
- <td align="center" bgcolor="#ffd153">5. ご注文完了</td>
+ <td class="order-step-current">5. ご注文完了</td>
</tr>
</table>
<br />
<br />
<div style="width: 80%;text-align: left;">
<form id="checkoutCompleteForm">
- <div>
+ <div class="portlet-msg">
<span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
</div>
<br />
@@ -51,6 +51,11 @@
またのご利用をお待ちしております。
</label>
</div>
+ <br />
+ <br />
+ <div>
+ <a id="productListLink" href="">お買い物に戻る</a>
+ </div>
</td>
</tr>
</table>
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html 2007-10-12 07:13:39 UTC (rev 622)
@@ -10,15 +10,15 @@
<center>
<table border="0" width="80%">
<tr>
- <td align="center" bgcolor="#a7a596">1. 会員情報の確認</td>
+ <td class="order-step-selected">1. 会員情報の確認</td>
<td>></td>
- <td align="center" bgcolor="#a7a596">2. お届け先の選択</td>
+ <td class="order-step-selected">2. お届け先の選択</td>
<td>></td>
- <td align="center" bgcolor="#a7a596">3. 支払方法とお届け方法の選択</td>
+ <td class="order-step-selected">3. 支払方法とお届け方法の選択</td>
<td>></td>
- <td align="center" bgcolor="#ffd153">4. ご注文内容の確認</td>
+ <td class="order-step-current">4. ご注文内容の確認</td>
<td>></td>
- <td align="center" bgcolor="#e1de81">5. ご注文完了</td>
+ <td class="order-step-unselected">5. ご注文完了</td>
</tr>
</table>
<br />
@@ -26,7 +26,7 @@
<div style="width: 80%;text-align: left;">
<form id="checkoutConfirmForm">
<input id="orderProcessId" type="hidden" />
- <div>
+ <div class="portlet-msg">
<span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
</div>
<br />
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/paymentSelect.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/paymentSelect.html 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/paymentSelect.html 2007-10-12 07:13:39 UTC (rev 622)
@@ -22,15 +22,15 @@
<center>
<table border="0" width="80%">
<tr>
- <td align="center" bgcolor="#a7a596">1. 会員情報の確認</td>
+ <td class="order-step-selected">1. 会員情報の確認</td>
<td>></td>
- <td align="center" bgcolor="#a7a596">2. お届け先の選択</td>
+ <td class="order-step-selected">2. お届け先の選択</td>
<td>></td>
- <td align="center" bgcolor="#ffd153">3. 支払方法とお届け方法の選択</td>
+ <td class="order-step-current">3. 支払方法とお届け方法の選択</td>
<td>></td>
- <td align="center" bgcolor="#e1de81">4. ご注文内容の確認</td>
+ <td class="order-step-unselected">4. ご注文内容の確認</td>
<td>></td>
- <td align="center" bgcolor="#e1de81">5. ご注文完了</td>
+ <td class="order-step-unselected">5. ご注文完了</td>
</tr>
</table>
<br />
@@ -38,7 +38,7 @@
<div style="width: 80%;text-align: left;">
<form id="paymentSelectForm"><input type="hidden" id="targetPaymentMethodId-hidden" /><input type="hidden" id="targetDeliveryMethodId-hidden" />
<input id="orderProcessId" type="hidden" />
- <div>
+ <div class="portlet-msg">
<span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
</div>
<br />
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userAddressSelect.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userAddressSelect.html 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userAddressSelect.html 2007-10-12 07:13:39 UTC (rev 622)
@@ -10,15 +10,15 @@
<center>
<table border="0" width="80%">
<tr>
- <td align="center" bgcolor="#a7a596">1. 会員情報の確認</td>
+ <td class="order-step-selected">1. 会員情報の確認</td>
<td>></td>
- <td align="center" bgcolor="#ffd153">2. お届け先の選択</td>
+ <td class="order-step-current">2. お届け先の選択</td>
<td>></td>
- <td align="center" bgcolor="#e1de81">3. 支払方法とお届け方法の選択</td>
+ <td class="order-step-unselected">3. 支払方法とお届け方法の選択</td>
<td>></td>
- <td align="center" bgcolor="#e1de81">4. ご注文内容の確認</td>
+ <td class="order-step-unselected">4. ご注文内容の確認</td>
<td>></td>
- <td align="center" bgcolor="#e1de81">5. ご注文完了</td>
+ <td class="order-step-unselected">5. ご注文完了</td>
</tr>
</table>
<br />
@@ -26,7 +26,7 @@
<div style="width: 80%;text-align: left;">
<form id="userAddressSelectForm">
<input id="orderProcessId" type="hidden" />
- <div>
+ <div class="portlet-msg">
<span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
</div>
<br />
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html 2007-10-12 07:13:39 UTC (rev 622)
@@ -10,15 +10,15 @@
<center>
<table border="0" width="80%">
<tr>
- <td align="center" bgcolor="#ffd153">1. 会員情報の確認</td>
+ <td class="order-step-current">1. 会員情報の確認</td>
<td>></td>
- <td align="center" bgcolor="#e1de81">2. お届け先の選択</td>
+ <td class="order-step-unselected">2. お届け先の選択</td>
<td>></td>
- <td align="center" bgcolor="#e1de81">3. 支払方法とお届け方法の選択</td>
+ <td class="order-step-unselected">3. 支払方法とお届け方法の選択</td>
<td>></td>
- <td align="center" bgcolor="#e1de81">4. ご注文内容の確認</td>
+ <td class="order-step-unselected">4. ご注文内容の確認</td>
<td>></td>
- <td align="center" bgcolor="#e1de81">5. ご注文完了</td>
+ <td class="order-step-unselected">5. ご注文完了</td>
</tr>
</table>
<br />
@@ -26,7 +26,7 @@
<form id="Form">
<input id="portalId-hidden" type="hidden" />
<div style="width:80%;text-align: left;">
- <div>
+ <div class="portlet-msg">
<span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
</div>
<br />
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productDetails.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productDetails.html 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productDetails.html 2007-10-12 07:13:39 UTC (rev 622)
@@ -7,9 +7,11 @@
</head>
<body>
<form id="productDetailsForm">
-<div><span id="messages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span></div>
+<div class="portlet-msg">
+ <span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
+</div>
<input id="productId" type="hidden" />
-<table style="width: 100%;">
+<table style="width: 95%;">
<tr>
<td width="300"><img id="detailsImage" src="" alt="画像" /></td>
<td align="left">
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productList.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productList.html 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productList.html 2007-10-12 07:13:39 UTC (rev 622)
@@ -36,7 +36,9 @@
<span id="isNotNewArrivalOrder-top"><a id="goProductList-newarrival" href="./productList.html?fixed_orderMode=newarrival">新着順</a></span>
<lable>]</lable>
</div>
-<div style="width: 100%;">
+<hr style="border-top: 1px dashed #999999;height: 1px;color: #ffffff;" size="1" noshade="noshade" />
+<br/>
+<div id="isNotEmptyRecord-countdisplay" style="width: 100%;">
<div style="display: inline;float: left;">
<span id="allRecordCount">131</span>件中 <span id="startRecordCount">31</span>〜<span id="endRecordCount">45</span>件目
</div>
@@ -49,13 +51,17 @@
</div>
</div>
</div>
+<div id="isEmptyRecord-message" style="width: 80%;">
+ <div>
+ <lable>ご指定のカテゴリに登録されている商品はありませんでした。</lable>
+ </div>
+</div>
<br/>
-<br/>
-<div style="width:100%;text-align:center;clear: both;">
+<div id="isNotEmptyRecord-records" style="width:100%;text-align:center;clear: both;">
<div id="isThumbnailDisplay" style="width: 100%;">
<div id="productItems-thumbnail" style="width:100%;">
<div style="float:left;width:240px">
- <a id="goProductDetails-image-thumbnail" href="productDetails.html?&productId=1"><img id="thumbnail-thumbnail" src="" alt="画像" border="0"/></a>
+ <a id="goProductDetails-image-thumbnail" href="productDetails.html?&productId=1"><img id="thumbnailByThumbnail" src="" alt="画像" border="0"/></a>
<br/>
<a id="goProductDetails-string-thumbnail" href="productDetails.html?&productId=1">
<span id="productName-thumbnail">AAAAAAA</span>
@@ -76,7 +82,7 @@
<tbody id="productItems-listwithimage">
<tr>
<td align="center">
- <a id="goProductDetails-image-listwithimage" href="productDetails.html?&productId=1"><img id="thumbnail-listwithimage" src="" alt="画像" border="0"/></a>
+ <a id="goProductDetails-image-listwithimage" href="productDetails.html?&productId=1"><img id="thumbnailByListWithImage" src="" alt="画像" border="0"/></a>
</td>
<td align="left">
<a id="goProductDetails-string-listwithimage" href="productDetails.html?&productId=1">
@@ -116,6 +122,7 @@
<br/>
<br/>
<div style="text-align: center;width: 100%;clear: both;">
+ <label>ページ: </label>
<div id="isExistPrePage-bottom" style="display: inline;">
<a id="goProductList-prev-bottom" href="productList.html?pageNumber=1&pageSize=1">前へ</a>
</div>
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupComplete.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupComplete.html 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupComplete.html 2007-10-12 07:13:39 UTC (rev 622)
@@ -10,7 +10,7 @@
<center>
<div style="width: 80%;text-align: left;">
<form id="checkoutCompleteForm">
- <div>
+ <div class="portlet-msg">
<span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
</div>
<br />
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupConfirm.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupConfirm.html 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupConfirm.html 2007-10-12 07:13:39 UTC (rev 622)
@@ -7,7 +7,7 @@
</head>
<body>
<form id="signupEditForm">
- <div>
+ <div class="portlet-msg">
<span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
</div>
<div style="width:100%;">
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html 2007-10-11 13:29:41 UTC (rev 621)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html 2007-10-12 07:13:39 UTC (rev 622)
@@ -7,7 +7,7 @@
</head>
<body>
<form id="signupEditForm">
- <div>
+ <div class="portlet-msg">
<span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
</div>
<div style="width:100%;">