Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl Sat May 19 09:35:12 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/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl Sat May 19 09:35:12 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/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl Sat May 19 09:35:12 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/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl Sat May 19 09:35:12 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/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl Sat May 19 09:35:12 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/trunk/specialpurpose/ecommerce/webapp/ecommerce/quote/QuoteList.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/quote/QuoteList.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/quote/QuoteList.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/quote/QuoteList.ftl Sat May 19 09:35:12 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/trunk/specialpurpose/ecommerce/webapp/ecommerce/request/RequestList.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/request/RequestList.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/request/RequestList.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/request/RequestList.ftl Sat May 19 09:35:12 2012 @@ -23,29 +23,29 @@ under the License. <table> <tr> <td width="10%"> - <div class="tabletext"><span style="white-space: nowrap;">${uiLabelMap.OrderRequest} ${uiLabelMap.CommonNbr}</span></div> + <div><span style="white-space: nowrap;">${uiLabelMap.OrderRequest} ${uiLabelMap.CommonNbr}</span></div> </td> <td width="10"> </td> <td width="10%"> - <div class="tabletext"><span style="white-space: nowrap;">${uiLabelMap.CommonType}</span></div> + <div><span style="white-space: nowrap;">${uiLabelMap.CommonType}</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.OrderRequestDate}</div> - <div class="tabletext">${uiLabelMap.OrderRequestCreatedDate}</div> - <div class="tabletext">${uiLabelMap.OrderRequestLastModifiedDate}</div> + <div>${uiLabelMap.OrderRequestDate}</div> + <div>${uiLabelMap.OrderRequestCreatedDate}</div> + <div>${uiLabelMap.OrderRequestLastModifiedDate}</div> </td> <td width="10"> </td> <td width="10"> </td> @@ -56,29 +56,29 @@ under the License. <tr> <td> - <div class="tabletext">${custRequest.custRequestId}</div> + <div>${custRequest.custRequestId}</div> </td> <td width="10"> </td> <td> - <div class="tabletext">${type.get("description",locale)?if_exists}</div> + <div>${type.get("description",locale)?if_exists}</div> </td> <td width="10"> </td> <td> - <div class="tabletext">${custRequest.custRequestName?if_exists}</div> + <div>${custRequest.custRequestName?if_exists}</div> </td> <td width="10"> </td> <td> - <div class="tabletext">${custRequest.description?if_exists}</div> + <div>${custRequest.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;">${custRequest.custRequestDate?if_exists}</span></div> - <div class="tabletext"><span style="white-space: nowrap;">${custRequest.createdDate?if_exists}</span></div> - <div class="tabletext"><span style="white-space: nowrap;">${custRequest.lastModifiedDate?if_exists}</span></div> + <div><span style="white-space: nowrap;">${custRequest.custRequestDate?if_exists}</span></div> + <div><span style="white-space: nowrap;">${custRequest.createdDate?if_exists}</span></div> + <div><span style="white-space: nowrap;">${custRequest.lastModifiedDate?if_exists}</span></div> </td> <td width="10"> </td> <td align="right"> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/requirePasswordChange.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/requirePasswordChange.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/requirePasswordChange.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/requirePasswordChange.ftl Sat May 19 09:35:12 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> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl Sat May 19 09:35:12 2012 @@ -99,7 +99,7 @@ under the License. <a href="javascript:document.selectShoppingList.submit();" class="buttontext">${uiLabelMap.CommonEdit}</a> </form> <#else> - <div class="tabletext">${uiLabelMap.EcommerceNoShoppingListsCreate}.</div> + <div>${uiLabelMap.EcommerceNoShoppingListsCreate}.</div> <a href="<@ofbizUrl>createEmptyShoppingList?productStoreId=${productStoreId}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonCreateNew}</a> </#if> </div> @@ -321,7 +321,7 @@ under the License. <tr><td colspan="9"><hr /></td></tr> <tr> <td align="right" colspan="9"> - <div class="tabletext"> + <div> <a href="javascript:document.reorderinfo.submit();" class="buttontext">${uiLabelMap.CommonSave}</a> <a href="<@ofbizUrl>editcontactmech?preContactMechTypeId=POSTAL_ADDRESS&contactMechPurposeTypeId=SHIPPING_LOCATION&DONE_PAGE=editShoppingList</@ofbizUrl>" class="buttontext">${uiLabelMap.PartyAddNewAddress}</a> <a href="<@ofbizUrl>editcreditcard?DONE_PAGE=editShoppingList</@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceNewCreditCard}</a> @@ -343,17 +343,17 @@ under the License. <#if lastSlOrderDate?has_content> <#assign lastOrderedString = Static["org.ofbiz.base.util.UtilFormatOut"].formatDate(lastSlOrderDate)?if_exists> </#if> - <div class="tabletext"> + <div> <table cellspacing="2" cellpadding="2" border="0"> <tr> <td><div class="tableheadtext">${uiLabelMap.OrderLastOrderedDate}</div></td> <td><div class="tableheadtext">:</div></td> - <td><div class="tabletext">${lastOrderedString?default("${uiLabelMap.OrderNotYetOrdered}")}</div></td> + <td><div>${lastOrderedString?default("${uiLabelMap.OrderNotYetOrdered}")}</div></td> </tr> <tr> <td><div class="tableheadtext">${uiLabelMap.EcommerceEstimateNextOrderDate}</div></td> <td><div class="tableheadtext">:</div></td> - <td><div class="tabletext">${nextTimeString?default("${uiLabelMap.EcommerceNotYetKnown}")}</div></td> + <td><div>${nextTimeString?default("${uiLabelMap.EcommerceNotYetKnown}")}</div></td> </tr> </table> </div> @@ -377,8 +377,8 @@ under the License. <div class="screenlet-body"> <table width="100%" cellspacing="0" cellpadding="1" border="0"> <tr> - <td><div class="tabletext"><b>${uiLabelMap.EcommerceListName}</b></div></td> - <td align="right"><div class="tabletext"><b>${uiLabelMap.EcommerceTotalPrice}</b></div></td> + <td><div><b>${uiLabelMap.EcommerceListName}</b></div></td> + <td align="right"><div><b>${uiLabelMap.EcommerceTotalPrice}</b></div></td> <td> </td> <td> </td> </tr> @@ -390,7 +390,7 @@ under the License. <a href="<@ofbizUrl>editShoppingList?shoppingListId=${childShoppingList.shoppingListId}</@ofbizUrl>" class="buttontext">${childShoppingList.listName?default(childShoppingList.shoppingListId)}</a> </td> <td nowrap="nowrap" align="right"> - <div class="tabletext"><@ofbizCurrency amount=totalPrice isoCode=currencyUomId/></div> + <div><@ofbizCurrency amount=totalPrice isoCode=currencyUomId/></div> </td> <td align="right"> <a href="<@ofbizUrl>editShoppingList?shoppingListId=${childShoppingList.shoppingListId}</@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceGoToList}</a> @@ -401,11 +401,11 @@ under the License. </#list> <tr><td colspan="6"><hr /></td></tr> <tr> - <td><div class="tabletext"> </div></td> + <td><div> </div></td> <td nowrap="nowrap" align="right"> <div class="tableheadtext"><@ofbizCurrency amount=shoppingListChildTotal isoCode=currencyUomId/></div> </td> - <td><div class="tabletext"> </div></td> + <td><div> </div></td> </tr> </table> </div> @@ -425,11 +425,11 @@ under the License. <@paginationControls/> <table width="100%" cellspacing="0" cellpadding="1" border="0"> <tr> - <td><div class="tabletext"><b>${uiLabelMap.OrderProduct}</b></div></td> - <td><table><tr><td class="tabletext" nowrap="nowrap" align="center"><b>- ${uiLabelMap.EcommerceStartdate} -</b></td><td class="tabletext" nowrap="nowrap"><b>- ${uiLabelMap.EcommerceNbrOfDays} -</b></td></tr><tr><td class="tabletext" nowrap="nowrap"><b>- ${uiLabelMap.EcommerceNbrOfPersons} -</b></td><td class="tabletext" nowrap="nowrap" align="center"><b>- ${uiLabelMap.CommonQuantity} -</b></td></tr></table></td> - <#-- <td nowrap="nowrap" align="center"><div class="tabletext"><b>Purchased</b></div></td> --> - <td align="right"><div class="tabletext"><b>${uiLabelMap.EcommercePrice}</b></div></td> - <td align="right"><div class="tabletext"><b>${uiLabelMap.OrderTotal}</b></div></td> + <td><div><b>${uiLabelMap.OrderProduct}</b></div></td> + <td><table><tr><td nowrap="nowrap" align="center"><b>- ${uiLabelMap.EcommerceStartdate} -</b></td><td nowrap="nowrap"><b>- ${uiLabelMap.EcommerceNbrOfDays} -</b></td></tr><tr><td nowrap="nowrap"><b>- ${uiLabelMap.EcommerceNbrOfPersons} -</b></td><td nowrap="nowrap" align="center"><b>- ${uiLabelMap.CommonQuantity} -</b></td></tr></table></td> + <#-- <td nowrap="nowrap" align="center"><div><b>Purchased</b></div></td> --> + <td align="right"><div><b>${uiLabelMap.EcommercePrice}</b></div></td> + <td align="right"><div><b>${uiLabelMap.OrderTotal}</b></div></td> <td> </td> </tr> <#list shoppingListItemDatas[lowIndex-1..highIndex-1] as shoppingListItemData> @@ -442,7 +442,7 @@ under the License. <#assign isVirtual = product.isVirtual?exists && product.isVirtual.equals("Y")/> <tr> <td> - <div class="tabletext"> + <div> <a href="<@ofbizUrl>product?product_id=${shoppingListItem.productId}</@ofbizUrl>" class="buttontext">${shoppingListItem.productId} - ${productContentWrapper.get("PRODUCT_NAME")?default("No Name")}</a> : ${productContentWrapper.get("DESCRIPTION")?if_exists} </div> @@ -452,7 +452,7 @@ under the License. <input type="hidden" name="shoppingListId" value="${shoppingListItem.shoppingListId}"/> <input type="hidden" name="shoppingListItemSeqId" value="${shoppingListItem.shoppingListItemSeqId}"/> <input type="hidden" name="reservStart"/> - <div class="tabletext"> + <div> <#if product.productTypeId == "ASSET_USAGE" || product.productTypeId == "ASSET_USAGE_OUT_IN"> <table border="0" width="100%"> <tr> @@ -468,7 +468,7 @@ under the License. <td> </td> <td> </td> </#if> - <td class="tabletext"> + <td> <#else> <table width="100%"> <tr> @@ -477,7 +477,7 @@ under the License. </tr> <tr> <td align="center">--</td> - <td class="tabletext"><input type="hidden" name="reservStartStr" value=""/> + <td><input type="hidden" name="reservStartStr" value=""/> </#if> <input size="6" class="inputBox" type="text" name="quantity" value="${shoppingListItem.quantity?string.number}"/> </td></tr></table> @@ -486,14 +486,14 @@ under the License. </td> <#-- <td nowrap="nowrap" align="center"> - <div class="tabletext">${shoppingListItem.quantityPurchased?default(0)?string.number}</div> + <div>${shoppingListItem.quantityPurchased?default(0)?string.number}</div> </td> --> <td nowrap="nowrap" align="right"> - <div class="tabletext"><@ofbizCurrency amount=unitPrice isoCode=currencyUomId/></div> + <div><@ofbizCurrency amount=unitPrice isoCode=currencyUomId/></div> </td> <td nowrap="nowrap" align="right"> - <div class="tabletext"><@ofbizCurrency amount=totalPrice isoCode=currencyUomId/></div> + <div><@ofbizCurrency amount=totalPrice isoCode=currencyUomId/></div> </td> <td align="right"> <a href="#" onclick="javascript:TimestampSubmit(listform_${shoppingListItem.shoppingListItemSeqId});" class="buttontext">${uiLabelMap.CommonUpdate}</a> @@ -528,14 +528,14 @@ under the License. </#list> <tr><td colspan="6"><hr /></td></tr> <tr> - <td><div class="tabletext"> </div></td> - <td><div class="tabletext"> </div></td> - <#--<td><div class="tabletext"> </div></td>--> - <td><div class="tabletext"> </div></td> + <td><div> </div></td> + <td><div> </div></td> + <#--<td><div> </div></td>--> + <td><div> </div></td> <td nowrap="nowrap" align="right"> <div class="tableheadtext"><@ofbizCurrency amount=shoppingListItemTotal isoCode=currencyUomId/></div> </td> - <td><div class="tabletext"> </div></td> + <td><div> </div></td> </tr> </table> <#else> @@ -552,21 +552,21 @@ under the License. <table width="100%" border="0" cellspacing="1" cellpadding="1"> <tr> <td width="5%" nowrap="nowrap"> - <div class="tabletext">${uiLabelMap.EcommerceChildListTotalPrice}</div> + <div>${uiLabelMap.EcommerceChildListTotalPrice}</div> </td> <td align="right" width="5%" nowrap="nowrap"> - <div class="tabletext"><@ofbizCurrency amount=shoppingListChildTotal isoCode=currencyUomId/></div> + <div><@ofbizCurrency amount=shoppingListChildTotal isoCode=currencyUomId/></div> </td> - <td width="90%"><div class="tabletext"> </div></td> + <td width="90%"><div> </div></td> </tr> <tr> <td nowrap="nowrap"> - <div class="tabletext">${uiLabelMap.EcommerceListItemsTotalPrice} </div> + <div>${uiLabelMap.EcommerceListItemsTotalPrice} </div> </td> <td align="right" nowrap="nowrap"> - <div class="tabletext"><@ofbizCurrency amount=shoppingListItemTotal isoCode=currencyUomId/></div> + <div><@ofbizCurrency amount=shoppingListItemTotal isoCode=currencyUomId/></div> </td> - <td><div class="tabletext"> </div></td> + <td><div> </div></td> </tr> <tr> <td nowrap="nowrap"> @@ -575,7 +575,7 @@ under the License. <td align="right" nowrap="nowrap"> <div class="tableheadtext"><@ofbizCurrency amount=shoppingListTotalPrice isoCode=currencyUomId/></div> </td> - <td><div class="tabletext"> </div></td> + <td><div> </div></td> </tr> </table> </div> @@ -589,7 +589,7 @@ under the License. <form name="addToShoppingList" method="post" action="<@ofbizUrl>addItemToShoppingList<#if requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>"> <input type="hidden" name="shoppingListId" value="${shoppingList.shoppingListId}"/> <input type="text" class="inputBox" name="productId" value="${requestParameters.add_product_id?if_exists}"/> - <#if reservStart?exists></td><td class="tabletext">${uiLabelMap.EcommerceStartDate}</td><td><input type="text" class="inputBox" size="10" name="reservStart" value="${requestParameters.reservStart?default("")}" /></td><td class="tabletext"> ${uiLabelMap.EcommerceLength}:</td><td><input type="text" class="inputBox" size="2" name="reservLength" value="${requestParameters.reservLength?default("")}" /></td></tr><tr><td> </td><td> </td><td class="tabletext">${uiLabelMap.OrderNbrPersons}:</td><td><input type="text" class="inputBox" size="3" name="reservPersons" value="${requestParameters.reservPersons?default("1")}" /></td><td class="tabletext" nowrap="nowrap"></#if> ${uiLabelMap.CommonQuantity} :</td><td><input type="text" class="inputBox" size="5" name="quantity" value="${requestParameters.quantity?default("1")}" /></td><td> + <#if reservStart?exists></td><td>${uiLabelMap.EcommerceStartDate}</td><td><input type="text" class="inputBox" size="10" name="reservStart" value="${requestParameters.reservStart?default("")}" /></td><td> ${uiLabelMap.EcommerceLength}:</td><td><input type="text" class="inputBox" size="2" name="reservLength" value="${requestParameters.reservLength?default("")}" /></td></tr><tr><td> </td><td> </td><td>${uiLabelMap.OrderNbrPersons}:</td><td><input type="text" class="inputBox" size="3" name="reservPersons" value="${requestParameters.reservPersons?default("1")}" /></td><td nowrap="nowrap"></#if> ${uiLabelMap.CommonQuantity} :</td><td><input type="text" class="inputBox" size="5" name="quantity" value="${requestParameters.quantity?default("1")}" /></td><td> <!-- <input type="text" class="inputBox" size="5" name="quantity" value="${requestParameters.quantity?default("1")}" />--> <input type="submit" class="smallSubmit" value="${uiLabelMap.OrderAddToShoppingList}"/> </form> Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/RequirePasswordChange.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/RequirePasswordChange.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/RequirePasswordChange.ftl (original) +++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/RequirePasswordChange.ftl Sat May 19 09:35:12 2012 @@ -38,19 +38,19 @@ under the License. (${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" name="PASSWORD" value="" size="20"/> </div> - <div class="tabletext"> + <div> ${uiLabelMap.CommonNewPassword}: <input type="password" name="newPassword" value="" size="20"/> </div> - <div class="tabletext"> + <div> ${uiLabelMap.CommonNewPasswordVerify}: <input type="password" name="newPasswordVerify" value="" size="20"/> </div> - <div class="tabletext"> + <div> <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonLogin}"/> </div> </form> Modified: ofbiz/trunk/themes/multiflex/includes/footer.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/multiflex/includes/footer.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/themes/multiflex/includes/footer.ftl (original) +++ ofbiz/trunk/themes/multiflex/includes/footer.ftl Sat May 19 09:35:12 2012 @@ -21,7 +21,7 @@ under the License. <div class="footer"> <p align="center"> - <p>Copyright (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org"; class="tabletext" target="_blank">www.apache.org</a></p> + <p>Copyright (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org"; target="_blank">www.apache.org</a></p> <p>Powered by <a href="http://ofbiz.apache.org"; target="_blank">Apache OFBiz</a></p> </p> <#if layoutSettings.VT_FTR_JAVASCRIPT?has_content>
