svnno****@sourc*****
svnno****@sourc*****
2007年 11月 21日 (水) 17:16:26 JST
Revision: 723
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=723
Author: shinsuke
Date: 2007-11-21 17:16:25 +0900 (Wed, 21 Nov 2007)
Log Message:
-----------
decoration fixes.
Modified Paths:
--------------
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderEditPage.java
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/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/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/admin/order/OrderEditPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderEditPage.java 2007-11-21 08:14:58 UTC (rev 722)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderEditPage.java 2007-11-21 08:16:25 UTC (rev 723)
@@ -364,4 +364,34 @@
super.setDeliveryStreetAddress(deliveryStreetAddress);
}
+ /* (non-Javadoc)
+ * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setBillingTelephone(java.lang.String)
+ */
+ @Override
+ @Required
+ public void setBillingTelephone(String billingTelephone) {
+ // TODO Auto-generated method stub
+ super.setBillingTelephone(billingTelephone);
+ }
+
+ /* (non-Javadoc)
+ * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setCustomerTelephone(java.lang.String)
+ */
+ @Override
+ @Required
+ public void setCustomerTelephone(String customerTelephone) {
+ // TODO Auto-generated method stub
+ super.setCustomerTelephone(customerTelephone);
+ }
+
+ /* (non-Javadoc)
+ * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setDeliveryTelephone(java.lang.String)
+ */
+ @Override
+ @Required
+ public void setDeliveryTelephone(String deliveryTelephone) {
+ // TODO Auto-generated method stub
+ super.setDeliveryTelephone(deliveryTelephone);
+ }
+
}
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-11-21 08:14:58 UTC (rev 722)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderConfirm.html 2007-11-21 08:16:25 UTC (rev 723)
@@ -229,25 +229,25 @@
</td>
</tr>
<tr>
- <th>顧客名(名字):<font color="#009900">[必須]</font></th>
+ <th>顧客名(姓):<font color="#009900">[必須]</font></th>
<td>
<span id="customerLastname-display">abc</span><input type="hidden" id="customerLastname"/>
</td>
</tr>
<tr>
- <th>顧客名(名前):<font color="#009900">[必須]</font></th>
+ <th>顧客名(名):<font color="#009900">[必須]</font></th>
<td>
<span id="customerFirstname-display">abc</span><input type="hidden" id="customerFirstname"/>
</td>
</tr>
<tr>
- <th>顧客名(名字フリガナ):<font color="#009900">[必須]</font></th>
+ <th>顧客名(セイ):<font color="#009900">[必須]</font></th>
<td>
<span id="customerLastnameDescription-display">abc</span><input type="hidden" id="customerLastnameDescription"/>
</td>
</tr>
<tr>
- <th>顧客名(名前フリガナ):<font color="#009900">[必須]</font></th>
+ <th>顧客名(メイ):<font color="#009900">[必須]</font></th>
<td>
<span id="customerFirstnameDescription-display">abc</span><input type="hidden" id="customerFirstnameDescription"/>
</td>
@@ -330,25 +330,25 @@
<td>
<table>
<tr>
- <th>顧客名(名字):<font color="#009900">[必須]</font></th>
+ <th>顧客名(姓):<font color="#009900">[必須]</font></th>
<td>
<span id="deliveryLastname-display">abc</span><input type="hidden" id="deliveryLastname"/>
</td>
</tr>
<tr>
- <th>顧客名(名前):<font color="#009900">[必須]</font></th>
+ <th>顧客名(名):<font color="#009900">[必須]</font></th>
<td>
<span id="deliveryFirstname-display">abc</span><input type="hidden" id="deliveryFirstname"/>
</td>
</tr>
<tr>
- <th>顧客名(名字フリガナ):<font color="#009900">[必須]</font></th>
+ <th>顧客名(セイ):<font color="#009900">[必須]</font></th>
<td>
<span id="deliveryLastnameDescription-display">abc</span><input type="hidden" id="deliveryLastnameDescription"/>
</td>
</tr>
<tr>
- <th>顧客名(名前フリガナ):<font color="#009900">[必須]</font></th>
+ <th>顧客名(メイ):<font color="#009900">[必須]</font></th>
<td>
<span id="deliveryFirstnameDescription-display">abc</span><input type="hidden" id="deliveryFirstnameDescription"/>
</td>
@@ -413,25 +413,25 @@
<td>
<table>
<tr>
- <th>顧客名(名字):<font color="#009900">[必須]</font></th>
+ <th>顧客名(姓):<font color="#009900">[必須]</font></th>
<td>
<span id="billingLastname-display">abc</span><input type="hidden" id="billingLastname"/>
</td>
</tr>
<tr>
- <th>顧客名(名前):<font color="#009900">[必須]</font></th>
+ <th>顧客名(名):<font color="#009900">[必須]</font></th>
<td>
<span id="billingFirstname-display">abc</span><input type="hidden" id="billingFirstname"/>
</td>
</tr>
<tr>
- <th>顧客名(名字フリガナ):<font color="#009900">[必須]</font></th>
+ <th>顧客名(セイ):<font color="#009900">[必須]</font></th>
<td>
<span id="billingLastnameDescription-display">abc</span><input type="hidden" id="billingLastnameDescription"/>
</td>
</tr>
<tr>
- <th>顧客名(名前フリガナ):<font color="#009900">[必須]</font></th>
+ <th>顧客名(メイ):<font color="#009900">[必須]</font></th>
<td>
<span id="billingFirstnameDescription-display">abc</span><input type="hidden" id="billingFirstnameDescription"/>
</td>
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-11-21 08:14:58 UTC (rev 722)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.html 2007-11-21 08:16:25 UTC (rev 723)
@@ -233,25 +233,25 @@
</td>
</tr>
<tr>
- <th>顧客名(名字):<font color="#009900">[必須]</font></th>
+ <th>顧客名(姓):<font color="#009900">[必須]</font></th>
<td>
<input type="text" id="customerLastname" size="20" />
</td>
</tr>
<tr>
- <th>顧客名(名前):<font color="#009900">[必須]</font></th>
+ <th>顧客名(名):<font color="#009900">[必須]</font></th>
<td>
<input type="text" id="customerFirstname" size="20"/>
</td>
</tr>
<tr>
- <th>顧客名(名字フリガナ):<font color="#009900">[必須]</font></th>
+ <th>顧客名(セイ):<font color="#009900">[必須]</font></th>
<td>
<input type="text" id="customerLastnameDescription" size="20" />
</td>
</tr>
<tr>
- <th>顧客名(名前フリガナ):<font color="#009900">[必須]</font></th>
+ <th>顧客名(メイ):<font color="#009900">[必須]</font></th>
<td>
<input type="text" id="customerFirstnameDescription" size="20"/>
</td>
@@ -314,7 +314,7 @@
</td>
</tr>
<tr>
- <th>電話番号:</th>
+ <th>電話番号:<font color="#009900">[必須]</font></th>
<td>
<input type="text" id="customerTelephone" size="13"/>
</td>
@@ -337,25 +337,25 @@
<td>
<table>
<tr>
- <th>顧客名(名字):<font color="#009900">[必須]</font></th>
+ <th>顧客名(姓):<font color="#009900">[必須]</font></th>
<td>
<input type="text" id="deliveryLastname" size="20"/>
</td>
</tr>
<tr>
- <th>顧客名(名前):<font color="#009900">[必須]</font></th>
+ <th>顧客名(名):<font color="#009900">[必須]</font></th>
<td>
<input type="text" id="deliveryFirstname" size="20"/>
</td>
</tr>
<tr>
- <th>顧客名(名字フリガナ):<font color="#009900">[必須]</font></th>
+ <th>顧客名(セイ):<font color="#009900">[必須]</font></th>
<td>
<input type="text" id="deliveryLastnameDescription" size="20"/>
</td>
</tr>
<tr>
- <th>顧客名(名前フリガナ):<font color="#009900">[必須]</font></th>
+ <th>顧客名(メイ):<font color="#009900">[必須]</font></th>
<td>
<input type="text" id="deliveryFirstnameDescription" size="20"/>
</td>
@@ -397,7 +397,7 @@
</td>
</tr>
<tr>
- <th>電話番号:</th>
+ <th>電話番号:<font color="#009900">[必須]</font></th>
<td>
<input type="text" id="deliveryTelephone" size="13"/>
</td>
@@ -420,25 +420,25 @@
<td>
<table>
<tr>
- <th>顧客名(名字):<font color="#009900">[必須]</font></th>
+ <th>顧客名(姓):<font color="#009900">[必須]</font></th>
<td>
<input type="text" id="billingLastname" size="20"/>
</td>
</tr>
<tr>
- <th>顧客名(名前):<font color="#009900">[必須]</font></th>
+ <th>顧客名(名):<font color="#009900">[必須]</font></th>
<td>
<input type="text" id="billingFirstname" size="20"/>
</td>
</tr>
<tr>
- <th>顧客名(名字フリガナ):<font color="#009900">[必須]</font></th>
+ <th>顧客名(セイ):<font color="#009900">[必須]</font></th>
<td>
<input type="text" id="billingLastnameDescription" size="20"/>
</td>
</tr>
<tr>
- <th>顧客名(名前フリガナ):<font color="#009900">[必須]</font></th>
+ <th>顧客名(メイ):<font color="#009900">[必須]</font></th>
<td>
<input type="text" id="billingFirstnameDescription" size="20"/>
</td>
@@ -480,7 +480,7 @@
</td>
</tr>
<tr>
- <th>電話番号:</th>
+ <th>電話番号:<font color="#009900">[必須]</font></th>
<td>
<input type="text" id="billingTelephone" size="13"/>
</td>
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-11-21 08:14:58 UTC (rev 722)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userAddressSelect.html 2007-11-21 08:16:25 UTC (rev 723)
@@ -71,7 +71,7 @@
<table>
<tr>
<th align="left">
- <label>名字:</label>
+ <label>氏名(姓):</label>
<font color="#009900">[必須]</font>
</th>
<td>
@@ -80,7 +80,7 @@
</tr>
<tr>
<th align="left">
- <label>名前:</label>
+ <label>氏名(名):</label>
<font color="#009900">[必須]</font>
</th>
<td>
@@ -89,20 +89,22 @@
</tr>
<tr>
<th align="left">
- <label>名字 (フリガナ):</label>
+ <label>氏名(セイ):</label>
<font color="#009900">[必須]</font>
</th>
<td>
<input id="lastnameDescription" type="text" class="portlet-form-input-field" size="20" />
+ <label>(全角カタカナ)</label>
</td>
</tr>
<tr>
<th align="left">
- <label>名前 (フリガナ):</label>
+ <label>氏名(メイ):</label>
<font color="#009900">[必須]</font>
</th>
<td>
<input id="firstnameDescription" type="text" class="portlet-form-input-field" size="20" />
+ <label>(全角カタカナ)</label>
</td>
</tr>
<tr>
@@ -135,6 +137,7 @@
</th>
<td>
<input id="city" type="text" class="portlet-form-input-field" size="20" />
+ <label>(例: 新宿区)</label>
</td>
</tr>
<tr>
@@ -144,6 +147,7 @@
</th>
<td>
<input id="streetAddress" type="text" class="portlet-form-input-field" size="40" />
+ <label>(例: 市谷田町1-2)</label>
</td>
</tr>
<tr>
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-11-21 08:14:58 UTC (rev 722)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html 2007-11-21 08:16:25 UTC (rev 723)
@@ -49,7 +49,7 @@
<tbody>
<tr>
<th align="left">
- <label>名字:</label>
+ <label>氏名(姓):</label>
<font color="#009900">[必須]</font>
</th>
<td>
@@ -58,7 +58,7 @@
</tr>
<tr>
<th align="left">
- <label>名前:</label>
+ <label>氏名(名):</label>
<font color="#009900">[必須]</font>
</th>
<td>
@@ -67,20 +67,22 @@
</tr>
<tr>
<th align="left">
- <label>名字 (フリガナ):</label>
+ <label>氏名(セイ):</label>
<font color="#009900">[必須]</font>
</th>
<td>
<input id="lastnameDescription" type="text" class="portlet-form-input-field" size="20" />
+ <label>(全角カタカナ)</label>
</td>
</tr>
<tr>
<th align="left">
- <label>名前 (フリガナ):</label>
+ <label>氏名(メイ):</label>
<font color="#009900">[必須]</font>
</th>
<td>
<input id="firstnameDescription" type="text" class="portlet-form-input-field" size="20" />
+ <label>(全角カタカナ)</label>
</td>
</tr>
<tr>
@@ -178,6 +180,7 @@
</th>
<td>
<input id="city" type="text" class="portlet-form-input-field" size="20" />
+ <label>(例: 新宿区)</label>
</td>
</tr>
<tr>
@@ -187,6 +190,7 @@
</th>
<td>
<input id="streetAddress" type="text" class="portlet-form-input-field" size="40" />
+ <label>(例: 市谷田町1-2)</label>
</td>
</tr>
<tr>
@@ -263,7 +267,7 @@
<tbody>
<tr>
<th align="left">
- <label>名字:</label>
+ <label>氏名(姓):</label>
</th>
<td>
<span id="lastname-display">VALUE</span>
@@ -271,7 +275,7 @@
</tr>
<tr>
<th align="left">
- <label>名前:</label>
+ <label>氏名(名):</label>
</th>
<td>
<span id="firstname-display">VALUE</span>
@@ -279,7 +283,7 @@
</tr>
<tr>
<th align="left">
- <label>名字 (フリガナ):</label>
+ <label>氏名(セイ):</label>
</th>
<td>
<span id="lastnameDescription-display">VALUE</span>
@@ -287,7 +291,7 @@
</tr>
<tr>
<th align="left">
- <label>名前 (フリガナ):</label>
+ <label>氏名(セイ):</label>
</th>
<td>
<span id="firstnameDescription-display">VALUE</span>
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-11-21 08:14:58 UTC (rev 722)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupConfirm.html 2007-11-21 08:16:25 UTC (rev 723)
@@ -33,7 +33,7 @@
</tr>
<tr>
<th align="left">
- <label>名字:</label>
+ <label>氏名(姓):</label>
</th>
<td>
<span id="lastname">abc</span><input id="lastname-hidden" type="hidden"/>
@@ -41,7 +41,7 @@
</tr>
<tr>
<th align="left">
- <label>名前:</label>
+ <label>氏名(名):</label>
</th>
<td>
<span id="firstname">abc</span><input id="firstname-hidden" type="hidden"/>
@@ -49,7 +49,7 @@
</tr>
<tr>
<th align="left">
- <label>名字 (フリガナ):</label>
+ <label>氏名(セイ):</label>
</th>
<td>
<span id="lastnameDescription">abc</span><input id="lastnameDescription-hidden" type="hidden"/>
@@ -57,7 +57,7 @@
</tr>
<tr>
<th align="left">
- <label>名前 (フリガナ):</label>
+ <label>氏名(メイ):</label>
</th>
<td>
<span id="firstnameDescription">abc</span><input id="firstnameDescription-hidden" type="hidden"/>
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-11-21 08:14:58 UTC (rev 722)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html 2007-11-21 08:16:25 UTC (rev 723)
@@ -35,7 +35,7 @@
</tr>
<tr>
<th align="left">
- <label>名字:</label>
+ <label>氏名(姓):</label>
<font color="#009900">[必須]</font>
</th>
<td>
@@ -44,7 +44,7 @@
</tr>
<tr>
<th align="left">
- <label>名前:</label>
+ <label>氏名(名):</label>
<font color="#009900">[必須]</font>
</th>
<td>
@@ -53,20 +53,22 @@
</tr>
<tr>
<th align="left">
- <label>名字 (フリガナ):</label>
+ <label>氏名(セイ):</label>
<font color="#009900">[必須]</font>
</th>
<td>
<input id="lastnameDescription" type="text" class="portlet-form-input-field" size="20" />
+ <label>(全角カタカナ)</label>
</td>
</tr>
<tr>
<th align="left">
- <label>名前 (フリガナ):</label>
+ <label>氏名(メイ):</label>
<font color="#009900">[必須]</font>
</th>
<td>
<input id="firstnameDescription" type="text" class="portlet-form-input-field" size="20" />
+ <label>(全角カタカナ)</label>
</td>
</tr>
<tr>
@@ -163,6 +165,7 @@
</th>
<td>
<input id="city" type="text" class="portlet-form-input-field" size="20" />
+ <label>(例: 新宿区)</label>
</td>
</tr>
<tr>
@@ -172,6 +175,7 @@
</th>
<td>
<input id="streetAddress" type="text" class="portlet-form-input-field" size="40" />
+ <label>(例: 市谷田町1-2)</label>
</td>
</tr>
<tr>