svn commit: r675831 [1/2] - in /ofbiz/trunk: applications/accounting/widget
Locked
svn commit: r675831 [1/2] - in /ofbiz/trunk: applications/accounting/widget
 
|
Author: adrianc
Date: Thu Jul 10 21:02:30 2008 New Revision: 675831 URL: http://svn.apache.org/viewvc?rev=675831&view=rev Log: Removed deprecated CSS styles from the maincss.css file. I skipped the eCommerce component because it doesn't use that style sheet, and I also skipped the content component because it is used in eCommerce. This shouldn't affect any layout. If it does, just post a message on the dev ml (with link please) and I'll fix it. Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/additionalPartyListing.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoCodes.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotionproducts.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/customertaxinfo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/editShipAddress.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderparty.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl ofbiz/trunk/applications/order/webapp/ordermgr/quote/CopyQuote.ftl ofbiz/trunk/applications/order/webapp/ordermgr/reports/reportlist.ftl ofbiz/trunk/applications/order/webapp/ordermgr/request/CopyRequestItem.ftl ofbiz/trunk/applications/order/webapp/ordermgr/setup/paymentsetup.ftl ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl ofbiz/trunk/applications/product/webapp/catalog/product/EditProductContent.ftl ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl ofbiz/trunk/applications/workeffort/webapp/workeffort/workeffort/EditWorkEffortDupForm.ftl ofbiz/trunk/framework/common/webcommon/includes/messages.ftl ofbiz/trunk/framework/images/webapp/images/maincss.css ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/login.ftl ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processDetailList.ftl ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processHistory.ftl ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processList.ftl ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processSteps.ftl ofbiz/trunk/specialpurpose/shark/webapp/shark/repository/showRepository.ftl ofbiz/trunk/specialpurpose/shark/webapp/shark/tasklist/worklist.ftl Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Thu Jul 10 21:02:30 2008 @@ -238,8 +238,8 @@ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <container style="screenlet"> - <container style="screenlet-header"> - <label style="boxhead" text="${uiLabelMap.AccountingMainPage}"/> + <container style="screenlet-title-bar"> + <label style="h3" text="${uiLabelMap.AccountingMainPage}"/> </container> <platform-specific><html><html-template location="component://accounting/webapp/accounting/main.ftl"/></html></platform-specific> </container> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl Thu Jul 10 21:02:30 2008 @@ -39,16 +39,16 @@ </tr> <tr> <td> - <div class="tableheadtext">${uiLabelMap.ProductProduct}</div> + <div>${uiLabelMap.ProductProduct}</div> </td> <td> - <div class="tableheadtext">${uiLabelMap.CommonQuantity}</div> + <div>${uiLabelMap.CommonQuantity}</div> </td> <td> - <div class="tableheadtext">${uiLabelMap.ProductMoveQuantity}</div> + <div>${uiLabelMap.ProductMoveQuantity}</div> </td> <td> - <div class="tableheadtext">${uiLabelMap.OrderShipGroupTo}</div> + <div>${uiLabelMap.OrderShipGroupTo}</div> </td> </tr> @@ -71,7 +71,7 @@ <div class="tabletext">${shipGroupItemQuantity}</div> </td> <td> - <div class="tabletext"><input type="text" name="quantity_o_${rowCount}" value="${shipGroupItemQuantity}" class="inputBox"/></div> + <div class="tabletext"><input type="text" name="quantity_o_${rowCount}" value="${shipGroupItemQuantity}"/></div> </td> <td> <div class="tabletext"> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/additionalPartyListing.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/additionalPartyListing.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/additionalPartyListing.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/additionalPartyListing.ftl Thu Jul 10 21:02:30 2008 @@ -27,7 +27,7 @@ <table border="0" width="100%" cellpadding="0"> <#list roleList as role> <tr> - <td align="left" valign="bottom"><div class="tableheadtext">${roleData[role].get("description",locale)}</div></td> + <td align="left" valign="bottom"><div>${roleData[role].get("description",locale)}</div></td> </tr> <tr> <td colspan="4"><hr/></td> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl Thu Jul 10 21:02:30 2008 @@ -195,35 +195,35 @@ <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonToName}</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="disabled"</#if>/> + <input type="text" size="30" maxlength="60" name="toName" value="${toName}" <#if requestParameters.useShipAddr?exists>disabled="disabled"</#if>/> </td> </tr> <tr> <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonAttentionName}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="60" name="attnName" value="${postalFields.attnName?if_exists}" <#if requestParameters.useShipAddr?exists>disabled="disabled"</#if>/> + <input type="text" size="30" maxlength="60" name="attnName" value="${postalFields.attnName?if_exists}" <#if requestParameters.useShipAddr?exists>disabled="disabled"</#if>/> </td> </tr> <tr> <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonAddressLine} 1</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="30" name="address1" value="${postalFields.address1?if_exists}" <#if requestParameters.useShipAddr?exists>disabled="disabled"</#if>/> + <input type="text" size="30" maxlength="30" name="address1" value="${postalFields.address1?if_exists}" <#if requestParameters.useShipAddr?exists>disabled="disabled"</#if>/> *</td> </tr> <tr> <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonAddressLine} 2</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="30" name="address2" value="${postalFields.address2?if_exists}" <#if requestParameters.useShipAddr?exists>disabled="disabled"</#if>/> + <input type="text" size="30" maxlength="30" name="address2" value="${postalFields.address2?if_exists}" <#if requestParameters.useShipAddr?exists>disabled="disabled"</#if>/> </td> </tr> <tr> <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonCity}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="30" name="city" value="${postalFields.city?if_exists}" <#if requestParameters.useShipAddr?exists>disabled="disabled"</#if>/> + <input type="text" size="30" maxlength="30" name="city" value="${postalFields.city?if_exists}" <#if requestParameters.useShipAddr?exists>disabled="disabled"</#if>/> *</td> </tr> <tr> @@ -244,7 +244,7 @@ <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonZipPostalCode}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="12" maxlength="10" name="postalCode" value="${postalFields.postalCode?if_exists}" <#if requestParameters.useShipAddr?exists>disabled="disabled"</#if>/> + <input type="text" size="12" maxlength="10" name="postalCode" value="${postalFields.postalCode?if_exists}" <#if requestParameters.useShipAddr?exists>disabled="disabled"</#if>/> *</td> </tr> <tr> @@ -295,21 +295,21 @@ <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingFirstNameCard}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="20" maxlength="60" name="firstNameOnCard" value="${(creditCard.firstNameOnCard)?if_exists}"/> + <input type="text" size="20" maxlength="60" name="firstNameOnCard" value="${(creditCard.firstNameOnCard)?if_exists}"/> *</td> </tr> <tr> <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingMiddleNameCard}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="15" maxlength="60" name="middleNameOnCard" value="${(creditCard.middleNameOnCard)?if_exists}"/> + <input type="text" size="15" maxlength="60" name="middleNameOnCard" value="${(creditCard.middleNameOnCard)?if_exists}"/> </td> </tr> <tr> <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.AccountingLastNameCard}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="20" maxlength="60" name="lastNameOnCard" value="${(creditCard.lastNameOnCard)?if_exists}"/> + <input type="text" size="20" maxlength="60" name="lastNameOnCard" value="${(creditCard.lastNameOnCard)?if_exists}"/> *</td> </tr> <tr> @@ -352,7 +352,7 @@ <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingCardNumber}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="20" maxlength="30" name="cardNumber" value="${creditCard.cardNumber?if_exists}"/> + <input type="text" size="20" maxlength="30" name="cardNumber" value="${creditCard.cardNumber?if_exists}"/> *</td> </tr> <#--<tr> @@ -412,7 +412,7 @@ <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonDescription}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="20" maxlength="30" name="description" value="${creditCard.description?if_exists}"/> + <input type="text" size="20" maxlength="30" name="description" value="${creditCard.description?if_exists}"/> </td> </tr> </#if> @@ -429,28 +429,28 @@ <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingNameAccount}</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}"/> + <input type="text" size="30" maxlength="60" name="nameOnAccount" value="${eftAccount.nameOnAccount?if_exists}"/> *</td> </tr> <tr> <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingCompanyNameAccount}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="60" name="companyNameOnAccount" value="${eftAccount.companyNameOnAccount?if_exists}"/> + <input type="text" size="30" maxlength="60" name="companyNameOnAccount" value="${eftAccount.companyNameOnAccount?if_exists}"/> </td> </tr> <tr> <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingBankName}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="60" name="bankName" value="${eftAccount.bankName?if_exists}"/> + <input type="text" size="30" maxlength="60" name="bankName" value="${eftAccount.bankName?if_exists}"/> *</td> </tr> <tr> <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingRoutingNumber}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="10" maxlength="30" name="routingNumber" value="${eftAccount.routingNumber?if_exists}"/> + <input type="text" size="10" maxlength="30" name="routingNumber" value="${eftAccount.routingNumber?if_exists}"/> *</td> </tr> <tr> @@ -469,14 +469,14 @@ <td width="26%" align="right" valign="top"><div class="tabletext">${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}"/> + <input type="text" size="20" maxlength="40" name="accountNumber" value="${eftAccount.accountNumber?if_exists}"/> *</td> </tr> <tr> <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonDescription}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${eftAccount.description?if_exists}"/> + <input type="text" size="30" maxlength="60" name="description" value="${eftAccount.description?if_exists}"/> </td> </tr> </#if> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoCodes.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoCodes.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoCodes.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoCodes.ftl Thu Jul 10 21:02:30 2008 @@ -25,7 +25,7 @@ <div class="screenlet-body"> <div class="tabletext"> <form method="post" action="<@ofbizUrl>addpromocode<#if requestAttributes._CURRENT_VIEW_?has_content>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>" name="addpromocodeform" style="margin: 0;"> - <input type="text" class="inputBox" size="15" name="productPromoCodeId" value=""> + <input type="text" size="15" name="productPromoCodeId" value=""> <input type="submit" class="smallSubmit" value="${uiLabelMap.OrderAddCode}"> <#assign productPromoCodeIds = (shoppingCart.getProductPromoCodesEntered())?if_exists> <#if productPromoCodeIds?has_content> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl Thu Jul 10 21:02:30 2008 @@ -23,7 +23,7 @@ </div> <div class="screenlet-body"> <div style="float: left; width: 40%;"> - <div class="tableheadtext">${uiLabelMap.OrderPromotionsApplied}:</div> + <div>${uiLabelMap.OrderPromotionsApplied}:</div> <#list shoppingCart.getProductPromoUseInfoIter() as productPromoUseInfo> <div class="tabletext"> <#-- TODO: when promo pretty print is done show promo short description here --> @@ -37,7 +37,7 @@ </#list> </div> <div style="float: right; width: 55%; padding-left: 10px; border-left: 1px solid #999999;"> - <div class="tableheadtext">${uiLabelMap.OrderCartItemUseinPromotions}:</div> + <div>${uiLabelMap.OrderCartItemUseinPromotions}:</div> <#list shoppingCart.items() as cartLine> <#assign cartLineIndex = shoppingCart.getItemIndex(cartLine)> <#if cartLine.getIsPromo()> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotionproducts.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotionproducts.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotionproducts.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/promotionproducts.ftl Thu Jul 10 21:02:30 2008 @@ -45,9 +45,9 @@ <table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxbottom"> <tr> - <td><div class="tableheadtext">${uiLabelMap.CommonQualifier}</div></td> - <td><div class="tableheadtext">${uiLabelMap.CommonBenefit}</div></td> - <td><div class="tableheadtext"> </div></td> + <td><div>${uiLabelMap.CommonQualifier}</div></td> + <td><div>${uiLabelMap.CommonBenefit}</div></td> + <td><div> </div></td> </tr> <#if (listSize > 0)> <#list productIds[lowIndex..highIndex-1] as productId> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl Thu Jul 10 21:02:30 2008 @@ -25,8 +25,8 @@ <form method="post" action="<@ofbizUrl>additem</@ofbizUrl>" name="quickaddform" style="margin: 0;"> <table border="0"> <tr> - <td align="right"><div class="tableheadtext">${uiLabelMap.ProductProductId} :</div></td> - <td><input type="text" class="inputBox" size="25" name="add_product_id" value=""/> + <td align="right"><div>${uiLabelMap.ProductProductId} :</div></td> + <td><input type="text" size="25" name="add_product_id" value=""/> <span class='tabletext'> <a href="javascript:quicklookup(document.quickaddform.add_product_id)" class="buttontext">${uiLabelMap.OrderQuickLookup}</a> <a href="javascript:call_fieldlookup2(document.quickaddform.add_product_id,'<@ofbizUrl>LookupProduct</@ofbizUrl>');"> @@ -36,41 +36,41 @@ </td> </tr> <tr> - <td align="right"><div class="tableheadtext">${uiLabelMap.OrderQuantity} :</div></td> - <td><input type="text" class="inputBox" size="6" name="quantity" value=""/></td> + <td align="right"><div>${uiLabelMap.OrderQuantity} :</div></td> + <td><input type="text" size="6" name="quantity" value=""/></td> </tr> <tr> - <td align="right"><div class="tableheadtext">${uiLabelMap.OrderDesiredDeliveryDate} :</div></td> + <td align="right"><div>${uiLabelMap.OrderDesiredDeliveryDate} :</div></td> <td> <div class="tabletext"> - <input type="text" class="inputBox" size="25" maxlength="30" name="itemDesiredDeliveryDate"<#if useAsDefaultDesiredDeliveryDate?exists> value="${defaultDesiredDeliveryDate}"</#if>/> + <input type="text" size="25" maxlength="30" name="itemDesiredDeliveryDate"<#if useAsDefaultDesiredDeliveryDate?exists> value="${defaultDesiredDeliveryDate}"</#if>/> <a href="javascript:call_cal(document.quickaddform.itemDesiredDeliveryDate,'${defaultDesiredDeliveryDate} 00:00:00.0');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.calendar_click_here_for_calendar}"/></a> - <input type="checkbox" class="inputBox" name="useAsDefaultDesiredDeliveryDate" value="true"<#if useAsDefaultDesiredDeliveryDate?exists> checked="checked"</#if>/> + <input type="checkbox" name="useAsDefaultDesiredDeliveryDate" value="true"<#if useAsDefaultDesiredDeliveryDate?exists> checked="checked"</#if>/> ${uiLabelMap.OrderUseDefaultDesiredDeliveryDate} </div> </td> </tr> <tr> - <td align="right"><div class="tableheadtext">${uiLabelMap.OrderShipAfterDate} :</div></td> + <td align="right"><div>${uiLabelMap.OrderShipAfterDate} :</div></td> <td> <div class="tabletext"> - <input type="text" class="inputBox" size="20" maxlength="30" name="shipAfterDate" value="${shoppingCart.getDefaultShipAfterDate()?default("")}"/> + <input type="text" size="20" maxlength="30" name="shipAfterDate" value="${shoppingCart.getDefaultShipAfterDate()?default("")}"/> <a href="javascript:call_cal(document.quickaddform.shipAfterDate,'${shoppingCart.getDefaultShipAfterDate()?default("")}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.calendar_click_here_for_calendar}"/></a> </div> </td> </tr> <tr> - <td align="right"><div class="tableheadtext">${uiLabelMap.OrderShipBeforeDate} :</div></td> + <td align="right"><div>${uiLabelMap.OrderShipBeforeDate} :</div></td> <td> <div class="tabletext"> - <input type="text" class="inputBox" size="20" maxlength="30" name="shipBeforeDate" value="${shoppingCart.getDefaultShipBeforeDate()?default("")}"/> + <input type="text" size="20" maxlength="30" name="shipBeforeDate" value="${shoppingCart.getDefaultShipBeforeDate()?default("")}"/> <a href="javascript:call_cal(document.quickaddform.shipBeforeDate,'${shoppingCart.getDefaultShipBeforeDate()?default("")}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.calendar_click_here_for_calendar}"/></a> </div> </td> </tr> <#if shoppingCart.getOrderType() == "PURCHASE_ORDER"> <tr> - <td align="right"><div class="tableheadtext">${uiLabelMap.OrderOrderItemType} :</div></td> + <td align="right"><div>${uiLabelMap.OrderOrderItemType} :</div></td> <td> <div class="tabletext"> <select name="add_item_type"> @@ -84,11 +84,11 @@ </tr> </#if> <tr> - <td align="right"><div class="tableheadtext">${uiLabelMap.CommonComment} :</div></td> + <td align="right"><div>${uiLabelMap.CommonComment} :</div></td> <td> <div class="tabletext"> - <input type="text" class="inputBox" size="25" name="itemComment" value="${defaultComment?if_exists}"> - <input type="checkbox" class="inputBox" name="useAsDefaultComment" value="true" <#if useAsDefaultComment?exists>checked</#if>> + <input type="text" size="25" name="itemComment" value="${defaultComment?if_exists}"> + <input type="checkbox" name="useAsDefaultComment" value="true" <#if useAsDefaultComment?exists>checked</#if>> ${uiLabelMap.OrderUseDefaultComment} </div> </td> @@ -106,15 +106,15 @@ <tr> <td> <form method="post" action="<@ofbizUrl>additem</@ofbizUrl>" name="bulkworkaddform" style="margin: 0;"> - <div class="tableheadtext"> + <div> ${uiLabelMap.OrderOrderItemType}: <select name="add_item_type"><option value="BULK_ORDER_ITEM">${uiLabelMap.ProductBulkItem}</option><option value="WORK_ORDER_ITEM">${uiLabelMap.ProductWorkItem}</option></select> - <br>${uiLabelMap.ProductProductCategory}: <input type="text" class="inputBox" name="add_category_id" size="20" maxlength="20" value="${requestParameters.add_category_id?if_exists}"/> + <br>${uiLabelMap.ProductProductCategory}: <input type="text" name="add_category_id" size="20" maxlength="20" value="${requestParameters.add_category_id?if_exists}"/> <a href="javascript:call_fieldlookup2(document.bulkworkaddform.add_category_id,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/></a> </div> - <div class="tableheadtext"> - ${uiLabelMap.CommonDescription}: <input type="text" class="inputBox" size="25" name="add_item_description" value=""/> - ${uiLabelMap.OrderQuantity}: <input type="text" class="inputBox" size="3" name="quantity" value="${requestParameters.quantity?default("1")}"/> - ${uiLabelMap.OrderPrice}: <input type="text" class="inputBox" size="6" name="price" value="${requestParameters.price?if_exists}"/> + <div> + ${uiLabelMap.CommonDescription}: <input type="text" size="25" name="add_item_description" value=""/> + ${uiLabelMap.OrderQuantity}: <input type="text" size="3" name="quantity" value="${requestParameters.quantity?default("1")}"/> + ${uiLabelMap.OrderPrice}: <input type="text" size="6" name="price" value="${requestParameters.price?if_exists}"/> <input type="submit" class="smallSubmit" value="${uiLabelMap.OrderAddToOrder}"/> </div> </form> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl Thu Jul 10 21:02:30 2008 @@ -73,7 +73,7 @@ <#if cartLine.getProductId()?exists> <#-- product item --> <a href="<@ofbizUrl>product?product_id=${cartLine.getProductId()}</@ofbizUrl>" class="buttontext">${cartLine.getProductId()}</a> - - <input size="60" class="inputBox" type="text" name="description_${cartLineIndex}" value="${cartLine.getName()?default("")}"/><br/> + <input size="60" type="text" name="description_${cartLineIndex}" value="${cartLine.getName()?default("")}"/><br/> <i>${cartLine.getDescription()?if_exists}</i> <#if shoppingCart.getOrderType() != "PURCHASE_ORDER"> <#-- only applies to sales orders, not purchase orders --> @@ -124,12 +124,12 @@ </#if> </#if> <#if cartLine.getItemComment()?has_content> - <tr><td align="left"><div class="tableheadtext">${uiLabelMap.CommonComment} : </div></td> + <tr><td align="left"><div>${uiLabelMap.CommonComment} : </div></td> <td align="left"><div class="tabletext">${cartLine.getItemComment()?if_exists}</div> </td></tr> </#if> <#if cartLine.getDesiredDeliveryDate()?has_content> - <tr><td align="left"><div class="tableheadtext">${uiLabelMap.OrderDesiredDeliveryDate}: </div></td> + <tr><td align="left"><div>${uiLabelMap.OrderDesiredDeliveryDate}: </div></td> <td align="left"><div class="tabletext">${cartLine.getDesiredDeliveryDate()?if_exists}</div> </td></tr> </#if> @@ -177,7 +177,7 @@ <tr> <td align="left"> <div class="tabletext">${uiLabelMap.OrderShipAfterDate} - <input type="text" class="inputBox" size="20" maxlength="30" name="shipAfterDate_${cartLineIndex}" + <input type="text" size="20" maxlength="30" name="shipAfterDate_${cartLineIndex}" value="${cartLine.getShipAfterDate()?default("")}"/> <a href="javascript:call_cal(document.cartform.shipAfterDate_${cartLineIndex},'${shoppingCart.getShipAfterDate()?default("")}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.calendar_click_here_for_calendar}"/></a> </div> @@ -185,7 +185,7 @@ <td> </td> <td align="left"> <div class="tabletext">${uiLabelMap.OrderShipBeforeDate} - <input type="text" class="inputBox" size="20" maxlength="30" name="shipBeforeDate_${cartLineIndex}" + <input type="text" size="20" maxlength="30" name="shipBeforeDate_${cartLineIndex}" value="${cartLine.getShipBeforeDate()?default("")}"/> <a href="javascript:call_cal(document.cartform.shipBeforeDate_${cartLineIndex},'${shoppingCart.getShipBeforeDate()?default("")}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.calendar_click_here_for_calendar}"/></a> </div> @@ -198,7 +198,7 @@ <#if (cartLine.getIsPromo() && cartLine.getAlternativeOptionProductIds()?has_content)> <#-- Show alternate gifts if there are any... --> - <div class="tableheadtext">${uiLabelMap.OrderChooseFollowingForGift}:</div> + <div>${uiLabelMap.OrderChooseFollowingForGift}:</div> <#list cartLine.getAlternativeOptionProductIds() as alternativeOptionProductId> <#assign alternativeOptionProduct = delegator.findByPrimaryKeyCache("Product", Static["org.ofbiz.base.util.UtilMisc"].toMap("productId", alternativeOptionProductId))> <#assign alternativeOptionName = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(alternativeOptionProduct, "PRODUCT_NAME", locale, dispatcher)?if_exists> @@ -233,7 +233,7 @@ <#if cartLine.getIsPromo() || cartLine.getShoppingListId()?exists> ${cartLine.getQuantity()?string.number} <#else> - <input size="6" class="inputBox" type="text" name="update_${cartLineIndex}" value="${cartLine.getQuantity()?string.number}"/> + <input size="6" type="text" name="update_${cartLineIndex}" value="${cartLine.getQuantity()?string.number}"/> </#if> </div> </td> @@ -242,7 +242,7 @@ <#if cartLine.getIsPromo() || (shoppingCart.getOrderType() == "SALES_ORDER" && !security.hasEntityPermission("ORDERMGR", "_SALES_PRICEMOD", session))> <@ofbizCurrency amount=cartLine.getDisplayPrice() isoCode=currencyUomId/> <#else> - <input size="6" class="inputBox" type="text" name="price_${cartLineIndex}" value="${cartLine.getBasePrice()}"/> + <input size="6" type="text" name="price_${cartLineIndex}" value="${cartLine.getBasePrice()}"/> </#if> </div> </td> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl Thu Jul 10 21:02:30 2008 @@ -45,7 +45,7 @@ </td> <td valign="middle"> <div class="tabletext"> - <input type="text" class="inputBox" name="SEARCH_STRING" size="40" value="${requestParameters.SEARCH_STRING?if_exists}"> + <input type="text" name="SEARCH_STRING" size="40" value="${requestParameters.SEARCH_STRING?if_exists}"> ${uiLabelMap.CommonAny}<input type="radio" name="SEARCH_OPERATOR" value="OR" <#if searchOperator == "OR">checked</#if>> ${uiLabelMap.CommonAll}<input type="radio" name="SEARCH_OPERATOR" value="AND" <#if searchOperator == "AND">checked</#if>> </div> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl Thu Jul 10 21:02:30 2008 @@ -347,14 +347,14 @@ </#if> <div id="add_amount" class="${hiddenStyle}"> <span style="white-space: nowrap;"><b>Amount:</b></span> - <input type="text" class="inputBox" size="5" name="add_amount" value=""> + <input type="text" size="5" name="add_amount" value=""> </div> <#if !configwrapper.isCompleted()> <div class="tabletext">[${uiLabelMap.EcommerceProductNotConfigured}] - <input type="text" class="inputBox" size="5" name="quantity" value="0" disabled></div> + <input type="text" size="5" name="quantity" value="0" disabled></div> <#else> <a href="javascript:addItem()" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.OrderAddToCart}</span></a> - <input type="text" class="inputBox" size="5" name="quantity" value="1" > + <input type="text" size="5" name="quantity" value="1" > </#if> </#if> <#if requestParameters.category_id?exists> @@ -379,7 +379,7 @@ <option value="">${uiLabelMap.OrderNewShoppingList}</option> </select> - <input type="text" size="5" class="inputBox" name="quantity" value="1"> + <input type="text" size="5" name="quantity" value="1"> <a href="javascript:document.addToShoppingList.submit();" class="buttontext">[${uiLabelMap.OrderAddToShoppingList}]</a> </form> <#else> <br/> @@ -463,7 +463,7 @@ <#list questions as question> <tr> <td> - <div class="tableheadtext">${question.question}</div> + <div>${question.question}</div> <#if question.isFirst()> <a name='#${question.getConfigItem().getString("configItemId")}'></a> <div class="tabletext">${question.description?if_exists}</div> @@ -574,7 +574,7 @@ <#if (isEcommerceScreen?exists && isEcommerceScreen?default("N") == "Y")> <tr> <td colspan="2"> - <div class="tableheadtext">${uiLabelMap.OrderCustomerReviews}:</div> + <div>${uiLabelMap.OrderCustomerReviews}:</div> <#if averageRating?exists && (averageRating?double > 0) && numRatings?exists && (numRatings?double > 1)> <div class="tabletext">${uiLabelMap.OrderAverageRating}: ${averageRating} <#if numRatings?exists>(${uiLabelMap.CommonFrom} ${numRatings} ${uiLabelMap.OrderRatings})</#if></div> </#if> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl Thu Jul 10 21:02:30 2008 @@ -26,7 +26,7 @@ <input type="hidden" name="VIEW_SIZE" value="10"/> <input type="hidden" name="PAGING" value="Y"/> <div class="tabletext"> - <input type="text" class="inputBox" name="SEARCH_STRING" size="14" maxlength="50" value="${requestParameters.SEARCH_STRING?if_exists}"/> + <input type="text" name="SEARCH_STRING" size="14" maxlength="50" value="${requestParameters.SEARCH_STRING?if_exists}"/> </div> <#if 0 < otherSearchProdCatalogCategories?size> <div class="tabletext"> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl Thu Jul 10 21:02:30 2008 @@ -435,13 +435,13 @@ <input type="hidden" name="add_product_id" value="${product.productId}"/> <div id="addCart1" style="display:none;> <span style="white-space: nowrap;"><b>${uiLabelMap.CommonQuantity}:</b></span> - <input type="text" class="inputBox" size="5" name="quantity" value="1"/> + <input type="text" size="5" name="quantity" value="1"/> <a href="javascript:javascript:addItem();" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.OrderAddToCart}</span></a> </div> <div id="addCart2" style="display:block;> <span style="white-space: nowrap;"><b>${uiLabelMap.CommonQuantity}:</b></span> - <input type="text" class="inputBox" size="5" value="1" disabled="disabled"/> + <input type="text" size="5" value="1" disabled="disabled"/> <a href="javascript:alert('Please select all features first');" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.OrderAddToCart}</span></a> </div> @@ -500,18 +500,18 @@ </#if> <div id="add_amount" class="${hiddenStyle}"> <span style="white-space: nowrap;"><b>${uiLabelMap.CommonAmount}:</b></span> - <input type="text" class="inputBox" size="5" name="add_amount" value=""/> + <input type="text" size="5" name="add_amount" value=""/> </div> <#if product.productTypeId?if_exists == "ASSET_USAGE"> <table width="100%"><tr> - <td class="tabletext" nowrap align="right">Start Date<br/>(yyyy-mm-dd)</td><td><input type="text" class="inputBox" size="10" name="reservStart"/><a href="javascript:call_cal(document.addform.reservStart, '${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString().substring(0,10)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a></td> - <td class="tabletext" nowrap align="right">End Date<br/>(yyyy-mm-dd)</td><td><input type="text" class="inputBox" size="10" name="reservEnd"/><a href="javascript:call_cal(document.addform.reservEnd, '${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString().substring(0,10)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a></td></tr> + <td class="tabletext" nowrap align="right">Start Date<br/>(yyyy-mm-dd)</td><td><input type="text" size="10" name="reservStart"/><a href="javascript:call_cal(document.addform.reservStart, '${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString().substring(0,10)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a></td> + <td class="tabletext" nowrap align="right">End Date<br/>(yyyy-mm-dd)</td><td><input type="text" size="10" name="reservEnd"/><a href="javascript:call_cal(document.addform.reservEnd, '${Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().toString().substring(0,10)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a></td></tr> <tr> - <#--td class="tabletext" nowrap align="right">Number<br/>of days</td><td><input type="textt" class="inputBox" size="4" name="reservLength"/></td></tr><tr><td> </td><td class="tabletext" align="right" nowrap> </td--> - <td class="tabletext" nowrap align="right">Number of persons</td><td><input type="text" class="inputBox" size="4" name="reservPersons" value="2"/></td> - <td class="tabletext" nowrap align="right">Number of rooms</td><td><input type="text" class="inputBox" size="5" name="quantity" value="1"/></td></tr></table> + <#--td class="tabletext" nowrap align="right">Number<br/>of days</td><td><input type="textt" size="4" name="reservLength"/></td></tr><tr><td> </td><td class="tabletext" align="right" nowrap> </td--> + <td class="tabletext" nowrap align="right">Number of persons</td><td><input type="text" size="4" name="reservPersons" value="2"/></td> + <td class="tabletext" nowrap align="right">Number of rooms</td><td><input type="text" size="5" name="quantity" value="1"/></td></tr></table> <#else/> - <input type="text" class="inputBox" size="5" name="quantity" value="1"<#if product.isVirtual?if_exists?upper_case == "Y"> disabled="disabled"</#if>/> + <input type="text" size="5" name="quantity" value="1"<#if product.isVirtual?if_exists?upper_case == "Y"> disabled="disabled"</#if>/> </#if> <#-- This calls addItem() so that variants of virtual products cant be added before distinguishing features are selected, it should not be changed to additemSubmit() --> <a href="javascript:addItem()" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.OrderAddToCart}</span></a> @@ -540,9 +540,9 @@ </select> <#if product.productTypeId?if_exists == "ASSET_USAGE"> - <table><tr><td> </td><td class="tabletext" align="right">${uiLabelMap.CommonStartDate} (yyyy-mm-dd)</td><td><input type="text" class="inputBox" size="10" name="reservStartStr" ></td><td class="tabletext">Number of days</td><td><input type="text" class="inputBox" size="4" name="reservLength"></td><td> </td><td class="tabletext" align="right">Number of persons</td><td><input type="text" class="inputBox" size="4" name="reservPersons" value="1"></td><td class="tabletext" align="right">Qty </td><td><input type="text" class="inputBox" size="5" name="quantity" value="1"></td></tr></table> + <table><tr><td> </td><td class="tabletext" align="right">${uiLabelMap.CommonStartDate} (yyyy-mm-dd)</td><td><input type="text" size="10" name="reservStartStr" ></td><td class="tabletext">Number of days</td><td><input type="text" size="4" name="reservLength"></td><td> </td><td class="tabletext" align="right">Number of persons</td><td><input type="text" size="4" name="reservPersons" value="1"></td><td class="tabletext" align="right">Qty </td><td><input type="text" size="5" name="quantity" value="1"></td></tr></table> <#else> - <input type="text" class="inputBox" size="5" name="quantity" value="1"/> + <input type="text" size="5" name="quantity" value="1"/> <input type="hidden" name="reservStartStr" value= ""/> </#if> <a href="javascript:addShoplistSubmit();" class="buttontext">${uiLabelMap.OrderAddToShoppingList}</a> @@ -597,7 +597,7 @@ <#-- Digital Download Files Associated with this Product --> <#if downloadProductContentAndInfoList?has_content> <div id="download-files"> - <div class="tableheadtext">${uiLabelMap.OrderDownloadFilesTitle}:</div> + <div>${uiLabelMap.OrderDownloadFilesTitle}:</div> <#list downloadProductContentAndInfoList as downloadProductContentAndInfo> <div class="tabletext">${downloadProductContentAndInfo.contentName}<#if downloadProductContentAndInfo.description?has_content> - ${downloadProductContentAndInfo.description}</#if></div> </#list> @@ -615,7 +615,7 @@ <#-- Product Reviews --> <#if (isEcommerceScreen?exists && isEcommerceScreen?default("N") == "Y")> <div id="reviews"> - <div class="tableheadtext">${uiLabelMap.OrderCustomerReviews}:</div> + <div>${uiLabelMap.OrderCustomerReviews}:</div> <#if averageRating?exists && (averageRating?double > 0) && numRatings?exists && (numRatings?double > 1)> <div class="tabletext">${uiLabelMap.OrderAverageRating}: ${averageRating} <#if numRatings?exists>(${uiLabelMap.CommonFrom} ${numRatings} ${uiLabelMap.OrderRatings})</#if></div> </#if> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl Thu Jul 10 21:02:30 2008 @@ -57,7 +57,7 @@ <#else> <form method="post" action="<@ofbizUrl>additem<#if requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>" name="the${requestAttributes.formNamePrefix?if_exists}${requestAttributes.listIndex?if_exists}form" style="margin: 0;"> <input type="hidden" name="add_product_id" value="${product.productId}"/> - <input type="text" class="inputBox" size="5" name="quantity" value="1"/> + <input type="text" size="5" name="quantity" value="1"/> <#if requestParameters.product_id?has_content><input type="hidden" name="product_id" value="${requestParameters.product_id}"/></#if> <#if requestParameters.category_id?has_content><input type="hidden" name="category_id" value="${requestParameters.category_id}"/></#if> <#if requestParameters.productPromoId?has_content><input type="hidden" name="productPromoId" value="${requestParameters.productPromoId}"/></#if> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickaddsummary.ftl Thu Jul 10 21:02:30 2008 @@ -55,7 +55,7 @@ <#elseif product.isVirtual?default("N") == "Y"> <a href="<@ofbizUrl>product?<#if categoryId?exists>category_id=${categoryId}&</#if>product_id=${product.productId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderChooseVariations}...</a> <#else> - <input type="text" size="5" class="inputBox" name="quantity_${product.productId}" value=""> + <input type="text" size="5" name="quantity_${product.productId}" value=""> </#if> </td> <#else> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl Thu Jul 10 21:02:30 2008 @@ -100,7 +100,7 @@ <td> </td> <td valign='middle'> <div class='tabletext' valign='top'> - <input type="text" class="inputBox" name="userLoginId" value="${requestParameters.userLoginId?if_exists}"/> + <input type="text" name="userLoginId" value="${requestParameters.userLoginId?if_exists}"/> <a href="javascript:call_fieldlookup2(document.salesentryform.userLoginId,'LookupUserLoginAndPartyDetails');"> <img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click here For Field Lookup'/> </a> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl Thu Jul 10 21:02:30 2008 @@ -149,7 +149,7 @@ <#-- Party Tax Info --> <#-- commented out by default because the TaxAuthority drop-down is just too wide... <hr/> - <div class="tableheadtext"> ${uiLabelMap.PartyTaxIdentification}</div> + <div> ${uiLabelMap.PartyTaxIdentification}</div> ${screens.render("component://order/widget/ordermgr/OrderEntryOrderScreens.xml#customertaxinfo")} --> </div> @@ -280,7 +280,7 @@ <#else><@ofbizUrl>viewprofile?DONE_PAGE=quickcheckout</@ofbizUrl>"</#if> class="buttontext">${uiLabelMap.PartyProfile}</a>.</div> <br/> <div class="tabletext">${uiLabelMap.OrderCommaSeperatedEmailAddresses}:</div> - <input type="text" class="inputBox" size="30" name="order_additional_emails" value="${shoppingCart.getOrderAdditionalEmails()?if_exists}"/> + <input type="text" size="30" name="order_additional_emails" value="${shoppingCart.getOrderAdditionalEmails()?if_exists}"/> </td> </tr> </table> @@ -490,7 +490,7 @@ <div class="tabletext">${uiLabelMap.CommonNumber}</div> </td> <td width="50%"> - <input type="text" size="15" class="inputBox" name="giftCardNumber" value="${(requestParameters.giftCardNumber)?if_exists}" onFocus="document.checkoutInfoForm.addGiftCard.checked=true;"/> + <input type="text" size="15" name="giftCardNumber" value="${(requestParameters.giftCardNumber)?if_exists}" onFocus="document.checkoutInfoForm.addGiftCard.checked=true;"/> </td> </tr> <#if shoppingCart.isPinRequiredForGC(delegator)> @@ -499,7 +499,7 @@ <div class="tabletext">${uiLabelMap.AccountingPIN}</div> </td> <td width="50%"> - <input type="text" size="10" class="inputBox" name="giftCardPin" value="${(requestParameters.giftCardPin)?if_exists}" onFocus="document.checkoutInfoForm.addGiftCard.checked=true;"/> + <input type="text" size="10" name="giftCardPin" value="${(requestParameters.giftCardPin)?if_exists}" onFocus="document.checkoutInfoForm.addGiftCard.checked=true;"/> </td> </tr> </#if> @@ -508,7 +508,7 @@ <div class="tabletext">${uiLabelMap.AccountingAmount}</div> </td> <td width="50%"> - <input type="text" size="6" class="inputBox" name="giftCardAmount" value="${(requestParameters.giftCardAmount)?if_exists}" onFocus="document.checkoutInfoForm.addGiftCard.checked=true;"/> + <input type="text" size="6" name="giftCardAmount" value="${(requestParameters.giftCardAmount)?if_exists}" onFocus="document.checkoutInfoForm.addGiftCard.checked=true;"/> </td> </tr> </#if> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl Thu Jul 10 21:02:30 2008 @@ -98,7 +98,7 @@ </#list> </#if> </table> - <div class="tableheadtext"> ${uiLabelMap.AccountingAgreementInformation}</div> + <div> ${uiLabelMap.AccountingAgreementInformation}</div> <table> <#if agreements?exists> <#if agreements.size()!=1> @@ -112,7 +112,7 @@ <td> </td> <td valign='middle'> <div class='tabletext' valign='top'> - <select name="agreementId" class="selectBox"> + <select name="agreementId"> <#list agreements as agreement> <option value='${agreement.agreementId?if_exists}'>${agreement.agreementId} - ${agreement.description?if_exists}</option> </#list> @@ -129,7 +129,7 @@ </table> <br /> <#-- Party Tax Info --> - <div class="tableheadtext"> ${uiLabelMap.PartyTaxIdentification}</div> + <div> ${uiLabelMap.PartyTaxIdentification}</div> ${screens.render("component://order/widget/ordermgr/OrderEntryOrderScreens.xml#customertaxinfo")} </div> </div> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/customertaxinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/customertaxinfo.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/customertaxinfo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/customertaxinfo.ftl Thu Jul 10 21:02:30 2008 @@ -24,17 +24,17 @@ </div> </#list> <div> - <span class="tableheadtext">${uiLabelMap.PartyTaxAddInfo}:</span> + <span>${uiLabelMap.PartyTaxAddInfo}:</span> <select name="taxAuthPartyGeoIds"> <option></option> <#list taxAuthorityAndDetailList as taxAuthorityAndDetail> <option value="${taxAuthorityAndDetail.taxAuthPartyId}::${taxAuthorityAndDetail.taxAuthGeoId}">[${taxAuthorityAndDetail.geoCode}] ${taxAuthorityAndDetail.geoName} (${taxAuthorityAndDetail.groupName?if_exists})</option> </#list> </select> - <span class="tabletext">${uiLabelMap.CommonId}: </span><input type="text" name="partyTaxId" class="inputBox" size="12" maxlength="40"/> + <span class="tabletext">${uiLabelMap.CommonId}: </span><input type="text" name="partyTaxId" size="12" maxlength="40"/> <#if productStore.showTaxIsExempt?default("Y") == "Y"> - <span class="tabletext">${uiLabelMap.PartyTaxIsExempt} </span><input type="checkbox" name="isExempt" class="inputBox" value="Y"/> + <span class="tabletext">${uiLabelMap.PartyTaxIsExempt} </span><input type="checkbox" name="isExempt" value="Y"/> <#else/> <input type="hidden" name="isExempt" value="N"/> </#if> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/custsettings.ftl Thu Jul 10 21:02:30 2008 @@ -30,35 +30,35 @@ <td width="26%" align="right"><div class="tabletext">${uiLabelMap.CommonTitle}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" name="personalTitle" value="${requestParameters.personalTitle?if_exists}" size="10" maxlength="30"/> + <input type="text" name="personalTitle" value="${requestParameters.personalTitle?if_exists}" size="10" maxlength="30"/> </td> </tr> <tr> <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyFirstName}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" name="firstName" value="${requestParameters.firstName?if_exists}" size="30" maxlength="30"/> + <input type="text" name="firstName" value="${requestParameters.firstName?if_exists}" size="30" maxlength="30"/> *</td> </tr> <tr> <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyMiddleInitial}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" name="middleName" value="${requestParameters.middleName?if_exists}" size="4" maxlength="4"/> + <input type="text" name="middleName" value="${requestParameters.middleName?if_exists}" size="4" maxlength="4"/> </td> </tr> <tr> <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyLastName}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" name="lastName" value="${requestParameters.lastName?if_exists}" size="30" maxlength="30"/> + <input type="text" name="lastName" value="${requestParameters.lastName?if_exists}" size="30" maxlength="30"/> *</td> </tr> <tr> <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartySuffix}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" name="suffix" value="${requestParameters.suffix?if_exists}" size="10" maxlength="30"/> + <input type="text" name="suffix" value="${requestParameters.suffix?if_exists}" size="10" maxlength="30"/> </td> </tr> <tr> @@ -68,10 +68,10 @@ <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyHomePhone}<BR>${uiLabelMap.CommonAllowSolicitation}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" name="homeCountryCode" value="${requestParameters.homeCountryCode?if_exists}" size="4" maxlength="10"/> - - <input type="text" class="inputBox" name="homeAreaCode" value="${requestParameters.homeAreaCode?if_exists}" size="4" maxlength="10"/>* - - <input type="text" class="inputBox" name="homeContactNumber" value="${requestParameters.homeContactNumber?if_exists}" size="15" maxlength="15"/>* - ext <input type="text" class="inputBox" name="homeExt" value="${requestParameters.homeExt?if_exists}" size="6" maxlength="10"/> + <input type="text" name="homeCountryCode" value="${requestParameters.homeCountryCode?if_exists}" size="4" maxlength="10"/> + - <input type="text" name="homeAreaCode" value="${requestParameters.homeAreaCode?if_exists}" size="4" maxlength="10"/>* + - <input type="text" name="homeContactNumber" value="${requestParameters.homeContactNumber?if_exists}" size="15" maxlength="15"/>* + ext <input type="text" name="homeExt" value="${requestParameters.homeExt?if_exists}" size="6" maxlength="10"/> <BR> <select name="homeSol"> <#if (((requestParameters.homeSol)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if> @@ -86,10 +86,10 @@ <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyBusinessPhone}<BR>${uiLabelMap.CommonAllowSolicitation}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" name="workCountryCode" value="${requestParameters.CUSTOMER_WORK_COUNTRY?if_exists}" size="4" maxlength="10"/> - - <input type="text" class="inputBox" name="workAreaCode" value="${requestParameters.CUSTOMER_WORK_AREA?if_exists}" size="4" maxlength="10"/> - - <input type="text" class="inputBox" name="workContactNumber" value="${requestParameters.CUSTOMER_WORK_CONTACT?if_exists}" size="15" maxlength="15"/> - ext <input type="text" class="inputBox" name="workExt" value="${requestParameters.CUSTOMER_WORK_EXT?if_exists}" size="6" maxlength="10"/> + <input type="text" name="workCountryCode" value="${requestParameters.CUSTOMER_WORK_COUNTRY?if_exists}" size="4" maxlength="10"/> + - <input type="text" name="workAreaCode" value="${requestParameters.CUSTOMER_WORK_AREA?if_exists}" size="4" maxlength="10"/> + - <input type="text" name="workContactNumber" value="${requestParameters.CUSTOMER_WORK_CONTACT?if_exists}" size="15" maxlength="15"/> + ext <input type="text" name="workExt" value="${requestParameters.CUSTOMER_WORK_EXT?if_exists}" size="6" maxlength="10"/> <BR> <select name="workSol"> <#if (((requestParameters.workSol)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if> @@ -107,7 +107,7 @@ <td width="26%" align="right"><div class="tabletext">${uiLabelMap.PartyEmailAddress}<BR>${uiLabelMap.CommonAllowSolicitation}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" name="emailAddress" value="" size="60" maxlength="255"> + <input type="text" name="emailAddress" value="" size="60" maxlength="255"> <BR> <select name="emailSol"> <#if (((requestParameters.emailSol)!"") == "Y")><option value="Y">${uiLabelMap.CommonY}</option></#if> @@ -125,7 +125,7 @@ <td width="26%" align="right"><div class="tabletext">${uiLabelMap.CommonUsername}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" name="userLoginId" value="${requestParameters.USERNAME?if_exists}" size="20" maxlength="250"/> + <input type="text" name="userLoginId" value="${requestParameters.USERNAME?if_exists}" size="20" maxlength="250"/> </td> </tr> <#-- @@ -133,21 +133,21 @@ <td width="26%" align="right"><div class="tabletext">${uiLabelMap.OrderPassword}</div></td> <td width="5"> </td> <td width="74%"> - <input type="password" class="inputBox" name="PASSWORD" value="" size="20" maxlength="50"> + <input type="password" name="PASSWORD" value="" size="20" maxlength="50"> *</td> </tr> <tr> <td width="26%" align="right"><div class="tabletext">${uiLabelMap.OrderConfirm} Password</div></td> <td width="5"> </td> <td width="74%"> - <input type="password" class="inputBox" name="CONFIRM_PASSWORD" value="" size="20" maxlength="50"> + <input type="password" name="CONFIRM_PASSWORD" value="" size="20" maxlength="50"> *</td> </tr> <tr> <td width="26%" align="right"><div class="tabletext">${uiLabelMap.OrderPassword} Hint</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" name="PASSWORD_HINT" value="${requestParameters.PASSWORD_HINT?if_exists}" size="40" maxlength="100"> + <input type="text" name="PASSWORD_HINT" value="${requestParameters.PASSWORD_HINT?if_exists}" size="40" maxlength="100"> </td> </tr> --> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/editShipAddress.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/editShipAddress.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/editShipAddress.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/editShipAddress.ftl Thu Jul 10 21:02:30 2008 @@ -50,35 +50,35 @@ <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonToName}</div></td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="60" name="toName" value="${toName}"/> + <input type="text" size="30" maxlength="60" name="toName" value="${toName}"/> </td> </tr> <tr> <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonAttentionName}</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}"/> + <input type="text" size="30" maxlength="60" name="attnName" value="${parameters.attnName?if_exists}"/> </td> </tr> <tr> <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonAddressLine} 1</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}"/> + <input type="text" size="30" maxlength="30" name="address1" value="${parameters.address1?if_exists}"/> *</td> </tr> <tr> <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonAddressLine} 2</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}"/> + <input type="text" size="30" maxlength="30" name="address2" value="${parameters.address2?if_exists}"/> </td> </tr> <tr> <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonCity}</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}"/> + <input type="text" size="30" maxlength="30" name="city" value="${parameters.city?if_exists}"/> *</td> </tr> <tr> @@ -95,7 +95,7 @@ <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonZipPostalCode}</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}"/> + <input type="text" size="12" maxlength="10" name="postalCode" value="${parameters.postalCode?if_exists}"/> *</td> </tr> <tr> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl Thu Jul 10 21:02:30 2008 @@ -30,11 +30,11 @@ <div class="screenlet-body"> <table width="100%" border="0" cellpadding="0"> <tr align="left" valign="bottom"> - <td width="65%" align="left"><span class="tableheadtext"><b>${uiLabelMap.ProductProduct}</b></span></td> - <td width="5%" align="right"><span class="tableheadtext"><b>${uiLabelMap.OrderQuantity}</b></span></td> - <td width="10%" align="right"><span class="tableheadtext"><b>${uiLabelMap.CommonUnitPrice}</b></span></td> - <td width="10%" align="right"><span class="tableheadtext"><b>${uiLabelMap.OrderAdjustments}</b></span></td> - <td width="10%" align="right"><span class="tableheadtext"><b>${uiLabelMap.OrderSubTotal}</b></span></td> + <td width="65%" align="left"><span><b>${uiLabelMap.ProductProduct}</b></span></td> + <td width="5%" align="right"><span><b>${uiLabelMap.OrderQuantity}</b></span></td> + <td width="10%" align="right"><span><b>${uiLabelMap.CommonUnitPrice}</b></span></td> + <td width="10%" align="right"><span><b>${uiLabelMap.OrderAdjustments}</b></span></td> + <td width="10%" align="right"><span><b>${uiLabelMap.OrderSubTotal}</b></span></td> </tr> <#list orderItems?if_exists as orderItem> <#assign itemType = orderItem.getRelatedOne("OrderItemType")?if_exists> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl Thu Jul 10 21:02:30 2008 @@ -37,11 +37,11 @@ <#-- header --> <tr> - <td><span class="tableheadtext">${uiLabelMap.OrderDestination}</span></td> - <td><span class="tableheadtext">${uiLabelMap.PartySupplier}</span></td> - <td><span class="tableheadtext">${uiLabelMap.ProductShipmentMethod}</span></td> - <td><span class="tableheadtext">${uiLabelMap.ProductItem}</span></td> - <td><span class="tableheadtext">${uiLabelMap.ProductQuantity}</span></td> + <td><span>${uiLabelMap.OrderDestination}</span></td> + <td><span>${uiLabelMap.PartySupplier}</span></td> + <td><span>${uiLabelMap.ProductShipmentMethod}</span></td> + <td><span>${uiLabelMap.ProductItem}</span></td> + <td><span>${uiLabelMap.ProductQuantity}</span></td> </tr> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderagreements.ftl Thu Jul 10 21:02:30 2008 @@ -43,7 +43,7 @@ <td> </td> <td valign='middle'> <div class='tabletext' valign='top'> - <select name="agreementId" class="inputBox"> + <select name="agreementId"> <option value="">${uiLabelMap.CommonNone}</option> <#list agreements as agreement> <option value='${agreement.agreementId}' >${agreement.agreementId} - ${agreement.description?if_exists}</option> @@ -65,7 +65,7 @@ <td> </td> <td valign='middle'> <div class='tabletext' valign='top'> - <select name="agreementId" class="inputBox"> + <select name="agreementId"> <option value="">${uiLabelMap.CommonNone}</option> <#list agreementRoles as agreementRole> <option value='${agreementRole.agreementId?if_exists}' >${agreementRole.agreementId?if_exists} - ${agreementRole.roleTypeId?if_exists}</option> @@ -83,7 +83,7 @@ </td> <td> </td> <td align='left'> - <input type='text' class="inputBox" size='60' maxlength='100' name='orderName'/> + <input type='text' size='60' maxlength='100' name='orderName'/> </td> </tr> @@ -124,7 +124,7 @@ <tr> <td> </td> - <td class="tableheadtext" align="right"> + <td align="right"> ${uiLabelMap.ProductChooseCatalog} </td> <td> </td> @@ -142,7 +142,7 @@ <tr> <td> </td> - <td class="tableheadtext" align="right"> + <td align="right"> ${uiLabelMap.WorkEffortWorkEffortId} </td> <td> </td> @@ -160,7 +160,7 @@ </div> </td> <td> </td> - <td><input type="text" name="shipAfterDate" size="20" maxlength="30" class="inputBox"/> + <td><input type="text" name="shipAfterDate" size="20" maxlength="30"/> <a href="javascript:call_cal(document.agreementForm.shipAfterDate,'');"> <img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/> </a> @@ -175,7 +175,7 @@ </div> </td> <td> </td> - <td><input type="text" name="shipBeforeDate" size="20" maxlength="30" class="inputBox"/> + <td><input type="text" name="shipBeforeDate" size="20" maxlength="30"/> <a href="javascript:call_cal(document.agreementForm.shipBeforeDate,'');"> <img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/> </a> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderparty.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderparty.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderparty.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderparty.ftl Thu Jul 10 21:02:30 2008 @@ -41,7 +41,7 @@ <div class='tabletext'><a href="${customerDetailLink}${partyId}" class="buttontext">${partyGroup.groupName?if_exists}</a></div> </#if> <form method="post" action="<@ofbizUrl>orderentry</@ofbizUrl>" name="setpartyform"> - <div><input type="text" class="inputBox" name="partyId" size='10' value="${partyId?if_exists}"></div> + <div><input type="text" name="partyId" size='10' value="${partyId?if_exists}"></div> <div class="tabletext"> <a href="javascript:document.setpartyform.submit();" class="buttontext">${uiLabelMap.CommonSet}</a> | <a href="/partymgr/control/findparty" class="buttontext">${uiLabelMap.CommonFind}</a><#if partyId?default("_NA_") != "_NA_" && partyId?default("_NA_") != ""> | <a href="${customerDetailLink}${partyId}" class="buttontext">${uiLabelMap.CommonView}</a></#if> </div> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl Thu Jul 10 21:02:30 2008 @@ -95,7 +95,7 @@ </td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="60" name="termValue" value="${termValue?if_exists}"/> + <input type="text" size="30" maxlength="60" name="termValue" value="${termValue?if_exists}"/> </td> </tr> <tr> @@ -104,7 +104,7 @@ </td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="60" name="termDays" value="${termDays?if_exists}"/> + <input type="text" size="30" maxlength="60" name="termDays" value="${termDays?if_exists}"/> </td> </tr> <tr> @@ -113,7 +113,7 @@ </td> <td width="5"> </td> <td width="74%"> - <input type="text" class="inputBox" size="30" maxlength="255" name="textValue" value="${textValue?if_exists}"/> + <input type="text" size="30" maxlength="255" name="textValue" value="${textValue?if_exists}"/> </td> </tr> <tr><td colspan="3" align="middle"><input type="submit" class="smallSubmit" value="${uiLabelMap.CommonAdd}"/></td></tr> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl Thu Jul 10 21:02:30 2008 @@ -28,7 +28,7 @@ <form method="post" action="<@ofbizUrl>setAdditionalParty</@ofbizUrl>" name="quickAddPartyForm"> <tr> - <td><div class="tableheadtext">1) ${uiLabelMap.OrderSelectPartyToOrder} :</div></td> + <td><div>1) ${uiLabelMap.OrderSelectPartyToOrder} :</div></td> </tr> <tr> <td width="100%"> @@ -72,7 +72,7 @@ <#assign lookupPartyView="LookupPartyGroup"> </#if> <tr> - <td><div class="tableheadtext">2) ${uiLabelMap.PartyFindParty} :</div></td> + <td><div>2) ${uiLabelMap.PartyFindParty} :</div></td> </tr> <tr> @@ -80,10 +80,10 @@ <table border="0" cellspacing="0" cellpadding="0" class="boxbottom"> <tr> <td> - <div class="tableheadtext">${uiLabelMap.CommonIdentifier} :</div> + <div>${uiLabelMap.CommonIdentifier} :</div> </td> <td> - <input type="text" class="inputBox" name="additionalPartyId" value="${additionalPartyId?if_exists}" onchange="javascript:document.quickAddPartyForm.submit()"> + <input type="text" name="additionalPartyId" value="${additionalPartyId?if_exists}" onchange="javascript:document.quickAddPartyForm.submit()"> </td> <td> <a href="javascript:document.quickAddPartyForm.additionalPartyId.focus();call_fieldlookup2(document.quickAddPartyForm.additionalPartyId, '${lookupPartyView}');"><img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Lookup"></a> @@ -104,7 +104,7 @@ <#if roles?has_content> <tr> - <td><div class="tableheadtext">3) ${uiLabelMap.OrderPartySelectRoleForParty} :</div></td> + <td><div>3) ${uiLabelMap.OrderPartySelectRoleForParty} :</div></td> </tr> <tr> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl?rev=675831&r1=675830&r2=675831&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl Thu Jul 10 21:02:30 2008 @@ -43,7 +43,7 @@ <#assign facilityContactMechList = facilityMap.facilityContactMechList> <tr> <td colspan="4"> - <div class="tableheadtext">${uiLabelMap.FacilityFacility}: ${facility.facilityName?if_exists} [${facility.facilityId}]</div> + <div>${uiLabelMap.FacilityFacility}: ${facility.facilityName?if_exists} [${facility.facilityId}]</div> </td> </tr> <tr><td colspan="4"><hr class='sepbar'/></td></tr> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |