svnno****@sourc*****
svnno****@sourc*****
2007年 10月 5日 (金) 17:57:34 JST
Revision: 605 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=605 Author: shinsuke Date: 2007-10-05 17:57:34 +0900 (Fri, 05 Oct 2007) Log Message: ----------- display no image. clean up order pages. fixed minor bugs. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/pom.xml pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductEditAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/CategoryListAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/CategoryListPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.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/webapp/WEB-INF/portlet.xml 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/categoryList.html -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/pom.xml =================================================================== --- pompei/portlets/pompei-core/trunk/pom.xml 2007-10-05 08:53:42 UTC (rev 604) +++ pompei/portlets/pompei-core/trunk/pom.xml 2007-10-05 08:57:34 UTC (rev 605) @@ -207,7 +207,7 @@ <dependency> <groupId>org.seasar.teeda</groupId> <artifactId>teeda-extension</artifactId> - <version>1.0.11</version> + <version>1.0.12-EA1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.seasar.teeda</groupId> Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java 2007-10-05 08:53:42 UTC (rev 604) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java 2007-10-05 08:57:34 UTC (rev 605) @@ -93,7 +93,11 @@ public static final String THUMBNAIL_IMAGE_URL = "thumbnailImageUrl"; + public static final String DEFAULT_THUMBNAIL_IMAGE_NAME = "noimage.png"; + public static final String DETAILS_IMAGE_URL = "detailsImageUrl"; + public static final String DEFAULT_DETAILS_IMAGE_NAME = "noimage.png"; + public static final String DISPLAYED_ORDER_COMPLETION = "DisplayedOrderCompletion"; } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductEditAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductEditAction.java 2007-10-05 08:53:42 UTC (rev 604) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductEditAction.java 2007-10-05 08:57:34 UTC (rev 605) @@ -54,6 +54,12 @@ private ManufacturerDxo manufacturerDxo; public Class<?> initialize() { + // manufacturer + getProductEditPage().setManufacturerIdItems(getManufacturerIdList()); + // tax + getProductEditPage().setTaxClassIdItems(getTaxClassIdList()); + // status + getProductEditPage().setStatusItems(getStatusList()); return null; } @@ -88,13 +94,6 @@ } public Class<?> prerender() { - //TODO initialize - // manufacturer - getProductEditPage().setManufacturerIdItems(getManufacturerIdList()); - // tax - getProductEditPage().setTaxClassIdItems(getTaxClassIdList()); - // status - getProductEditPage().setStatusItems(getStatusList()); if (isUpdate()) { // update Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmPage.java 2007-10-05 08:53:42 UTC (rev 604) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmPage.java 2007-10-05 08:57:34 UTC (rev 605) @@ -5,6 +5,7 @@ import java.util.List; import java.util.Map; +import org.seasar.teeda.extension.annotation.convert.BigDecimalConverter; import org.seasar.teeda.extension.util.LabelHelper; public class CheckoutConfirmPage implements Serializable { @@ -20,6 +21,8 @@ private String deliveryMethodName; + //TODO i18n + @BigDecimalConverter(pattern = "###,###") private BigDecimal deliveryPrice; private String cellphone; @@ -28,6 +31,8 @@ private String company; + private String department; + private String fax; private String firstname; @@ -44,6 +49,8 @@ private String telephone; + //TODO i18n + @BigDecimalConverter(pattern = "###,###") private BigDecimal finalPrice; private String manufacturerName; @@ -58,10 +65,16 @@ private BigDecimal quantity; + //TODO i18n + @BigDecimalConverter(pattern = "###,###") private BigDecimal subTotalPrice; + //TODO i18n + @BigDecimalConverter(pattern = "###,###") private BigDecimal tax; + //TODO i18n + @BigDecimalConverter(pattern = "###,###") private BigDecimal totalPrice; private String orderFormNumber; @@ -296,4 +309,18 @@ public void setOrderFormNumber(String orderFormNumber) { this.orderFormNumber = orderFormNumber; } + + /** + * @return department + */ + public String getDepartment() { + return department; + } + + /** + * @param department 設定する department + */ + public void setDepartment(String department) { + this.department = department; + } } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectAction.java 2007-10-05 08:53:42 UTC (rev 604) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectAction.java 2007-10-05 08:57:34 UTC (rev 605) @@ -2,11 +2,15 @@ import java.io.Serializable; import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; import javax.faces.context.FacesContext; +import jp.sf.pal.common.util.DateUtil; import jp.sf.pal.common.util.FacesMessageUtil; import jp.sf.pal.pompei.PompeiConstants; import jp.sf.pal.pompei.dxo.CardTypeDxo; @@ -53,6 +57,31 @@ private CardTypeDxo cardTypeDxo; public Class<?> initialize() { + // ccExpiresYear + Date now = new Date(); + List<Map<String, String>> ccExpiresYearItems = new ArrayList<Map<String, String>>(); + int year = DateUtil.getYear(now) + 1900; + for (int i = 0; i < 20; i++) { + Map<String, String> map = new HashMap<String, String>(); + map.put("label", Integer.toString(year + i)); + map.put("value", Integer.toString(year + i)); + ccExpiresYearItems.add(map); + } + getPaymentSelectPage().setCcExpiresYearItems(ccExpiresYearItems); + // getPaymentSelectPage().setCcExpiresYear(Integer.toString(year)); + + // ccExpiresMonth + List<Map<String, String>> ccExpiresMonthItems = new ArrayList<Map<String, String>>(); + for (int i = 1; i < 13; i++) { + Map<String, String> map = new HashMap<String, String>(); + map.put("label", Integer.toString(i)); + map.put("value", Integer.toString(i)); + ccExpiresMonthItems.add(map); + } + getPaymentSelectPage().setCcExpiresMonthItems(ccExpiresMonthItems); + // getPaymentSelectPage().setCcExpiresMonth( + // Integer.toString(DateUtil.getMonth(now) + 1)); + return null; } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectPage.java 2007-10-05 08:53:42 UTC (rev 604) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectPage.java 2007-10-05 08:57:34 UTC (rev 605) @@ -16,8 +16,12 @@ private String ccExpiresMonth; + private List<Map<String, String>> ccExpiresMonthItems; + private String ccExpiresYear; + private List<Map<String, String>> ccExpiresYearItems; + private String ccNumber1; private String ccNumber2; @@ -290,4 +294,32 @@ this.targetPaymentMethodId = targetPaymentMethodId; } + /** + * @return ccExpiresMonthItems + */ + public List<Map<String, String>> getCcExpiresMonthItems() { + return ccExpiresMonthItems; + } + + /** + * @param ccExpiresMonthItems 設定する ccExpiresMonthItems + */ + public void setCcExpiresMonthItems(List<Map<String, String>> ccExpiresMonthItems) { + this.ccExpiresMonthItems = ccExpiresMonthItems; + } + + /** + * @return ccExpiresYearItems + */ + public List<Map<String, String>> getCcExpiresYearItems() { + return ccExpiresYearItems; + } + + /** + * @param ccExpiresYearItems 設定する ccExpiresYearItems + */ + public void setCcExpiresYearItems(List<Map<String, String>> ccExpiresYearItems) { + this.ccExpiresYearItems = ccExpiresYearItems; + } + } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectAction.java 2007-10-05 08:53:42 UTC (rev 604) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectAction.java 2007-10-05 08:57:34 UTC (rev 605) @@ -41,6 +41,18 @@ private CustomerDxo customerDxo; public Class<?> initialize() { + // state items + List<Map<String, String>> stateItems = new ArrayList<Map<String, String>>(); + String states = getUserAddressSelectPage().getLabelHelper() + .getLabelValue("state.items"); + String[] stateArray = states.split(","); + for (String state : stateArray) { + Map<String, String> map = new HashMap<String, String>(); + map.put("label", state); + map.put("value", state); + stateItems.add(map); + } + getUserAddressSelectPage().setStateItems(stateItems); return null; } @@ -92,7 +104,27 @@ return null; } + // private void postprocessingForRender() { + // // postcode + // if (getUserAddressSelectPage().getPostcode() != null) { + // String[] postcode = getUserAddressSelectPage().getPostcode().split( + // "-"); + // if (postcode.length == 2) { + // getUserAddressSelectPage().setPrimaryPostcode(postcode[0]); + // getUserAddressSelectPage().setSecondaryPostcode(postcode[1]); + // } + // } + // } + + private void preprocessingForUpdate() { + // postcode + getUserAddressSelectPage().setPostcode( + getUserAddressSelectPage().getPrimaryPostcode() + "-" + + getUserAddressSelectPage().getSecondaryPostcode()); + } + public Class<?> doEdit() { + preprocessingForUpdate(); //TODO move to edit page return null; } @@ -113,6 +145,8 @@ return UserInfoEditPage.class; } + preprocessingForUpdate(); + AddressBook addressBook = new AddressBook(); getCustomerDxo().convert(getUserAddressSelectPage(), addressBook); addressBook.setAddressBookId(null); Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectPage.java 2007-10-05 08:53:42 UTC (rev 604) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectPage.java 2007-10-05 08:57:34 UTC (rev 605) @@ -4,6 +4,9 @@ import java.util.List; import java.util.Map; +import org.seasar.teeda.extension.annotation.validator.Required; +import org.seasar.teeda.extension.util.LabelHelper; + public class UserAddressSelectPage implements Serializable { /** @@ -11,6 +14,8 @@ */ private static final long serialVersionUID = -2196818928662366687L; + private LabelHelper labelHelper; + private String orderProcessId; private int addressBookIdIndex; @@ -21,20 +26,39 @@ private String cellphone; + @Required private String city; private String company; private String fax; + @Required private String firstname; + @Required + private String firstnameDescription; + + @Required private String lastname; + @Required + private String lastnameDescription; + private String postcode; + @Required + private String primaryPostcode; + + @Required + private String secondaryPostcode; + + private List<Map<String, String>> stateItems; + + @Required private String state; + @Required private String streetAddress; private String telephone; @@ -186,4 +210,88 @@ this.department = department; } + /** + * @return firstnameDescription + */ + public String getFirstnameDescription() { + return firstnameDescription; + } + + /** + * @param firstnameDescription 設定する firstnameDescription + */ + public void setFirstnameDescription(String firstnameDescription) { + this.firstnameDescription = firstnameDescription; + } + + /** + * @return lastnameDescription + */ + public String getLastnameDescription() { + return lastnameDescription; + } + + /** + * @param lastnameDescription 設定する lastnameDescription + */ + public void setLastnameDescription(String lastnameDescription) { + this.lastnameDescription = lastnameDescription; + } + + /** + * @return primaryPostcode + */ + public String getPrimaryPostcode() { + return primaryPostcode; + } + + /** + * @param primaryPostcode 設定する primaryPostcode + */ + public void setPrimaryPostcode(String primaryPostcode) { + this.primaryPostcode = primaryPostcode; + } + + /** + * @return secondaryPostcode + */ + public String getSecondaryPostcode() { + return secondaryPostcode; + } + + /** + * @param secondaryPostcode 設定する secondaryPostcode + */ + public void setSecondaryPostcode(String secondaryPostcode) { + this.secondaryPostcode = secondaryPostcode; + } + + /** + * @return stateItems + */ + public List<Map<String, String>> getStateItems() { + return stateItems; + } + + /** + * @param stateItems 設定する stateItems + */ + public void setStateItems(List<Map<String, String>> stateItems) { + this.stateItems = stateItems; + } + + /** + * @return labelHelper + */ + public LabelHelper getLabelHelper() { + return labelHelper; + } + + /** + * @param labelHelper 設定する labelHelper + */ + public void setLabelHelper(LabelHelper labelHelper) { + this.labelHelper = labelHelper; + } + } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditAction.java 2007-10-05 08:53:42 UTC (rev 604) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditAction.java 2007-10-05 08:57:34 UTC (rev 605) @@ -44,11 +44,6 @@ private CustomerDxo customerDxo; public Class<?> initialize() { - return null; - } - - public Class<?> prerender() { - //TODO to initialize // state items List<Map<String, String>> stateItems = new ArrayList<Map<String, String>>(); String states = getUserInfoEditPage().getLabelHelper().getLabelValue( @@ -95,7 +90,10 @@ getUserInfoEditPage().setDateOfDayOfBirthItems(dateOfDayOfBirthItems); getUserInfoEditPage().setDateOfDayOfBirth( new Integer(DateUtil.getDate(now))); + return null; + } + public Class<?> prerender() { // check login String remoteUser = FacesContext.getCurrentInstance() .getExternalContext().getRemoteUser(); Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/CategoryListAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/CategoryListAction.java 2007-10-05 08:53:42 UTC (rev 604) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/CategoryListAction.java 2007-10-05 08:57:34 UTC (rev 605) @@ -89,6 +89,9 @@ getCategoryService().getSubCategoryDescriptionList( getCategoryListPage().getCategoryId()))); + // set current category id + getCategoryListPage().setCurrentCategoryId(currentCategoryId); + return null; } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/CategoryListPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/CategoryListPage.java 2007-10-05 08:53:42 UTC (rev 604) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/CategoryListPage.java 2007-10-05 08:57:34 UTC (rev 605) @@ -26,6 +26,8 @@ private BigDecimal targetId; + private BigDecimal currentCategoryId; + public int getBreadcrumbIndex() { return breadcrumbIndex; } @@ -96,4 +98,26 @@ this.targetId = targetId; } + /** + * @return currentCategoryId + */ + public BigDecimal getCurrentCategoryId() { + return currentCategoryId; + } + + /** + * @param currentCategoryId 設定する currentCategoryId + */ + public void setCurrentCategoryId(BigDecimal currentCategoryId) { + this.currentCategoryId = currentCategoryId; + } + + public boolean isSelected() { + if (getCurrentCategoryId() != null) { + if (getCurrentCategoryId().equals(getCategoryId())) { + return true; + } + } + return false; + } } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java 2007-10-05 08:53:42 UTC (rev 604) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java 2007-10-05 08:57:34 UTC (rev 605) @@ -19,6 +19,7 @@ import jp.sf.pal.pompei.service.CartService; import jp.sf.pal.pompei.service.CustomerService; import jp.sf.pal.pompei.service.ProductService; +import jp.sf.pal.pompei.util.SessionUtil; import jp.sf.pal.pompei.util.UploadedFileUtil; public class ProductDetailsAction implements Serializable { @@ -46,9 +47,6 @@ } public Class<?> prerender() { - if (getProductDetailsPage().getProductId() == null) { - return ProductListPage.class; - } // check login String remoteUser = FacesContext.getCurrentInstance() @@ -69,6 +67,21 @@ } } + // check if category is changed + Object ccid = SessionUtil + .getFromApplicationScope(PompeiConstants.CURRENT_CATEGORY_ID); + if (ccid == null + || !ccid + .equals(SessionUtil + .getFromLocalScope(PompeiConstants.CURRENT_CATEGORY_ID))) { + return ProductListPage.class; + } + + // check product + if (getProductDetailsPage().getProductId() == null) { + return ProductListPage.class; + } + ProductDescription description = productService .getProdcutsDescription(getProductDetailsPage().getProductId()); productDxo.convert(description, productDetailsPage); @@ -87,7 +100,11 @@ UploadedFileUtil.getProductImageUrl(productImage .getImageName())); } else { - getProductDetailsPage().setDetailsImageUrl(""); + // default image + getProductDetailsPage() + .setDetailsImageUrl( + UploadedFileUtil + .getProductImageUrl(PompeiConstants.DEFAULT_DETAILS_IMAGE_NAME)); } // render faces messages 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-05 08:53:42 UTC (rev 604) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java 2007-10-05 08:57:34 UTC (rev 605) @@ -57,6 +57,10 @@ //TODO should put it to session? } + // store category id to local session + SessionUtil.putToLocalScope(PompeiConstants.CURRENT_CATEGORY_ID, + currentCategoryId); + //商品一覧の取得 List<Product> list = getProductService().getProductList( currentCategoryId); @@ -87,8 +91,12 @@ UploadedFileUtil.getProductImageUrl(productImage .getImageName())); } else { - // TODO set default image path - map.put(PompeiConstants.THUMBNAIL_IMAGE_URL, ""); + // set default image path + map + .put( + PompeiConstants.THUMBNAIL_IMAGE_URL, + UploadedFileUtil + .getProductImageUrl(PompeiConstants.DEFAULT_THUMBNAIL_IMAGE_NAME)); } } 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-05 08:53:42 UTC (rev 604) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/portlet.xml 2007-10-05 08:57:34 UTC (rev 605) @@ -42,6 +42,7 @@ <name>edit-page</name> <value></value> </init-param> --> + <expiration-cache>0</expiration-cache> <supports> <mime-type>text/html</mime-type> <portlet-mode>VIEW</portlet-mode> @@ -83,6 +84,7 @@ <name>edit-page</name> <value></value> </init-param> --> + <expiration-cache>0</expiration-cache> <supports> <mime-type>text/html</mime-type> <portlet-mode>VIEW</portlet-mode> @@ -124,6 +126,7 @@ <name>edit-page</name> <value></value> </init-param> --> + <expiration-cache>0</expiration-cache> <supports> <mime-type>text/html</mime-type> <portlet-mode>VIEW</portlet-mode> @@ -161,6 +164,7 @@ <name>edit-page</name> <value></value> </init-param> --> + <expiration-cache>0</expiration-cache> <supports> <mime-type>text/html</mime-type> <portlet-mode>VIEW</portlet-mode> @@ -198,6 +202,7 @@ <name>edit-page</name> <value></value> </init-param> --> + <expiration-cache>0</expiration-cache> <supports> <mime-type>text/html</mime-type> <portlet-mode>VIEW</portlet-mode> @@ -235,6 +240,7 @@ <name>edit-page</name> <value></value> </init-param> --> + <expiration-cache>0</expiration-cache> <supports> <mime-type>text/html</mime-type> <portlet-mode>VIEW</portlet-mode> @@ -272,6 +278,7 @@ <name>edit-page</name> <value></value> </init-param> --> + <expiration-cache>0</expiration-cache> <supports> <mime-type>text/html</mime-type> <portlet-mode>VIEW</portlet-mode> @@ -309,6 +316,7 @@ <name>edit-page</name> <value></value> </init-param> --> + <expiration-cache>0</expiration-cache> <supports> <mime-type>text/html</mime-type> <portlet-mode>VIEW</portlet-mode> @@ -346,6 +354,7 @@ <name>edit-page</name> <value></value> </init-param> --> + <expiration-cache>0</expiration-cache> <supports> <mime-type>text/html</mime-type> <portlet-mode>VIEW</portlet-mode> @@ -383,6 +392,7 @@ <name>edit-page</name> <value></value> </init-param> --> + <expiration-cache>0</expiration-cache> <supports> <mime-type>text/html</mime-type> <portlet-mode>VIEW</portlet-mode> 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-05 08:53:42 UTC (rev 604) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/cart/productList.html 2007-10-05 08:57:34 UTC (rev 605) @@ -1,83 +1,128 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ja" lang="ja"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<title id="title-head">カート画面</title> -</head> -<body> -<form id="form" method="post"> -<div id="isUser" style="width: 100%;"> -<center> -<table border="1" style="width: 80%;"> - <thead> - <tr style="dummy"> - <th align="center"><label>商品名</label></th> - <th align="center" width="100"><label>単価</label></th> - <th align="center" width="60"><label>数量</label></th> - <th align="center" width="100"><label>小計</label></th> - <th align="center" width="50"><label>消費税</label></th> - <th align="center" width="40"><label>送料</label></th> - <th align="center" width="50"><label>代引料</label></th> - <th> </th> - </tr> - </thead> - <tbody id="productItems"> - <tr style="dummy"> - <td align="left"> - <span id="productName">XXX 01MAX</span><br/> - <label>コード:</label><span id="productCode">MX-XXX</span><br/> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ja" lang="ja"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title id="title-head">カート画面</title> + </head> + <body> + <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> + <table border="1" style="width: 100%;"> + <thead> + <tr style="dummy"> + <th align="center"> + <label>商品名</label> + </th> + <th align="center" width="100"> + <label>単価</label> + </th> + <th align="center" width="60"> + <label>数量</label> + </th> + <th align="center" width="100"> + <label>小計</label> + </th> + <th align="center" width="50"> + <label>消費税</label> + </th> + <th align="center" width="40"> + <label>送料</label> + </th> + <th align="center" width="50"> + <label>代引料</label> + </th> + <th> </th> + </tr> + </thead> + <tbody id="productItems"> + <tr style="dummy"> + <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 style="width: 80%;margin-top: 20px;"> - <a id="orderLink" href="">購入手続きへ</a> - <hr style="border-top: 1px dashed #999999;height: 1px;color: #ffffff;" size="1" noshade="noshade"/> - <div> - <a id="productListLink" href="">お買物を続ける</a> - </div> - </div> -</center> -</div> -<div id="isLogin" style="width: 100%;"> - <center> - <label> - 会員情報を登録する必要があります。<br/> + </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> + <hr style="border-top: 1px dashed #999999;height: 1px;color: #ffffff;" size="1" noshade="noshade" /> + <div> + <a id="productListLink" href="">お買物を続ける</a> + </div> + </div> + </center> + </div> + <div id="isNotUser" style="width: 100%;"> + <div id="isLogin" style="width: 100%;"> + <center> + <label> + 会員情報を登録する必要があります。<br /> 以下のリンクをクリックしてユーザー登録をお願いいたします。 </label> - <br/> - <br/> - <a id="registerLink" href="">ユーザー登録へ進む</a> - </center> -</div> -<div id="isNotLogin" style="width: 100%;"> - <center> - <label> - 商品をカートに入れるためにはログインする必要があります。<br/> + <br /> + <br /> + <a id="orderLink" href="">会員登録へ進む</a> + </center> + </div> + <div id="isNotLogin" style="width: 100%;"> + <center> + <label> + 商品をカートに入れるためにはログインする必要があります。<br /> ユーザー登録をされていない場合は、以下のリンクをクリックしてユーザー登録をお願いいたします。 </label> - <br/> - <br/> - <a id="registerLink" href="">ユーザー登録へ進む</a> - </center> -</div> -</form> -</body></html> + <br /> + <br /> + <a id="registerLink" href="">ユーザー登録へ進む</a> + </center> + </div> + </div> + </form> + </body> +</html> 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-05 08:53:42 UTC (rev 604) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutComplete.html 2007-10-05 08:57:34 UTC (rev 605) @@ -1,25 +1,62 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ja" lang="ja"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title id="title-head">注文受付画面</title> - </head> - <body> - <form id="checkoutCompleteForm"> - <h2> - <label>注文受付</label> - </h2> - <div> - <span id="messages"></span> - </div> - <div> - <label>注文番号:</label><span id="orderFormNumber"></span> - </div> - <label>注文を受け付けました。 -<br />ご注文有難うございました。 -<br />またのご利用をお待ちしております。</label> - <br /> - </form> - </body> -</html> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ja" lang="ja"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title id="title-head">注文受付画面</title> + </head> + <body> + <div style="width:100%;"> + <center> + <table border="0" width="80%"> + <tr> + <td align="center" bgcolor="#a7a596">1. 会員情報の確認</td> + <td>></td> + <td align="center" bgcolor="#a7a596">2. お届け先の選択</td> + <td>></td> + <td align="center" bgcolor="#a7a596">3. 支払方法とお届け方法の選択</td> + <td>></td> + <td align="center" bgcolor="#a7a596">4. ご注文内容の確認</td> + <td>></td> + <td align="center" bgcolor="#ffd153">5. ご注文完了</td> + </tr> + </table> + <br /> + <br /> + <div style="width: 80%;text-align: left;"> + <form id="checkoutCompleteForm"> + <div> + <span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span> + </div> + <br /> + <div style="font-size: 14pt;font-weight: bold;"><span style="color:#ff9900;">5.</span> ご注文が完了しました</div> + <table style="border-top: 1px solid silver;border-bottom: 1px solid silver;width: 100%;"> + <tr> + <td width="10" bgcolor="#ffd153"> </td> + <td width="100" bgcolor="#fff1a1" valign="top" align="center"> + <label>注文番号</label> + </td> + <td> + <div style="margin: 5px;"> + <strong> + <span id="orderFormNumber">12345</span> + </strong> + </div> + <br /> + <div> + <label>注文を受け付けました。 + <br /> + ご注文有難うございました。 + <br /> + またのご利用をお待ちしております。 + </label> + </div> + </td> + </tr> + </table> + </form> + </div> + </center> + </div> + </body> +</html> 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-05 08:53:42 UTC (rev 604) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html 2007-10-05 08:57:34 UTC (rev 605) @@ -1,216 +1,245 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ja" lang="ja"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title id="title-head">注文確認画面</title> - </head> - <body> -<div style="width:100%;"> -<center> -<table border="0" width="80%"> - <tr> - <td align="center" bgcolor="#a7a596">1. 会員情報の確認</td> - <td>></td> - <td align="center" bgcolor="#a7a596">2. お届け先の選択</td> - <td>></td> - <td align="center" bgcolor="#a7a596">3. 支払方法とお届け方法の選択</td> - <td>></td> - <td align="center" bgcolor="#ffd153">4. ご注文内容の確認</td> - <td>></td> - <td align="center" bgcolor="#e1de81">5. ご注文完了</td> - </tr> -</table> -</center> -</div> - <form id="checkoutConfirmForm"> - <input id="orderProcessId" type="hidden"/> - <div> - <span id="allMessages"></span> - </div> - <table border="1"> - <tr> - <th> - <label>注文商品</label> - </th> - <td> - <table border="1"> - <thead> - <tr style="dummy" height="20px"> - <th> - <label>商品名</label> - </th> - <th> - <label>型番</label> - </th> - <th> - <label>メーカー</label> - </th> - <th> - <label>数量</label> - </th> - <th> - <label>価格</label> - </th> - </tr> - </thead> - <tbody id="customerBasketItems"> - <tr style="dummy"> - <td> - <span id="name">XXX 01MAX</span> - </td> - <td> - <span id="model">MX-XXX</span> - </td> - <td> - <span id="manufacturerName">アディダス</span> - </td> - <td> - <span id="quantity">1</span> - </td> - <td> - <span id="finalPrice">30,000</span> - </td> - </tr> - </tbody> - <tfoot> - <tr> - <td colspan="4" align="right">小計</td> - <td colspan="2"><span id="subTotalPrice">30,000</span><input type="hidden" id="subTotalPrice-hidden"/></td> - </tr> - <tr> - <td colspan="4" align="right">送料</td> - <td colspan="2"><span id="deliveryPrice">1000</span><input type="hidden" id="deliveryPrice-hidden"/></td> - </tr> - <tr> - <td colspan="4" align="right">消費税</td> - <td colspan="2"><span id="tax">50</span><input type="hidden" id="tax-hidden"/></td> - </tr> - <tr> - <td colspan="4" align="right">合計</td> - <td colspan="2"><span id="totalPrice">31,050</span><input type="hidden" id="totalPrice-hidden"/></td> - </tr> - </tfoot> - </table> - </td> - </tr> - <tr> - <th> - <label>お届け先</label> - </th> - <td> - <table border="1"> - <tr style="dummy" height="20px"> - <th> - <label>氏名(姓)</label> - </th> - <td> - <span id="lastname">VALUE</span> - </td> - </tr> - <tr style="dummy" height="20px"> - <th> - <label>氏名(名)</label> - </th> - <td> - <span id="firstname">VALUE</span> - </td> - </tr> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ja" lang="ja"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title id="title-head">注文確認画面</title> + </head> + <body> + <div style="width:100%;"> + <center> + <table border="0" width="80%"> + <tr> + <td align="center" bgcolor="#a7a596">1. 会員情報の確認</td> + <td>></td> + <td align="center" bgcolor="#a7a596">2. お届け先の選択</td> + <td>></td> + <td align="center" bgcolor="#a7a596">3. 支払方法とお届け方法の選択</td> + <td>></td> + <td align="center" bgcolor="#ffd153">4. ご注文内容の確認</td> + <td>></td> + <td align="center" bgcolor="#e1de81">5. ご注文完了</td> + </tr> + </table> + <br /> + <br /> + <div style="width: 80%;text-align: left;"> + <form id="checkoutConfirmForm"> + <input id="orderProcessId" type="hidden" /> + <div> + <span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span> + </div> + <br /> + <div style="font-size: 14pt;font-weight: bold;"><span style="color:#ff9900;">4.</span> ご注文内容をご確認ください</div> + <table style="border-top: 1px solid silver;border-bottom: 1px solid silver;width: 100%;"> <tr> - <th> - <label>性別:</label> - </th> + <td width="10" bgcolor="#ffd153"> </td> + <td width="100" bgcolor="#fff1a1" valign="top" align="center"> + <label>ご注文商品</label> + </td> <td> - <span id="genderString">男性</span> + <table style="width: 100%;" border="1" cellspacing="0"> + <thead> + <tr> + <th> + <label>商品名</label> + </th> + <th> + <label>型番</label> + </th> + <th> + <label>メーカー</label> + </th> + <th align="center"> + <label>数量</label> + </th> + <th align="center" width="100"> + <label>価格</label> + </th> + </tr> + </thead> + <tbody id="customerBasketItems"> + <tr> + <td> + <span id="name">XXX 01MAX</span> + </td> + <td> + <span id="model">MX-XXX</span> + </td> + <td> + <span id="manufacturerName">アディダス</span> + </td> + <td align="right"> + <span id="quantity">1</span> + </td> + <td align="right"> + <span id="finalPrice">30,000</span> + </td> + </tr> + </tbody> + <tfoot> + <tr> + <td colspan="4" align="right">小計</td> + <td colspan="2" align="right"> + <span id="subTotalPrice">30,000</span> + <input type="hidden" id="subTotalPrice-hidden" /> + </td> + </tr> + <tr> + <td colspan="4" align="right">送料</td> + <td colspan="2" align="right"> + <span id="deliveryPrice">1000</span> + <input type="hidden" id="deliveryPrice-hidden" /> + </td> + </tr> + <tr> + <td colspan="4" align="right">消費税</td> + <td colspan="2" align="right"> + <span id="tax">50</span> + <input type="hidden" id="tax-hidden" /> + </td> + </tr> + <tr> + <td colspan="4" align="right">合計</td> + <td colspan="2" align="right"> + <span id="totalPrice">31,050</span> + <input type="hidden" id="totalPrice-hidden" /> + </td> + </tr> + </tfoot> + </table> </td> </tr> - <tr style="dummy" height="20px"> - <th> - <label>郵便番号</label> - </th> - <td> - <span id="postcode">VALUE</span> - </td> - </tr> - <tr style="dummy" height="20px"> - <th> - <label>都道府県</label> - </th> - <td> - <span id="state">VALUE</span> - </td> - </tr> - <tr style="dummy" height="20px"> - <th> - <label>郡市区 (島、国)</label> - </th> - <td> - <span id="city">VALUE</span> - </td> - </tr> - <tr style="dummy" height="20px"> - <th>それ以降の住所</th> - <td> - <span id="streetAddress">VALUE</span> - </td> - </tr> - <tr style="dummy" height="20px"> - <th> - <label>会社名・団体名</label> - </th> - <td> - <span id="company">VALUE</span> - </td> - </tr> - <tr style="dummy" height="20px"> - <th> - <label>電話番号</label> - </th> - <td> - <span id="telephone">VALUE</span> - </td> - </tr> - <tr style="dummy" height="20px"> - <th> - <label>FAX番号</label> - </th> - <td> - <span id="fax">VALUE</span> - </td> - </tr> - <tr style="dummy" height="20px"> - <th> - <label>携帯電話番号</label> - </th> - <td> - <span id="cellphone">VALUE</span> - </td> - </tr> - </table> - </td> - </tr> - <tr> - <th> - <label>お支払い方法</label> - </th> - <td> - <span id="paymentMethodName">代金引換え</span> - </td> - </tr> - <tr> - <th> - <label>配送方法</label> - </th> - <td> - <span id="deliveryMethodName">一括配送</span> - </td> - </tr> - </table> - <br /> - <br /> - <br /> - <input id="doCancel" type="button" value="注文画面に戻る" onclick="location.href='./checkoutEdit.html'" /> - <input id="doConfirm" type="button" value="注文する" onclick="location.href='./checkoutComplete.html'" /> - </form> - </body> -</html> + </table> + <table style="border-bottom: 1px solid silver;width: 100%;"> + <tr> + <td width="10" bgcolor="#ffd153"> </td> + <td width="100" bgcolor="#fff1a1" valign="top" align="center"> + <label>お届け先</label> + </td> + <td> + <table> + <tr> + <th align="left"> + <label>名前:</label> + </th> + <td> + <span id="lastname">VALUE</span> <span id="firstname">VALUE</span> + </td> + </tr> + <tr> + <th align="left"> + <label>性別:</label> + </th> + <td> + <span id="genderString">男性</span> + </td> + </tr> + <tr> + <th align="left"> + <label>郵便番号:</label> + </th> + <td> + <span id="postcode">VALUE</span> + </td> + </tr> + <tr> + <th align="left"> + <label>都道府県:</label> + </th> + <td> + <span id="state">VALUE</span> + </td> + </tr> + <tr> + <th align="left"> + <label>郡市区 (島、国):</label> + </th> + <td> + <span id="city">VALUE</span> + </td> + </tr> + <tr> + <th align="left">それ以降の住所:</th> + <td> + <span id="streetAddress">VALUE</span> + </td> + </tr> + <tr> + <th align="left"> + <label>電話番号:</label> + </th> + <td> + <span id="telephone">VALUE</span> + </td> + </tr> + <tr> + <th align="left"> + <label>FAX:</label> + </th> + <td> + <span id="fax">VALUE</span> + </td> + </tr> + <tr> + <th align="left"> + <label>携帯電話番号:</label> + </th> + <td> + <span id="cellphone">VALUE</span> + </td> + </tr> + <tr> + <th align="left"> + <label>会社名・団体名:</label> + </th> + <td> + <span id="company">VALUE</span> + </td> + </tr> + <tr> + <th align="left"> + <label>部署名・役職:</label> + </th> + <td> + <span id="department">VALUE</span> + </td> + </tr> + </table> + </td> + </tr> + </table> + <table style="border-bottom: 1px solid silver;width: 100%;"> + <tr> + <td width="10" bgcolor="#ffd153"> </td> + <td width="100" bgcolor="#fff1a1" valign="top" align="center"> + <label>お支払い方法</label> + </td> + <td> + <span id="paymentMethodName">代金引換え</span> + </td> + </tr> + </table> + <table style="border-bottom: 1px solid silver;width: 100%;"> + <tr> + <td width="10" bgcolor="#ffd153"> </td> + <td width="100" bgcolor="#fff1a1" valign="top" align="center"> + <label>配送方法</label> + </td> + <td> + <span id="deliveryMethodName">一括配送</span> + </td> + </tr> + </table> + <br /> + <br /> + <div style="width: 100%;text-align: center;"> + <input id="doCancel" type="button" value="注文を取り消します" onclick="location.href='./checkoutEdit.html'" /> + <input id="doConfirm" type="button" value="注文を完了する" onclick="location.href='./checkoutComplete.html'" /> + </div> + </form> + </div> + </center> + </div> + </body> +</html> 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-05 08:53:42 UTC (rev 604) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/paymentSelect.html 2007-10-05 08:57:34 UTC (rev 605) @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ja" lang="ja" xmlns:te="http://www.seasar.org/teeda/extension"> +<html xmlns="http://www.w3.org/1999/xhtml" xmlns:te="http://www.seasar.org/teeda/extension" xml:lang="ja" lang="ja"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <title id="title-head">注文画面: 支払方法選択</title> </head> <body> -<script language="javascript"> + <script language="javascript"> <!-- function setPaymentMethodId(form, id){ children = form.childNodes; @@ -17,103 +17,169 @@ children[1].value = id; } --> -</script> -<div style="width:100%;"> -<center> -<table border="0" width="80%"> - <tr> - <td align="center" bgcolor="#a7a596">1. 会員情報の確認</td> - <td>></td> - <td align="center" bgcolor="#a7a596">2. お届け先の選択</td> - <td>></td> - <td align="center" bgcolor="#ffd153">3. 支払方法とお届け方法の選択</td> - <td>></td> - <td align="center" bgcolor="#e1de81">4. ご注文内容の確認</td> - <td>></td> - <td align="center" bgcolor="#e1de81">5. ご注文完了</td> - </tr> -</table> -</center> -</div> - <form id="paymentSelectForm"><input type="hidden" id="targetPaymentMethodId-hidden"/><input type="hidden" id="targetDeliveryMethodId-hidden"/> - <input id="orderProcessId" type="hidden"/> - <div> - <span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span> - </div> - <br /> - <h3 class="portlet-section-header"> - <label>お支払い方法の選択</label> - </h3> - <table> - <tbody id="paymentMethodItems"> + </script> + <div style="width:100%;"> + <center> + <table border="0" width="80%"> <tr> - <td><label><input type="radio" name="paymentMethodId" onclick="setPaymentMethodId(this.form,this.nextSibling.value);"/><input type="hidden" id="paymentMethodId-hidden"/><span id="name">名前</span></label></td> + <td align="center" bgcolor="#a7a596">1. 会員情報の確認</td> + <td>></td> + <td align="center" bgcolor="#a7a596">2. お届け先の選択</td> + <td>></td> + <td align="center" bgcolor="#ffd153">3. 支払方法とお届け方法の選択</td> + <td>></td> + <td align="center" bgcolor="#e1de81">4. ご注文内容の確認</td> + <td>></td> + <td align="center" bgcolor="#e1de81">5. ご注文完了</td> </tr> - <tr> - <td><span id="description" te:escape="false">説明</span></td> - </tr> - </tbody> </table> - <h3 class="portlet-section-header"> - <label>カード情報の入力</label> - </h3> - <table> - <tr> - <td></td> - <td> - <table> - <tr> - <th> - <label>カード会社</label> - </th> - <td> - <select id="cardCode" > - <option value="bbb">hoge</option> - </select> - </td> - </tr> - <tr> - <th> - <label>カード番号</label> - </th> - <td><input type="text" id="ccNumber1" size="4" />- -<input type="text" id="ccNumber2" size="4" />- -<input type="text" id="ccNumber3" size="4" />- -<input type="text" id="ccNumber4" size="4" /></td> - </tr> - <tr> - <th> - <label>有効期限</label> - </th> - <td><!-- TODO pulldown --><input type="text" id="ccExpiresMonth" size="2" />/ -<input type="text" id="ccExpiresYear" size="4" /></td> - </tr> - <tr> - <th> - <label>名義人</label> - </th> - <td> - <input type="text" id="ccOwner" /> - </td> - </tr> - </table> - </td> - </tr> - </table> - <h3 class="portlet-section-header"> - <label>配送方法の選択</label> - </h3> - <table> - <tbody id="deliveryMethodItems"> - <tr> - <td><label><input type="radio" name="deliveryMethodId" onclick="setDeliveryMethodId(this.form,this.nextSibling.value);"/><input type="hidden" id="deliveryMethodId-hidden"/><span id="name">名前</span></label></td> - </tr> - <tr> - <td><span id="description" te:escape="false">説明</span></td> - </tr> - </tbody> - </table> - <input id="doNext" type="button" value="次へ" onclick="location.href='./userAddressSelection.html'" /> - </form> + <br /> + <br /> + <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> + <span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span> + </div> + <br /> + <div style="font-size: 14pt;font-weight: bold;"><span style="color:#ff9900;">3-1.</span> お支払い方法を選択してください</div> + <table style="border-top: 1px solid silver;border-bottom: 1px solid silver;width: 100%;"> + <tr> + <td width="10" bgcolor="#ffd153"> </td> + <td width="100" bgcolor="#fff1a1" valign="top" align="center"> + <label>お支払い方法</label> + </td> + <td> + <div> + <label>以下のお支払方法から選択してください</label> + </div> + <table style="width: 100%;"> + <tbody id="paymentMethodItems"> + <tr> + <td><hr size="1"/></td> + </tr> + <tr> + <td> + <label> + <input type="radio" name="paymentMethodId" onclick="setPaymentMethodId(this.form,this.nextSibling.value);" /><input type="hidden" id="paymentMethodId-hidden" /> + <span id="name">名前</span> + </label> + </td> + </tr> + <tr> + <td> + <span id="description" te:escape="false">説明</span> + </td> + </tr> + </tbody> + </table> + </td> + </tr> + </table> + <br /> + <div style="font-size: 14pt;font-weight: bold;"><span style="color:#ff9900;">3-2.</span> クレジットカード情報を入力してください (カード払いの場合のみ)</div> + <table style="border-top: 1px solid silver;border-bottom: 1px solid silver;width: 100%;"> + <tr> + <td width="10" bgcolor="#ffd153"> </td> + <td width="100" bgcolor="#fff1a1" valign="top" align="center"> + <label>カード情報</label> + </td> + <td> + <table> + <tr> + <th> + <label>カード会社</label> + </th> + <td> + <select id="cardCode"> + <option value="bbb">hoge</option> + </select> + </td> + </tr> + <tr> + <th> + <label>カード番号</label> + </th> + <td> + <input type="text" id="ccNumber1" size="4" />- + <input type="text" id="ccNumber2" size="4" />- + <input type="text" id="ccNumber3" size="4" />- + <input type="text" id="ccNumber4" size="4" /> + </td> + </tr> + <tr> + <th> + <label>有効期限</label> + </th> + <td> + <!-- input type="text" id="ccExpiresMonth" size="2" / --> + <input type="hidden" id="ccExpiresMonthItemsSave" /> + <select id="ccExpiresMonth"> + <option value="bbb">hoge</option> + </select> + / + <!-- input type="text" id="ccExpiresYear" size="4" / --> + <input type="hidden" id="ccExpiresYearItemsSave" /> + <select id="ccExpiresYear"> + <option value="bbb">hoge</option> + </select> + </td> + </tr> + <tr> + <th> + <label>名義人</label> + </th> + <td> + <input type="text" id="ccOwner" /> + </td> + </tr> + </table> + </td> + </tr> + </table> + <br /> + <div style="font-size: 14pt;font-weight: bold;"><span style="color:#ff9900;">3-3.</span> 配送方法を選択してください</div> + <table style="border-top: 1px solid silver;border-bottom: 1px solid silver;width: 100%;"> + <tr> + <td width="10" bgcolor="#ffd153"> </td> + <td width="100" bgcolor="#fff1a1" valign="top" align="center"> + <label>配送方法</label> + </td> + <td> + <div> + <label>以下の配送方法から選択してください</label> + </div> + <table style="width: 100%;"> + <tbody id="deliveryMethodItems"> + <tr> + <td><hr size="1" /></td> + </tr> + <tr> + <td> + <label> + <input type="radio" name="deliveryMethodId" onclick="setDeliveryMethodId(this.form,this.nextSibling.value);" /><input type="hidden" id="deliveryMethodId-hidden" /> + <span id="name">名前</span> + </label> + </td> + </tr> + <tr> + <td> + <span id="description" te:escape="false">説明</span> + </td> + </tr> + </tbody> + </table> + </td> + </tr> + </table> + <br/> + <br/> + <div style="width:100%;text-align: center;"> + <input id="doNext" type="button" value="ご注文内容の確認へ" onclick="location.href='./userAddressSelection.html'" /> + </div> + </form> + </div> + </center> + </div> </body> </html> 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-05 08:53:42 UTC (rev 604) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userAddressSelect.html 2007-10-05 08:57:34 UTC (rev 605) @@ -6,144 +6,197 @@ <title id="title-head">注文画面: ユーザー情報確認</title> </head> <body> -<div style="width:100%;"> -<center> -<table border="0" width="80%"> - <tr> - <td align="center" bgcolor="#a7a596">1. 会員情報の確認</td> - <td>></td> - <td align="center" bgcolor="#ffd153">2. お届け先の選択</td> - <td>></td> - <td align="center" bgcolor="#e1de81">3. 支払方法とお届け方法の選択</td> - <td>></td> - <td align="center" bgcolor="#e1de81">4. ご注文内容の確認</td> - <td>></td> - <td align="center" bgcolor="#e1de81">5. ご注文完了</td> - </tr> -</table> -</center> -</div> - <form id="Form"> - <input id="orderProcessId" type="hidden"/> - <div> - <span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span> - </div> - <br /> - <h3 class="portlet-section-header"> - <label>お届け先情報の入力</label> - </h3> - <h4 class="portlet-section-subheader"> - <label>登録した届け先から選択</label> - </h4> - <div> - <span id="addressBookId" style="pageDirection"> - <input type="radio" name="addressBookId" value="0" checked="checked" />会員住所<br/> - <input type="radio" name="addressBookId" value="1" />届け先1<br/> - <input type="radio" name="addressBookId" value="2" />届け先2<br/> - </span> - </div> - <div> - <!-- TODO input id="doEdit" type="button" value="編集(TBD)" onclick="location.href='./userAddressSelection.html'" / --> - <input id="doDelete" type="button" value="削除" onclick="location.href='./userAddressSelection.html'" /> - </div> - <div> - <input id="doNext" type="button" value="次へ" onclick="location.href='./userAddressSelection.html'" /> - </div> - <h4 class="portlet-section-subheader"> - <label>届け先の追加</label> - </h4> - <div> - <table border="1"> - <tr style="dummy" height="20px"> - <th> - <label>氏名(姓)</label> - </th> - <td> - <input type="text" id="lastname" class="portlet-form-input-field"/> - </td> - </tr> - <tr style="dummy" height="20px"> - <th> - <label>氏名(名)</label> - </th> - <td> - <input type="text" id="firstname" class="portlet-form-input-field"/> - </td> - </tr> - <tr style="dummy" height="20px"> - <th> - <label>郵便番号</label> - </th> - <td> - <input type="text" id="postcode" size="8" maxlength="8" class="portlet-form-input-field"/> - </td> - </tr> - <tr style="dummy" height="20px"> - <th> - <label>都道府県</label> - </th> - <td> - <input type="text" id="state" class="portlet-form-input-field"/> -<!-- TODO pulldown --> - </td> - </tr> - <tr style="dummy" height="20px"> - <th> - <label>郡市区 (島、国)</label> - </th> - <td> - <input type="text" id="city" class="portlet-form-input-field"/> - </td> - </tr> - <tr style="dummy" height="20px"> - <th>それ以降の住所</th> - <td> - <input type="text" id="streetAddress" class="portlet-form-input-field"/> - </td> - </tr> - <tr style="dummy" height="20px"> - <th> - <label>電話番号</label> - </th> - <td> - <input type="text" id="telephone" class="portlet-form-input-field"/> - </td> - </tr> - <tr style="dummy" height="20px"> - <th> - <label>FAX番号</label> - </th> - <td> - <input type="text" id="fax" class="portlet-form-input-field"/> - </td> - </tr> - <tr style="dummy" height="20px"> - <th> - <label>携帯電話番号</label> - </th> - <td> - <input type="text" id="cellphone" class="portlet-form-input-field"/> - </td> - </tr> - <tr style="dummy" height="20px"> - <th> - <label>会社名・団体名</label> - </th> - <td> - <input type="text" id="company" class="portlet-form-input-field"/> - </td> - </tr> + <div style="width:100%;"> + <center> + <table border="0" width="80%"> <tr> - <th> - <label>部署名・役職:</label> - </th> - <td> - <input id="department" type="text" class="portlet-form-input-field" /> - </td> + <td align="center" bgcolor="#a7a596">1. 会員情報の確認</td> + <td>></td> + <td align="center" bgcolor="#ffd153">2. お届け先の選択</td> + <td>></td> + <td align="center" bgcolor="#e1de81">3. 支払方法とお届け方法の選択</td> + <td>></td> + <td align="center" bgcolor="#e1de81">4. ご注文内容の確認</td> + <td>></td> + <td align="center" bgcolor="#e1de81">5. ご注文完了</td> </tr> </table> - <input id="doAdd" type="button" value="追加" onclick="location.href='./userAddressSelection.html'" /> - </div> - </form> + <br /> + <br /> + <div style="width: 80%;text-align: left;"> + <form id="userAddressSelectForm"> + <input id="orderProcessId" type="hidden" /> + <div> + <span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span> + </div> + <br /> + <br /> + <div style="font-size: 14pt;font-weight: bold;"><span style="color:#ff9900;">2-1.</span> お届け先を選択してください</div> + <table style="border-top: 1px solid silver;border-bottom: 1px solid silver;width: 100%;"> + <tr> + <td width="10" bgcolor="#ffd153"> </td> + <td width="100" bgcolor="#fff1a1" valign="top" align="center"> + <label>お届け先</label> + </td> + <td> + <span id="addressBookId" style="pageDirection"><input type="radio" name="addressBookId" value="0" checked="checked" />会員住所<br /> + <input type="radio" name="addressBookId" value="1" />届け先1<br /> + <input type="radio" name="addressBookId" value="2" />届け先2<br /> + </span> + </td> + </tr> + </table> + <br /> + <div style="width:100%;text-align: right;"> +<!-- TODO input id="doEdit" type="button" value="編集(TBD)" onclick="location.href='./userAddressSelection.html'" / --> + <input id="doDelete" type="button" value="選択したお届け先を削除します" onclick="location.href='./userAddressSelection.html'" /> + </div> + <br /> + <div style="width:100%;text-align: center;"> + <input id="doNext" type="button" value="支払方法とお届け方法の選択へ" onclick="location.href='./userAddressSelection.html'" /> + </div> + </form> + <br /> + <br /> + <form id="userAddressSelectForm-addAddressBook"> + <input id="orderProcessId" type="hidden" /> + <div style="font-size: 14pt;font-weight: bold;"><span style="color:#ff9900;">2-2.</span> お届け先を追加する (追加する場合のみ)</div> + <table style="border-top: 1px solid silver;border-bottom: 1px solid silver;width: 100%;"> + <tr> + <td width="10" bgcolor="#ffd153"> </td> + <td width="100" bgcolor="#fff1a1" valign="top" align="center"> + <label>お届け先</label> + </td> + <td> + <table> + <tr> + <th align="left"> + <label>名字:</label> + <font color="#009900">[必須]</font> + </th> + <td> + <input id="lastname" type="text" class="portlet-form-input-field" size="20" /> + </td> + </tr> + <tr> + <th align="left"> + <label>名前:</label> + <font color="#009900">[必須]</font> + </th> + <td> + <input id="firstname" type="text" class="portlet-form-input-field" size="20" /> + </td> + </tr> + <tr> + <th align="left"> + <label>名字 (フリガナ):</label> + <font color="#009900">[必須]</font> + </th> + <td> + <input id="lastnameDescription" type="text" class="portlet-form-input-field" size="20" /> + </td> + </tr> + <tr> + <th align="left"> + <label>名前 (フリガナ):</label> + <font color="#009900">[必須]</font> + </th> + <td> + <input id="firstnameDescription" type="text" class="portlet-form-input-field" size="20" /> + </td> + </tr> + <tr> + <th align="left"> + <label>郵便番号:</label> + <font color="#009900">[必須]</font> + </th> + <td><input id="primaryPostcode" type="text" class="portlet-form-input-field" size="3" /> + - + <input id="secondaryPostcode" type="text" class="portlet-form-input-field" size="4" /> + <!-- input id="postcode" type="text" class="portlet-form-input-field" / --> + </td> + </tr> + <tr> + <th align="left"> + <label>都道府県:</label> + <font color="#009900">[必須]</font> + </th> + <td> + <input type="hidden" id="stateItemsSave" /> + <select id="state"> + <option value="bbb">hoge</option> + </select> + </td> + </tr> + <tr> + <th align="left"> + <label>郡市区 (島、国):</label> + <font color="#009900">[必須]</font> + </th> + <td> + <input id="city" type="text" class="portlet-form-input-field" size="20" /> + </td> + </tr> + <tr> + <th align="left"> + <label>それ以降の住所:</label> + <font color="#009900">[必須]</font> + </th> + <td> + <input id="streetAddress" type="text" class="portlet-form-input-field" size="40" /> + </td> + </tr> + <tr> + <th align="left"> + <label>電話番号:</label> + </th> + <td> + <input id="telephone" type="text" class="portlet-form-input-field" size="13" /> + </td> + </tr> + <tr> + <th align="left"> + <label>FAX:</label> + </th> + <td> + <input id="fax" type="text" class="portlet-form-input-field" size="13" /> + </td> + </tr> + <tr> + <th align="left"> + <label>携帯電話番号:</label> + </th> + <td> + <input id="cellphone" type="text" class="portlet-form-input-field" size="13" /> + </td> + </tr> + <tr> + <th align="left"> + <label>会社名・団体名:</label> + </th> + <td> + <input id="company" type="text" class="portlet-form-input-field" size="20" /> + </td> + </tr> + <tr> + <th align="left"> + <label>部署名・役職:</label> + </th> + <td> + <input id="department" type="text" class="portlet-form-input-field" size="20" /> + </td> + </tr> + </table> + </td> + </tr> + </table> + <br /> + <div style="width: 100%;text-align: center;"> + <input id="doAdd" type="button" value="上記の会員情報を追加します" onclick="location.href='./userAddressSelection.html'" /> + </div> + </form> + </div> + </center> + </div> </body> </html> 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-05 08:53:42 UTC (rev 604) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html 2007-10-05 08:57:34 UTC (rev 605) @@ -6,345 +6,422 @@ <title id="title-head">注文画面: ユーザー情報確認</title> </head> <body> -<div style="width:100%;"> -<center> -<table border="0" width="80%"> - <tr> - <td align="center" bgcolor="#ffd153">1. 会員情報の確認</td> - <td>></td> - <td align="center" bgcolor="#e1de81">2. お届け先の選択</td> - <td>></td> - <td align="center" bgcolor="#e1de81">3. 支払方法とお届け方法の選択</td> - <td>></td> - <td align="center" bgcolor="#e1de81">4. ご注文内容の確認</td> - <td>></td> - <td align="center" bgcolor="#e1de81">5. ご注文完了</td> - </tr> -</table> -</center> -</div> - <form id="Form"> - <input id="portalId-hidden" type="hidden"/> - <div> - <span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span> - </div> - <br /> - <div id="isNotLogin"> - <span class="portlet-msg-info"> - <label>カートに入れた商品を注文していただくには、ログインする必要があります。</label> - </span> - </div> - <div id="isLogin"> - <div id="isEdit"> - <div class="portlet-section-header">ユーザー情報登録</div> - <table> - <tbody> - <tr> - <th align="left"> - <label>名字:</label><font color="#009900">[必須]</font> - </th> - <td> - <input id="lastname" type="text" class="portlet-form-input-field" size="20"/> - </td> - </tr> - <tr> - <th align="left"> - <label>名前:</label><font color="#009900">[必須]</font> - </th> - <td> - <input id="firstname" type="text" class="portlet-form-input-field" size="20"/> - </td> - </tr> - <tr> - <th align="left"> - <label>名字 (フリガナ):</label><font color="#009900">[必須]</font> - </th> - <td> - <input id="lastnameDescription" type="text" class="portlet-form-input-field" size="20"/> - </td> - </tr> - <tr> - <th align="left"> - <label>名前 (フリガナ):</label><font color="#009900">[必須]</font> - </th> - <td> - <input id="firstnameDescription" type="text" class="portlet-form-input-field" size="20"/> - </td> - </tr> - <tr> - <th align="left"> - <label>性別:</label><font color="#009900">[必須]</font> - </th> - <td> - <span id="gender"> - <label><input type="radio" name="gender" value="M" class="portlet-form-field-label" />男性</label> - <label><input type="radio" name="gender" value="F" class="portlet-form-field-label" />女性</label> - </span> - </td> - </tr> + <div style="width:100%;"> + <center> + <table border="0" width="80%"> + <tr> + <td align="center" bgcolor="#ffd153">1. 会員情報の確認</td> + <td>></td> + <td align="center" bgcolor="#e1de81">2. お届け先の選択</td> + <td>></td> + <td align="center" bgcolor="#e1de81">3. 支払方法とお届け方法の選択</td> + <td>></td> + <td align="center" bgcolor="#e1de81">4. ご注文内容の確認</td> + <td>></td> + <td align="center" bgcolor="#e1de81">5. ご注文完了</td> + </tr> + </table> + <br /> + <br /> + <form id="Form"> + <input id="portalId-hidden" type="hidden" /> + <div style="width:80%;text-align: left;"> + <div> + <span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span> + </div> + <br /> + <div id="isNotLogin"> + <span class="portlet-msg-info"> + <label>カートに入れた商品を注文していただくには、ログインする必要があります。</label> + </span> + </div> + <div id="isLogin"> + <div id="isEdit"> + <div style="font-size: 14pt;font-weight: bold;"><span style="color:#ff9900;">1-1.</span> 会員情報を入力してください</div> + <table style="border-top: 1px solid silver;border-bottom: 1px solid silver;width: 100%;"> + <tr> + <td width="10" bgcolor="#ffd153"> </td> + <td width="100" bgcolor="#fff1a1" valign="top" align="center"> + <label>会員情報</label> + </td> + <td> + <table> + <tbody> + <tr> + <th align="left"> + <label>名字:</label> + <font color="#009900">[必須]</font> + </th> + <td> + <input id="lastname" type="text" class="portlet-form-input-field" size="20" /> + </td> + </tr> + <tr> + <th align="left"> + <label>名前:</label> + <font color="#009900">[必須]</font> + </th> + <td> + <input id="firstname" type="text" class="portlet-form-input-field" size="20" /> + </td> + </tr> + <tr> + <th align="left"> + <label>名字 (フリガナ):</label> + <font color="#009900">[必須]</font> + </th> + <td> + <input id="lastnameDescription" type="text" class="portlet-form-input-field" size="20" /> + </td> + </tr> + <tr> + <th align="left"> + <label>名前 (フリガナ):</label> + <font color="#009900">[必須]</font> + </th> + <td> + <input id="firstnameDescription" type="text" class="portlet-form-input-field" size="20" /> + </td> + </tr> + <tr> + <th align="left"> + <label>性別:</label> + <font color="#009900">[必須]</font> + </th> + <td> + <span id="gender"> + <label><input type="radio" name="gender" value="M" class="portlet-form-field-label" />男性</label> + <label><input type="radio" name="gender" value="F" class="portlet-form-field-label" />女性</label> + </span> + </td> + </tr> <!-- TODO: customers_dob --> - <tr> - <th align="left"> - <label>メールアドレス:</label><font color="#009900">[必須]</font> - </th> - <td> - <input id="emailAddress" type="text" class="portlet-form-input-field" size="30"/> - </td> - </tr> - <tr> - <th align="left"> - <label>メールアドレス(確認):</label><font color="#009900">[必須]</font> - </th> - <td> - <input id="emailAddressConfirm" type="text" class="portlet-form-input-field" size="30"/> - </td> - </tr> - <tr> - <th align="left"> - <label>誕生日:</label><font color="#009900">[必須]</font> - </th> - <td> - <select id="yearOfDayOfBirth" class="portlet-form-input-field"> - <option>2000</option> - </select> - / - <select id="monthOfDayOfBirth" class="portlet-form-input-field"> - <option>1</option> - </select> - / - <select id="dateOfDayOfBirth" class="portlet-form-input-field"> - <option>1</option> - </select> - <!-- input id="dayOfBirth" type="text" class="portlet-form-input-field" /--> - </td> - </tr> - <tr> - <th align="left"> - <label>電話番号:</label> - </th> - <td> - <input id="telephone" type="text" class="portlet-form-input-field" size="13"/> - </td> - </tr> - <tr> - <th align="left"> - <label>FAX:</label> - </th> - <td> - <input id="fax" type="text" class="portlet-form-input-field" size="13"/> - </td> - </tr> - <tr> - <th align="left"> - <label>携帯電話番号:</label> - </th> - <td> - <input id="cellphone" type="text" class="portlet-form-input-field" size="13"/> - </td> - </tr> - <tr> - <th align="left"> - <label>郵便番号:</label><font color="#009900">[必須]</font> - </th> - <td> - <input id="primaryPostcode" type="text" class="portlet-form-input-field" size="3"/> - - - <input id="secondaryPostcode" type="text" class="portlet-form-input-field" size="4"/> - <!-- input id="postcode" type="text" class="portlet-form-input-field" / --> - </td> - </tr> - <tr> - <th align="left"> - <label>都道府県:</label><font color="#009900">[必須]</font> - </th> - <td> - <select id="state"> - <option value="bbb">hoge</option> - </select> - </td> - </tr> - <tr> - <th align="left"> - <label>郡市区 (島、国):</label><font color="#009900">[必須]</font> - </th> - <td> - <input id="city" type="text" class="portlet-form-input-field" size="20"/> - </td> - </tr> - <tr> - <th align="left"> - <label>それ以降の住所:</label><font color="#009900">[必須]</font> - </th> - <td> - <input id="streetAddress" type="text" class="portlet-form-input-field" size="40"/> - </td> - </tr> - <tr> - <th align="left"> - <label>会社名・団体名:</label> - </th> - <td> - <input id="company" type="text" class="portlet-form-input-field" size="20"/> - </td> - </tr> - <tr> - <th align="left"> - <label>部署名・役職:</label> - </th> - <td> - <input id="department" type="text" class="portlet-form-input-field" size="20"/> - </td> - </tr> + <tr> + <th align="left"> + <label>メールアドレス:</label> + <font color="#009900">[必須]</font> + </th> + <td> + <input id="emailAddress" type="text" class="portlet-form-input-field" size="30" /> + </td> + </tr> + <tr> + <th align="left"> + <label>メールアドレス(確認):</label> + <font color="#009900">[必須]</font> + </th> + <td> + <input id="emailAddressConfirm" type="text" class="portlet-form-input-field" size="30" /> + </td> + </tr> + <tr> + <th align="left"> + <label>誕生日:</label> + <font color="#009900">[必須]</font> + </th> + <td> + <input type="hidden" id="yearOfDayOfBirthItemsSave"/> + <select id="yearOfDayOfBirth" class="portlet-form-input-field"><option>2000</option></select> + / + <input type="hidden" id="monthOfDayOfBirthItemsSave"/> + <select id="monthOfDayOfBirth" class="portlet-form-input-field"><option>1</option></select> + / + <input type="hidden" id="dateOfDayOfBirthItemsSave"/> + <select id="dateOfDayOfBirth" class="portlet-form-input-field"><option>1</option></select> + <!-- input id="dayOfBirth" type="text" class="portlet-form-input-field" /--> + </td> + </tr> + </tbody> + </table> + </td> + </tr> + </table> + <br /> + <br /> + <div style="font-size: 14pt;font-weight: bold;"><span style="color:#ff9900;">1-2.</span> お届け先を入力してください</div> + <table style="border-top: 1px solid silver;border-bottom: 1px solid silver;width: 100%;"> + <tr> + <td width="10" bgcolor="#ffd153"> </td> + <td width="100" bgcolor="#fff1a1" valign="top" align="center"> + <label>お届け先</label> + </td> + <td> + <table> + <tbody> + <tr> + <th align="left"> + <label>郵便番号:</label> + <font color="#009900">[必須]</font> + </th> + <td><input id="primaryPostcode" type="text" class="portlet-form-input-field" size="3" /> + - + <input id="secondaryPostcode" type="text" class="portlet-form-input-field" size="4" /> + <!-- input id="postcode" type="text" class="portlet-form-input-field" / --> + </td> + </tr> + <tr> + <th align="left"> + <label>都道府県:</label> + <font color="#009900">[必須]</font> + </th> + <td> + <input type="hidden" id="stateItemsSave"/> + <select id="state"> + <option value="bbb">hoge</option> + </select> + </td> + </tr> + <tr> + <th align="left"> + <label>郡市区 (島、国):</label> + <font color="#009900">[必須]</font> + </th> + <td> + <input id="city" type="text" class="portlet-form-input-field" size="20" /> + </td> + </tr> + <tr> + <th align="left"> + <label>それ以降の住所:</label> + <font color="#009900">[必須]</font> + </th> + <td> + <input id="streetAddress" type="text" class="portlet-form-input-field" size="40" /> + </td> + </tr> + <tr> + <th align="left"> + <label>電話番号:</label> + </th> + <td> + <input id="telephone" type="text" class="portlet-form-input-field" size="13" /> + </td> + </tr> + <tr> + <th align="left"> + <label>FAX:</label> + </th> + <td> + <input id="fax" type="text" class="portlet-form-input-field" size="13" /> + </td> + </tr> + <tr> + <th align="left"> + <label>携帯電話番号:</label> + </th> + <td> + <input id="cellphone" type="text" class="portlet-form-input-field" size="13" /> + </td> + </tr> + <tr> + <th align="left"> + <label>会社名・団体名:</label> + </th> + <td> + <input id="company" type="text" class="portlet-form-input-field" size="20" /> + </td> + </tr> + <tr> + <th align="left"> + <label>部署名・役職:</label> + </th> + <td> + <input id="department" type="text" class="portlet-form-input-field" size="20" /> + </td> + </tr> <!-- TODO: entry_country_id --> - </tbody> - </table> + </tbody> + </table> + </td> + </tr> + </table> <!-- Term of Licence --> - <input id="doUpdate" type="button" value="登録" onclick="location.href='./userInfoEdit.html'" /> - <div id="isUser" style="display: inline;"> - <a id="goUserInfoEdit" href="./userInfoEdit.html?fixed_mode=none">キャンセル</a> - </div> - </div> - <div id="isNotEdit"> - <div class="portlet-section-header">ユーザー情報の確認</div> - <table> - <tbody> - <tr> - <th align="left"> - <label>名字:</label> - </th> - <td> - <span id="lastname-display">VALUE</span> - </td> - </tr> - <tr> - <th align="left"> - <label>名前:</label> - </th> - <td> - <span id="firstname-display">VALUE</span> - </td> - </tr> - <tr> - <th align="left"> - <label>名字 (フリガナ):</label> - </th> - <td> - <span id="lastnameDescription-display">VALUE</span> - </td> - </tr> - <tr> - <th align="left"> - <label>名前 (フリガナ):</label> - </th> - <td> - <span id="firstnameDescription-display">VALUE</span> - </td> - </tr> - <tr> - <th align="left"> - <label>性別:</label> - </th> - <td> - <span id="genderString">性別</span> - </td> - </tr> - <tr> - <th align="left"> - <label>メールアドレス:</label> - </th> - <td> - <span id="emailAddress-display">VALUE</span> - </td> - </tr> - <tr> - <th align="left"> - <label>誕生日:</label> - </th> - <td> - <span id="dayOfBirth-display">VALUE</span> - </td> - </tr> - <tr> - <th align="left"> - <label>電話番号:</label> - </th> - <td> - <span id="telephone-display">VALUE</span> - </td> - </tr> - <tr> - <th align="left"> - <label>FAX:</label> - </th> - <td> - <span id="fax-display">VALUE</span> - </td> - </tr> - <tr> - <th align="left"> - <label>携帯電話番号:</label> - </th> - <td> - <span id="cellphone-display">VALUE</span> - </td> - </tr> - <tr> - <th align="left"> - <label>郵便番号:</label> - </th> - <td> - <span id="postcode-display">VALUE</span> - </td> - </tr> - <tr> - <th align="left"> - <label>都道府県:</label> - </th> - <td> - <span id="state-display">VALUE</span> - </td> - </tr> - <tr> - <th align="left"> - <label>郡市区 (島、国):</label> - </th> - <td> - <span id="city-display">VALUE</span> - </td> - </tr> - <tr> - <th align="left"> - <label>それ以降の住所:</label> - </th> - <td> - <span id="streetAddress-display">VALUE</span> - </td> - </tr> - <tr> - <th align="left"> - <label>会社名・団体名:</label> - </th> - <td> - <span id="company-display">VALUE</span> - </td> - </tr> - <tr> - <th align="left"> - <label>部署名・役職:</label> - </th> - <td> - <span id="department-display">VALUE</span> - </td> - </tr> + <br /> + <br /> + <div id="isNotUser" style="text-align: center;"> + <input id="doUpdate-create" type="button" value="上記の会員情報を登録します" onclick="location.href='./userInfoEdit.html'" /> + <a id="goUserInfoEdit-create" href="./userInfoEdit.html?fixed_mode=none">会員情報の登録を取り消します</a> + </div> + <div id="isUser" style="text-align: center;"> + <input id="doUpdate-update" type="button" value="上記の会員情報で更新します" onclick="location.href='./userInfoEdit.html'" /> + <a id="goUserInfoEdit-update" href="./userInfoEdit.html?fixed_mode=none">会員情報の更新を取り消します</a> + </div> + </div> + <div id="isNotEdit"> + <div style="font-size: 14pt;font-weight: bold;"><span style="color:#ff9900;">1-1.</span> 会員情報をご確認ください</div> + <table style="border-top: 1px solid silver;border-bottom: 1px solid silver;width: 100%;"> + <tr> + <td width="10" bgcolor="#ffd153"> </td> + <td width="100" bgcolor="#fff1a1" valign="top" align="center"> + <label>会員情報</label> + </td> + <td> + <table> + <tbody> + <tr> + <th align="left"> + <label>名字:</label> + </th> + <td> + <span id="lastname-display">VALUE</span> + </td> + </tr> + <tr> + <th align="left"> + <label>名前:</label> + </th> + <td> + <span id="firstname-display">VALUE</span> + </td> + </tr> + <tr> + <th align="left"> + <label>名字 (フリガナ):</label> + </th> + <td> + <span id="lastnameDescription-display">VALUE</span> + </td> + </tr> + <tr> + <th align="left"> + <label>名前 (フリガナ):</label> + </th> + <td> + <span id="firstnameDescription-display">VALUE</span> + </td> + </tr> + <tr> + <th align="left"> + <label>性別:</label> + </th> + <td> + <span id="genderString">性別</span> + </td> + </tr> + <tr> + <th align="left"> + <label>メールアドレス:</label> + </th> + <td> + <span id="emailAddress-display">VALUE</span> + </td> + </tr> + <tr> + <th align="left"> + <label>誕生日:</label> + </th> + <td> + <span id="dayOfBirth-display">VALUE</span> + </td> + </tr> + </tbody> + </table> + </td> + </tr> + </table> + <br /> + <br /> + <div style="font-size: 14pt;font-weight: bold;"><span style="color:#ff9900;">1-2.</span> お届け先をご確認ください</div> + <table style="border-top: 1px solid silver;border-bottom: 1px solid silver;width: 100%;"> + <tr> + <td width="10" bgcolor="#ffd153"> </td> + <td width="100" bgcolor="#fff1a1" valign="top" align="center"> + <label>お届け先</label> + </td> + <td> + <table> + <tbody> + <tr> + <th align="left"> + <label>郵便番号:</label> + </th> + <td> + <span id="postcode-display">VALUE</span> + </td> + </tr> + <tr> + <th align="left"> + <label>都道府県:</label> + </th> + <td> + <span id="state-display">VALUE</span> + </td> + </tr> + <tr> + <th align="left"> + <label>郡市区 (島、国):</label> + </th> + <td> + <span id="city-display">VALUE</span> + </td> + </tr> + <tr> + <th align="left"> + <label>それ以降の住所:</label> + </th> + <td> + <span id="streetAddress-display">VALUE</span> + </td> + </tr> + <tr> + <th align="left"> + <label>電話番号:</label> + </th> + <td> + <span id="telephone-display">VALUE</span> + </td> + </tr> + <tr> + <th align="left"> + <label>FAX:</label> + </th> + <td> + <span id="fax-display">VALUE</span> + </td> + </tr> + <tr> + <th align="left"> + <label>携帯電話番号:</label> + </th> + <td> + <span id="cellphone-display">VALUE</span> + </td> + </tr> + <tr> + <th align="left"> + <label>会社名・団体名:</label> + </th> + <td> + <span id="company-display">VALUE</span> + </td> + </tr> + <tr> + <th align="left"> + <label>部署名・役職:</label> + </th> + <td> + <span id="department-display">VALUE</span> + </td> + </tr> <!-- TODO: entry_country_id --> - </tbody> - </table> + </tbody> + </table> + </td> + </tr> + </table> <!-- Term of Licence --> - <input id="customerId-hidden" type="hidden"/> - <input id="doModify" type="button" value="登録情報の修正" onclick="location.href='./userInfoEdit.html'" /> - <input id="doNext" type="button" value="次へ" onclick="location.href='./userAddressSelect.html'" /> - </div> - </div> - </form> + <br /> + <br /> + <input id="customerId-hidden" type="hidden" /> + <div style="text-align: center;width: 100%;"> + <input id="doModify" type="button" value="上記の会員情報を修正する" onclick="location.href='./userInfoEdit.html'" /> + <input id="doNext" type="button" value="お届け先の選択へ" onclick="location.href='./userAddressSelect.html'" /> + </div> + </div> + </div> + </div> + </form> + </center> + </div> </body> </html> Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/categoryList.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/categoryList.html 2007-10-05 08:53:42 UTC (rev 604) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/categoryList.html 2007-10-05 08:57:34 UTC (rev 605) @@ -17,10 +17,15 @@ --> </script><form id="categoryForm"><input id="doFinish" type="submit" style="display: none;"/><input type="hidden" id="targetId" /> <div id="breadcrumbItems"> -<span id="depth" te:escape="false"> </span>» <input type="hidden" id="categoryId-breadcrumbItems" /><a id="goCategoryList-breadcrmb" href="./categoryList.html?categoryId=0" onclick="setCategoryId(this.previousSibling.form,this.previousSibling.value);"><span id="name">カテゴリ</span></a><br/> +<div id="isNotSelected"> +<span id="depth-breadcrumbItems" te:escape="false"> </span>» <input type="hidden" id="categoryId-breadcrumbItems" /><a id="goCategoryList-breadcrmb" href="./categoryList.html?categoryId=0" onclick="setCategoryId(this.previousSibling.form,this.previousSibling.value);"><span id="name">カテゴリ</span></a><br/> </div> +<div id="isSelected"> +<span id="depth-breadcrumbItems-selected" te:escape="false"> </span>» <span id="name">カテゴリ</span><br/> +</div> +</div> <div id="categoryItems"> - <span id="depth" te:escape="false"> </span>- <input type="hidden" id="categoryId-categoryItems" /><a id="goCategoryList" href="./categoryList.html?categoryId=1" onclick="setCategoryId(this.previousSibling.form,this.previousSibling.value);"><span id="name">スニーカー</span></a><br/> + <span id="depth-categoryItems" te:escape="false"> </span>- <input type="hidden" id="categoryId-categoryItems" /><a id="goCategoryList" href="./categoryList.html?categoryId=1" onclick="setCategoryId(this.previousSibling.form,this.previousSibling.value);"><span id="name">スニーカー</span></a><br/> </div> </form> </body>