You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2008/07/12 20:41:46 UTC
svn commit: r676212 [1/3] - in /ofbiz/trunk:
applications/accounting/webapp/accounting/agreement/
applications/humanres/widget/forms/ applications/order/webapp/ordermgr/entry/
applications/order/webapp/ordermgr/entry/cart/
applications/order/webapp/ord...
Author: adrianc
Date: Sat Jul 12 11:41:44 2008
New Revision: 676212
URL: http://svn.apache.org/viewvc?rev=676212&view=rev
Log:
Removed deprecated CSS styles from back office applications.
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml
ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml
ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml
ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml
ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml
ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml
ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/additionalPartyListing.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/addrsettings.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/manualPromotions.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoCodes.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoText.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotiondetails.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotionproducts.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showAllPromotions.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/editProduct.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/customertaxinfo.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/editShipAddress.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderparty.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/poheader.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml
ofbiz/trunk/applications/order/webapp/ordermgr/return/ReturnForms.xml
ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/setup/paymentsetup.ftl
ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml
ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml
ofbiz/trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml
ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl
ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/footer.ftl
ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/login.ftl
ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/menu.ftl
ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/productstocktake.ftl
ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/receipt.ftl
ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/stocktake.ftl
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processDetailList.ftl
ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processHistory.ftl
ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processList.ftl
ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processSteps.ftl
ofbiz/trunk/specialpurpose/shark/webapp/shark/repository/showRepository.ftl
ofbiz/trunk/specialpurpose/shark/webapp/shark/tasklist/worklist.ftl
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml Sat Jul 12 11:41:44 2008
@@ -497,8 +497,8 @@
<field-map env-name="agreementId" field-name="agreementId" />
</entity-and>
</actions>
- <field name="agreementItemSeqId" widget-style="tabletext"><display/></field>
- <field name="workEffortId" widget-style="tabletext"><display/></field>
+ <field name="agreementItemSeqId"><display/></field>
+ <field name="workEffortId"><display/></field>
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteAgreementWorkEffortAppl?agreementId=${agreementId}&agreementItemSeqId=${agreementItemSeqId}&workEffortId=${workEffortId}"/>
</field>
Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml Sat Jul 12 11:41:44 2008
@@ -75,11 +75,11 @@
</entity-options>
</drop-down>
</field>
- <field name="partyIdFrom" use-when="employment!=null" title="${uiLabelMap.HumanResPartyIdFrom}" widget-style="tabletext" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
+ <field name="partyIdFrom" use-when="employment!=null" title="${uiLabelMap.HumanResPartyIdFrom}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
<field name="partyIdTo" use-when="employment==null" title="${uiLabelMap.HumanResPartyIdTo}" tooltip="${uiLabelMap.CommonRequired}"><lookup target-form-name="LookupPartyName"/></field>
- <field name="partyIdTo" use-when="employment!=null" title="${uiLabelMap.HumanResPartyIdTo}" widget-style="tabletext" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
+ <field name="partyIdTo" use-when="employment!=null" title="${uiLabelMap.HumanResPartyIdTo}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
<field name="fromDate" use-when="employment==null" title="${uiLabelMap.CommonDate}" tooltip="${uiLabelMap.CommonRequired}"><date-time/></field>
- <field name="fromDate" use-when="employment!=null" title="${uiLabelMap.CommonDate}" widget-style="tabletext" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
+ <field name="fromDate" use-when="employment!=null" title="${uiLabelMap.CommonDate}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
<field name="terminationReasonId" use-when="employment!=null" title="${uiLabelMap.HumanResTerminationReasonId}"><lookup target-form-name="LookupTerminationReason"/></field>
<field name="terminationTypeId" use-when="employment!=null" title="${uiLabelMap.HumanResTerminationTypeId}">
<drop-down allow-empty="true" no-current-selected-key="------">
Modified: ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml Sat Jul 12 11:41:44 2008
@@ -53,7 +53,7 @@
<form name="EditPartyResume" type="single" target="createPartyResume" title="" default-map-name="partyResume"
header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="partyResume != null" target="updatePartyResume"/>
- <field name="resumeId" use-when="resumeId!=null" title="${uiLabelMap.HumanResResumeId}" widget-style="tabletext" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
+ <field name="resumeId" use-when="resumeId!=null" title="${uiLabelMap.HumanResResumeId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
<field name="resumeId" use-when="resumeId==null" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field>
<field name="contentId"><lookup target-form-name="LookupContent"/></field>
<field name="partyId" use-when="partyResume!=null&&partyId!=null" title="${uiLabelMap.FormFieldTitle_partyId}"><hidden/></field>
Modified: ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml Sat Jul 12 11:41:44 2008
@@ -44,7 +44,7 @@
header-row-style="header-row" default-table-style="basic-table" default-map-name="payGrade">
<alt-target use-when="payGradeId==null" target="createPayGrade"/>
<auto-fields-service default-field-type="edit" service-name="createPayGrade"/>
- <field use-when="payGrade!=null" name="payGradeId" widget-style="tabletext" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
+ <field use-when="payGrade!=null" name="payGradeId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
<field use-when="payGrade==null" name="payGradeId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text/></field>
<field name="payGradeName"><text/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field>
Modified: ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml Sat Jul 12 11:41:44 2008
@@ -51,9 +51,9 @@
<alt-target use-when="perfReview==null" target="createPerfReview"/>
<auto-fields-service service-name="updatePerfReview" map-name="perfReview"/>
<field name="perfReviewId" use-when="perfReview==null" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup target-form-name="LookupPerfReview"/></field>
- <field name="perfReviewId" use-when="perfReview!=null" widget-style="tabletext" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
+ <field name="perfReviewId" use-when="perfReview!=null" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
<field name="employeePartyId" use-when="perfReview==null" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup target-form-name="LookupPartyName"/></field>
- <field name="employeePartyId" use-when="perfReview!=null" widget-style="tabletext" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
+ <field name="employeePartyId" use-when="perfReview!=null" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
<field name="employeeRoleTypeId"><hidden value="EMPLOYEE"/></field>
<field name="managerPartyId"><lookup target-form-name="LookupPartyName"/></field>
<field name="managerRoleTypeId">
Modified: ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml Sat Jul 12 11:41:44 2008
@@ -59,7 +59,7 @@
<set field="insideEmployee" from-field="parameters.insideEmployee"/>
</actions>
<alt-target use-when="insideEmployee != null" target="createPersonTrainingExt"/>
- <field use-when="party!=null" name="partyId" widget-style="tabletext"><hidden/></field>
+ <field use-when="party!=null" name="partyId"><hidden/></field>
<field use-when="party==null" name="partyId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup target-form-name="LookupPartyName"/></field>
<field name="trainingClassTypeId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
<drop-down allow-empty="false">
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl Sat Jul 12 11:41:44 2008
@@ -65,16 +65,16 @@
<input type="hidden" name="fromGroupIndex_o_${rowCount}" value="${shipGroupIndex}"/>
<tr>
<td>
- <div class="tabletext">[${shoppingCartItem.getProductId()}] ${shoppingCartItem.getName()?if_exists}: ${shoppingCartItem.getDescription()?if_exists}</div>
+ <div>[${shoppingCartItem.getProductId()}] ${shoppingCartItem.getName()?if_exists}: ${shoppingCartItem.getDescription()?if_exists}</div>
</td>
<td>
- <div class="tabletext">${shipGroupItemQuantity}</div>
+ <div>${shipGroupItemQuantity}</div>
</td>
<td>
- <div class="tabletext"><input type="text" name="quantity_o_${rowCount}" value="${shipGroupItemQuantity}"/></div>
+ <div><input type="text" name="quantity_o_${rowCount}" value="${shipGroupItemQuantity}"/></div>
</td>
<td>
- <div class="tabletext">
+ <div>
<select name="toGroupIndex_o_${rowCount}">
<option value="${shipGroupIndex}">---</option>
<#list 0..(shoppingCart.getShipGroupSize() - 1) as groupIdx>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/additionalPartyListing.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/additionalPartyListing.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/additionalPartyListing.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/additionalPartyListing.ftl Sat Jul 12 11:41:44 2008
@@ -34,9 +34,9 @@
</tr>
<#list additionalPartyRoleMap[role] as party>
<tr>
- <td><div class="tabletext">${party}</div></td>
+ <td><div>${party}</div></td>
<td>
- <div class="tabletext">
+ <div>
<#if partyData[party].type == "person">
${partyData[party].firstName?if_exists}
<#else>
@@ -45,7 +45,7 @@
</div>
</td>
<td>
- <div class="tabletext">
+ <div>
<#if partyData[party].type == "person">
${partyData[party].lastName?if_exists}
</#if>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/addrsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/addrsettings.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/addrsettings.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/addrsettings.ftl Sat Jul 12 11:41:44 2008
@@ -52,7 +52,7 @@
</td>
<td nowrap> </td>
<td width="100%">
- <div class="tabletext">
+ <div>
<#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonToName}:</b> ${shippingAddress.toName}<br/></#if>
<#if shippingAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${shippingAddress.attnName}<br/></#if>
<#if shippingAddress.address1?has_content>${shippingAddress.address1}<br/></#if>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl Sat Jul 12 11:41:44 2008
@@ -58,7 +58,7 @@
</select>
</td>
<td width="50%">
- <span class="tabletext">${uiLabelMap.FormFieldTitle_billingAccountId}</span>
+ <span>${uiLabelMap.FormFieldTitle_billingAccountId}</span>
</td>
<td> </td>
</tr>
@@ -78,7 +78,7 @@
<input type="radio" name="checkOutPaymentId" value="EXT_OFFLINE" <#if checkOutPaymentId?exists && checkOutPaymentId == "EXT_OFFLINE">checked="checked"</#if>/>
</td>
<td colspan="2" width="50%">
- <span class="tabletext">${uiLabelMap.OrderPaymentOfflineCheckMoney}</span>
+ <span>${uiLabelMap.OrderPaymentOfflineCheckMoney}</span>
</td>
</tr>
<tr><td colspan="3"><hr/></td></tr>
@@ -87,7 +87,7 @@
<input type="radio" name="checkOutPaymentId" value="EXT_COD" <#if checkOutPaymentId?exists && checkOutPaymentId == "EXT_COD">checked="checked"</#if>/>
</td>
<td colspan="2" width="50%">
- <span class="tabletext">${uiLabelMap.OrderCOD}</span>
+ <span>${uiLabelMap.OrderCOD}</span>
</td>
</tr>
<tr><td colspan="3"><hr/></td></tr>
@@ -100,7 +100,7 @@
<input type="radio" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if checkOutPaymentId?exists && paymentMethod.paymentMethodId == checkOutPaymentId>checked="checked"</#if>/>
</td>
<td width="50%">
- <span class="tabletext">
+ <span>
CC: ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}
<#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
${uiLabelMap.OrderCardSecurityCode} <input type="text" size="5" maxlength="10" name="securityCode_${paymentMethod.paymentMethodId}" value=""/>
@@ -115,7 +115,7 @@
<input type="radio" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if checkOutPaymentId?exists && paymentMethod.paymentMethodId == checkOutPaymentId>checked="checked"</#if>/>
</td>
<td width="50%">
- <span class="tabletext">
+ <span>
EFT: ${eftAccount.bankName?if_exists}: ${eftAccount.accountNumber?if_exists}
<#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
</span>
@@ -126,7 +126,7 @@
</#if>
</#list>
<#else>
- <div class="tabletext"><b>${uiLabelMap.AccountingNoPaymentMethods}</b></div>
+ <div><b>${uiLabelMap.AccountingNoPaymentMethods}</b></div>
</#if>
</table>
</form>
@@ -171,7 +171,7 @@
<input type="checkbox" name="useShipAddr" value="Y" onClick="javascript:shipBillAddr();" <#if requestParameters.useShipAddr?exists>checked="checked"</#if>/>
</td>
<td colspan="2" align="left" valign="center">
- <div class="tabletext">${uiLabelMap.FacilityBillingAddressSameShipping}</div>
+ <div>${uiLabelMap.FacilityBillingAddressSameShipping}</div>
</td>
</tr>
<tr>
@@ -192,42 +192,42 @@
<#-- generic address information -->
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonToName}</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonToName}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="30" maxlength="60" name="toName" value="${toName}" <#if requestParameters.useShipAddr?exists>disabled="disabled"</#if>/>
</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonAttentionName}</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonAttentionName}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="30" maxlength="60" name="attnName" value="${postalFields.attnName?if_exists}" <#if requestParameters.useShipAddr?exists>disabled="disabled"</#if>/>
</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonAddressLine} 1</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonAddressLine} 1</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="30" maxlength="30" name="address1" value="${postalFields.address1?if_exists}" <#if requestParameters.useShipAddr?exists>disabled="disabled"</#if>/>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonAddressLine} 2</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonAddressLine} 2</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="30" maxlength="30" name="address2" value="${postalFields.address2?if_exists}" <#if requestParameters.useShipAddr?exists>disabled="disabled"</#if>/>
</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonCity}</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonCity}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="30" maxlength="30" name="city" value="${postalFields.city?if_exists}" <#if requestParameters.useShipAddr?exists>disabled="disabled"</#if>/>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonStateProvince}</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonStateProvince}</div></td>
<td width="5"> </td>
<td width="74%">
<select name="stateProvinceGeoId" <#if requestParameters.useShipAddr?exists>disabled="disabled"</#if>>
@@ -241,14 +241,14 @@
</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonZipPostalCode}</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonZipPostalCode}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="12" maxlength="10" name="postalCode" value="${postalFields.postalCode?if_exists}" <#if requestParameters.useShipAddr?exists>disabled="disabled"</#if>/>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonCountry}</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonCountry}</div></td>
<td width="5"> </td>
<td width="74%">
<select name="countryGeoId" <#if requestParameters.useShipAddr?exists>disabled="disabled"</#if>>
@@ -272,14 +272,14 @@
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingCompanyNameCard}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingCompanyNameCard}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class='inputBox' size="30" maxlength="60" name="companyNameOnCard" value="${creditCard.companyNameOnCard?if_exists}"/>
</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingPrefixCard}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingPrefixCard}</div></td>
<td width="5"> </td>
<td width="74%">
<select name="titleOnCard">
@@ -292,28 +292,28 @@
</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingFirstNameCard}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingFirstNameCard}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="20" maxlength="60" name="firstNameOnCard" value="${(creditCard.firstNameOnCard)?if_exists}"/>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingMiddleNameCard}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingMiddleNameCard}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="15" maxlength="60" name="middleNameOnCard" value="${(creditCard.middleNameOnCard)?if_exists}"/>
</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingLastNameCard}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingLastNameCard}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="20" maxlength="60" name="lastNameOnCard" value="${(creditCard.lastNameOnCard)?if_exists}"/>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingSuffixCard}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingSuffixCard}</div></td>
<td width="5"> </td>
<td width="74%">
<select name="suffixOnCard">
@@ -330,7 +330,7 @@
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingCardType}</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingCardType}</div></td>
<td width="5"> </td>
<td width="74%">
<select name="cardType">
@@ -349,21 +349,21 @@
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingCardNumber}</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingCardNumber}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="20" maxlength="30" name="cardNumber" value="${creditCard.cardNumber?if_exists}"/>
*</td>
</tr>
<#--<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.OrderCardSecurityCode}</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.OrderCardSecurityCode}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="5" maxlength="10" name="cardSecurityCode" value=""/>
</td>
</tr>-->
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingExpirationDate}</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingExpirationDate}</div></td>
<td width="5"> </td>
<td width="74%">
<#assign expMonth = "">
@@ -409,7 +409,7 @@
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonDescription}</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonDescription}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="20" maxlength="30" name="description" value="${creditCard.description?if_exists}"/>
@@ -426,35 +426,35 @@
<td colspan="3"><hr/></td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingNameAccount}</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingNameAccount}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="30" maxlength="60" name="nameOnAccount" value="${eftAccount.nameOnAccount?if_exists}"/>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingCompanyNameAccount}</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingCompanyNameAccount}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="30" maxlength="60" name="companyNameOnAccount" value="${eftAccount.companyNameOnAccount?if_exists}"/>
</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingBankName}</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingBankName}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="30" maxlength="60" name="bankName" value="${eftAccount.bankName?if_exists}"/>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingRoutingNumber}</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingRoutingNumber}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="10" maxlength="30" name="routingNumber" value="${eftAccount.routingNumber?if_exists}"/>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingAccountType}</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingAccountType}</div></td>
<td width="5"> </td>
<td width="74%">
<select name="accountType">
@@ -466,14 +466,14 @@
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingAccountNumber}</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingAccountNumber}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="20" maxlength="40" name="accountNumber" value="${eftAccount.accountNumber?if_exists}"/>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonDescription}</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonDescription}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="30" maxlength="60" name="description" value="${eftAccount.description?if_exists}"/>
@@ -503,23 +503,23 @@
<#if !requestParameters.createNew?exists>
<tr>
<td width='1%' nowrap><input type="radio" name="paymentMethodTypeAndId" value="EXT_OFFLINE" <#if checkOutPaymentId?exists && checkOutPaymentId == "EXT_OFFLINE">checked="checked"</#if> onchange="setCheckoutPaymentId(this.value)" onClick="setCheckoutPaymentId(this.value)"/></td>
- <td width='50%'nowrap><div class="tabletext">${uiLabelMap.OrderPaymentOfflineCheckMoney}</div></td>
+ <td width='50%'nowrap><div>${uiLabelMap.OrderPaymentOfflineCheckMoney}</div></td>
</tr>
<tr><td colspan="2"><hr/></td></tr>
<tr>
<td width="1%" nowrap><input type="radio" name="paymentMethodTypeAndId" value="EXT_COD" <#if checkOutPaymentId?exists && checkOutPaymentId == "EXT_COD">checked="checked"</#if> onchange="setCheckoutPaymentId(this.value)" onClick="setCheckoutPaymentId(this.value)"/></td>
- <td width="50%"nowrap><div class="tabletext">${uiLabelMap.OrderCOD}</div></td>
+ <td width="50%"nowrap><div>${uiLabelMap.OrderCOD}</div></td>
</tr>
<tr><td colspan="2"><hr/></td></tr>
</#if>
<tr>
<td width='1%' nowrap><input type="radio" name="paymentMethodTypeAndId" value="CC" onchange="setCheckoutPaymentId(this.value)" onClick="setCheckoutPaymentId(this.value)"/>
- <td width='50%' nowrap><div class="tabletext">${uiLabelMap.AccountingVisaMastercardAmexDiscover}</div></td>
+ <td width='50%' nowrap><div>${uiLabelMap.AccountingVisaMastercardAmexDiscover}</div></td>
</tr>
<tr><td colspan="2"><hr/></td></tr>
<tr>
<td width='1%' nowrap><input type="radio" name="paymentMethodTypeAndId" value="EFT" onchange="setCheckoutPaymentId(this.value)" onClick="setCheckoutPaymentId(this.value)"/>
- <td width='50%' nowrap><div class="tabletext">${uiLabelMap.AccountingAHCElectronicCheck}</div></td>
+ <td width='50%' nowrap><div>${uiLabelMap.AccountingAHCElectronicCheck}</div></td>
</tr>
</table>
</form>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl Sat Jul 12 11:41:44 2008
@@ -39,7 +39,7 @@
<table border="0">
<tr>
<td>
- <div class="tabletext">
+ <div>
<select name='shoppingListId'>
<#list shoppingLists as shoppingList>
<option value='${shoppingList.shoppingListId}'>${shoppingList.getString("listName")}</option>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/manualPromotions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/manualPromotions.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/manualPromotions.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/manualPromotions.ftl Sat Jul 12 11:41:44 2008
@@ -23,7 +23,7 @@
<div class="boxhead"> ${uiLabelMap.OrderManualPromotions}</div>
</div>
<div class="screenlet-body">
- <div class="tabletext">
+ <div>
<form method="post" action="<@o...@ofbizUrl>" name="domanualpromotions" style="margin: 0;">
<!-- to enter more than two manual promotions, just add a new select box with name="productPromoId_n" -->
<select name="productPromoId_1">
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/minicart.ftl Sat Jul 12 11:41:44 2008
@@ -35,13 +35,13 @@
</#if>
<table width="100%" cellpadding="0" cellspacing="2">
<tr>
- <td valign="bottom"><div class="tabletext"><b>${uiLabelMap.OrderQty}</b></div></td>
- <td valign="bottom"><div class="tabletext"><b>${uiLabelMap.OrderItem}</b></div></td>
- <td valign="bottom" align="right"><div class="tabletext"><b>${uiLabelMap.CommonSubtotal}</b></div></td>
+ <td valign="bottom"><div><b>${uiLabelMap.OrderQty}</b></div></td>
+ <td valign="bottom"><div><b>${uiLabelMap.OrderItem}</b></div></td>
+ <td valign="bottom" align="right"><div><b>${uiLabelMap.CommonSubtotal}</b></div></td>
</tr>
<#list shoppingCart.items() as cartLine>
<tr>
- <td valign="top"><div class="tabletext">${cartLine.getQuantity()?string.number}</div></td>
+ <td valign="top"><div>${cartLine.getQuantity()?string.number}</div></td>
<td valign="top">
<#if cartLine.getProductId()?exists>
<#if cartLine.getParentProductId()?exists>
@@ -50,18 +50,18 @@
<div><a href="<@o...@ofbizUrl>" class="linktext">${cartLine.getName()}</a></div>
</#if>
<#else>
- <div class="tabletext"><b>${cartLine.getItemTypeDescription()?if_exists}</b></div>
+ <div><b>${cartLine.getItemTypeDescription()?if_exists}</b></div>
</#if>
</td>
- <td align="right" valign="top"><div class="tabletext"><@ofbizCurrency amount=cartLine.getDisplayItemSubTotal() isoCode=shoppingCart.getCurrency()/></div></td>
+ <td align="right" valign="top"><div><@ofbizCurrency amount=cartLine.getDisplayItemSubTotal() isoCode=shoppingCart.getCurrency()/></div></td>
</tr>
<#if cartLine.getReservStart()?exists>
- <tr><td> </td><td colspan="2"><div class="tabletext">(${cartLine.getReservStart()?string("yyyy-MM-dd")}, ${cartLine.getReservLength()} <#if cartLine.getReservLength() == 1>${uiLabelMap.CommonDay}<#else/>${uiLabelMap.CommonDays}</#if>)</div></td></tr>
+ <tr><td> </td><td colspan="2"><div>(${cartLine.getReservStart()?string("yyyy-MM-dd")}, ${cartLine.getReservLength()} <#if cartLine.getReservLength() == 1>${uiLabelMap.CommonDay}<#else/>${uiLabelMap.CommonDays}</#if>)</div></td></tr>
</#if>
</#list>
<tr>
<td colspan="3" align="right">
- <div class="tabletext"><b>${uiLabelMap.OrderTotal}: <@ofbizCurrency amount=shoppingCart.getGrandTotal() isoCode=shoppingCart.getCurrency()/></b></div>
+ <div><b>${uiLabelMap.OrderTotal}: <@ofbizCurrency amount=shoppingCart.getGrandTotal() isoCode=shoppingCart.getCurrency()/></b></div>
</td>
</tr>
</table>
@@ -71,7 +71,7 @@
<div style="margin-top: 4px;"><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceOnePageCheckout}</a></div>
</#if>
<#else>
- <div class="tabletext">${uiLabelMap.OrderShoppingCartEmpty}</div>
+ <div>${uiLabelMap.OrderShoppingCartEmpty}</div>
</#if>
</div>
</div>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoCodes.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoCodes.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoCodes.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoCodes.ftl Sat Jul 12 11:41:44 2008
@@ -23,7 +23,7 @@
<div class="boxhead"> ${uiLabelMap.OrderPromotionCouponCodes}</div>
</div>
<div class="screenlet-body">
- <div class="tabletext">
+ <div>
<form method="post" action="<@ofbizUrl>addpromocode<#if requestAttributes._CURRENT_VIEW_?has_content>/${requestAttributes._CURRENT_VIEW_}</#...@ofbizUrl>" name="addpromocodeform" style="margin: 0;">
<input type="text" size="15" name="productPromoCodeId" value="">
<input type="submit" class="smallSubmit" value="${uiLabelMap.OrderAddCode}">
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoText.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoText.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoText.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoText.ftl Sat Jul 12 11:41:44 2008
@@ -27,7 +27,7 @@
<#list productPromos as productPromo>
<tr>
<td>
- <div class="tabletext"><a href="<@o...@ofbizUrl>" class="linktext">${uiLabelMap.CommonDetails}</a> ${productPromo.promoText?if_exists}</div>
+ <div><a href="<@o...@ofbizUrl>" class="linktext">${uiLabelMap.CommonDetails}</a> ${productPromo.promoText?if_exists}</div>
</td>
</tr>
<#if productPromo_has_next>
@@ -37,7 +37,7 @@
<tr><td><hr/></td></tr>
<tr>
<td>
- <div class="tabletext"><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderViewAllPromotions}</a></div>
+ <div><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderViewAllPromotions}</a></div>
</td>
</tr>
</table>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl Sat Jul 12 11:41:44 2008
@@ -25,14 +25,14 @@
<div style="float: left; width: 40%;">
<div>${uiLabelMap.OrderPromotionsApplied}:</div>
<#list shoppingCart.getProductPromoUseInfoIter() as productPromoUseInfo>
- <div class="tabletext">
+ <div>
<#-- TODO: when promo pretty print is done show promo short description here -->
${uiLabelMap.EcommercePromotion} <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDetails}</a>
<#if productPromoUseInfo.productPromoCodeId?has_content> - ${uiLabelMap.OrderWithPromoCode} [${productPromoUseInfo.productPromoCodeId}]</#if>
<#if (productPromoUseInfo.totalDiscountAmount != 0)> - ${uiLabelMap.CommonTotalValue} <@ofbizCurrency amount=(-1*productPromoUseInfo.totalDiscountAmount) isoCode=shoppingCart.getCurrency()/></#if>
</div>
<#if (productPromoUseInfo.quantityLeftInActions > 0)>
- <div class="tabletext">- Could be used for ${productPromoUseInfo.quantityLeftInActions} more discounted item<#if (productPromoUseInfo.quantityLeftInActions > 1)>s</#if> if added to your cart.</div>
+ <div>- Could be used for ${productPromoUseInfo.quantityLeftInActions} more discounted item<#if (productPromoUseInfo.quantityLeftInActions > 1)>s</#if> if added to your cart.</div>
</#if>
</#list>
</div>
@@ -41,21 +41,21 @@
<#list shoppingCart.items() as cartLine>
<#assign cartLineIndex = shoppingCart.getItemIndex(cartLine)>
<#if cartLine.getIsPromo()>
- <div class="tabletext">${uiLabelMap.OrderItemN} ${cartLineIndex+1} [${cartLine.getProductId()?if_exists}] - ${uiLabelMap.OrderIsAPromotionalItem}</div>
+ <div>${uiLabelMap.OrderItemN} ${cartLineIndex+1} [${cartLine.getProductId()?if_exists}] - ${uiLabelMap.OrderIsAPromotionalItem}</div>
<#else>
- <div class="tabletext">${uiLabelMap.OrderItemN} ${cartLineIndex+1} [${cartLine.getProductId()?if_exists}] - ${cartLine.getPromoQuantityUsed()?string.number}/${cartLine.getQuantity()?string.number} ${uiLabelMap.CommonUsed} - ${cartLine.getPromoQuantityAvailable()?string.number} ${uiLabelMap.CommonAvailable}</div>
+ <div>${uiLabelMap.OrderItemN} ${cartLineIndex+1} [${cartLine.getProductId()?if_exists}] - ${cartLine.getPromoQuantityUsed()?string.number}/${cartLine.getQuantity()?string.number} ${uiLabelMap.CommonUsed} - ${cartLine.getPromoQuantityAvailable()?string.number} ${uiLabelMap.CommonAvailable}</div>
<#list cartLine.getQuantityUsedPerPromoActualIter() as quantityUsedPerPromoActualEntry>
<#assign productPromoActualPK = quantityUsedPerPromoActualEntry.getKey()>
<#assign actualQuantityUsed = quantityUsedPerPromoActualEntry.getValue()>
<#assign isQualifier = "ProductPromoCond" == productPromoActualPK.getEntityName()>
- <div class="tabletext"> - ${actualQuantityUsed} ${uiLabelMap.CommonUsedAs} <#if isQualifier>${uiLabelMap.CommonQualifier}<#else>${uiLabelMap.CommonBenefit}</#if> ${uiLabelMap.OrderOfPromotion} <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDetails}</a></div>
+ <div> - ${actualQuantityUsed} ${uiLabelMap.CommonUsedAs} <#if isQualifier>${uiLabelMap.CommonQualifier}<#else>${uiLabelMap.CommonBenefit}</#if> ${uiLabelMap.OrderOfPromotion} <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDetails}</a></div>
<!-- productPromoActualPK ${productPromoActualPK.toString()} -->
</#list>
<#list cartLine.getQuantityUsedPerPromoFailedIter() as quantityUsedPerPromoFailedEntry>
<#assign productPromoFailedPK = quantityUsedPerPromoFailedEntry.getKey()>
<#assign failedQuantityUsed = quantityUsedPerPromoFailedEntry.getValue()>
<#assign isQualifier = "ProductPromoCond" == productPromoFailedPK.getEntityName()>
- <div class="tabletext"> - ${uiLabelMap.CommonCouldBeUsedAs} <#if isQualifier>${uiLabelMap.CommonQualifier}<#else>${uiLabelMap.CommonBenefit}</#if> ${uiLabelMap.OrderOfPromotion} <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDetails}</a></div>
+ <div> - ${uiLabelMap.CommonCouldBeUsedAs} <#if isQualifier>${uiLabelMap.CommonQualifier}<#else>${uiLabelMap.CommonBenefit}</#if> ${uiLabelMap.OrderOfPromotion} <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDetails}</a></div>
<!-- Total times checked but failed: ${failedQuantityUsed}, productPromoFailedPK ${productPromoFailedPK.toString()} -->
</#list>
<#list cartLine.getQuantityUsedPerPromoCandidateIter() as quantityUsedPerPromoCandidateEntry>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl Sat Jul 12 11:41:44 2008
@@ -23,30 +23,30 @@
</div>
<div class="screenlet-body">
<#if productPromoCategoryIncludeList?has_content>
- <div class="tabletext">${uiLabelMap.OrderPromotionProductsInCategories}:</div>
+ <div>${uiLabelMap.OrderPromotionProductsInCategories}:</div>
<#list productPromoCategoryIncludeList as productPromoCategory>
<#assign productCategory = productPromoCategory.getRelatedOneCache("ProductCategory")>
- <div class="tabletext">
+ <div>
- <a href="<@o...@ofbizUrl>" class="buttontext">${(productCategory.description)?default(productPromoCategory.productCategoryId)}</a>
<#if productPromoCategory.includeSubCategories?if_exists = "Y">(${uiLabelMap.OrderIncludeSubCategories})</#if>
</div>
</#list>
</#if>
<#if productPromoCategoryExcludeList?has_content>
- <div class="tabletext">${uiLabelMap.OrderExcludeCategories}</div>
+ <div>${uiLabelMap.OrderExcludeCategories}</div>
<#list productPromoCategoryExcludeList as productPromoCategory>
<#assign productCategory = productPromoCategory.getRelatedOneCache("ProductCategory")>
- <div class="tabletext">
+ <div>
- <a href="<@o...@ofbizUrl>" class="buttontext">${(productCategory.description)?default(productPromoCategory.productCategoryId)}</a>
<#if productPromoCategory.includeSubCategories?if_exists = "Y">(${uiLabelMap.OrderIncludeSubCategories})</#if>
</div>
</#list>
</#if>
<#if productPromoCategoryAlwaysList?has_content>
- <div class="tabletext">${uiLabelMap.OrderAlwaysList}</div>
+ <div>${uiLabelMap.OrderAlwaysList}</div>
<#list productPromoCategoryAlwaysList as productPromoCategory>
<#assign productCategory = productPromoCategory.getRelatedOneCache("ProductCategory")>
- <div class="tabletext">
+ <div>
- <a href="<@o...@ofbizUrl>" class="buttontext">${(productCategory.description)?default(productPromoCategory.productCategoryId)}</a>
<#if productPromoCategory.includeSubCategories?if_exists = "Y">(${uiLabelMap.OrderIncludeSubCategories})</#if>
</div>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotiondetails.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotiondetails.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotiondetails.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotiondetails.ftl Sat Jul 12 11:41:44 2008
@@ -22,7 +22,7 @@
<div class="boxhead"> ${uiLabelMap.OrderPromotionDetails}:</div>
</div>
<div class="screenlet-body">
- <div class="tabletext">${productPromo.promoText?if_exists}</div>
- <div class="tabletext">Generated Description: ${promoAutoDescription?if_exists}</div>
+ <div>${productPromo.promoText?if_exists}</div>
+ <div>Generated Description: ${promoAutoDescription?if_exists}</div>
</div>
</div>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotionproducts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotionproducts.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotionproducts.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotionproducts.ftl Sat Jul 12 11:41:44 2008
@@ -27,7 +27,7 @@
<table border="0" width="100%" cellpadding="2">
<tr>
<td align="right">
- <span class="tabletext">
+ <span>
<b>
<#if (viewIndex > 0)>
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a> |
@@ -52,8 +52,8 @@
<#if (listSize > 0)>
<#list productIds[lowIndex..highIndex-1] as productId>
<tr>
- <td><div class="tabletext">[<#if productIdsCond.contains(productId)>x<#else> </#if>]</div></td>
- <td><div class="tabletext">[<#if productIdsAction.contains(productId)>x<#else> </#if>]</div></td>
+ <td><div>[<#if productIdsCond.contains(productId)>x<#else> </#if>]</div></td>
+ <td><div>[<#if productIdsAction.contains(productId)>x<#else> </#if>]</div></td>
<td>
${setRequestAttribute("optProductId", productId)}
${setRequestAttribute("listIndex", productId_index)}
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showAllPromotions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showAllPromotions.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showAllPromotions.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showAllPromotions.ftl Sat Jul 12 11:41:44 2008
@@ -24,7 +24,7 @@
<div class="screenlet-body">
<#-- show promotions text -->
<#list productPromosAllShowable as productPromo>
- <div class="tabletext"><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDetails}</a> ${productPromo.promoText}</div>
+ <div><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDetails}</a> ${productPromo.promoText}</div>
<#if productPromo_has_next>
<hr/>
</#if>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl Sat Jul 12 11:41:44 2008
@@ -42,7 +42,7 @@
<tr>
<td align="right"><div>${uiLabelMap.OrderDesiredDeliveryDate} :</div></td>
<td>
- <div class="tabletext">
+ <div>
<input type="text" size="25" maxlength="30" name="itemDesiredDeliveryDate"<#if useAsDefaultDesiredDeliveryDate?exists> value="${defaultDesiredDeliveryDate}"</#if>/>
<a href="javascript:call_cal(document.quickaddform.itemDesiredDeliveryDate,'${defaultDesiredDeliveryDate} 00:00:00.0');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.calendar_click_here_for_calendar}"/></a>
<input type="checkbox" name="useAsDefaultDesiredDeliveryDate" value="true"<#if useAsDefaultDesiredDeliveryDate?exists> checked="checked"</#if>/>
@@ -53,7 +53,7 @@
<tr>
<td align="right"><div>${uiLabelMap.OrderShipAfterDate} :</div></td>
<td>
- <div class="tabletext">
+ <div>
<input type="text" size="20" maxlength="30" name="shipAfterDate" value="${shoppingCart.getDefaultShipAfterDate()?default("")}"/>
<a href="javascript:call_cal(document.quickaddform.shipAfterDate,'${shoppingCart.getDefaultShipAfterDate()?default("")}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.calendar_click_here_for_calendar}"/></a>
</div>
@@ -62,7 +62,7 @@
<tr>
<td align="right"><div>${uiLabelMap.OrderShipBeforeDate} :</div></td>
<td>
- <div class="tabletext">
+ <div>
<input type="text" size="20" maxlength="30" name="shipBeforeDate" value="${shoppingCart.getDefaultShipBeforeDate()?default("")}"/>
<a href="javascript:call_cal(document.quickaddform.shipBeforeDate,'${shoppingCart.getDefaultShipBeforeDate()?default("")}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.calendar_click_here_for_calendar}"/></a>
</div>
@@ -72,7 +72,7 @@
<tr>
<td align="right"><div>${uiLabelMap.OrderOrderItemType} :</div></td>
<td>
- <div class="tabletext">
+ <div>
<select name="add_item_type">
<option value=""> </option>
<#list purchaseOrderItemTypeList as orderItemType>
@@ -86,7 +86,7 @@
<tr>
<td align="right"><div>${uiLabelMap.CommonComment} :</div></td>
<td>
- <div class="tabletext">
+ <div>
<input type="text" size="25" name="itemComment" value="${defaultComment?if_exists}">
<input type="checkbox" name="useAsDefaultComment" value="true" <#if useAsDefaultComment?exists>checked</#if>>
${uiLabelMap.OrderUseDefaultComment}
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl Sat Jul 12 11:41:44 2008
@@ -37,7 +37,7 @@
<tr>
<td> </td>
<td colspan="2">
- <div class="tabletext">
+ <div>
<b>${uiLabelMap.ProductProduct}</b>
<#if showOrderGiftWrap?default("true") == "true">
<select name="GWALL" onchange="javascript:gwAll(this);">
@@ -52,10 +52,10 @@
</#if>
</div>
</td>
- <td align="center"><div class="tabletext"><b>${uiLabelMap.OrderQuantity}</b></div></td>
- <td align="right"><div class="tabletext"><b>${uiLabelMap.CommonUnitPrice}</b></div></td>
- <td align="right"><div class="tabletext"><b>${uiLabelMap.OrderAdjustments}</b></div></td>
- <td align="right"><div class="tabletext"><b>${uiLabelMap.OrderItemTotal}</b></div></td>
+ <td align="center"><div><b>${uiLabelMap.OrderQuantity}</b></div></td>
+ <td align="right"><div><b>${uiLabelMap.CommonUnitPrice}</b></div></td>
+ <td align="right"><div><b>${uiLabelMap.OrderAdjustments}</b></div></td>
+ <td align="right"><div><b>${uiLabelMap.OrderItemTotal}</b></div></td>
<td align="center"><input type="checkbox" name="selectAll" value="0" onclick="javascript:toggleAll(this);"></td>
</tr>
@@ -69,7 +69,7 @@
<td>
<table border="0">
<tr><td colspan="2">
- <div class="tabletext">
+ <div>
<#if cartLine.getProductId()?exists>
<#-- product item -->
<a href="<@o...@ofbizUrl>" class="buttontext">${cartLine.getProductId()}</a> -
@@ -110,7 +110,7 @@
<#if cartLine.getRequirementId()?has_content>
<tr>
<td colspan="2" align="left">
- <div class="tabletext"><b>${uiLabelMap.OrderRequirementId}</b>: ${cartLine.getRequirementId()?if_exists}</div>
+ <div><b>${uiLabelMap.OrderRequirementId}</b>: ${cartLine.getRequirementId()?if_exists}</div>
</td>
</tr>
</#if>
@@ -118,19 +118,19 @@
<#if cartLine.getQuoteItemSeqId()?has_content>
<tr>
<td colspan="2" align="left">
- <div class="tabletext"><b>${uiLabelMap.OrderOrderQuoteId}</b>: ${cartLine.getQuoteId()?if_exists} - ${cartLine.getQuoteItemSeqId()?if_exists}</div>
+ <div><b>${uiLabelMap.OrderOrderQuoteId}</b>: ${cartLine.getQuoteId()?if_exists} - ${cartLine.getQuoteItemSeqId()?if_exists}</div>
</td>
</tr>
</#if>
</#if>
<#if cartLine.getItemComment()?has_content>
<tr><td align="left"><div>${uiLabelMap.CommonComment} : </div></td>
- <td align="left"><div class="tabletext">${cartLine.getItemComment()?if_exists}</div>
+ <td align="left"><div>${cartLine.getItemComment()?if_exists}</div>
</td></tr>
</#if>
<#if cartLine.getDesiredDeliveryDate()?has_content>
<tr><td align="left"><div>${uiLabelMap.OrderDesiredDeliveryDate}: </div></td>
- <td align="left"><div class="tabletext">${cartLine.getDesiredDeliveryDate()?if_exists}</div>
+ <td align="left"><div>${cartLine.getDesiredDeliveryDate()?if_exists}</div>
</td></tr>
</#if>
<#-- inventory summary -->
@@ -139,7 +139,7 @@
<#assign product = cartLine.getProduct()>
<tr>
<td colspan="2" align="left">
- <div class="tabletext">
+ <div>
<a href="/catalog/control/EditProductInventoryItems?productId=${productId}" class="buttontext"><b>${uiLabelMap.ProductInventory}</b></a>:
${uiLabelMap.ProductAtp} = ${availableToPromiseMap.get(productId)}, ${uiLabelMap.ProductQoh} = ${quantityOnHandMap.get(productId)}
<#if product.productTypeId == "MARKETING_PKG_AUTO" || product.productTypeId == "MARKETING_PKG_PICK">
@@ -153,7 +153,7 @@
<#assign currentOrderItemType = cartLine.getItemTypeGenericValue()?if_exists/>
<tr>
<td align="left">
- <div class="tabletext">
+ <div>
${uiLabelMap.OrderOrderItemType}:
<select name="itemType_${cartLineIndex}">
<#if currentOrderItemType?has_content>
@@ -176,7 +176,7 @@
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td align="left">
- <div class="tabletext">${uiLabelMap.OrderShipAfterDate}
+ <div>${uiLabelMap.OrderShipAfterDate}
<input type="text" size="20" maxlength="30" name="shipAfterDate_${cartLineIndex}"
value="${cartLine.getShipAfterDate()?default("")}"/>
<a href="javascript:call_cal(document.cartform.shipAfterDate_${cartLineIndex},'${shoppingCart.getShipAfterDate()?default("")}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.calendar_click_here_for_calendar}"/></a>
@@ -184,7 +184,7 @@
</td>
<td> </td>
<td align="left">
- <div class="tabletext">${uiLabelMap.OrderShipBeforeDate}
+ <div>${uiLabelMap.OrderShipBeforeDate}
<input type="text" size="20" maxlength="30" name="shipBeforeDate_${cartLineIndex}"
value="${cartLine.getShipBeforeDate()?default("")}"/>
<a href="javascript:call_cal(document.cartform.shipBeforeDate_${cartLineIndex},'${shoppingCart.getShipBeforeDate()?default("")}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.calendar_click_here_for_calendar}"/></a>
@@ -202,7 +202,7 @@
<#list cartLine.getAlternativeOptionProductIds() as alternativeOptionProductId>
<#assign alternativeOptionProduct = delegator.findByPrimaryKeyCache("Product", Static["org.ofbiz.base.util.UtilMisc"].toMap("productId", alternativeOptionProductId))>
<#assign alternativeOptionName = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(alternativeOptionProduct, "PRODUCT_NAME", locale, dispatcher)?if_exists>
- <div class="tabletext"><a href="<@o...@ofbizUrl>" class="buttontext">Select: ${alternativeOptionName?default(alternativeOptionProductId)}</a></div>
+ <div><a href="<@o...@ofbizUrl>" class="buttontext">Select: ${alternativeOptionName?default(alternativeOptionProductId)}</a></div>
</#list>
</#if>
</td>
@@ -229,7 +229,7 @@
</td>
<#-- end gift wrap option -->
<td nowrap align="center">
- <div class="tabletext">
+ <div>
<#if cartLine.getIsPromo() || cartLine.getShoppingListId()?exists>
${cartLine.getQuantity()?string.number}
<#else>
@@ -238,7 +238,7 @@
</div>
</td>
<td nowrap align="right">
- <div class="tabletext">
+ <div>
<#if cartLine.getIsPromo() || (shoppingCart.getOrderType() == "SALES_ORDER" && !security.hasEntityPermission("ORDERMGR", "_SALES_PRICEMOD", session))>
<@ofbizCurrency amount=cartLine.getDisplayPrice() isoCode=currencyUomId/>
<#else>
@@ -246,29 +246,29 @@
</#if>
</div>
</td>
- <td nowrap align="right"><div class="tabletext"><@ofbizCurrency amount=cartLine.getOtherAdjustments() isoCode=currencyUomId/></div></td>
- <td nowrap align="right"><div class="tabletext"><@ofbizCurrency amount=cartLine.getDisplayItemSubTotal() isoCode=currencyUomId/></div></td>
- <td nowrap align="center"><div class="tabletext"><#if !cartLine.getIsPromo()><input type="checkbox" name="selectedItem" value="${cartLineIndex}" onclick="javascript:checkToggle(this);"><#else> </#if></div></td>
+ <td nowrap align="right"><div><@ofbizCurrency amount=cartLine.getOtherAdjustments() isoCode=currencyUomId/></div></td>
+ <td nowrap align="right"><div><@ofbizCurrency amount=cartLine.getDisplayItemSubTotal() isoCode=currencyUomId/></div></td>
+ <td nowrap align="center"><div><#if !cartLine.getIsPromo()><input type="checkbox" name="selectedItem" value="${cartLineIndex}" onclick="javascript:checkToggle(this);"><#else> </#if></div></td>
</tr>
</#list>
<#if shoppingCart.getAdjustments()?has_content>
<tr><td colspan="7"><hr/></td></tr>
<tr>
- <td colspan="4" nowrap align="right"><div class="tabletext">${uiLabelMap.OrderSubTotal}:</div></td>
- <td nowrap align="right"><div class="tabletext"><@ofbizCurrency amount=shoppingCart.getSubTotal() isoCode=currencyUomId/></div></td>
+ <td colspan="4" nowrap align="right"><div>${uiLabelMap.OrderSubTotal}:</div></td>
+ <td nowrap align="right"><div><@ofbizCurrency amount=shoppingCart.getSubTotal() isoCode=currencyUomId/></div></td>
<td> </td>
</tr>
<#list shoppingCart.getAdjustments() as cartAdjustment>
<#assign adjustmentType = cartAdjustment.getRelatedOneCache("OrderAdjustmentType")>
<tr>
<td colspan="4" nowrap align="right">
- <div class="tabletext">
+ <div>
<i>Adjustment</i> - ${adjustmentType.get("description",locale)?if_exists}
<#if cartAdjustment.productPromoId?has_content><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDetails}</a></#if>:
</div>
</td>
- <td nowrap align="right"><div class="tabletext"><@ofbizCurrency amount=Static["org.ofbiz.order.order.OrderReadHelper"].calcOrderAdjustment(cartAdjustment, shoppingCart.getSubTotal()) isoCode=currencyUomId/></div></td>
+ <td nowrap align="right"><div><@ofbizCurrency amount=Static["org.ofbiz.order.order.OrderReadHelper"].calcOrderAdjustment(cartAdjustment, shoppingCart.getSubTotal()) isoCode=currencyUomId/></div></td>
<td> </td>
</tr>
</#list>
@@ -276,11 +276,11 @@
<tr>
<td colspan="6" align="right" valign="bottom">
- <div class="tabletext"><b>${uiLabelMap.OrderCartTotal}:</b></div>
+ <div><b>${uiLabelMap.OrderCartTotal}:</b></div>
</td>
<td align="right" valign="bottom">
<hr/>
- <div class="tabletext"><b><@ofbizCurrency amount=shoppingCart.getGrandTotal() isoCode=currencyUomId/></b></div>
+ <div><b><@ofbizCurrency amount=shoppingCart.getGrandTotal() isoCode=currencyUomId/></b></div>
</td>
</tr>
<tr>
@@ -289,7 +289,7 @@
</table>
</form>
<#else>
- <div class="tabletext">${uiLabelMap.OrderNoOrderItemsToDisplay}</div>
+ <div>${uiLabelMap.OrderNoOrderItemsToDisplay}</div>
</#if>
</div>
</div>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl Sat Jul 12 11:41:44 2008
@@ -28,10 +28,10 @@
<input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId?if_exists}">
<tr>
<td align="right" valign="middle">
- <div class="tabletext">${uiLabelMap.ProductCategory}:</div>
+ <div>${uiLabelMap.ProductCategory}:</div>
</td>
<td valign="middle">
- <div class="tabletext">
+ <div>
<b>"${(searchCategory.description)?if_exists}"</b>${uiLabelMap.ProductIncludeSubcategories}
${uiLabelMap.CommonYes}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="Y" checked>
${uiLabelMap.CommonNo}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="N">
@@ -41,10 +41,10 @@
</#if>
<tr>
<td align="right" valign="middle">
- <div class="tabletext">${uiLabelMap.ProductKeywords}:</div>
+ <div>${uiLabelMap.ProductKeywords}:</div>
</td>
<td valign="middle">
- <div class="tabletext">
+ <div>
<input type="text" name="SEARCH_STRING" size="40" value="${requestParameters.SEARCH_STRING?if_exists}">
${uiLabelMap.CommonAny}<input type="radio" name="SEARCH_OPERATOR" value="OR" <#if searchOperator == "OR">checked</#if>>
${uiLabelMap.CommonAll}<input type="radio" name="SEARCH_OPERATOR" value="AND" <#if searchOperator == "AND">checked</#if>>
@@ -57,10 +57,10 @@
<#assign productFeatures = productFeaturesByTypeMap[productFeatureTypeId]>
<tr>
<td align="right" valign="middle">
- <div class="tabletext">${(productFeatureType.get("description",locale))?if_exists}:</div>
+ <div>${(productFeatureType.get("description",locale))?if_exists}:</div>
</td>
<td valign="middle">
- <div class="tabletext">
+ <div>
<select name="pft_${productFeatureTypeId}">
<option value="">- ${uiLabelMap.CommonSelectAny} -</option>
<#list productFeatures as productFeature>
@@ -73,10 +73,10 @@
</#list>
<tr>
<td align="right" valign="middle">
- <div class="tabletext">${uiLabelMap.ProductSupplier}:</div>
+ <div>${uiLabelMap.ProductSupplier}:</div>
</td>
<td valign="middle">
- <div class="tabletext">
+ <div>
<select name="SEARCH_SUPPLIER_ID">
<option value="">- ${uiLabelMap.CommonSelectAny} -</option>
<#list supplerPartyRoleAndPartyDetails as supplerPartyRoleAndPartyDetail>
@@ -88,10 +88,10 @@
</tr>
<tr>
<td align="right" valign="middle">
- <div class="tabletext">${uiLabelMap.CommonSortedBy}:</div>
+ <div>${uiLabelMap.CommonSortedBy}:</div>
</td>
<td valign="middle">
- <div class="tabletext">
+ <div>
<select name="sortOrder">
<option value="SortKeywordRelevancy">${uiLabelMap.ProductKeywordRelevency}</option>
<option value="SortProductField:productName">${uiLabelMap.ProductProductName}</option>
@@ -111,14 +111,14 @@
<#if searchConstraintStrings?has_content>
<tr>
<td align="right" valign="top">
- <div class="tabletext">${uiLabelMap.ProductLastSearch}:</div>
+ <div>${uiLabelMap.ProductLastSearch}:</div>
</td>
<td valign="top">
<#list searchConstraintStrings as searchConstraintString>
- <div class="tabletext"> - ${searchConstraintString}</div>
+ <div> - ${searchConstraintString}</div>
</#list>
- <div class="tabletext">${uiLabelMap.CommonSortedBy}: ${searchSortOrderString}</div>
- <div class="tabletext">
+ <div>${uiLabelMap.CommonSortedBy}: ${searchSortOrderString}</div>
+ <div>
${uiLabelMap.ProductNewSearch}<input type="radio" name="clearSearch" value="Y" checked>
${uiLabelMap.ProductRefineSearch}<input type="radio" name="clearSearch" value="N">
</div>
@@ -127,7 +127,7 @@
</#if>
<tr>
<td>
- <div class="tabletext">
+ <div>
<a href="javascript:document.advtokeywordsearchform.submit()" class="buttontext">${uiLabelMap.CommonFind}</a>
</div>
</td>
@@ -139,20 +139,20 @@
<h2>${uiLabelMap.OrderLastSearches}...</h2>
- <div class="tabletext">
+ <div>
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderClearSearchHistory}</a>
${uiLabelMap.OrderClearSearchHistoryNote}
</div>
<#list searchOptionsHistoryList as searchOptions>
<#-- searchOptions type is ProductSearchSession.ProductSearchOptions -->
- <div class="tabletext">
+ <div>
<b>${uiLabelMap.CommonSearch} #${searchOptions_index + 1}</b>
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonSearch}</a>
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRefine}</a>
</div>
<#assign constraintStrings = searchOptions.searchGetConstraintStrings(false, delegator, locale)>
<#list constraintStrings as constraintString>
- <div class="tabletext"> - ${constraintString}</div>
+ <div> - ${constraintString}</div>
</#list>
<#if searchOptions_has_next>
<hr/>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl Sat Jul 12 11:41:44 2008
@@ -53,7 +53,7 @@
</#if>
</#macro>
-<div class="tabletext">
+<div>
<a href="<@o...@ofbizUrl>" class="linktext">${uiLabelMap.CommonMain}</a>
<#-- Show the category branch -->
<#list topLevelList as category>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl Sat Jul 12 11:41:44 2008
@@ -33,7 +33,7 @@
<a href="<@ofbizUrl>category/~category_id=${productCategoryId}/~VIEW_SIZE=${viewSize}/~VIEW_INDEX=${viewIndex?int - 1}</...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a> |
</#if>
<#if (listSize?int > 0)>
- <span class="tabletext">${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span>
+ <span>${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span>
</#if>
<#if highIndex?int < listSize?int>
| <a href="<@ofbizUrl>category/~category_id=${productCategoryId}/~VIEW_SIZE=${viewSize}/~VIEW_INDEX=${viewIndex?int + 1}</...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a>
@@ -63,7 +63,7 @@
<#assign longDescription = categoryContentWrapper.get("LONG_DESCRIPTION")?if_exists/>
<#assign categoryImageUrl = categoryContentWrapper.get("CATEGORY_IMAGE_URL")?if_exists/>
<#if categoryImageUrl?has_content || longDescription?has_content>
- <div class="tabletext">
+ <div>
<#if categoryImageUrl?has_content>
<img src='<@o...@ofbizContentUrl>' vspace='5' hspace='5' border='1' height='100' align='left'/>
</#if>