Author: mrisaliti
Date: Mon Feb 4 08:16:27 2008
New Revision: 618314
URL: http://svn.apache.org/viewvc?rev=618314&view=rev
Log:
All the eBay forms (ftl/widgets screen) has now the same look and feel (Part of
issue OFBIZ-1614)
Modified:
ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl
ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml
ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml
Modified:
ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl?rev=618314&r1=618313&r2=618314&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl
(original)
+++ ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl
Mon Feb 4 08:16:27 2008
@@ -35,11 +35,11 @@
<form method="post" action="<@ofbizUrl>PostProductsToEbay</@ofbizUrl>"
name="ProductsExportToEbay">
<table border="0" cellpadding="2" cellspacing="0">
<tr>
- <td align="right"><div
class="tabletext">${uiLabelMap.FormFieldTitle_ebayCategory}</div></td>
+ <td align="right"
class="label">${uiLabelMap.FormFieldTitle_ebayCategory}</td>
<td> </td>
<td>
<input type="hidden" name="selectResult"
value="${selectResult}"/>
- <select class="selectBox" name="ebayCategory"
onchange="changeEbayCategory(this.value,
this.options[this.selectedIndex].text)">
+ <select name="ebayCategory"
onchange="changeEbayCategory(this.value,
this.options[this.selectedIndex].text)">
<#if categories?exists>
<#list categories as category>
<option
value="${category.CategoryCode}">${category.CategoryName}</option>
@@ -49,10 +49,10 @@
</td>
</tr>
<tr>
- <td align="right"><div
class="tabletext">${uiLabelMap.CommonCountry}</div></td>
+ <td align="right"
class="label">${uiLabelMap.CommonCountry}</td>
<td> </td>
<td>
- <select class="selectBox" name="country">
+ <select name="country">
<#if countries?exists>
<#list countries as country>
<option <#if country.geoCode?has_content &&
country.geoCode == "US">selected="selected"</#if>
value="${country.geoCode}">${country.get("geoName",locale)}</option>
@@ -62,17 +62,17 @@
</td>
</tr>
<tr>
- <td align="right"><div
class="tabletext">${uiLabelMap.FormFieldTitle_location}</div></td>
+ <td align="right"
class="label">${uiLabelMap.FormFieldTitle_location}</td>
<td> </td>
<td>
<input type="text" name="location" size="50"
maxlength="50"/>
</td>
</tr>
<tr>
- <td align="right"><div
class="tabletext">${uiLabelMap.FormFieldTitle_listingDuration}</div></td>
+ <td align="right"
class="label">${uiLabelMap.FormFieldTitle_listingDuration}</td>
<td> </td>
<td>
- <select class="selectBox" name="listingDuration">
+ <select name="listingDuration">
<option value="Days_1">1
${uiLabelMap.CommonDay}</option>
<option value="Days_3">3
${uiLabelMap.CommonDays}</option>
<option value="Days_7">7
${uiLabelMap.CommonDays}</option>
@@ -80,63 +80,63 @@
</td>
</tr>
<tr>
- <td align="right"><div
class="tabletext">${uiLabelMap.FormFieldTitle_startPrice}</div></td>
+ <td align="right"
class="label">${uiLabelMap.FormFieldTitle_startPrice}</td>
<td> </td>
<td>
<input type="text" name="startPrice" size="12"
maxlength="12" value="1.0"/>
</td>
</tr>
<tr>
- <td align="right"><div
class="tabletext">${uiLabelMap.FormFieldTitle_quantity}</div></td>
+ <td align="right"
class="label">${uiLabelMap.FormFieldTitle_quantity}</td>
<td> </td>
<td>
<input type="text" name="qnt" size="12" maxlength="12"
value="1"/>
</td>
</tr>
<tr>
- <td align="center" colspan="3"><div
class="tabletext">${uiLabelMap.FormFieldTitle_paymentMethodsAccepted}</div></td>
+ <td align="center"
colspan="3"><b><u>${uiLabelMap.FormFieldTitle_paymentMethodsAccepted}</u></b></td>
</tr>
<tr>
<td> </td>
</tr>
<tr>
- <td colspan="3" class="tabletext">
- <table border="0" cellpadding="2" cellspacing="0">
+ <td colspan="3">
+ <table class="basic-table" cellspacing="0">
<tr>
- <td align="right"
width="23%">${uiLabelMap.FormFieldTitle_paymentPayPal}</td>
+ <td align="right" width="23%"
class="label">${uiLabelMap.FormFieldTitle_paymentPayPal}</td>
<td width="2%"><input type="checkbox"
name="paymentPayPal" checked="checked"/></td>
- <td align="right"
width="23%">${uiLabelMap.FormFieldTitle_paymentVisaMC}</td>
+ <td align="right" width="23%"
class="label">${uiLabelMap.FormFieldTitle_paymentVisaMC}</td>
<td width="2%"><input type="checkbox"
name="paymentVisaMC" checked="checked"/></td>
- <td align="right"
width="23%">${uiLabelMap.FormFieldTitle_paymentAmEx}</td>
+ <td align="right" width="23%"
class="label">${uiLabelMap.FormFieldTitle_paymentAmEx}</td>
<td width="2%"><input type="checkbox"
name="paymentAmEx" checked="checked"/></td>
- <td align="right"
width="23%">${uiLabelMap.FormFieldTitle_paymentDiscover}</td>
+ <td align="right" width="23%"
class="label">${uiLabelMap.FormFieldTitle_paymentDiscover}</td>
<td width="2%"><input type="checkbox"
name="paymentDiscover" checked="checked"/></td>
</tr>
<tr>
- <td align="right"
width="23%">${uiLabelMap.FormFieldTitle_paymentMOCC}</td>
+ <td align="right" width="23%"
class="label">${uiLabelMap.FormFieldTitle_paymentMOCC}</td>
<td width="2%"><input type="checkbox"
name="paymentMOCC" checked="checked"/></td>
- <td align="right"
width="23%">${uiLabelMap.FormFieldTitle_paymentPersonalCheck}</td>
+ <td align="right" width="23%"
class="label">${uiLabelMap.FormFieldTitle_paymentPersonalCheck}</td>
<td width="2%"><input type="checkbox"
name="paymentPersonalCheck" checked="checked"/></td>
- <td align="right"
width="23%">${uiLabelMap.FormFieldTitle_paymentCCAccepted}</td>
+ <td align="right" width="23%"
class="label">${uiLabelMap.FormFieldTitle_paymentCCAccepted}</td>
<td width="2%"><input type="checkbox"
name="paymentCCAccepted"/></td>
- <td align="right"
width="23%">${uiLabelMap.FormFieldTitle_paymentCashInPerson}</td>
+ <td align="right" width="23%"
class="label">${uiLabelMap.FormFieldTitle_paymentCashInPerson}</td>
<td width="2%"><input type="checkbox"
name="paymentCashInPerson"/></td>
</tr>
<tr>
- <td align="right"
width="23%">${uiLabelMap.FormFieldTitle_paymentCashOnPickup}</td>
+ <td align="right" width="23%"
class="label">${uiLabelMap.FormFieldTitle_paymentCashOnPickup}</td>
<td width="2%"><input type="checkbox"
name="paymentCashOnPickup"/></td>
- <td align="right"
width="23%">${uiLabelMap.FormFieldTitle_paymentCOD}</td>
+ <td align="right" width="23%"
class="label">${uiLabelMap.FormFieldTitle_paymentCOD}</td>
<td width="2%"><input type="checkbox"
name="paymentCOD"/></td>
- <td align="right"
width="23%">${uiLabelMap.FormFieldTitle_paymentCODPrePayDelivery}</td>
+ <td align="right" width="23%"
class="label">${uiLabelMap.FormFieldTitle_paymentCODPrePayDelivery}</td>
<td width="2%"><input type="checkbox"
name="paymentCODPrePayDelivery"/></td>
- <td align="right"
width="23%">${uiLabelMap.FormFieldTitle_paymentMoneyXferAccepted}</td>
+ <td align="right" width="23%"
class="label">${uiLabelMap.FormFieldTitle_paymentMoneyXferAccepted}</td>
<td width="2%"><input type="checkbox"
name="paymentMoneyXferAccepted"/></td>
</tr>
</table>
</td>
</tr>
<tr>
- <td align="right"><div
class="tabletext">${uiLabelMap.FormFieldTitle_payPalEmail}</div></td>
+ <td align="right"
class="label">${uiLabelMap.FormFieldTitle_payPalEmail}</td>
<td> </td>
<td>
<input type="text" name="quantity" size="50"
maxlength="50"/>
Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml?rev=618314&r1=618313&r2=618314&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml Mon Feb 4 08:16:27
2008
@@ -20,7 +20,8 @@
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd";>
- <form name="ManageOrdersFromEbay" type="single"
target="ImportOrdersSearchFromEbay">
+ <form name="ManageOrdersFromEbay" type="single"
target="ImportOrdersSearchFromEbay"
+ header-row-style="header-row" default-table-style="basic-table">
<field name="productStoreId">
<drop-down>
<entity-options entity-name="ProductStore"
description="${storeName}" key-field-name="productStoreId">
@@ -32,7 +33,8 @@
<field name="thruDate"
title="${uiLabelMap.CommonThruDateTime}"><date-time default-value="${bsh:
org.ofbiz.base.util.UtilDateTime.getDayEnd(org.ofbiz.base.util.UtilDateTime.nowTimestamp())}"/></field>
<field name="submitButton"
title="${uiLabelMap.EbayImportOrdersSearchFromEbay}"><submit
button-type="button"/></field>
</form>
- <form name="ListOrdersFromEbay" type="multi" use-row-submit="true"
list-name="orderList" target="ImportOrderFromEbay">
+ <form name="ListOrdersFromEbay" type="multi" use-row-submit="true"
list-name="orderList" target="ImportOrderFromEbay"
+ odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<row-actions>
<set field="canImportOrder" value="${bsh:
org.ofbiz.base.util.UtilValidate.isEmpty(orderId) &&
org.ofbiz.base.util.UtilValidate.isEmpty(errorMessage)}" type="Boolean"/>
<set field="allowProductIdChange" value="${bsh:
org.ofbiz.base.util.UtilValidate.isEmpty(orderId) &&
org.ofbiz.base.util.UtilValidate.isNotEmpty(errorMessage)}" type="Boolean"/>
Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml?rev=618314&r1=618313&r2=618314&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml Mon Feb 4 08:16:27
2008
@@ -127,10 +127,24 @@
<widgets>
<decorator-screen name="permission-decorator">
<decorator-section name="body">
- <container>
- <label
style="head1">${uiLabelMap.PageTitleEbayProductsExportToEbay}</label>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head3">
+ <label
text="${uiLabelMap.PageTitleEbayProductsExportToEbay}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <platform-specific>
+ <html>
+ <html-template
location="component://ebay/webapp/ebay/find/productsExportToEbay.ftl"/>
+ </html>
+ </platform-specific>
+ </widgets>
+ </section>
+ </container>
</container>
- <platform-specific><html><html-template
location="component://ebay/webapp/ebay/find/productsExportToEbay.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
</widgets>
@@ -147,14 +161,34 @@
<widgets>
<decorator-screen name="permission-decorator">
<decorator-section name="body">
- <container>
- <label
style="head1">${uiLabelMap.EbayImportOrdersSearchFromEbay}</label>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head3">
+ <label
text="${uiLabelMap.EbayImportOrdersSearchFromEbay}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form
name="ManageOrdersFromEbay" location="component://ebay/widget/EbayForms.xml"/>
+ </widgets>
+ </section>
+ </container>
</container>
- <include-form name="ManageOrdersFromEbay"
location="component://ebay/widget/EbayForms.xml"/>
- <container>
- <label
style="head1">${uiLabelMap.EbayImportOrdersFromEbay}</label>
- </container>
- <include-form name="ListOrdersFromEbay"
location="component://ebay/widget/EbayForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head3">
+ <label
text="${uiLabelMap.EbayImportOrdersFromEbay}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form
name="ListOrdersFromEbay" location="component://ebay/widget/EbayForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
