You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2012/05/19 11:35:14 UTC
svn commit: r1340386 [2/3] - in /ofbiz/trunk: applications/content/data/
applications/content/template/survey/ applications/content/testdef/data/
applications/content/webapp/content/cms/
applications/content/webapp/content/survey/ applications/order/we...
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl Sat May 19 09:35:12 2012
@@ -34,35 +34,35 @@ under the License.
<p/>
<table width="90%" border="0" cellpadding="2" cellspacing="0">
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingNameOnAccount}</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingNameOnAccount}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="60" name="nameOnAccount" value="${eftAccountData.nameOnAccount?if_exists}" />
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingCompanyNameOnAccount}</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingCompanyNameOnAccount}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="60" name="companyNameOnAccount" value="${eftAccountData.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" class="inputBox" size="30" maxlength="60" name="bankName" value="${eftAccountData.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" class="inputBox" size="10" maxlength="30" name="routingNumber" value="${eftAccountData.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" class="selectBox">
@@ -74,14 +74,14 @@ under the License.
*</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" class="inputBox" size="20" maxlength="40" name="accountNumber" value="${eftAccountData.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" class="inputBox" size="30" maxlength="60" name="description" value="${paymentMethodData.description?if_exists}" />
@@ -89,7 +89,7 @@ under the License.
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyBillingAddress}</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.PartyBillingAddress}</div></td>
<td width="5"> </td>
<td width="74%">
<#-- Removed because is confusing, can add but would have to come back here with all data populated as before...
@@ -103,17 +103,17 @@ under the License.
<input type="radio" name="contactMechId" value="${curContactMechId}" checked="checked" />
</td>
<td valign="top" width="80%">
- <div class="tabletext"><b>${uiLabelMap.PartyUseCurrentAddress}:</b></div>
+ <div><b>${uiLabelMap.PartyUseCurrentAddress}:</b></div>
<#list curPartyContactMechPurposes as curPartyContactMechPurpose>
<#assign curContactMechPurposeType = curPartyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")>
- <div class="tabletext">
+ <div>
<b>${curContactMechPurposeType.get("description",locale)?if_exists}</b>
<#if curPartyContactMechPurpose.thruDate?exists>
(${uiLabelMap.CommonExpire}:${curPartyContactMechPurpose.thruDate.toString()})
</#if>
</div>
</#list>
- <div class="tabletext">
+ <div>
<#if curPostalAddress.toName?exists><b>${uiLabelMap.CommonTo}:</b> ${curPostalAddress.toName}<br /></#if>
<#if curPostalAddress.attnName?exists><b>${uiLabelMap.PartyAddrAttnName}:</b> ${curPostalAddress.attnName}<br /></#if>
${curPostalAddress.address1?if_exists}<br />
@@ -121,21 +121,21 @@ under the License.
${curPostalAddress.city}<#if curPostalAddress.stateProvinceGeoId?has_content>, ${curPostalAddress.stateProvinceGeoId}</#if> ${curPostalAddress.postalCode}
<#if curPostalAddress.countryGeoId?exists><br />${curPostalAddress.countryGeoId}</#if>
</div>
- <div class="tabletext">(${uiLabelMap.CommonUpdated}: ${(curPartyContactMech.fromDate.toString())?if_exists})</div>
- <#if curPartyContactMech.thruDate?exists><div class="tabletext"><b>${uiLabelMap.CommonDelete}: ${curPartyContactMech.thruDate.toString()}</b></div></#if>
+ <div>(${uiLabelMap.CommonUpdated}: ${(curPartyContactMech.fromDate.toString())?if_exists})</div>
+ <#if curPartyContactMech.thruDate?exists><div><b>${uiLabelMap.CommonDelete}: ${curPartyContactMech.thruDate.toString()}</b></div></#if>
</td>
</tr>
<#else>
<#-- <tr>
<td valign="top" colspan="2">
- <div class="tabletext">${uiLabelMap.PartyNoBillingAddress}</div>
+ <div>${uiLabelMap.PartyNoBillingAddress}</div>
</td>
</tr> -->
</#if>
<#-- is confusing
<tr>
<td valign="top" colspan="2">
- <div class="tabletext"><b>${uiLabelMap.EcommerceMessage3}</b></div>
+ <div><b>${uiLabelMap.EcommerceMessage3}</b></div>
</td>
</tr>
-->
@@ -151,12 +151,12 @@ under the License.
<td valign="top" width="80%">
<#list partyContactMechPurposes as partyContactMechPurpose>
<#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")>
- <div class="tabletext">
+ <div>
<b>${contactMechPurposeType.get("description",locale)?if_exists}</b>
<#if partyContactMechPurpose.thruDate?exists>(${uiLabelMap.CommonExpire}:${partyContactMechPurpose.thruDate})</#if>
</div>
</#list>
- <div class="tabletext">
+ <div>
<#if postalAddress.toName?exists><b>${uiLabelMap.CommonTo}:</b> ${postalAddress.toName}<br /></#if>
<#if postalAddress.attnName?exists><b>${uiLabelMap.PartyAddrAttnName}:</b> ${postalAddress.attnName}<br /></#if>
${postalAddress.address1?if_exists}<br />
@@ -164,13 +164,13 @@ under the License.
${postalAddress.city}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId}</#if> ${postalAddress.postalCode}
<#if postalAddress.countryGeoId?exists><br />${postalAddress.countryGeoId}</#if>
</div>
- <div class="tabletext">(${uiLabelMap.CommonUpdated}: ${(partyContactMech.fromDate.toString())?if_exists})</div>
- <#if partyContactMech.thruDate?exists><div class="tabletext"><b>${uiLabelMap.CommonDelete}: ${partyContactMech.thruDate.toString()}</b></div></#if>
+ <div>(${uiLabelMap.CommonUpdated}: ${(partyContactMech.fromDate.toString())?if_exists})</div>
+ <#if partyContactMech.thruDate?exists><div><b>${uiLabelMap.CommonDelete}: ${partyContactMech.thruDate.toString()}</b></div></#if>
</td>
</tr>
</#list>
<#if !postalAddressInfos?has_content && !curContactMech?exists>
- <tr><td colspan="2"><div class="tabletext">${uiLabelMap.PartyNoContactInformation}.</div></td></tr>
+ <tr><td colspan="2"><div>${uiLabelMap.PartyNoContactInformation}.</div></td></tr>
</#if>
</table>
</td>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editgiftcard.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editgiftcard.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editgiftcard.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editgiftcard.ftl Sat May 19 09:35:12 2012
@@ -34,7 +34,7 @@ under the License.
<p/>
<table width="90%" border="0" cellpadding="2" cellspacing="0">
<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%">
<#if giftCardData?has_content && giftCardData.cardNumber?has_content>
@@ -56,14 +56,14 @@ under the License.
</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingPINNumber}</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingPINNumber}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="password" class="inputBox" size="10" maxlength="60" name="pinNumber" value="${giftCardData.pinNumber?if_exists}" />
</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 = "">
@@ -100,7 +100,7 @@ under the License.
</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" class="inputBox" size="30" maxlength="60" name="description" value="${paymentMethodData.description?if_exists}" />
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editperson.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editperson.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editperson.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editperson.ftl Sat May 19 09:35:12 2012
@@ -98,7 +98,7 @@ under the License.
<td align="right">${uiLabelMap.PartyBirthDate}</td>
<td>
<input type="text" class='inputBox' size="11" maxlength="20" name="birthDate" value="${(personData.birthDate.toString())?if_exists}"/>
- <div class="tabletext">${uiLabelMap.CommonFormatDate}</div>
+ <div>${uiLabelMap.CommonFormatDate}</div>
</td>
</tr>
<tr>
@@ -156,7 +156,7 @@ under the License.
<td align="right">${uiLabelMap.PartyPassportExpireDate}</td>
<td>
<input type="text" class='inputBox' size="11" maxlength="20" name="passportExpireDate" value="${personData.passportExpireDate?if_exists}"/>
- <div class="tabletext">${uiLabelMap.CommonFormatDate}</div>
+ <div>${uiLabelMap.CommonFormatDate}</div>
</td>
</tr>
<tr>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardbalance.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardbalance.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardbalance.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardbalance.ftl Sat May 19 09:35:12 2012
@@ -19,7 +19,7 @@ under the License.
<h1>${uiLabelMap.AccountingGiftCardBalance}</h1>
<br />
-<div class="tabletext">${uiLabelMap.AccountingEnterGiftCardNumber}</div>
+<div>${uiLabelMap.AccountingEnterGiftCardNumber}</div>
<br />
<br />
@@ -27,7 +27,7 @@ under the License.
<#if requestAttributes.processResult?exists>
<tr>
<td colspan="2">
- <div align="center" class="tabletext">
+ <div align="center">
${uiLabelMap.AccountingCurrentBalance}
</div>
</td>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardlink.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardlink.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardlink.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardlink.ftl Sat May 19 09:35:12 2012
@@ -19,7 +19,7 @@ under the License.
<h1>${uiLabelMap.AccountingGiftCardLink}</h1>
<br />
-<div class="tabletext">${uiLabelMap.AccountingEnterGiftCardLink}.</div>
+<div>${uiLabelMap.AccountingEnterGiftCardLink}.</div>
<br />
<form name="gclink" method="post" action="<@o...@ofbizUrl>">
@@ -34,11 +34,11 @@ under the License.
</td>
</tr>
<tr>
- <td><div class="tabletext">${uiLabelMap.AccountingCardNumber}</div></td>
+ <td><div>${uiLabelMap.AccountingCardNumber}</div></td>
<td><input type="text" class="inputBox" name="physicalCard" size="20" /></td>
</tr>
<tr>
- <td><div class="tabletext">${uiLabelMap.AccountingPINNumber}</div></td>
+ <td><div>${uiLabelMap.AccountingPINNumber}</div></td>
<td><input type="text" class="inputBox" name="physicalPin" size="20" /></td>
</tr>
<tr>
@@ -50,11 +50,11 @@ under the License.
</td>
</tr>
<tr>
- <td><div class="tabletext">${uiLabelMap.AccountingCardNumber}</div></td>
+ <td><div>${uiLabelMap.AccountingCardNumber}</div></td>
<td><input type="text" class="inputBox" name="virtualCard" size="20" /></td>
</tr>
<tr>
- <td><div class="tabletext">${uiLabelMap.AccountingPINNumber}</div></td>
+ <td><div>${uiLabelMap.AccountingPINNumber}</div></td>
<td><input type="text" class="inputBox" name="virtualPin" size="20" /></td>
</tr>
<tr>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagedetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagedetail.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagedetail.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagedetail.ftl Sat May 19 09:35:12 2012
@@ -40,25 +40,25 @@ under the License.
<tr><td> </td></tr>
<tr>
<td align="right"><div class="tableheadtext">${uiLabelMap.CommonFrom}:</div></td>
- <td><div class="tabletext">${fromName?if_exists}</div></td>
+ <td><div>${fromName?if_exists}</div></td>
</tr>
<tr>
<td align="right"><div class="tableheadtext">${uiLabelMap.CommonTo}:</div></td>
- <td><div class="tabletext">${toName?if_exists}</div></td>
+ <td><div>${toName?if_exists}</div></td>
</tr>
<tr>
<td align="right"><div class="tableheadtext">${uiLabelMap.CommonDate}:</div></td>
- <td><div class="tabletext">${communicationEvent.entryDate}</div></td>
+ <td><div>${communicationEvent.entryDate}</div></td>
</tr>
<tr>
<td align="right"><div class="tableheadtext">${uiLabelMap.EcommerceSubject}:</div></td>
- <td><div class="tabletext"> ${(communicationEvent.subject)?default("[${uiLabelMap.EcommerceNoSubject}]")}</div></td>
+ <td><div> ${(communicationEvent.subject)?default("[${uiLabelMap.EcommerceNoSubject}]")}</div></td>
</tr>
<tr><td> </td></tr>
<tr>
<td> </td>
<td>
- <div class="tabletext">${StringUtil.wrapString(communicationEvent.content)?default("[${uiLabelMap.EcommerceEmptyBody}]")}</div>
+ <div>${StringUtil.wrapString(communicationEvent.content)?default("[${uiLabelMap.EcommerceEmptyBody}]")}</div>
</td>
</tr>
</table>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagelist.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagelist.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagelist.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagelist.ftl Sat May 19 09:35:12 2012
@@ -29,10 +29,10 @@ under the License.
<#assign partyNameTo = "${uiLabelMap.CommonNA}">
</#if>
<tr>
- <td><div class="tabletext">${partyNameFrom}</div></td>
- <td><div class="tabletext">${partyNameTo}</div></td>
- <td><div class="tabletext">${communicationEvent.subject?default("")}</div></td>
- <td><div class="tabletext">${communicationEvent.entryDate}</div></td>
+ <td><div>${partyNameFrom}</div></td>
+ <td><div>${partyNameTo}</div></td>
+ <td><div>${communicationEvent.subject?default("")}</div></td>
+ <td><div>${communicationEvent.entryDate}</div></td>
<td align="right">
<form method="post" action="<@o...@ofbizUrl>" name="ecomm_read_mess${index}">
<input name="communicationEventId" value="${communicationEvent.communicationEventId}" type="hidden"/>
@@ -63,7 +63,7 @@ under the License.
<div class="screenlet-body">
<table width="100%" border="0" cellpadding="1">
<#if (!receivedCommunicationEvents?has_content && !sentCommunicationEvents?has_content)>
- <tr><td><div class="tabletext">${uiLabelMap.EcommerceNoMessages}.</div></td></tr>
+ <tr><td><div>${uiLabelMap.EcommerceNoMessages}.</div></td></tr>
<#else/>
<tr>
<td><div class="tableheadtext">${uiLabelMap.CommonFrom}</div></td>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newmsg.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newmsg.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newmsg.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newmsg.ftl Sat May 19 09:35:12 2012
@@ -51,7 +51,7 @@ under the License.
<tr>
<td width="5"> </td>
<td align="right"><div class="tableheadtext">${uiLabelMap.CommonFrom}:</div></td>
- <td><div class="tabletext"> ${sessionAttributes.autoName?if_exists} [${userLogin.partyId}] (${uiLabelMap.CommonNotYou}? <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonClickHere}</a>)</div></td>
+ <td><div> ${sessionAttributes.autoName?if_exists} [${userLogin.partyId}] (${uiLabelMap.CommonNotYou}? <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonClickHere}</a>)</div></td>
</tr>
<#if partyIdTo?has_content>
<#assign partyToName = Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, partyIdTo, true)>
@@ -62,7 +62,7 @@ under the License.
<tr>
<td width="5"> </td>
<td align="right"><div class="tableheadtext">${uiLabelMap.CommonTo}:</div></td>
- <td><div class="tabletext"> ${partyToName}</div></td>
+ <td><div> ${partyToName}</div></td>
</tr>
</#if>
<tr>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl Sat May 19 09:35:12 2012
@@ -127,7 +127,7 @@ under the License.
<td valign="top">
<#list partyContactMechValueMap.partyContactMechPurposes?if_exists as partyContactMechPurpose>
<#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType") />
- <div class="tabletext">
+ <div>
<#if contactMechPurposeType?exists>
${contactMechPurposeType.get("description",locale)}
<#if contactMechPurposeType.contactMechPurposeTypeId == "SHIPPING_LOCATION" && (profiledefs.defaultShipAddr)?default("") == contactMech.contactMechId>
@@ -148,7 +148,7 @@ under the License.
</#list>
<#if contactMech.contactMechTypeId?if_exists = "POSTAL_ADDRESS">
<#assign postalAddress = partyContactMechValueMap.postalAddress?if_exists />
- <div class="tabletext">
+ <div>
<#if postalAddress?exists>
<#if postalAddress.toName?has_content>${uiLabelMap.CommonTo}: ${postalAddress.toName}<br /></#if>
<#if postalAddress.attnName?has_content>${uiLabelMap.PartyAddrAttnName}: ${postalAddress.attnName}<br /></#if>
@@ -170,7 +170,7 @@ under the License.
</div>
<#elseif contactMech.contactMechTypeId?if_exists = "TELECOM_NUMBER">
<#assign telecomNumber = partyContactMechValueMap.telecomNumber?if_exists>
- <div class="tabletext">
+ <div>
<#if telecomNumber?exists>
${telecomNumber.countryCode?if_exists}
<#if telecomNumber.areaCode?has_content>${telecomNumber.areaCode}-</#if>${telecomNumber.contactNumber?if_exists}
@@ -187,7 +187,7 @@ under the License.
${contactMech.infoString}
<a href="mailto:${contactMech.infoString}" class="linktext">(${uiLabelMap.PartySendEmail})</a>
<#elseif contactMech.contactMechTypeId?if_exists = "WEB_ADDRESS">
- <div class="tabletext">
+ <div>
${contactMech.infoString}
<#assign openAddress = contactMech.infoString?if_exists />
<#if !openAddress.startsWith("http") && !openAddress.startsWith("HTTP")><#assign openAddress = "http://" + openAddress /></#if>
@@ -196,10 +196,10 @@ under the License.
<#else>
${contactMech.infoString?if_exists}
</#if>
- <div class="tabletext">(${uiLabelMap.CommonUpdated}: ${partyContactMech.fromDate.toString()})</div>
- <#if partyContactMech.thruDate?exists><div class="tabletext">${uiLabelMap.CommonDelete}: ${partyContactMech.thruDate.toString()}</div></#if>
+ <div>(${uiLabelMap.CommonUpdated}: ${partyContactMech.fromDate.toString()})</div>
+ <#if partyContactMech.thruDate?exists><div>${uiLabelMap.CommonDelete}: ${partyContactMech.thruDate.toString()}</div></#if>
</td>
- <td align="center" valign="top"><div class="tabletext">(${partyContactMech.allowSolicitation?if_exists})</div></td>
+ <td align="center" valign="top"><div>(${partyContactMech.allowSolicitation?if_exists})</div></td>
<td> </td>
<td align="right" valign="top">
<a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.CommonUpdate}</a>
@@ -242,7 +242,7 @@ under the License.
<tr>
<#if paymentMethod.paymentMethodTypeId?if_exists == "CREDIT_CARD">
<td valign="top">
- <div class="tabletext">
+ <div>
${uiLabelMap.AccountingCreditCard}:
<#if creditCard.companyNameOnCard?has_content>${creditCard.companyNameOnCard} </#if>
<#if creditCard.titleOnCard?has_content>${creditCard.titleOnCard} </#if>
@@ -279,7 +279,7 @@ under the License.
</#if>
<td valign="top">
- <div class="tabletext">
+ <div>
${uiLabelMap.AccountingGiftCard}: ${giftCardNumber}
<#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
<#if paymentMethod.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate.toString()})</#if>
@@ -293,7 +293,7 @@ under the License.
</td>
<#elseif paymentMethod.paymentMethodTypeId?if_exists == "EFT_ACCOUNT">
<td valign="top">
- <div class="tabletext">
+ <div>
${uiLabelMap.AccountingEFTAccount}: ${eftAccount.nameOnAccount?if_exists} - <#if eftAccount.bankName?has_content>${uiLabelMap.AccountingBank}: ${eftAccount.bankName}</#if> <#if eftAccount.accountNumber?has_content>${uiLabelMap.AccountingAccount} #: ${eftAccount.accountNumber}</#if>
<#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
<#if paymentMethod.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate.toString()})</#if>
@@ -382,7 +382,7 @@ under the License.
<tr>
<td> </td>
<td>
- <div class="tabletext"><span style="white-space:;"><#if shipMeth.partyId != "_NA_">${shipMeth.partyId?if_exists} </#if>${shipMeth.get("description",locale)?if_exists}</span></div>
+ <div><span style="white-space:;"><#if shipMeth.partyId != "_NA_">${shipMeth.partyId?if_exists} </#if>${shipMeth.get("description",locale)?if_exists}</span></div>
</td>
<td><input type="radio" name="defaultShipMeth" value="${shippingMethod}" <#if profiledefs.defaultShipMeth?default("") == shippingMethod>checked="checked"</#if> /></td>
</tr>
@@ -482,7 +482,7 @@ under the License.
<tr><td colspan="7"></td></tr>
<tr>
<td>${contactList.contactListName?if_exists}<#if contactList.description?has_content> - ${contactList.description}</#if></td>
- <#-- <td><div class="tabletext">${contactListType.get("description",locale)?if_exists}</div></td> -->
+ <#-- <td><div>${contactListType.get("description",locale)?if_exists}</div></td> -->
<td>${contactListParty.fromDate?if_exists}</td>
<td>${contactListParty.thruDate?if_exists}</td>
<td>${(statusItem.get("description",locale))?if_exists}</td>
@@ -567,7 +567,7 @@ under the License.
<#assign survey = surveyAppl.getRelatedOne("Survey") />
<tr>
<td> </td>
- <td valign="top"><div class="tabletext">${survey.surveyName?if_exists} - ${survey.description?if_exists}</div></td>
+ <td valign="top"><div>${survey.surveyName?if_exists} - ${survey.description?if_exists}</div></td>
<td> </td>
<td valign="top">
<#assign responses = Static["org.ofbiz.product.store.ProductStoreWorker"].checkSurveyResponse(request, survey.surveyId)?default(0)>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/bloglib.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/bloglib.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/bloglib.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/bloglib.ftl Sat May 19 09:35:12 2012
@@ -52,7 +52,7 @@ under the License.
<tr>
<td width="40px"> </td>
<td class="blogtext" >
- <div class="tabletext">
+ <div>
by:<#if authorName?has_content>${authorName?if_exists}
<#else>
<#if content?has_content>${content.createdByUserLogin?if_exists}</#if>
@@ -69,7 +69,7 @@ under the License.
</#if>
</div>
</td>
- <td class="tabletext" >
+ <td >
<#if content?has_content>${content.contentName?if_exists}</#if>
--
<#if content?has_content>${content.description?if_exists}</#if>
@@ -89,7 +89,7 @@ under the License.
<#if sz == 0 >
- <tr><td class="tabletext" align="center">${uiLabelMap.CommonNoRecordFound}</td></tr>
+ <tr><td align="center">${uiLabelMap.CommonNoRecordFound}</td></tr>
</#if>
<@wrapSubContentCache subContentId=contentIdx wrapTemplateId=stdWrapId contentPurposeList="ARTICLE">
</...@wrapSubContentCache>
@@ -106,7 +106,7 @@ under the License.
</td></tr>
</...@checkPermission>
<@checkPermission mode="not-equals" entityOperation="_CREATE" subContentId=contentDept statusId="CTNT_PUBLISHED" targetOperation=targOp contentPurposeList="ARTICLE" quickCheckContentId=contentIdx>
-<tr><td class="tabletext" align="right">
+<tr><td align="right">
${uiLabelMap.EcommerceLoggedToPost}
</td></tr>
</...@checkPermission>
@@ -124,7 +124,7 @@ ${uiLabelMap.EcommerceLoggedToPost}
<#local csv = "">
<#local counter = 0>
<#local len = trail?size>
- <table border="0" class="tabletext" cellspacing="4">
+ <table border="0" cellspacing="4">
<#list trail as content>
<#if counter < (len - endIndexOffset) && startIndex <= counter >
<#if 0 < counter >
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/forumPaging.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/forumPaging.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/forumPaging.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/forumPaging.ftl Sat May 19 09:35:12 2012
@@ -38,7 +38,7 @@ under the License.
<a href="<@o...@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="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl Sat May 19 09:35:12 2012
@@ -41,13 +41,13 @@ under the License.
${uiLabelMap.CommonTitle}: ${result.resultData.content.description?if_exists} ${uiLabelMap.CommonBy}:${result.resultData.content.createdByUserLogin} ${uiLabelMap.CommonAt}: ${result.resultData.content.createdDate.toString().substring(0,16)}
<a href="addForumMessage?forumId=${parameters.forumId}&forumMessageIdTo=${result.resultData.content.contentId}&threadView=${parameters.threadView?if_exists}" class="buttontext">${uiLabelMap.PartyReply}</a>
</div>
- <div class="tabletext">
+ <div>
<#if result.resultData.electronicText?exists>
${result.resultData.electronicText.textData}
</#if>
</div>
<hr />
<#else>
- <div class="tabletext"> ${result.errorMessage?if_exists}</div>
+ <div> ${result.errorMessage?if_exists}</div>
</#if>
-->
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/mostrecent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/mostrecent.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/mostrecent.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/mostrecent.ftl Sat May 19 09:35:12 2012
@@ -35,24 +35,24 @@ under the License.
<#list entityList as content>
<@checkPermission entityOperation="_ADMIN" targetOperation="CONTENT_PUBLISH" subContentId=forumId >
<tr>
- <td class="tabletext"> ${uiLabelMap.CommonId}:${content.contentId} </td>
- <td class="tabletext"> ${uiLabelMap.CommonName}:${content.contentName} </td>
+ <td> ${uiLabelMap.CommonId}:${content.contentId} </td>
+ <td> ${uiLabelMap.CommonName}:${content.contentName} </td>
<@injectNodeTrailCsv subContentId=content.contentId redo="true" contentAssocTypeId="PUBLISH_LINK">
<td>
<a class="tabButton" href="<@o...@ofbizUrl>" >${uiLabelMap.CommonView}</a>
</td>
- <td class="tabletext">
+ <td>
${uiLabelMap.CommonSubmitted}:
<input type="radio" name="statusId_o_${row}" value="CTNT_IN_PROGRESS" checked="checked" />
</td>
- <td class="tabletext">
+ <td>
${uiLabelMap.CommonPublish}:
<input type="radio" name="statusId_o_${row}" value="CTNT_PUBLISHED"/>
</td>
</tr>
<input type="hidden" name="contentId_o_${row}" value="${content.contentId}"/>
<tr>
- <td colspan="5" class="tabletext">
+ <td colspan="5">
${uiLabelMap.CommonContent}:<br />
<@renderSubContentCache subContentId=content.contentId/>
</td>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showblog.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showblog.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showblog.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showblog.ftl Sat May 19 09:35:12 2012
@@ -97,7 +97,7 @@ under the License.
</#if>
<#if content?exists>
<tr>
- <td class="tabletext">
+ <td>
${indentFill}
<a class="tabButton" href="<@o...@ofbizUrl>" >${uiLabelMap.CommonView}</a>
${content.contentId?if_exists}-${content.description?if_exists}<br />
@@ -144,7 +144,7 @@ ${uiLabelMap.CommonDescription}[${curren
<#assign csv = "">
<#assign counter = 0>
<#assign len = trail?size>
- <table border="0" class="tabletext" cellspacing="4">
+ <table border="0" cellspacing="4">
<#list trail as webSitePublishPoint>
<#if counter < len && startIndex <= counter >
<tr>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showforumresponse.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showforumresponse.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showforumresponse.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showforumresponse.ftl Sat May 19 09:35:12 2012
@@ -91,7 +91,7 @@ under the License.
</#if>
<#if content?exists>
<tr>
- <td class="tabletext">
+ <td>
${indentFill}
<a class="tabButton" href="<@o...@ofbizUrl>" >${uiLabelMap.CommonView}</a>
${content.contentId?if_exists}-${content.description?if_exists}<br />
@@ -142,7 +142,7 @@ ${uiLabelMap.CommonDescription}[${curren
<#assign csv = "">
<#assign counter = 0>
<#assign len = trail?size>
- <table border="0" class="tabletext" cellspacing="4">
+ <table border="0" cellspacing="4">
<#list trail as webSitePublishPoint>
<#if counter < len && startIndex <= counter >
<tr>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/footer.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/footer.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/footer.ftl Sat May 19 09:35:12 2012
@@ -26,13 +26,13 @@ under the License.
<a href="http://validator.w3.org/check?uri=referer"><img style="border:0;width:88px;height:31px" src="<@o...@ofbizContentUrl>" alt="Valid XHTML 1.0!"/></a>
</div>
<br />
- <div class="tabletext">
+ <div>
<a href="http://ofbiz.apache.org">${uiLabelMap.EcommerceAboutUs}</a>
- <div class="tabletext">Copyright (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org" class="tabletext">www.apache.org</a></div>
- <div class="tabletext">Powered by <a href="http://ofbiz.apache.org" class="tabletext">Apache OFBiz</a></div>
+ <div>Copyright (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org">www.apache.org</a></div>
+ <div>Powered by <a href="http://ofbiz.apache.org">Apache OFBiz</a></div>
</div>
<br />
- <div class="tabletext"><a href="<@o...@ofbizUrl>">${uiLabelMap.EcommerceSeeStorePoliciesHere}</a></div>
+ <div><a href="<@o...@ofbizUrl>">${uiLabelMap.EcommerceSeeStorePoliciesHere}</a></div>
</div>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/billsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/billsettings.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/billsettings.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/billsettings.ftl Sat May 19 09:35:12 2012
@@ -36,7 +36,7 @@ function shipBillAddr() {
<div class="screenlet-title-bar">
<div class="boxlink">
<#if requestParameters.singleUsePayment?default("N") != "Y">
- <div class="tabletext">
+ <div>
${screens.render(anonymoustrailScreen)}
</div>
</#if>
@@ -93,7 +93,7 @@ function shipBillAddr() {
<input type="checkbox" name="useShipAddr" value="Y" onclick="javascript:shipBillAddr();" <#if requestParameters.useShipAddr?exists>checked="checked"</#if> />
</td>
<td colspan="2" valign="center">
- <div class="tabletext">${uiLabelMap.FacilityBillingAddressSameShipping}</div>
+ <div>${uiLabelMap.FacilityBillingAddressSameShipping}</div>
</td>
</tr>
<tr>
@@ -141,35 +141,35 @@ function shipBillAddr() {
<td width="74%"> </td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingNameOnAccount}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingNameOnAccount}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="60" name="nameOnAccount" value="${eftAccount.nameOnAccount?if_exists}" />
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingCompanyNameOnAccount}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingCompanyNameOnAccount}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="60" name="companyNameOnAccount" value="${eftAccount.companyNameOnAccount?if_exists}" />
</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingBankName}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingBankName}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="60" name="bankName" value="${eftAccount.bankName?if_exists}" />
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingRoutingNumber}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingRoutingNumber}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="10" maxlength="30" name="routingNumber" value="${eftAccount.routingNumber?if_exists}" />
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingAccountType}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingAccountType}</div></td>
<td width="5"> </td>
<td width="74%">
<select name="accountType" class='selectBox'>
@@ -181,14 +181,14 @@ function shipBillAddr() {
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingAccountNumber}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingAccountNumber}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="20" maxlength="40" name="accountNumber" value="${eftAccount.accountNumber?if_exists}" />
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.CommonDescription}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.CommonDescription}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${eftAccount.description?if_exists}" />
@@ -211,21 +211,21 @@ function shipBillAddr() {
<td width="74%"> </td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingGiftCardNumber}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingGiftCardNumber}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="20" maxlength="60" name="giftCardNumber" value="${giftCard.cardNumber?if_exists}" />
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingPINNumber}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingPINNumber}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="10" maxlength="60" name="giftCardPin" value="${giftCard.pinNumber?if_exists}" />
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.CommonDescription}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.CommonDescription}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${giftCard.description?if_exists}" />
@@ -233,7 +233,7 @@ function shipBillAddr() {
</tr>
<#if paymentMethodType != "GC">
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingAmountToUse}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingAmountToUse}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="5" maxlength="10" name="giftCardAmount" value="${giftCard.pinNumber?if_exists}" />
@@ -257,28 +257,28 @@ function shipBillAddr() {
<#if productStorePaymentMethodTypeIdMap.GIFT_CARD?exists>
<tr>
<td width='5%' nowrap="nowrap"><input type="checkbox" name="useGc" value="GC" <#if paymentMethodType?exists && paymentMethodType == "GC">checked="checked"</#if> /></td>
- <td width='95%' nowrap="nowrap"><div class="tabletext">${uiLabelMap.AccountingCheckGiftCard}</div></td>
+ <td width='95%' nowrap="nowrap"><div>${uiLabelMap.AccountingCheckGiftCard}</div></td>
</tr>
<tr><td colspan="2"><hr /></td></tr>
</#if>
<#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE?exists>
<tr>
<td width='5%' nowrap="nowrap"><input type="radio" name="paymentMethodType" value="offline" <#if paymentMethodType?exists && paymentMethodType == "offline">checked="checked"</#if> /></td>
- <td width='95%'nowrap="nowrap"><div class="tabletext">${uiLabelMap.OrderPaymentOfflineCheckMoney}</div></td>
+ <td width='95%'nowrap="nowrap"><div>${uiLabelMap.OrderPaymentOfflineCheckMoney}</div></td>
</tr>
<tr><td colspan="2"><hr /></td></tr>
</#if>
<#if productStorePaymentMethodTypeIdMap.CREDIT_CARD?exists>
<tr>
<td width='5%' nowrap="nowrap"><input type="radio" name="paymentMethodType" value="CC" <#if paymentMethodType?exists && paymentMethodType == "CC">checked="checked"</#if> /></td>
- <td width='95%' nowrap="nowrap"><div class="tabletext">${uiLabelMap.AccountingVisaMastercardAmexDiscover}</div></td>
+ <td width='95%' nowrap="nowrap"><div>${uiLabelMap.AccountingVisaMastercardAmexDiscover}</div></td>
</tr>
<tr><td colspan="2"><hr /></td></tr>
</#if>
<#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT?exists>
<tr>
<td width='5%' nowrap="nowrap"><input type="radio" name="paymentMethodType" value="EFT" <#if paymentMethodType?exists && paymentMethodType == "EFT">checked="checked"</#if> /></td>
- <td width='95%' nowrap="nowrap"><div class="tabletext">${uiLabelMap.AccountingAHCElectronicCheck}</div></td>
+ <td width='95%' nowrap="nowrap"><div>${uiLabelMap.AccountingAHCElectronicCheck}</div></td>
</tr>
</#if>
<tr>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl Sat May 19 09:35:12 2012
@@ -74,7 +74,7 @@ function submitForm(form, mode, value) {
<input type="radio" name="shipping_method" value="${shippingMethod}" <#if shippingMethod == StringUtil.wrapString(chosenShippingMethod!"N@A")>checked="checked"</#if> />
</td>
<td valign="top">
- <div class="tabletext">
+ <div>
<#if shoppingCart.getShippingContactMechId()?exists>
<#assign shippingEst = shippingEstWpr.getShippingEstimate(carrierShipmentMethod)?default(-1)>
</#if>
@@ -90,7 +90,7 @@ function submitForm(form, mode, value) {
<input type="radio" name="shipping_method" value="Default" checked="checked" />
</td>
<td valign="top">
- <div class="tabletext">${uiLabelMap.OrderUseDefault}.</div>
+ <div>${uiLabelMap.OrderUseDefault}.</div>
</td>
</tr>
</#if>
@@ -105,7 +105,7 @@ function submitForm(form, mode, value) {
<input type="radio" <#if "Y" != shoppingCart.getMaySplit()?default("N")>checked="checked"</#if> name="may_split" value="false" />
</td>
<td valign="top">
- <div class="tabletext">${uiLabelMap.OrderPleaseWaitUntilBeforeShipping}.</div>
+ <div>${uiLabelMap.OrderPleaseWaitUntilBeforeShipping}.</div>
</td>
</tr>
<tr>
@@ -113,7 +113,7 @@ function submitForm(form, mode, value) {
<input <#if "Y" == shoppingCart.getMaySplit()?default("N")>checked="checked"</#if> type="radio" name="may_split" value="true" />
</td>
<td valign="top">
- <div class="tabletext">${uiLabelMap.OrderPleaseShipItemsBecomeAvailable}.</div>
+ <div>${uiLabelMap.OrderPleaseShipItemsBecomeAvailable}.</div>
</td>
</tr>
<tr><td colspan="2"><hr /></td></tr>
@@ -143,8 +143,8 @@ function submitForm(form, mode, value) {
<td colspan="2">
<div>
<h2>${uiLabelMap.OrderIsThisGift}</h2>
- <input type="radio" <#if "Y" == shoppingCart.getIsGift()?default("N")>checked="checked"</#if> name="is_gift" value="true" /><span class="tabletext">${uiLabelMap.CommonYes}</span>
- <input type="radio" <#if "Y" != shoppingCart.getIsGift()?default("N")>checked="checked"</#if> name="is_gift" value="false" /><span class="tabletext">${uiLabelMap.CommonNo}</span>
+ <input type="radio" <#if "Y" == shoppingCart.getIsGift()?default("N")>checked="checked"</#if> name="is_gift" value="true" /><span>${uiLabelMap.CommonYes}</span>
+ <input type="radio" <#if "Y" != shoppingCart.getIsGift()?default("N")>checked="checked"</#if> name="is_gift" value="false" /><span>${uiLabelMap.CommonNo}</span>
</div>
</td>
</tr>
@@ -170,17 +170,17 @@ function submitForm(form, mode, value) {
</tr>
<tr>
<td colspan="2">
- <div class="tabletext">${uiLabelMap.OrderEmailSentToFollowingAddresses}:</div>
- <div class="tabletext">
+ <div>${uiLabelMap.OrderEmailSentToFollowingAddresses}:</div>
+ <div>
<b>
<#list emailList as email>
${email.infoString?if_exists}<#if email_has_next>,</#if>
</#list>
</b>
</div>
- <div class="tabletext">${uiLabelMap.OrderUpdateEmailAddress} <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.PartyProfile}</a>.</div>
+ <div>${uiLabelMap.OrderUpdateEmailAddress} <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.PartyProfile}</a>.</div>
<br />
- <div class="tabletext">${uiLabelMap.OrderCommaSeperatedEmailAddresses}:</div>
+ <div>${uiLabelMap.OrderCommaSeperatedEmailAddresses}:</div>
<input type="text" class="inputBox" size="30" name="order_additional_emails" value="${shoppingCart.getOrderAdditionalEmails()?if_exists}"/>
</td>
</tr>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/eftinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/eftinfo.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/eftinfo.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/eftinfo.ftl Sat May 19 09:35:12 2012
@@ -23,24 +23,24 @@ under the License.
<input type="hidden" name="paymentMethodId" value="${parameters.paymentMethodId?if_exists}"/></td></tr>
<tr><td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.AccountingEFTAccountInformation}</div></td><td width="5"> </td><td width="74%"> </td></tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingNameOnAccount}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingNameOnAccount}</div></td>
<td width="5"> </td>
<td width="74%"><input type="text" class="inputBox" size="30" maxlength="60" name="nameOnAccount" value="${eftAccount.nameOnAccount?if_exists}"/>*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingCompanyNameOnAccount}</div></td><td width="5"> </td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingCompanyNameOnAccount}</div></td><td width="5"> </td>
<td width="74%"><input type="text" class="inputBox" size="30" maxlength="60" name="companyNameOnAccount" value="${eftAccount.companyNameOnAccount?if_exists}"/></td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingBankName}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingBankName}</div></td>
<td width="5"> </td><td width="74%"><input type="text" class="inputBox" size="30" maxlength="60" name="bankName" value="${eftAccount.bankName?if_exists}"/>*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingRoutingNumber}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingRoutingNumber}</div></td>
<td width="5"> </td><td width="74%"><input type="text" class="inputBox" size="10" maxlength="30" name="routingNumber" value="${eftAccount.routingNumber?if_exists}"/>*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingAccountType}</div></td><td width="5"> </td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingAccountType}</div></td><td width="5"> </td>
<td width="74%">
<select name="accountType" class='selectBox'>
<option>${eftAccount.accountType?if_exists}</option>
@@ -51,10 +51,10 @@ under the License.
</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingAccountNumber}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingAccountNumber}</div></td>
<td width="5"> </td><td width="74%"><input type="text" class="inputBox" size="20" maxlength="40" name="accountNumber" value="${eftAccount.accountNumber?if_exists}"/>*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.CommonDescription}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.CommonDescription}</div></td>
<td width="5"> </td><td width="74%"><input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${eftAccount.description?if_exists}"/></td>
</tr>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/gcinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/gcinfo.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/gcinfo.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/gcinfo.ftl Sat May 19 09:35:12 2012
@@ -31,21 +31,21 @@ under the License.
<td width="74%"> </td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingGiftCardNumber}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingGiftCardNumber}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="20" maxlength="60" name="giftCardNumber" value="${giftCard.cardNumber?if_exists}"/>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingPINNumber}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingPINNumber}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="10" maxlength="60" name="giftCardPin" value="${giftCard.pinNumber?if_exists}"/>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.CommonDescription}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.CommonDescription}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${giftCard.description?if_exists}"/>
@@ -53,7 +53,7 @@ under the License.
</tr>
<#if paymentMethodTypeId?if_exists != "GIFT_CARD">
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingAmountToUse}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingAmountToUse}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="5" maxlength="10" name="giftCardAmount" value="${giftCard.pinNumber?if_exists}"/>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/genericaddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/genericaddress.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/genericaddress.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/genericaddress.ftl Sat May 19 09:35:12 2012
@@ -29,42 +29,42 @@ under the License.
</#if>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.PartyToName}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.PartyToName}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="60" name="toName" value="${toName}" <#if requestParameters.useShipAddr?exists>disabled</#if>/>
</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.PartyAttentionName}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.PartyAttentionName}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="60" name="attnName" value="${(parameters.attnName)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>/>
</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.PartyAddressLine1}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.PartyAddressLine1}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="30" name="address1" value="${(parameters.address1)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>/>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.PartyAddressLine2}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.PartyAddressLine2}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="30" name="address2" value="${(parameters.address2)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>/>
</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.PartyCity}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.PartyCity}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="30" name="city" value="${(parameters.city)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>/>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.PartyState}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.PartyState}</div></td>
<td width="5"> </td>
<td width="74%">
<select name="stateProvinceGeoId" class="selectBox" <#if requestParameters.useShipAddr?exists>disabled</#if>>
@@ -79,14 +79,14 @@ under the License.
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.PartyZipCode}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.PartyZipCode}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="12" maxlength="10" name="postalCode" value="${(parameters.postalCode)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>/>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.CommonCountry}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.CommonCountry}</div></td>
<td width="5"> </td>
<td width="74%">
<select name="countryGeoId" class="selectBox" <#if requestParameters.useShipAddr?exists>disabled</#if>>
@@ -99,7 +99,7 @@ under the License.
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.PartyAllowSolicitation}?</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.PartyAllowSolicitation}?</div></td>
<td width="5"> </td>
<td width="74%">
<select name="allowSolicitation" class='selectBox' <#if requestParameters.useShipAddr?exists>disabled</#if>>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentinformation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentinformation.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentinformation.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentinformation.ftl Sat May 19 09:35:12 2012
@@ -65,7 +65,7 @@ function shipBillAddr() {
<#elseif paymentMethodTypeId?if_exists == "EXT_OFFLINE">
<form method="post" action="<@o...@ofbizUrl>" name="${parameters.formNameValue}">
<#else>
- <div class="tabletext">${uiLabelMap.AccountingPaymentMethodTypeNotHandled} ${paymentMethodTypeId?if_exists}</div>
+ <div>${uiLabelMap.AccountingPaymentMethodTypeNotHandled} ${paymentMethodTypeId?if_exists}</div>
</#if>
<#if requestParameters.singleUsePayment?default("N") == "Y">
@@ -87,7 +87,7 @@ function shipBillAddr() {
<input type="checkbox" name="useShipAddr" value="Y" onclick="javascript:shipBillAddr();" <#if useShipAddr?exists>checked="checked"</#if>/>
</td>
<td colspan="2" valign="middle">
- <div class="tabletext">${uiLabelMap.FacilityBillingAddressSameShipping}</div>
+ <div>${uiLabelMap.FacilityBillingAddressSameShipping}</div>
</td>
</tr>
<tr>
@@ -135,35 +135,35 @@ function shipBillAddr() {
<td width="74%"> </td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingNameOnAccount}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingNameOnAccount}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="60" name="nameOnAccount" value="${eftAccount.nameOnAccount?if_exists}"/>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingCompanyNameOnAccount}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingCompanyNameOnAccount}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="60" name="companyNameOnAccount" value="${eftAccount.companyNameOnAccount?if_exists}"/>
</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingBankName}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingBankName}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="60" name="bankName" value="${eftAccount.bankName?if_exists}"/>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingRoutingNumber}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingRoutingNumber}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="10" maxlength="30" name="routingNumber" value="${eftAccount.routingNumber?if_exists}"/>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingAccountType}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingAccountType}</div></td>
<td width="5"> </td>
<td width="74%">
<select name="accountType" class="selectBox">
@@ -175,14 +175,14 @@ function shipBillAddr() {
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingAccountNumber}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingAccountNumber}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="20" maxlength="40" name="accountNumber" value="${eftAccount.accountNumber?if_exists}"/>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.CommonDescription}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.CommonDescription}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${eftAccount.description?if_exists}"/>
@@ -205,21 +205,21 @@ function shipBillAddr() {
<td width="74%"> </td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingGiftCardNumber}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingGiftCardNumber}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="20" maxlength="60" name="giftCardNumber" value="${giftCard.cardNumber?if_exists}"/>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingPINNumber}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingPINNumber}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="10" maxlength="60" name="giftCardPin" value="${giftCard.pinNumber?if_exists}"/>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.CommonDescription}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.CommonDescription}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${giftCard.description?if_exists}"/>
@@ -227,7 +227,7 @@ function shipBillAddr() {
</tr>
<#if paymentMethodTypeId?if_exists != "GIFT_CARD">
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingAmountToUse}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingAmountToUse}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="5" maxlength="10" name="giftCardAmount" value="${giftCard.pinNumber?if_exists}"/>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentoptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentoptions.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentoptions.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentoptions.ftl Sat May 19 09:35:12 2012
@@ -43,13 +43,13 @@ under the License.
<#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT?exists>
<div>
<input type="radio" id="paymentMethodTypeId_EFT_ACCOUNT" name="paymentMethodTypeId" value="EFT_ACCOUNT" <#if paymentMethodTypeId?exists && paymentMethodTypeId == "EFT_ACCOUNT">checked="checked"</#if> />
- <label for="paymentMethodTypeId_EFT_ACCOUNT" class="tabletext">${uiLabelMap.AccountingAHCElectronicCheck}</label>
+ <label for="paymentMethodTypeId_EFT_ACCOUNT">${uiLabelMap.AccountingAHCElectronicCheck}</label>
</div>
</#if>
<#if productStorePaymentMethodTypeIdMap.EXT_PAYPAL?exists>
<div>
<input type="radio" id="paymentMethodTypeId_EXT_PAYPAL" name="paymentMethodTypeId" value="EXT_PAYPAL" <#if paymentMethodTypeId?exists && paymentMethodTypeId == "EXT_PAYPAL">checked="checked"</#if> />
- <label for="paymentMethodTypeId_EXT_PAYPAL" class="tabletext">${uiLabelMap.AccountingPayWithPayPal}</label>
+ <label for="paymentMethodTypeId_EXT_PAYPAL">${uiLabelMap.AccountingPayWithPayPal}</label>
</div>
</#if>
<div class="buttons">
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl Sat May 19 09:35:12 2012
@@ -66,7 +66,7 @@ under the License.
<td width="72%"> </td>
</tr>
<tr>
- <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyFirstName}</div></td>
+ <td width="26%" align="right"><div>${uiLabelMap.PartyFirstName}</div></td>
<td width="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="firstName"/>
@@ -74,14 +74,14 @@ under the License.
</td>
</tr>
<tr>
- <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyMiddleInitial}</div></td>
+ <td width="26%" align="right"><div>${uiLabelMap.PartyMiddleInitial}</div></td>
<td width="2%"> </td>
<td width="72%">
<input type="text" class="inputBox" name="middleName" value="${parameters.middleName?if_exists}" size="4" maxlength="4"/>
</td>
</tr>
<tr>
- <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyLastName} </div></td>
+ <td width="26%" align="right"><div>${uiLabelMap.PartyLastName} </div></td>
<td width="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="lastName"/>
@@ -89,12 +89,12 @@ under the License.
</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext"></div></td>
+ <td width="26%" align="right" valign="top"><div></div></td>
<td width="2%"> </td>
- <td width="72%"><div class="tabletext">[${uiLabelMap.PartyCountryCode}] [${uiLabelMap.PartyAreaCode}] [${uiLabelMap.PartyContactNumber}] [${uiLabelMap.PartyExtension}]</div></td>
+ <td width="72%"><div>[${uiLabelMap.PartyCountryCode}] [${uiLabelMap.PartyAreaCode}] [${uiLabelMap.PartyContactNumber}] [${uiLabelMap.PartyExtension}]</div></td>
</tr>
<tr>
- <td width="10%" align="right"><div class="tabletext">${uiLabelMap.PartyHomePhone}</div></td>
+ <td width="10%" align="right"><div>${uiLabelMap.PartyHomePhone}</div></td>
<td width="2%"> </td>
<td width="88%">
<@fieldErrorsMulti fieldName1="homeCountryCode" fieldName2="homeAreaCode" fieldName3="homeContactNumber" fieldName4="homeExt"/>
@@ -108,7 +108,7 @@ under the License.
</td>
</tr>
<tr>
- <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyBusinessPhone}</div></td>
+ <td width="26%" align="right"><div>${uiLabelMap.PartyBusinessPhone}</div></td>
<td width="2%"> </td>
<td width="72%">
<input type="hidden" name="workPhoneContactMechId" value="${parameters.workPhoneContactMechId?if_exists}"/>
@@ -119,7 +119,7 @@ under the License.
</td>
</tr>
<tr>
- <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyEmailAddress}</div></td>
+ <td width="26%" align="right"><div>${uiLabelMap.PartyEmailAddress}</div></td>
<td width="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="emailAddress"/>
@@ -147,7 +147,7 @@ under the License.
<td width="72%"> </td>
</tr>
<tr>
- <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyToName}</div></td>
+ <td width="26%" align="right"><div>${uiLabelMap.PartyToName}</div></td>
<td width="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="shipToName"/>
@@ -155,7 +155,7 @@ under the License.
</td>
</tr>
<tr>
- <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyAttentionName}</div></td>
+ <td width="26%" align="right"><div>${uiLabelMap.PartyAttentionName}</div></td>
<td width="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="shipToAttnName"/>
@@ -163,7 +163,7 @@ under the License.
</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.PartyAddressLine1}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.PartyAddressLine1}</div></td>
<td width="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="shipToAddress1"/>
@@ -171,14 +171,14 @@ under the License.
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.PartyAddressLine2}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.PartyAddressLine2}</div></td>
<td width="2%"> </td>
<td width="72%">
<input type="text" class="inputBox" size="30" maxlength="30" id="shipToAddress2" name="shipToAddress2" value="${parameters.shipToAddress2?if_exists}" />
</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.PartyCity}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.PartyCity}</div></td>
<td width="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="shipToCity"/>
@@ -186,7 +186,7 @@ under the License.
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.PartyState}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.PartyState}</div></td>
<td width="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="shipToStateProvinceGeoId"/>
@@ -202,7 +202,7 @@ under the License.
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.PartyZipCode}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.PartyZipCode}</div></td>
<td width="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="shipToPostalCode"/>
@@ -210,7 +210,7 @@ under the License.
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.CommonCountry}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.CommonCountry}</div></td>
<td width="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="shipToCountryGeoId"/>
@@ -230,7 +230,7 @@ under the License.
<table width="100%" border="0" cellpadding="1" cellspacing="0">
<tr>
<td align="center" valign="top" colspan="3">
- <div class="tabletext">
+ <div>
<input type="checkbox" class="checkbox" id="useShippingPostalAddressForBilling" name="useShippingPostalAddressForBilling" value="Y"/>
${uiLabelMap.FacilityBillingAddressSameShipping}
</div>
@@ -242,7 +242,7 @@ under the License.
<td width="72%"> </td>
</tr>
<tr>
- <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyToName}</div></td>
+ <td width="26%" align="right"><div>${uiLabelMap.PartyToName}</div></td>
<td width="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="billToName"/>
@@ -250,7 +250,7 @@ under the License.
</td>
</tr>
<tr>
- <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyAttentionName}</div></td>
+ <td width="26%" align="right"><div>${uiLabelMap.PartyAttentionName}</div></td>
<td width="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="billToAttnName"/>
@@ -258,7 +258,7 @@ under the License.
</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.PartyAddressLine1}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.PartyAddressLine1}</div></td>
<td width="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="billToAddress1"/>
@@ -266,14 +266,14 @@ under the License.
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.PartyAddressLine2}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.PartyAddressLine2}</div></td>
<td width="2%"> </td>
<td width="72%">
<input type="text" class="inputBox" id="billToAddress2" size="30" maxlength="30" name="billToAddress2" value="${parameters.billToAddress2?if_exists}" />
</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.PartyCity}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.PartyCity}</div></td>
<td width="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="billToCity"/>
@@ -281,7 +281,7 @@ under the License.
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.PartyState}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.PartyState}</div></td>
<td width="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="billToStateProvinceGeoId"/>
@@ -297,7 +297,7 @@ under the License.
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.PartyZipCode}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.PartyZipCode}</div></td>
<td width="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="billToPostalCode"/>
@@ -305,7 +305,7 @@ under the License.
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.CommonCountry}</div></td>
+ <td width="26%" align="right" valign="middle"><div>${uiLabelMap.CommonCountry}</div></td>
<td width="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="billToCountryGeoId"/>