svn commit: r1356888 [4/5] - in /ofbiz/branches/20120329_portl
Locked
svn commit: r1356888 [4/5] - in /ofbiz/branches/20120329_portl
 
|
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/forum/showblog.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/forum/showblog.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/forum/showblog.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/forum/showblog.ftl Tue Jul 3 19:42:32 2012 @@ -97,7 +97,7 @@ under the License. </#if> <#if content?exists> <tr> - <td class="tabletext"> + <td> ${indentFill} <a class="tabButton" href="<@ofbizUrl>ViewBlog?contentId=${thisContentId}&nodeTrailCsv=${nodeTrailCsv?if_exists}</@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/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/forum/showforumresponse.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/forum/showforumresponse.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/forum/showforumresponse.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/forum/showforumresponse.ftl Tue Jul 3 19:42:32 2012 @@ -91,7 +91,7 @@ under the License. </#if> <#if content?exists> <tr> - <td class="tabletext"> + <td> ${indentFill} <a class="tabButton" href="<@ofbizUrl>ViewBlog?contentId=${thisContentId}&nodeTrailCsv=${nodeTrailCsv?if_exists}</@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/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/includes/footer.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/includes/footer.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/includes/footer.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/includes/footer.ftl Tue Jul 3 19:42:32 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="<@ofbizContentUrl>/images/valid-xhtml10.png</@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="<@ofbizUrl>policies</@ofbizUrl>">${uiLabelMap.EcommerceSeeStorePoliciesHere}</a></div> + <div><a href="<@ofbizUrl>policies</@ofbizUrl>">${uiLabelMap.EcommerceSeeStorePoliciesHere}</a></div> </div> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/billsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/billsettings.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/billsettings.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/billsettings.ftl Tue Jul 3 19:42:32 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/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl Tue Jul 3 19:42:32 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="<@ofbizUrl>viewprofile?DONE_PAGE=checkoutoptions</@ofbizUrl>" class="buttontext">${uiLabelMap.PartyProfile}</a>.</div> + <div>${uiLabelMap.OrderUpdateEmailAddress} <a href="<@ofbizUrl>viewprofile?DONE_PAGE=checkoutoptions</@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/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/eftinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/eftinfo.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/eftinfo.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/eftinfo.ftl Tue Jul 3 19:42:32 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/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/gcinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/gcinfo.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/gcinfo.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/gcinfo.ftl Tue Jul 3 19:42:32 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/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/genericaddress.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/genericaddress.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/genericaddress.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/genericaddress.ftl Tue Jul 3 19:42:32 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/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/paymentinformation.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/paymentinformation.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/paymentinformation.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/paymentinformation.ftl Tue Jul 3 19:42:32 2012 @@ -65,7 +65,7 @@ function shipBillAddr() { <#elseif paymentMethodTypeId?if_exists == "EXT_OFFLINE"> <form method="post" action="<@ofbizUrl>processPaymentSettings</@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/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/paymentoptions.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/paymentoptions.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/paymentoptions.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/paymentoptions.ftl Tue Jul 3 19:42:32 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/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl Tue Jul 3 19:42:32 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"/> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl Tue Jul 3 19:42:32 2012 @@ -76,7 +76,7 @@ function onClickShippingMethod(e) { <#list carrierShipmentMethodList as carrierShipmentMethod> <tr> <td> - <div class="tabletext"> + <div> <#assign shippingMethod = carrierShipmentMethod.shipmentMethodTypeId + "@" + carrierShipmentMethod.partyId> <input type="radio" onclick="return onClickShippingMethod(event)" name="shipping_method" value="${shippingMethod}" <#if shippingMethod == chosenShippingMethod?default("N@A")>checked="checked"</#if>/> <#if shoppingCart.getShippingContactMechId()?exists> @@ -91,7 +91,7 @@ function onClickShippingMethod(e) { <#if !carrierShipmentMethodList?exists || carrierShipmentMethodList?size == 0> <tr> <td width="1%" valign="top"> - <div class="tabletext"><input type="radio" onclick="return onClickShippingMethod(event)" name="shipping_method" value="Default" checked="checked"/>${uiLabelMap.OrderUseDefault}.</div> + <div><input type="radio" onclick="return onClickShippingMethod(event)" name="shipping_method" value="Default" checked="checked"/>${uiLabelMap.OrderUseDefault}.</div> </td> </tr> </#if> @@ -149,7 +149,7 @@ function onClickShippingMethod(e) { <td valign="top" colspan="2"> <div> <input type='radio' <#if shoppingCart.getMaySplit()?default("N") == "N">checked="checked"</#if> name='may_split' value='false'/> - <span class="tabletext">${uiLabelMap.OrderPleaseWaitUntilBeforeShipping}.</span> + <span>${uiLabelMap.OrderPleaseWaitUntilBeforeShipping}.</span> </div> </td> </tr> @@ -157,7 +157,7 @@ function onClickShippingMethod(e) { <td valign="top" colspan="2"> <div> <input <#if shoppingCart.getMaySplit()?default("N") == "Y">checked="checked"</#if> type='radio' name='may_split' value='true'/> - <span class="tabletext">${uiLabelMap.OrderPleaseShipItemsBecomeAvailable}.</span> + <span>${uiLabelMap.OrderPleaseShipItemsBecomeAvailable}.</span> </div> </td> </tr> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl Tue Jul 3 19:42:32 2012 @@ -45,11 +45,11 @@ under the License. </#if> <tr> <td align="right" valign="top" width="15%"> - <div class="tabletext"> <b>${uiLabelMap.PartyName}</b></div> + <div> <b>${uiLabelMap.PartyName}</b></div> </td> <td width="5"> </td> <td valign="top" width="80%"> - <div class="tabletext"> + <div> ${(displayPartyNameResult.fullName)?default("[Name Not Found]")} </div> </td> @@ -59,14 +59,14 @@ under the License. <#-- order status information --> <tr> <td align="right" valign="top" width="15%"> - <div class="tabletext"> <b>${uiLabelMap.CommonStatus}</b></div> + <div> <b>${uiLabelMap.CommonStatus}</b></div> </td> <td width="5"> </td> <td valign="top" width="80%"> <#if orderHeader?has_content> - <div class="tabletext">${localOrderReadHelper.getStatusString(locale)}</div> + <div>${localOrderReadHelper.getStatusString(locale)}</div> <#else> - <div class="tabletext"><b>${uiLabelMap.OrderNotYetOrdered}</b></div> + <div><b>${uiLabelMap.OrderNotYetOrdered}</b></div> </#if> </td> </tr> @@ -75,11 +75,11 @@ under the License. <tr><td colspan="7"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%"> - <div class="tabletext"> <b>${uiLabelMap.CommonDate}</b></div> + <div> <b>${uiLabelMap.CommonDate}</b></div> </td> <td width="5"> </td> <td valign="top" width="80%"> - <div class="tabletext">${orderHeader.orderDate.toString()}</div> + <div>${orderHeader.orderDate.toString()}</div> </td> </tr> </#if> @@ -87,11 +87,11 @@ under the License. <tr><td colspan="7"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%"> - <div class="tabletext"> <b>${uiLabelMap.OrderDistributor}</b></div> + <div> <b>${uiLabelMap.OrderDistributor}</b></div> </td> <td width="5"> </td> <td valign="top" width="80%"> - <div class="tabletext">${distributorId}</div> + <div>${distributorId}</div> </td> </tr> </#if> @@ -127,11 +127,11 @@ under the License. <#if shippingAddress?has_content> <tr> <td align="right" valign="top" width="15%"> - <div class="tabletext"> <b>${uiLabelMap.OrderDestination}</b> [${groupNumber}]</div> + <div> <b>${uiLabelMap.OrderDestination}</b> [${groupNumber}]</div> </td> <td width="5"> </td> <td valign="top" width="80%"> - <div class="tabletext"> + <div> <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br /></#if> <#if shippingAddress.attnName?has_content><b>${uiLabelMap.PartyAddrAttnName}:</b> ${shippingAddress.attnName}<br /></#if> ${shippingAddress.address1}<br /> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl Tue Jul 3 19:42:32 2012 @@ -150,7 +150,7 @@ function getPaymentInformation() { <td width='26%' nowrap="nowrap" align="right"> <input type="checkbox" id="addGiftCard" name="addGiftCard" value="Y" onclick="javascript:getGCInfo();"/> </td> - <td colspan="2" nowrap="nowrap"><div class="tabletext">${uiLabelMap.AccountingCheckGiftCard}</div></td> + <td colspan="2" nowrap="nowrap"><div>${uiLabelMap.AccountingCheckGiftCard}</div></td> </tr> <tr><td colspan="3"><div id="giftCardSection"></div></td></tr> </#if> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl Tue Jul 3 19:42:32 2012 @@ -74,7 +74,7 @@ under the License. <tr> <td> - <div class="tabletext"> + <div> <#if orderItem.productId?exists> <a href="<@ofbizUrl>product?product_id=${orderItem.productId}</@ofbizUrl>" class="buttontext">${orderItem.productId}</a> <input type="hidden" name="productId_o_${rowCount}" value="${orderItem.productId}"/> @@ -86,7 +86,7 @@ under the License. <input type="text" class="inputBox" size="6" name="returnQuantity_o_${rowCount}" value="${returnableItems.get(orderItem).get("returnableQuantity")}"/> </td> <td> - <div class="tabletext"><@ofbizCurrency amount=returnableItems.get(orderItem).get("returnablePrice") isoCode=orderHeader.currencyUom/></div> + <div><@ofbizCurrency amount=returnableItems.get(orderItem).get("returnablePrice") isoCode=orderHeader.currencyUom/></div> </td> <td> <select name="returnReasonId_o_${rowCount}" class="selectBox"> @@ -125,7 +125,7 @@ under the License. <input type="radio" name="originContactMechId" value="${shippingAddress.contactMechId}"/> </td> <td width="99%" valign="top" nowrap="nowrap"> - <div class="tabletext"> + <div> <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br /></#if> <#if shippingAddress.attnName?has_content><b>${uiLabelMap.PartyAddrAttnName}:</b> ${shippingAddress.attnName}<br /></#if> <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br /></#if> @@ -149,7 +149,7 @@ under the License. </td> </tr> <#else> - <tr><td colspan="6"><div class="tabletext">${uiLabelMap.OrderNoReturnableItems} ${uiLabelMap.CommonNbr}${orderId}</div></td></tr> + <tr><td colspan="6"><div>${uiLabelMap.OrderNoReturnableItems} ${uiLabelMap.CommonNbr}${orderId}</div></td></tr> </#if> </table> </form> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl Tue Jul 3 19:42:32 2012 @@ -62,10 +62,10 @@ function submitForm(form, mode, value) { <input type="hidden" name="groupIndex" value="${groupIdx}"/> <tr> <td> - <div class="tabletext"><b>${uiLabelMap.CommonGroup} ${groupNumber}:</b></div> + <div><b>${uiLabelMap.CommonGroup} ${groupNumber}:</b></div> <#list group.getShipItems() as item> <#assign groupItem = group.getShipItemInfo(item)> - <div class="tabletext"> ${item.getName()} - (${groupItem.getItemQuantity()})</div> + <div> ${item.getName()} - (${groupItem.getItemQuantity()})</div> </#list> </td> <td> @@ -145,7 +145,7 @@ function submitForm(form, mode, value) { </form> </#list> <#else> - <div class="tabletext">${uiLabelMap.OrderNoShipGroupsDefined}.</div> + <div>${uiLabelMap.OrderNoShipGroupsDefined}.</div> </#if> </table> </div> @@ -158,10 +158,10 @@ function submitForm(form, mode, value) { <div class="screenlet-body"> <table width="100%" cellspacing="0" cellpadding="1" border="0"> <tr> - <td><div class="tabletext"><b>${uiLabelMap.OrderProduct}</b></div></td> - <td align="center"><div class="tabletext"><b>${uiLabelMap.OrderTotalQty}</b></div></td> + <td><div><b>${uiLabelMap.OrderProduct}</b></div></td> + <td align="center"><div><b>${uiLabelMap.OrderTotalQty}</b></div></td> <td> </td> - <td align="center"><div class="tabletext"><b>${uiLabelMap.OrderMoveQty}</b></div></td> + <td align="center"><div><b>${uiLabelMap.OrderMoveQty}</b></div></td> <td> </td> <td> </td> </tr> @@ -172,7 +172,7 @@ function submitForm(form, mode, value) { <form method="post" action="<@ofbizUrl>updatesplit</@ofbizUrl>" name="editgroupform" style="margin: 0;"> <input type="hidden" name="itemIndex" value="${cartLineIndex}"/> <td> - <div class="tabletext"> + <div> <#if cartLine.getProductId()?exists> <#-- product item --> <#-- start code to display a small image of the product --> @@ -190,7 +190,7 @@ function submitForm(form, mode, value) { <#-- display the registered ship groups and quantity --> <#assign itemShipGroups = cart.getShipGroups(cartLine)> <#list itemShipGroups.entrySet() as group> - <div class="tabletext"> + <div> <#assign groupNumber = group.getKey() + 1> <b>Group - </b>${groupNumber} / <b>${uiLabelMap.CommonQuantity} - </b>${group.getValue()} </div> @@ -211,7 +211,7 @@ function submitForm(form, mode, value) { </td> <td align="right"> - <div class="tabletext">${cartLine.getQuantity()?string.number} </div> + <div>${cartLine.getQuantity()?string.number} </div> </td> <td> <div> </div> @@ -223,7 +223,7 @@ function submitForm(form, mode, value) { <div> </div> </td> <td> - <div class="tabletext">${uiLabelMap.CommonFrom}: + <div>${uiLabelMap.CommonFrom}: <select name="fromGroupIndex" class="selectBox"> <#list itemShipGroups.entrySet() as group> <#assign groupNumber = group.getKey() + 1> @@ -233,7 +233,7 @@ function submitForm(form, mode, value) { </div> </td> <td> - <div class="tabletext">${uiLabelMap.CommonTo}: + <div>${uiLabelMap.CommonTo}: <select name="toGroupIndex" class="selectBox"> <#list 0..(cart.getShipGroupSize() - 1) as groupIdx> <#assign groupNumber = groupIdx + 1> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/quote/QuoteList.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/quote/QuoteList.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/quote/QuoteList.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/quote/QuoteList.ftl Tue Jul 3 19:42:32 2012 @@ -23,25 +23,25 @@ under the License. <table> <tr> <td width="10%"> - <div class="tabletext"><span style="white-space: nowrap;">${uiLabelMap.OrderQuote} ${uiLabelMap.CommonNbr}</span></div> + <div><span style="white-space: nowrap;">${uiLabelMap.OrderQuote} ${uiLabelMap.CommonNbr}</span></div> </td> <td width="10"> </td> <td width="20%"> - <div class="tabletext">${uiLabelMap.CommonName}</div> + <div>${uiLabelMap.CommonName}</div> </td> <td width="10"> </td> <td width="40%"> - <div class="tabletext">${uiLabelMap.CommonDescription}</div> + <div>${uiLabelMap.CommonDescription}</div> </td> <td width="10"> </td> <td width="10%"> - <div class="tabletext">${uiLabelMap.CommonStatus}</div> + <div>${uiLabelMap.CommonStatus}</div> </td> <td width="10"> </td> <td width="20%"> - <div class="tabletext">${uiLabelMap.OrderOrderQuoteIssueDate}</div> - <div class="tabletext">${uiLabelMap.CommonValidFromDate}</div> - <div class="tabletext">${uiLabelMap.CommonValidThruDate}</div> + <div>${uiLabelMap.OrderOrderQuoteIssueDate}</div> + <div>${uiLabelMap.CommonValidFromDate}</div> + <div>${uiLabelMap.CommonValidThruDate}</div> </td> <td width="10"> </td> <td width="10"> </td> @@ -51,25 +51,25 @@ under the License. <tr> <td> - <div class="tabletext">${quote.quoteId}</div> + <div>${quote.quoteId}</div> </td> <td width="10"> </td> <td> - <div class="tabletext">${quote.quoteName?if_exists}</div> + <div>${quote.quoteName?if_exists}</div> </td> <td width="10"> </td> <td> - <div class="tabletext">${quote.description?if_exists}</div> + <div>${quote.description?if_exists}</div> </td> <td width="10"> </td> <td> - <div class="tabletext">${status.get("description",locale)}</div> + <div>${status.get("description",locale)}</div> </td> <td width="10"> </td> <td> - <div class="tabletext"><span style="white-space: nowrap;">${quote.issueDate?if_exists}</span></div> - <div class="tabletext"><span style="white-space: nowrap;">${quote.validFromDate?if_exists}</span></div> - <div class="tabletext"><span style="white-space: nowrap;">${quote.validThruDate?if_exists}</span></div> + <div><span style="white-space: nowrap;">${quote.issueDate?if_exists}</span></div> + <div><span style="white-space: nowrap;">${quote.validFromDate?if_exists}</span></div> + <div><span style="white-space: nowrap;">${quote.validThruDate?if_exists}</span></div> </td> <td width="10"> </td> <td align="right"> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/requirePasswordChange.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/requirePasswordChange.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/requirePasswordChange.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/requirePasswordChange.ftl Tue Jul 3 19:42:32 2012 @@ -35,27 +35,27 @@ under the License. <form method="post" action="<@ofbizUrl>login${previousParams}</@ofbizUrl>" name="loginform"> <input type="hidden" name="requirePasswordChange" value="Y"/> <input type="hidden" name="USERNAME" value="${username}"/> - <div class="tabletext"> + <div> ${uiLabelMap.CommonUsername}: ${username} </div> <#if autoUserLogin?has_content> - <div class="tabletext"> + <div> (${uiLabelMap.CommonNot} ${autoUserLogin.userLoginId}? <a href="<@ofbizUrl>${autoLogoutUrl}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonClickHere}</a>) </div> </#if> - <div class="tabletext"> + <div> ${uiLabelMap.CommonPassword}: <input type="password" class="inputBox" name="PASSWORD" value="" size="20"/> </div> - <div class="tabletext"> + <div> ${uiLabelMap.CommonNewPassword}: <input type="password" class="inputBox" name="newPassword" value="" size="20"/> </div> - <div class="tabletext"> + <div> ${uiLabelMap.CommonNewPasswordVerify}: <input type="password" class="inputBox" name="newPasswordVerify" value="" size="20"/> </div> - <div class="tabletext"> + <div> <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonLogin}"/> </div> </form> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |