You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2008/07/12 20:41:46 UTC
svn commit: r676212 [3/3] - in /ofbiz/trunk:
applications/accounting/webapp/accounting/agreement/
applications/humanres/widget/forms/ applications/order/webapp/ordermgr/entry/
applications/order/webapp/ordermgr/entry/cart/
applications/order/webapp/ord...
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl Sat Jul 12 11:41:44 2008
@@ -24,10 +24,10 @@
<#if (orderName?has_content)>
<tr>
<td align="right" valign="top" width="15%">
- <span class="tabletext"> <b>${uiLabelMap.OrderOrderName}</b> </span>
+ <span> <b>${uiLabelMap.OrderOrderName}</b> </span>
</td>
<td width="5"> </td>
- <td align="left" valign="top" width="80%" class="tabletext">
+ <td align="left" valign="top" width="80%">
${orderName}
</td>
</tr>
@@ -37,10 +37,10 @@
<#if (orderForParty?exists)>
<tr>
<td align="right" valign="top" width="15%">
- <span class="tabletext"> <b>${uiLabelMap.OrderOrderFor}</b> </span>
+ <span> <b>${uiLabelMap.OrderOrderFor}</b> </span>
</td>
<td width="5"> </td>
- <td align="left" valign="top" width="80%" class="tabletext">
+ <td align="left" valign="top" width="80%">
${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(orderForParty, false)} [${orderForParty.partyId}]
</td>
</tr>
@@ -49,10 +49,10 @@
<#if (cart.getPoNumber()?has_content)>
<tr>
<td align="right" valign="top" width="15%">
- <span class="tabletext"> <b>${uiLabelMap.OrderPONumber}</b> </span>
+ <span> <b>${uiLabelMap.OrderPONumber}</b> </span>
</td>
<td width="5"> </td>
- <td align="left" valign="top" width="80%" class="tabletext">
+ <td align="left" valign="top" width="80%">
${cart.getPoNumber()}
</td>
</tr>
@@ -61,25 +61,25 @@
<#if orderTerms?has_content>
<tr>
<td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.OrderOrderTerms}</b></div>
+ <div> <b>${uiLabelMap.OrderOrderTerms}</b></div>
</td>
<td width="5"> </td>
<td align="left" valign="top" width="80%">
<table>
<tr>
- <td width="35%"><div class="tabletext"><b>${uiLabelMap.OrderOrderTermType}</b></div></td>
- <td width="10%"><div class="tabletext"><b>${uiLabelMap.OrderOrderTermValue}</b></div></td>
- <td width="10%"><div class="tabletext"><b>${uiLabelMap.OrderOrderTermDays}</b></div></td>
- <td width="45%"><div class="tabletext"><b>${uiLabelMap.CommonDescription}</b></div></td>
+ <td width="35%"><div><b>${uiLabelMap.OrderOrderTermType}</b></div></td>
+ <td width="10%"><div><b>${uiLabelMap.OrderOrderTermValue}</b></div></td>
+ <td width="10%"><div><b>${uiLabelMap.OrderOrderTermDays}</b></div></td>
+ <td width="45%"><div><b>${uiLabelMap.CommonDescription}</b></div></td>
</tr>
<tr><td colspan="4"><hr/></td></tr>
<#assign index=0/>
<#list orderTerms as orderTerm>
<tr>
- <td width="35%"><div class="tabletext">${orderTerm.getRelatedOne("TermType").get("description",locale)}</div></td>
- <td width="10%"><div class="tabletext">${orderTerm.termValue?default("")}</div></td>
- <td width="10%"><div class="tabletext">${orderTerm.termDays?default("")}</div></td>
- <td width="45%"><div class="tabletext">${orderTerm.textValue?default("")}</div></td>
+ <td width="35%"><div>${orderTerm.getRelatedOne("TermType").get("description",locale)}</div></td>
+ <td width="10%"><div>${orderTerm.termValue?default("")}</div></td>
+ <td width="10%"><div>${orderTerm.termDays?default("")}</div></td>
+ <td width="45%"><div>${orderTerm.textValue?default("")}</div></td>
</tr>
<#if orderTerms.size()<index>
<tr><td colspan="4"><hr/></td></tr>
@@ -95,12 +95,12 @@
<#if trackingNumber?has_content>
<tr>
<td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.FacilityTrackingNumber}</b></div>
+ <div> <b>${uiLabelMap.FacilityTrackingNumber}</b></div>
</td>
<td width="5"> </td>
<td align="left" valign="top" width="80%">
<#-- TODO: add links to UPS/FEDEX/etc based on carrier partyId -->
- <div class="tabletext">${trackingNumber}</div>
+ <div>${trackingNumber}</div>
</td>
</tr>
<tr><td colspan="7"><hr/></td></tr>
@@ -108,11 +108,11 @@
<#-- splitting preference -->
<tr>
<td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.OrderSplittingPreference}</b></div>
+ <div> <b>${uiLabelMap.OrderSplittingPreference}</b></div>
</td>
<td width="5"> </td>
<td align="left" valign="top" width="80%">
- <div class="tabletext">
+ <div>
<#if maySplit?default("N") == "N">${uiLabelMap.FacilityWaitEntireOrderReady}</#if>
<#if maySplit?default("Y") == "Y">${uiLabelMap.FacilityShipAvailable}</#if>
</div>
@@ -123,11 +123,11 @@
<tr><td colspan="7"><hr/></td></tr>
<tr>
<td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.CommonInstructions}</b></div>
+ <div> <b>${uiLabelMap.CommonInstructions}</b></div>
</td>
<td width="5"> </td>
<td align="left" valign="top" width="80%">
- <div class="tabletext">${shippingInstructions}</div>
+ <div>${shippingInstructions}</div>
</td>
</tr>
</#if>
@@ -136,11 +136,11 @@
<#-- gift settings -->
<tr>
<td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.OrderGift}</b></div>
+ <div> <b>${uiLabelMap.OrderGift}</b></div>
</td>
<td width="5"> </td>
<td align="left" valign="top" width="80%">
- <div class="tabletext">
+ <div>
<#if isGift?default("N") == "N">${uiLabelMap.OrderThisOrderNotGift}</#if>
<#if isGift?default("N") == "Y">${uiLabelMap.OrderThisOrderGift}</#if>
</div>
@@ -150,11 +150,11 @@
<#if giftMessage?has_content>
<tr>
<td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.OrderGiftMessage}</b></div>
+ <div> <b>${uiLabelMap.OrderGiftMessage}</b></div>
</td>
<td width="5"> </td>
<td align="left" valign="top" width="80%">
- <div class="tabletext">${giftMessage}</div>
+ <div>${giftMessage}</div>
</td>
</tr>
<tr><td colspan="7"><hr/></td></tr>
@@ -163,22 +163,22 @@
<#if shipAfterDate?has_content>
<tr>
<td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.OrderShipAfterDate}</b></div>
+ <div> <b>${uiLabelMap.OrderShipAfterDate}</b></div>
</td>
<td width="5"> </td>
<td align="left" valign="top" width="80%">
- <div class="tabletext">${shipAfterDate}</div>
+ <div>${shipAfterDate}</div>
</td>
</tr>
</#if>
<#if shipBeforeDate?has_content>
<tr>
<td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.OrderShipBeforeDate}</b></div>
+ <div> <b>${uiLabelMap.OrderShipBeforeDate}</b></div>
</td>
<td width="5"> </td>
<td align="left" valign="top" width="80%">
- <div class="tabletext">${shipBeforeDate}</div>
+ <div>${shipBeforeDate}</div>
</td>
</tr>
</#if>
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=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderitems.ftl Sat Jul 12 11:41:44 2008
@@ -42,11 +42,11 @@
<tr>
<#if orderItem.productId?exists && orderItem.productId == "_?_">
<td colspan="1" valign="top">
- <b><div class="tabletext"> >> ${orderItem.itemDescription}</div></b>
+ <b><div> >> ${orderItem.itemDescription}</div></b>
</td>
<#else>
<td valign="top">
- <div class="tabletext">
+ <div>
<#if orderItem.productId?exists>
<a href="<@o...@ofbizUrl>" class="buttontext">${orderItem.productId} - ${orderItem.itemDescription}</a>
<#else>
@@ -56,16 +56,16 @@
</td>
<td align="right" valign="top">
- <div class="tabletext" nowrap>${orderItem.quantity?string.number}</div>
+ <div nowrap>${orderItem.quantity?string.number}</div>
</td>
<td align="right" valign="top">
- <div class="tabletext" nowrap><@ofbizCurrency amount=orderItem.unitPrice isoCode=currencyUomId/></div>
+ <div nowrap><@ofbizCurrency amount=orderItem.unitPrice isoCode=currencyUomId/></div>
</td>
<td align="right" valign="top">
- <div class="tabletext" nowrap><@ofbizCurrency amount=localOrderReadHelper.getOrderItemAdjustmentsTotal(orderItem) isoCode=currencyUomId/></div>
+ <div nowrap><@ofbizCurrency amount=localOrderReadHelper.getOrderItemAdjustmentsTotal(orderItem) isoCode=currencyUomId/></div>
</td>
<td align="right" valign="top" nowrap>
- <div class="tabletext"><@ofbizCurrency amount=localOrderReadHelper.getOrderItemSubTotal(orderItem) isoCode=currencyUomId/></div>
+ <div><@ofbizCurrency amount=localOrderReadHelper.getOrderItemSubTotal(orderItem) isoCode=currencyUomId/></div>
</td>
<#if maySelectItems?default(false)>
<td>
@@ -80,7 +80,7 @@
<#if WorkOrderItemFulfillments?has_content>
<#list WorkOrderItemFulfillments as WorkOrderItemFulfillment>
<#assign workEffort = WorkOrderItemFulfillment.getRelatedOneCache("WorkEffort")?if_exists>
- <tr><td> </td><td> </td><td colspan="8"><div class="tabletext">${uiLabelMap.CommonFrom}: ${workEffort.estimatedStartDate?string("yyyy-MM-dd")} ${uiLabelMap.CommonTo}: ${workEffort.estimatedCompletionDate?string("yyyy-MM-dd")} ${uiLabelMap.OrderNbrPersons}: ${workEffort.reservPersons}</div></td></tr>
+ <tr><td> </td><td> </td><td colspan="8"><div>${uiLabelMap.CommonFrom}: ${workEffort.estimatedStartDate?string("yyyy-MM-dd")} ${uiLabelMap.CommonTo}: ${workEffort.estimatedCompletionDate?string("yyyy-MM-dd")} ${uiLabelMap.OrderNbrPersons}: ${workEffort.reservPersons}</div></td></tr>
<#break><#-- need only the first one -->
</#list>
</#if>
@@ -91,7 +91,7 @@
<#list itemAdjustments as orderItemAdjustment>
<tr>
<td align="right">
- <div class="tabletext" style="font-size: xx-small;">
+ <div style="font-size: xx-small;">
<b><i>${uiLabelMap.OrderAdjustment}</i>:</b> <b>${localOrderReadHelper.getAdjustmentType(orderItemAdjustment)}</b>
<#if orderItemAdjustment.description?has_content>: ${orderItemAdjustment.get("description",locale)}</#if>
@@ -115,7 +115,7 @@
<td> </td>
<td> </td>
<td align="right">
- <div class="tabletext" style="font-size: xx-small;"><@ofbizCurrency amount=localOrderReadHelper.getOrderItemAdjustmentTotal(orderItem, orderItemAdjustment) isoCode=currencyUomId/></div>
+ <div style="font-size: xx-small;"><@ofbizCurrency amount=localOrderReadHelper.getOrderItemAdjustmentTotal(orderItem, orderItemAdjustment) isoCode=currencyUomId/></div>
</td>
<td> </td>
<td> </td>
@@ -129,29 +129,29 @@
<tr><td colspan="8"><hr/></td></tr>
<tr>
- <td align="right" colspan="4"><div class="tabletext"><b>${uiLabelMap.OrderSubTotal}</b></div></td>
- <td align="right" nowrap><div class="tabletext"> <#if orderSubTotal?exists><@ofbizCurrency amount=orderSubTotal isoCode=currencyUomId/></#if></div></td>
+ <td align="right" colspan="4"><div><b>${uiLabelMap.OrderSubTotal}</b></div></td>
+ <td align="right" nowrap><div> <#if orderSubTotal?exists><@ofbizCurrency amount=orderSubTotal isoCode=currencyUomId/></#if></div></td>
</tr>
<#list headerAdjustmentsToShow?if_exists as orderHeaderAdjustment>
<tr>
- <td align="right" colspan="4"><div class="tabletext"><b>${localOrderReadHelper.getAdjustmentType(orderHeaderAdjustment)}</b></div></td>
- <td align="right" nowrap><div class="tabletext"><@ofbizCurrency amount=localOrderReadHelper.getOrderAdjustmentTotal(orderHeaderAdjustment) isoCode=currencyUomId/></div></td>
+ <td align="right" colspan="4"><div><b>${localOrderReadHelper.getAdjustmentType(orderHeaderAdjustment)}</b></div></td>
+ <td align="right" nowrap><div><@ofbizCurrency amount=localOrderReadHelper.getOrderAdjustmentTotal(orderHeaderAdjustment) isoCode=currencyUomId/></div></td>
</tr>
</#list>
<tr>
- <td align="right" colspan="4"><div class="tabletext"><b>${uiLabelMap.FacilityShippingAndHandling}</b></div></td>
- <td align="right" nowrap><div class="tabletext"><#if orderShippingTotal?exists><@ofbizCurrency amount=orderShippingTotal isoCode=currencyUomId/></#if></div></td>
+ <td align="right" colspan="4"><div><b>${uiLabelMap.FacilityShippingAndHandling}</b></div></td>
+ <td align="right" nowrap><div><#if orderShippingTotal?exists><@ofbizCurrency amount=orderShippingTotal isoCode=currencyUomId/></#if></div></td>
</tr>
<tr>
- <td align="right" colspan="4"><div class="tabletext"><b>${uiLabelMap.OrderSalesTax}</b></div></td>
- <td align="right" nowrap><div class="tabletext"><#if orderTaxTotal?exists><@ofbizCurrency amount=orderTaxTotal isoCode=currencyUomId/></#if></div></td>
+ <td align="right" colspan="4"><div><b>${uiLabelMap.OrderSalesTax}</b></div></td>
+ <td align="right" nowrap><div><#if orderTaxTotal?exists><@ofbizCurrency amount=orderTaxTotal isoCode=currencyUomId/></#if></div></td>
</tr>
<tr><td colspan=2></td><td colspan="8"><hr/></td></tr>
<tr>
- <td align="right" colspan="4"><div class="tabletext"><b>${uiLabelMap.OrderGrandTotal}</b></div></td>
+ <td align="right" colspan="4"><div><b>${uiLabelMap.OrderGrandTotal}</b></div></td>
<td align="right" nowrap>
- <div class="tabletext"><#if orderGrandTotal?exists><@ofbizCurrency amount=orderGrandTotal isoCode=currencyUomId/></#if></div>
+ <div><#if orderGrandTotal?exists><@ofbizCurrency amount=orderGrandTotal isoCode=currencyUomId/></#if></div>
</td>
</tr>
</table>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl Sat Jul 12 11:41:44 2008
@@ -30,24 +30,24 @@
<tr>
<#if paymentMethodType.paymentMethodTypeId == "EXT_OFFLINE">
<td colspan="3" valign="top">
- <div class="tabletext" align="center"><b>${uiLabelMap.AccountingOfflinePayment}</b></div>
+ <div align="center"><b>${uiLabelMap.AccountingOfflinePayment}</b></div>
<#if orderHeader?has_content && paymentAddress?has_content>
- <div class="tabletext" align="center"><hr/></div>
- <div class="tabletext" align="center"><b>${uiLabelMap.AccountingPleaseSendPaymentTo}:</b></div>
- <#if paymentAddress.toName?has_content><div class="tabletext" align="center">${paymentAddress.toName}</div></#if>
- <#if paymentAddress.attnName?has_content><div class="tabletext" align="center"><b>${uiLabelMap.CommonAttn}:</b> ${paymentAddress.attnName}</div></#if>
- <div class="tabletext" align="center">${paymentAddress.address1}</div>
- <#if paymentAddress.address2?has_content><div class="tabletext" align="center">${paymentAddress.address2}</div></#if>
- <div class="tabletext" align="center">${paymentAddress.city}<#if paymentAddress.stateProvinceGeoId?has_content>, ${paymentAddress.stateProvinceGeoId}</#if> ${paymentAddress.postalCode}
- <div class="tabletext" align="center">${paymentAddress.countryGeoId}</div>
- <div class="tabletext" align="center"><hr/></div>
- <div class="tabletext" align="center"><b>${uiLabelMap.OrderBeSureIncludeOrder} #</b></div>
+ <div align="center"><hr/></div>
+ <div align="center"><b>${uiLabelMap.AccountingPleaseSendPaymentTo}:</b></div>
+ <#if paymentAddress.toName?has_content><div align="center">${paymentAddress.toName}</div></#if>
+ <#if paymentAddress.attnName?has_content><div align="center"><b>${uiLabelMap.CommonAttn}:</b> ${paymentAddress.attnName}</div></#if>
+ <div align="center">${paymentAddress.address1}</div>
+ <#if paymentAddress.address2?has_content><div align="center">${paymentAddress.address2}</div></#if>
+ <div align="center">${paymentAddress.city}<#if paymentAddress.stateProvinceGeoId?has_content>, ${paymentAddress.stateProvinceGeoId}</#if> ${paymentAddress.postalCode}
+ <div align="center">${paymentAddress.countryGeoId}</div>
+ <div align="center"><hr/></div>
+ <div align="center"><b>${uiLabelMap.OrderBeSureIncludeOrder} #</b></div>
</#if>
</td>
<#else>
<#assign outputted = true>
<td colspan="3" valign="top">
- <div class="tabletext" align="center"><b>${uiLabelMap.AccountingPaymentVia} ${paymentMethodType.get("description",locale)}</b></div>
+ <div align="center"><b>${uiLabelMap.AccountingPaymentVia} ${paymentMethodType.get("description",locale)}</b></div>
</td>
</#if>
</tr>
@@ -58,11 +58,11 @@
<#if creditCard?has_content>
<tr>
<td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.AccountingCreditCard}</b></div>
+ <div> <b>${uiLabelMap.AccountingCreditCard}</b></div>
</td>
<td width="5"> </td>
<td align="left" valign="top" width="80%">
- <div class="tabletext">
+ <div>
<#if creditCard.companyNameOnCard?has_content>${creditCard.companyNameOnCard}<br/></#if>
<#if creditCard.titleOnCard?has_content>${creditCard.titleOnCard} </#if>
${creditCard.firstNameOnCard}
@@ -78,11 +78,11 @@
<#elseif eftAccount?has_content>
<tr>
<td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.AccountingEFTAccount}</b></div>
+ <div> <b>${uiLabelMap.AccountingEFTAccount}</b></div>
</td>
<td width="5"> </td>
<td align="left" valign="top" width="80%">
- <div class="tabletext">
+ <div>
${eftAccount.nameOnAccount}<br/>
<#if eftAccount.companyNameOnAccount?has_content>${eftAccount.companyNameOnAccount}<br/></#if>
Bank: ${eftAccount.bankName}, ${eftAccount.routingNumber}<br/>
@@ -100,11 +100,11 @@
<#assign outputted = true/>
<tr>
<td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.AccountingBillingAccount}</b></div>
+ <div> <b>${uiLabelMap.AccountingBillingAccount}</b></div>
</td>
<td width="5"> </td>
<td align="left" valign="top" width="80%">
- <div class="tabletext">
+ <div>
#${billingAccount.billingAccountId?if_exists} - ${billingAccount.description?if_exists}
</div>
</td>
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=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl Sat Jul 12 11:41:44 2008
@@ -62,7 +62,7 @@
<#-- address destination column (spans a number of rows = number of cart items in it) -->
- <td rowspan="${numberOfItems}" class="tabletext">
+ <td rowspan="${numberOfItems}">
<#assign contactMech = delegator.findByPrimaryKey("ContactMech", Static["org.ofbiz.base.util.UtilMisc"].toMap("contactMechId", cartShipInfo.contactMechId))?if_exists />
<#if contactMech?has_content>
<#assign address = contactMech.getRelatedOne("PostalAddress")?if_exists />
@@ -81,14 +81,14 @@
<#-- supplier id (for drop shipments) (also spans rows = number of items) -->
- <td rowspan="${numberOfItems}" valign="top" class="tabletext">
+ <td rowspan="${numberOfItems}" valign="top">
<#assign supplier = delegator.findByPrimaryKey("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", cartShipInfo.getSupplierPartyId()))?if_exists />
<#if supplier?has_content>${supplier.groupName?default(supplier.partyId)}</#if>
</td>
<#-- carrier column (also spans rows = number of items) -->
- <td rowspan="${numberOfItems}" valign="top" class="tabletext">
+ <td rowspan="${numberOfItems}" valign="top">
<#assign carrier = delegator.findByPrimaryKey("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", cartShipInfo.getCarrierPartyId()))?if_exists />
<#assign method = delegator.findByPrimaryKey("ShipmentMethodType", Static["org.ofbiz.base.util.UtilMisc"].toMap("shipmentMethodTypeId", cartShipInfo.getShipmentMethodTypeId()))?if_exists />
<#if carrier?has_content>${carrier.groupName?default(carrier.partyId)}</#if>
@@ -101,8 +101,8 @@
<#list cartShipInfo.getShipItems() as shoppingCartItem>
<#if (itemIndex > 0)> <tr> </#if>
- <td valign="top" class="tabletext"> ${shoppingCartItem.getProductId()?default("")} - ${shoppingCartItem.getName()?default("")} </td>
- <td valign="top" class="tabletext"> ${cartShipInfo.getShipItemInfo(shoppingCartItem).getItemQuantity()?default("0")} </td>
+ <td valign="top"> ${shoppingCartItem.getProductId()?default("")} - ${shoppingCartItem.getName()?default("")} </td>
+ <td valign="top"> ${cartShipInfo.getShipItemInfo(shoppingCartItem).getItemQuantity()?default("0")} </td>
<#if (itemIndex == 0)> </tr> </#if>
<#assign itemIndex = itemIndex + 1 />
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=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderparty.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderparty.ftl Sat Jul 12 11:41:44 2008
@@ -36,13 +36,13 @@
<tr>
<td align="center">
<#if person?has_content>
- <div class="tabletext"><a href="${customerDetailLink}${partyId}" class="buttontext">${person.firstName?if_exists} ${person.lastName?if_exists}</a></div>
+ <div><a href="${customerDetailLink}${partyId}" class="buttontext">${person.firstName?if_exists} ${person.lastName?if_exists}</a></div>
<#elseif partyGroup?has_content>
<div class='tabletext'><a href="${customerDetailLink}${partyId}" class="buttontext">${partyGroup.groupName?if_exists}</a></div>
</#if>
<form method="post" action="<@o...@ofbizUrl>" name="setpartyform">
<div><input type="text" name="partyId" size='10' value="${partyId?if_exists}"></div>
- <div class="tabletext">
+ <div>
<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>
</form>
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=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/orderterms.ftl Sat Jul 12 11:41:44 2008
@@ -33,20 +33,20 @@
</td>
</tr>
<tr>
- <td><div class="tabletext"><b>${uiLabelMap.OrderOrderTermType}</b></div></td>
- <td><div class="tabletext"><b>${uiLabelMap.OrderOrderTermValue}</b></div></td>
- <td><div class="tabletext"><b>${uiLabelMap.OrderOrderTermDays}</b></div></td>
- <td><div class="tabletext"><b>${uiLabelMap.CommonDescription}</b></div></td>
+ <td><div><b>${uiLabelMap.OrderOrderTermType}</b></div></td>
+ <td><div><b>${uiLabelMap.OrderOrderTermValue}</b></div></td>
+ <td><div><b>${uiLabelMap.OrderOrderTermDays}</b></div></td>
+ <td><div><b>${uiLabelMap.CommonDescription}</b></div></td>
<td align="right"> </td>
</tr>
<tr><td colspan="5"><hr class='sepbar'></td></tr>
<#assign index=0>
<#list orderTerms as orderTerm>
<tr>
- <td><div class="tabletext">${orderTerm.getRelatedOne("TermType").get("description",locale)}</div></td>
- <td><div class="tabletext">${orderTerm.termValue?default("")}</div></td>
- <td><div class="tabletext">${orderTerm.termDays?default("")}</div></td>
- <td><div class="tabletext">${orderTerm.textValue?default("")}</div></td>
+ <td><div>${orderTerm.getRelatedOne("TermType").get("description",locale)}</div></td>
+ <td><div>${orderTerm.termValue?default("")}</div></td>
+ <td><div>${orderTerm.termDays?default("")}</div></td>
+ <td><div>${orderTerm.textValue?default("")}</div></td>
<td align="right">
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonUpdate}</a>
@@ -75,7 +75,7 @@
<table width="100%" border="0" cellpadding="1" cellspacing="0">
<tr>
<td width="26%" align="right" valign="top">
- <div class="tabletext">${uiLabelMap.OrderOrderTermType}</div>
+ <div>${uiLabelMap.OrderOrderTermType}</div>
</td>
<td width="5"> </td>
<td width="74%">
@@ -91,7 +91,7 @@
</tr>
<tr>
<td width="26%" align="right" valign="top">
- <div class="tabletext">${uiLabelMap.OrderOrderTermValue}</div>
+ <div>${uiLabelMap.OrderOrderTermValue}</div>
</td>
<td width="5"> </td>
<td width="74%">
@@ -100,7 +100,7 @@
</tr>
<tr>
<td width="26%" align="right" valign="top">
- <div class="tabletext">${uiLabelMap.OrderOrderTermDays}</div>
+ <div>${uiLabelMap.OrderOrderTermDays}</div>
</td>
<td width="5"> </td>
<td width="74%">
@@ -109,7 +109,7 @@
</tr>
<tr>
<td width="26%" align="right" valign="top">
- <div class="tabletext">${uiLabelMap.CommonDescription}</div>
+ <div>${uiLabelMap.CommonDescription}</div>
</td>
<td width="5"> </td>
<td width="74%">
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/poheader.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/poheader.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/poheader.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/poheader.ftl Sat Jul 12 11:41:44 2008
@@ -29,7 +29,7 @@
</div>
<div class="screenlet-body">
<table width="100%" border="0" cellpadding="1" cellspacing="0">
- <tr><td><div class="tabletext">Supplier Information Here</div></td></tr>
+ <tr><td><div>Supplier Information Here</div></td></tr>
</table>
</div>
</div>
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=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl Sat Jul 12 11:41:44 2008
@@ -38,7 +38,7 @@
<input type="radio" name="additionalPartyType" value="Person" onclick="<#if additionalPartyType?exists>javascript:document.quickAddPartyForm.additionalPartyId.value='';</#if>document.quickAddPartyForm.submit()"<#if (additionalPartyType?exists && additionalPartyType == "Person")> checked="checked"</#if>>
</td>
<td>
- <div class="tabletext">${uiLabelMap.CommonPerson}</div>
+ <div>${uiLabelMap.CommonPerson}</div>
</td>
</tr>
<tr>
@@ -46,7 +46,7 @@
<input type="radio" name="additionalPartyType" value="Group" onclick="<#if additionalPartyType?exists>javascript:document.quickAddPartyForm.additionalPartyId.value='';</#if>document.quickAddPartyForm.submit()"<#if additionalPartyType?exists && additionalPartyType == "Group"> checked="checked"</#if>>
</td>
<td>
- <div class="tabletext">${uiLabelMap.CommonGroup}</div>
+ <div>${uiLabelMap.CommonGroup}</div>
</td>
</tr>
<tr>
@@ -54,7 +54,7 @@
<input type="radio" name="additionalPartyType" value="None" onclick="<#if additionalPartyType?exists>javascript:document.quickAddPartyForm.additionalPartyId.value='';</#if>document.quickAddPartyForm.submit()"<#if !additionalPartyType?exists> checked="checked"</#if>>
</td>
<td>
- <div class="tabletext">${uiLabelMap.OrderPartyDontWish}</div>
+ <div>${uiLabelMap.OrderPartyDontWish}</div>
</td>
</tr>
</table>
@@ -116,7 +116,7 @@
<td>
<select name="additionalRoleTypeId" size="5" multiple>
<#list roles as role>
- <option value="${role.roleTypeId}" class="tabletext">${role.get("description",locale)}</option>
+ <option value="${role.roleTypeId}">${role.get("description",locale)}</option>
</#list>
</select>
</td>
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=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/shipsettings.ftl Sat Jul 12 11:41:44 2008
@@ -60,7 +60,7 @@
</td>
<td nowrap> </td>
<td align="left" valign="top" width="100%" 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.CommonAttn}:</b> ${shippingAddress.attnName}<br/></#if>
<#if shippingAddress.address1?has_content>${shippingAddress.address1}<br/></#if>
@@ -72,7 +72,7 @@
</div>
</td>
<td>
- <div class="tabletext"><a href="/facility/control/EditContactMech?facilityId=${facility.facilityId}&contactMechId=${shippingAddress.contactMechId}" target="_blank" class="buttontext">${uiLabelMap.CommonUpdate}</a></div>
+ <div><a href="/facility/control/EditContactMech?facilityId=${facility.facilityId}&contactMechId=${shippingAddress.contactMechId}" target="_blank" class="buttontext">${uiLabelMap.CommonUpdate}</a></div>
</td>
</tr>
<#if shippingContactMech_has_next>
@@ -84,7 +84,7 @@
<#else>
<tr>
<td colspan="4">
- <div class="tabletext">
+ <div>
${uiLabelMap.CommonNoContactInformationOnFile}:
<a href="/facility/control/EditContactMech?facilityId=${facility.facilityId}&preContactMechTypeId=POSTAL_ADDRESS" target="_blank" class="buttontext">${uiLabelMap.CommonNew}</a>
</div>
@@ -126,7 +126,7 @@
</tr>
<tr>
<td colspan="3">
- <div class="tabletext">
+ <div>
${uiLabelMap.PartySupplier}:
<select name="${shipGroupIndex?default("0")}_supplierPartyId">
<option value=""></option>
@@ -160,7 +160,7 @@
<input type="radio" name="${shipGroupIndex?default("0")}_shipping_contact_mech_id" value="${shippingAddress.contactMechId}" ${checkedValue} />
</td>
<td align="left" valign="top" width="99%" 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.CommonAttn}:</b> ${shippingAddress.attnName}<br/></#if>
<#if shippingAddress.address1?has_content>${shippingAddress.address1}<br/></#if>
@@ -172,7 +172,7 @@
</div>
</td>
<td>
- <div class="tabletext"><a href="/partymgr/control/editcontactmech?partyId=${orderParty.partyId}&contactMechId=${shippingContactMech.contactMechId}" target="_blank" class="buttontext">${uiLabelMap.CommonUpdate}</a></div>
+ <div><a href="/partymgr/control/editcontactmech?partyId=${orderParty.partyId}&contactMechId=${shippingContactMech.contactMechId}" target="_blank" class="buttontext">${uiLabelMap.CommonUpdate}</a></div>
</td>
</tr>
<#if shippingContactMech_has_next>
@@ -192,7 +192,7 @@
<input type="radio" name="${shipGroupIndex?default("0")}_shipping_contact_mech_id" value="${shippingAddress.contactMechId}"/>
</td>
<td align="left" valign="top" width="99%" 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.CommonAttn}:</b> ${shippingAddress.attnName}<br/></#if>
<#if shippingAddress.address1?has_content>${shippingAddress.address1}<br/></#if>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Sat Jul 12 11:41:44 2008
@@ -100,7 +100,7 @@
<#assign inProductionQuantity = productionProductQuantityMap.get(productId)?default(0)>
<#assign unplannedQuantity = requiredQuantity - qohQuantity - inProductionQuantity - onOrderQuantity - mktgPkgQOH>
<#if unplannedQuantity < 0><#assign unplannedQuantity = 0></#if>
- <div class="tabletext" style="margin-top: 15px; margin-left: 20px;">
+ <div style="margin-top: 15px; margin-left: 20px;">
<table cellspacing="0" cellpadding="0" border="0">
<tr><td style="text-align: right; padding-bottom: 10px;">
<a class="buttontext" href="/catalog/control/EditProductInventoryItems?productId=${productId}&showAllFacilities=Y&externalLoginKey=${externalLoginKey}" target="_blank">${uiLabelMap.ProductInventory}</a>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl Sat Jul 12 11:41:44 2008
@@ -76,7 +76,7 @@
</td>
<td width="1%"> </td>
<td align="left" valign="top" width="60%">
- <div class="tabletext">
+ <div>
<#if (finAccountType?has_content)>
${finAccountType.description?default(finAccountType.finAccountTypeId)}
</#if>
@@ -140,8 +140,8 @@
<br/> [<#if oppStatusItem?exists>${oppStatusItem.get("description",locale)}<#else>${orderPaymentPreference.statusId}</#if>]
</div>
<#--
- <div class="tabletext"><@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/> - ${(orderPaymentPreference.authDate.toString())?if_exists}</div>
- <div class="tabletext"> <#if orderPaymentPreference.authRefNum?exists>(${uiLabelMap.OrderReference}: ${orderPaymentPreference.authRefNum})</#if></div>
+ <div><@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/> - ${(orderPaymentPreference.authDate.toString())?if_exists}</div>
+ <div> <#if orderPaymentPreference.authRefNum?exists>(${uiLabelMap.OrderReference}: ${orderPaymentPreference.authRefNum})</#if></div>
-->
</td>
<#else>
@@ -249,7 +249,7 @@
</td>
<td width="1%"> </td>
<td align="left" valign="top" width="60%">
- <div class="tabletext">
+ <div>
<#if eftAccount?has_content>
${eftAccount.nameOnAccount?if_exists}<br/>
<#if eftAccount.companyNameOnAccount?exists>${eftAccount.companyNameOnAccount}<br/></#if>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml Sat Jul 12 11:41:44 2008
@@ -105,7 +105,7 @@
</actions>
<alt-target use-when="quote==null" target="createQuote"/>
<auto-fields-entity entity-name="Quote" default-field-type="edit"/>
- <field name="quoteId" title="${uiLabelMap.OrderOrderQuoteId}" widget-style="tabletext"><display/></field>
+ <field name="quoteId" title="${uiLabelMap.OrderOrderQuoteId}"><display/></field>
<field name="quoteTypeId" title="${uiLabelMap.OrderOrderQuoteTypeId}">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="QuoteType" key-field-name="quoteTypeId">
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/ReturnForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/ReturnForms.xml?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/ReturnForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/ReturnForms.xml Sat Jul 12 11:41:44 2008
@@ -158,7 +158,7 @@
<field name="entryDate" title="${uiLabelMap.OrderEntryDate}">
<display/>
</field>
- <field name="fromPartyId" widget-style="tabletext" title="${uiLabelMap.OrderReturnFromParty}">
+ <field name="fromPartyId" title="${uiLabelMap.OrderReturnFromParty}">
<display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName} ${firstName} ${lastName}">
<sub-hyperlink link-style="buttontext" target-type="inter-app" description="${fromPartyId}" target="/partymgr/control/viewprofile?partyId=${fromPartyId}${externalKeyParam}"/>
</display-entity>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl Sat Jul 12 11:41:44 2008
@@ -37,7 +37,7 @@
</#if>
<tr>
<td><a href="<@o...@ofbizUrl>" class="buttontext">${returnHeader.returnId}</a></td>
- <td><div class="tabletext">${returnHeader.entryDate.toString()}</div></td>
+ <td><div>${returnHeader.entryDate.toString()}</div></td>
<td>
<#if returnHeader.fromPartyId?exists>
<a href="${customerDetailLink}${returnHeader.fromPartyId}${externalKeyParam}" class='buttontext'>${returnHeader.fromPartyId}</a>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/setup/paymentsetup.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/setup/paymentsetup.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/setup/paymentsetup.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/setup/paymentsetup.ftl Sat Jul 12 11:41:44 2008
@@ -60,15 +60,15 @@
<#assign rowStyle = "alternate-row">
</#if>
<tr class="${rowStyle}">
- <td><div class="tabletext">${paymentSetting.siteName?if_exists}</div></td>
- <td><div class="tabletext">${paymentSetting.description?if_exists}</div></td>
- <td><div class="tabletext">${paymentSetting.paymentAuthService?if_exists}</div></td>
- <td><div class="tabletext">${paymentSetting.paymentReAuthService?if_exists}</div></td>
- <td><div class="tabletext">${paymentSetting.paymentCaptureService?if_exists}</div></td>
- <td><div class="tabletext">${paymentSetting.paymentRefundService?if_exists}</div></td>
- <td><div class="tabletext">${paymentSetting.paymentConfiguration?if_exists}</div></td>
+ <td><div>${paymentSetting.siteName?if_exists}</div></td>
+ <td><div>${paymentSetting.description?if_exists}</div></td>
+ <td><div>${paymentSetting.paymentAuthService?if_exists}</div></td>
+ <td><div>${paymentSetting.paymentReAuthService?if_exists}</div></td>
+ <td><div>${paymentSetting.paymentCaptureService?if_exists}</div></td>
+ <td><div>${paymentSetting.paymentRefundService?if_exists}</div></td>
+ <td><div>${paymentSetting.paymentConfiguration?if_exists}</div></td>
<td nowrap>
- <div class="tabletext">
+ <div>
<#if security.hasEntityPermission("PAYPROC", "_UPDATE", session)>
<a href="<@o...@ofbizUrl>" class="buttontext">Edit</a>
</#if>
@@ -81,7 +81,7 @@
</#list>
<#else>
<tr>
- <td colspan="8"><div class="tabletext">No settings found.</div></td>
+ <td colspan="8"><div>No settings found.</div></td>
</tr>
</#if>
</table>
@@ -127,12 +127,12 @@
</#if>
<table border='0' cellpadding='2' cellspacing='0'>
<tr>
- <td width="26%" align="right"><div class="tabletext">WebSite</div></td>
+ <td width="26%" align="right"><div>WebSite</div></td>
<td> </td>
<td width="74%">
<#if webSitePayment?has_content>
<input type='hidden' name='webSiteId' value='${webSitePayment.webSiteId}'>
- <div class="tabletext">
+ <div>
<b>${webSitePayment.siteName}</b> (This cannot be changed without re-creating the setting.)
</div>
<#else>
@@ -145,12 +145,12 @@
</td>
</tr>
<tr>
- <td width="26%" align="right"><div class="tabletext">Payment Method Type</div></td>
+ <td width="26%" align="right"><div>Payment Method Type</div></td>
<td> </td>
<td width="74%">
<#if webSitePayment?has_content>
<input type='hidden' name='paymentMethodTypeId' value='${webSitePayment.paymentMethodTypeId}'>
- <div class="tabletext">
+ <div>
<b>${webSitePayment.description}</b> (This cannot be changed without re-creating the setting.)
</div>
<#else>
@@ -164,27 +164,27 @@
</tr>
<tr>
- <td width="26%" align="right"><div class="tabletext">Processor Auth Service</div></td>
+ <td width="26%" align="right"><div>Processor Auth Service</div></td>
<td> </td>
<td width="74%"><input type="text" name="paymentAuthService" value="${payInfo.paymentAuthService?if_exists}" size="30" maxlength="60"></td>
</tr>
<tr>
- <td width="26%" align="right"><div class="tabletext">Processor Re-Auth Service</div></td>
+ <td width="26%" align="right"><div>Processor Re-Auth Service</div></td>
<td> </td>
<td width="74%"><input type="text" name="paymentReAuthService" value="${payInfo.paymentReAuthService?if_exists}" size="30" maxlength="60"></td>
</tr>
<tr>
- <td width="26%" align="right"><div class="tabletext">Processor Capture Service</div></td>
+ <td width="26%" align="right"><div>Processor Capture Service</div></td>
<td> </td>
<td width="74%"><input type="text" name="paymentCaptureService" value="${payInfo.paymentCaptureService?if_exists}" size="30" maxlength="60"></td>
</tr>
<tr>
- <td width="26%" align="right"><div class="tabletext">Processor Refund Service</div></td>
+ <td width="26%" align="right"><div>Processor Refund Service</div></td>
<td> </td>
<td width="74%"><input type="text" name="paymentRefundService" value="${payInfo.paymentRefundService?if_exists}" size="30" maxlength="60"></td>
</tr>
<tr>
- <td width="26%" align="right"><div class="tabletext">Processor Properties URL</div></td>
+ <td width="26%" align="right"><div>Processor Properties URL</div></td>
<td> </td>
<td width="74%"><input type="text" name="paymentConfiguration" value="${payInfo.paymentConfiguration?if_exists}" size="30" maxlength="60"></td>
</tr>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml Sat Jul 12 11:41:44 2008
@@ -139,8 +139,8 @@
<field name="productId" title="${uiLabelMap.ProductProductId}" widget-style="buttontext">
<hyperlink description="${productId}" target="/catalog/control/EditProductInventoryItems?productId=${productId}" target-type="inter-app"/>
</field>
- <field name="brandName" title="${uiLabelMap.ProductBrandName}" widget-style="tabletext"><display/></field>
- <field name="internalName" widget-style="tabletext"><display/></field>
+ <field name="brandName" title="${uiLabelMap.ProductBrandName}"><display/></field>
+ <field name="internalName"><display/></field>
<field name="quantity" title="${uiLabelMap.OrderQuantity}">
<text size="5" maxlength="10"/>
</field>
@@ -159,10 +159,10 @@
<field name="productId" widget-style="buttontext">
<hyperlink description="${productId}" target="/catalog/control/EditProductInventoryItems?productId=${productId}" target-type="inter-app"/>
</field>
- <field name="supplierProductId" widget-style="tabletext"><display/></field>
- <field name="supplierProductName" widget-style="tabletext"><display/></field>
- <field name="lastPrice" widget-style="tabletext"><display/></field>
- <field name="minimumOrderQuantity" widget-style="tabletext"><display/></field>
+ <field name="supplierProductId"><display/></field>
+ <field name="supplierProductName"><display/></field>
+ <field name="lastPrice"><display/></field>
+ <field name="minimumOrderQuantity"><display/></field>
<field name="quantity" title="${uiLabelMap.OrderQuantity}">
<text size="5" maxlength="10"/>
</field>
Modified: ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml Sat Jul 12 11:41:44 2008
@@ -92,9 +92,9 @@
<alt-target target="createTimesheet" use-when="timesheet==null"/>
<auto-fields-service service-name="updateTimesheet"/>
- <field name="timesheetId" use-when="timesheet!=null" title="${uiLabelMap.TimesheetTimesheetId}" tooltip="${uiLabelMap.CommonNotModifRecreat}" widget-style="tabletext"><display/></field>
+ <field name="timesheetId" use-when="timesheet!=null" title="${uiLabelMap.TimesheetTimesheetId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
<field name="timesheetId" use-when="timesheet==null&&timesheetId==null" title="${uiLabelMap.TimesheetTimesheetId}"><ignored/></field>
- <field name="timesheetId" use-when="timesheet==null&&timesheetId!=null" title="${uiLabelMap.TimesheetTimesheetId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${timesheetId}]" widget-style="tabletext"><display also-hidden="false"/></field>
+ <field name="timesheetId" use-when="timesheet==null&&timesheetId!=null" title="${uiLabelMap.TimesheetTimesheetId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${timesheetId}]"><display also-hidden="false"/></field>
<field name="partyId" title="${uiLabelMap.PartyParty}*"><lookup target-form-name="LookupPartyName"/></field>
<field name="clientPartyId"><lookup target-form-name="LookupPartyName"/></field>
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml Sat Jul 12 11:41:44 2008
@@ -106,7 +106,7 @@
</drop-down>
</field>
<field name="facilityId"><lookup target-form-name="LookupFacility"/></field>
- <field name="mustRsvp" widget-style="tabletext"><check/></field>
+ <field name="mustRsvp"><check/></field>
<field name="comments"><text size="60" maxlength="255"/></field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
Modified: ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl (original)
+++ ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/productsExportToEbay.ftl Sat Jul 12 11:41:44 2008
@@ -31,7 +31,7 @@
}
}
</script>
-<div class="tabletext">
+<div>
<form method="post" action="<@o...@ofbizUrl>" name="ProductsExportToEbay">
<table border="0" cellpadding="2" cellspacing="0">
<tr>
Modified: ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/footer.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/footer.ftl (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/footer.ftl Sat Jul 12 11:41:44 2008
@@ -25,7 +25,7 @@
</tr>
<tr height=24 class="boxbottom">
<td width=100%>
-<span class="tabletext">
+<span>
Hand Held Facility
</span>
</td>
Modified: ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/login.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/login.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/login.ftl (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/login.ftl Sat Jul 12 11:41:44 2008
@@ -53,7 +53,7 @@
<table width='100%' border='0' cellpadding='0' cellspacing='2'>
<tr>
<td align="right">
- <span class="tabletext">Username </span>
+ <span>Username </span>
</td>
<td align="left">
<input type="text" name="USERNAME" value="${username}" size="20">
@@ -61,7 +61,7 @@
</tr>
<tr>
<td align="right">
- <span class="tabletext">Password </span>
+ <span>Password </span>
</td>
<td align="left">
<input type="password" name="PASSWORD" value="" size="20">
Modified: ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/menu.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/menu.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/menu.ftl (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/menu.ftl Sat Jul 12 11:41:44 2008
@@ -18,7 +18,7 @@
-->
<#assign facility = parameters.facility>
-<span class="tabletext">
+<span>
<ol>
<li><a accesskey="1" href="<@o...@ofbizUrl>">Goods Receipt</a></li>
<li><a accesskey="2" href="<@o...@ofbizUrl>">Inventory Movement</a></li>
Modified: ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/productstocktake.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/productstocktake.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/productstocktake.ftl (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/productstocktake.ftl Sat Jul 12 11:41:44 2008
@@ -19,7 +19,7 @@
<#assign facility = parameters.facility>
-<span class="tabletext">
+<span>
<#if negativeQOH?has_content>
<a href="<@o...@ofbizUrl>">Fix negative QOH</a>
</#if>
Modified: ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/receipt.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/receipt.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/receipt.ftl (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/receipt.ftl Sat Jul 12 11:41:44 2008
@@ -19,7 +19,7 @@
<#assign facility = parameters.facility>
-<span class="tabletext">
+<span>
<ol>
<li><a accesskey="1" href="<@o...@ofbizUrl>">PO Receipt</a></li>
<li><a accesskey="2" href="<@o...@ofbizUrl>">Product Receipt</a></li>
Modified: ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/stocktake.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/stocktake.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/stocktake.ftl (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/stocktake.ftl Sat Jul 12 11:41:44 2008
@@ -23,16 +23,16 @@
</#if>
<#if idValue?has_content && !productList?has_content>
- <span class="tabletext">No Product(s) Found</span>
+ <span>No Product(s) Found</span>
</#if>
<#if productList?has_content>
- <span class="tabletext">Products Found:</span>
+ <span>Products Found:</span>
<table>
<#list productList as product>
<tr>
<td>
- <div class="tabletext"><b>${product.productId}</b></div>
+ <div><b>${product.productId}</b></div>
</td>
<td> </td>
<td>
Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl Sat Jul 12 11:41:44 2008
@@ -39,15 +39,15 @@
<#list workEffortNoteandDetails as note>
<tr>
<td align="left" valign="top" width="35%">
- <div class="tabletext"> <b>${uiLabelMap.CommonBy}: </b>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, note.noteParty, true)}</div>
- <div class="tabletext"> <b>${uiLabelMap.CommonAt}: </b>${Static["org.ofbiz.base.util.UtilDateTime"].timeStampToString(note.noteDateTime?if_exists,"dd-MM-yyyy HH:mm",Static["java.util.TimeZone"].getDefault(),context.get("locale"))}</div>
+ <div> <b>${uiLabelMap.CommonBy}: </b>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, note.noteParty, true)}</div>
+ <div> <b>${uiLabelMap.CommonAt}: </b>${Static["org.ofbiz.base.util.UtilDateTime"].timeStampToString(note.noteDateTime?if_exists,"dd-MM-yyyy HH:mm",Static["java.util.TimeZone"].getDefault(),context.get("locale"))}</div>
</td>
<td align="left" valign="top" width="50%">
- <div class="tabletext">${note.noteInfo?if_exists}</div>
+ <div>${note.noteInfo?if_exists}</div>
</td>
<td align="right" valign="top" width="15%">
<#if note.internalNote?if_exists == "N">
- <div class="tabletext">${uiLabelMap.ProjectMgrPrintableNote}</div>
+ <div>${uiLabelMap.ProjectMgrPrintableNote}</div>
<#if project?has_content>
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNotesPrivate}</a>
<#else>
@@ -55,7 +55,7 @@
</#if>
</#if>
<#if note.internalNote?if_exists == "Y">
- <div class="tabletext">${uiLabelMap.ProjectMgrNotPrintableNote}</div>
+ <div>${uiLabelMap.ProjectMgrNotPrintableNote}</div>
<#if project?has_content>
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNotesPublic}</a>
<#else>
@@ -71,9 +71,9 @@
</table>
<#else>
<#if project?has_content>
- <div class="tabletext"> ${uiLabelMap.ProjectMgrProjectNoNotes}.</div>
+ <div> ${uiLabelMap.ProjectMgrProjectNoNotes}.</div>
<#else>
- <div class="tabletext"> ${uiLabelMap.ProjectMgrTaskNoNotes}.</div>
+ <div> ${uiLabelMap.ProjectMgrTaskNoNotes}.</div>
</#if>
</#if>
@@ -101,17 +101,17 @@
</#if>
</tr>
<tr>
- <td width="26%" align="right"><div class="tabletext">${uiLabelMap.OrderNote}</div></td>
+ <td width="26%" align="right"><div>${uiLabelMap.OrderNote}</div></td>
<td width="54%">
<textarea name="noteInfo" rows="5" cols="70"></textarea>
</td>
</tr>
<tr>
- <td/><td class="tabletext">${uiLabelMap.OrderInternalNote} :
+ <td/><td>${uiLabelMap.OrderInternalNote} :
<select name="internalNote" size="1"><option value=""></option><option value="Y" selected>${uiLabelMap.CommonYes}</option><option value="N">${uiLabelMap.CommonNo}</option></select></td>
</tr>
<tr>
- <td/><td class="tabletext"><i>${uiLabelMap.OrderInternalNoteMessage}</i></td>
+ <td/><td><i>${uiLabelMap.OrderInternalNoteMessage}</i></td>
</tr>
</table>
<#if project?has_content>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Sat Jul 12 11:41:44 2008
@@ -431,9 +431,9 @@
<order-by field-name="noteId"/>
</entity-condition>
</actions>
- <field name="noteId" widget-style="tabletext"><hidden/></field>
+ <field name="noteId"><hidden/></field>
<field name="workEffortId"><hidden/></field>
- <field name="noteParty" title="${uiLabelMap.CommonBy}" widget-style="tabletext"><display description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, noteParty, true)} at ${bsh: org.ofbiz.base.util.UtilDateTime.timeStampToString(noteDateTime, "dd-MM-yyyy HH:mm", TimeZone.getDefault(), context.get("locale"))}"/></field>
+ <field name="noteParty" title="${uiLabelMap.CommonBy}"><display description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, noteParty, true)} at ${bsh: org.ofbiz.base.util.UtilDateTime.timeStampToString(noteDateTime, "dd-MM-yyyy HH:mm", TimeZone.getDefault(), context.get("locale"))}"/></field>
</form>
<form name="listResourcesTasks" type="list" list-name="tasks" paginate-target="listResourcesTask" target="updateResourcesTaskAssigment"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Sat Jul 12 11:41:44 2008
@@ -474,9 +474,9 @@
<order-by field-name="noteId"/>
</entity-condition>
</actions>
- <field name="noteId" widget-style="tabletext"><hidden/></field>
+ <field name="noteId"><hidden/></field>
<field name="workEffortId"><hidden/></field>
- <field name="noteParty" title="${uiLabelMap.CommonBy}" widget-style="tabletext"><display description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, noteParty, true)} at ${bsh: org.ofbiz.base.util.UtilDateTime.timeStampToString(noteDateTime, "dd-MM-yyyy HH:mm", TimeZone.getDefault(), context.get("locale"))}"/></field>
+ <field name="noteParty" title="${uiLabelMap.CommonBy}"><display description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, noteParty, true)} at ${bsh: org.ofbiz.base.util.UtilDateTime.timeStampToString(noteDateTime, "dd-MM-yyyy HH:mm", TimeZone.getDefault(), context.get("locale"))}"/></field>
<field name="Private/Public" widget-style="buttontext" title="${uiLabelMap.PorjectMgrPrivateOrPublic}" use-when="internalNote.equals("N")">
<hyperlink target="updateTaskNote?workEffortId=${workEffortId}&noteId=${noteId}&internalNote=Y" description="${uiLabelMap.OrderNotesPrivate}"></hyperlink>
Modified: ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processDetailList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processDetailList.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processDetailList.ftl (original)
+++ ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processDetailList.ftl Sat Jul 12 11:41:44 2008
@@ -21,7 +21,7 @@
<#if processes?has_content>
<#assign proc1 = processes[0]>
<div> </div>
- <div class="tabletext"><b>Process :</b> ${proc1.name()} - "${proc1.description()?default("N/A")}"</div>
+ <div><b>Process :</b> ${proc1.name()} - "${proc1.description()?default("N/A")}"</div>
<table cellpadding="2" cellspacing="0" border="1">
<tr>
@@ -37,10 +37,10 @@
</tr>
<#list processes as proc>
<tr>
- <td align="left"><div class="tabletext">${proc.key()}</div></td>
- <td align="left"><div class="tabletext">${proc.state()}</div></td>
- <td align="center"><div class="tabletext">${proc.priority()}</div></td>
- <td align="center"><div class="tabletext">${proc.how_many_step()}</div></td>
+ <td align="left"><div>${proc.key()}</div></td>
+ <td align="left"><div>${proc.state()}</div></td>
+ <td align="center"><div>${proc.priority()}</div></td>
+ <td align="center"><div>${proc.how_many_step()}</div></td>
<#if proc.state() != "open.not_running.not_started">
<td align="center"><a href="<@o...@ofbizUrl>" class="buttontext">History</a></td>
<#else>
@@ -68,5 +68,5 @@
</#list>
</table>
<#else>
- <div class="tabletext">No running processes.</div>
+ <div>No running processes.</div>
</#if>
Modified: ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processHistory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processHistory.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processHistory.ftl (original)
+++ ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processHistory.ftl Sat Jul 12 11:41:44 2008
@@ -20,7 +20,7 @@
<h2>Process History</h2>
<#if historyList?has_content>
<div> </div>
- <div class="tabletext"><b>Process :</b> ${process.name()} - ${process.description()?default("N/A")} [${process.key()}]</div>
+ <div><b>Process :</b> ${process.name()} - ${process.description()?default("N/A")} [${process.key()}]</div>
<table cellpadding="2" cellspacing="0" border="1">
<tr>
<td><div>Time</div></td>
@@ -29,9 +29,9 @@
<#list historyList as history>
<#assign time = history.time_stamp().getTime()>
<tr>
- <td align="left"><div class="tabletext">${Static["org.ofbiz.base.util.UtilDateTime"].getTimestamp(time)}</div></td>
+ <td align="left"><div>${Static["org.ofbiz.base.util.UtilDateTime"].getTimestamp(time)}</div></td>
<td align="left">
- <div class="tabletext">
+ <div>
<#assign eventType = history.event_type()>
${eventType}
<#if eventType == "processStateChanged">
@@ -47,5 +47,5 @@
</#list>
</table>
<#else>
- <div class="tabletext">No history available.</div>
+ <div>No history available.</div>
</#if>
Modified: ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processList.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processList.ftl (original)
+++ ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processList.ftl Sat Jul 12 11:41:44 2008
@@ -34,11 +34,11 @@
<#list processMgrs as mgr>
<#assign state = mgr.process_mgr_state().value()>
<tr>
- <td align="left"><div class="tabletext">${mgr.name()}</div></td>
- <td align="left"><div class="tabletext">${mgr.version()}</div></td>
- <td align="left"><div class="tabletext">${mgr.category()}</div></td>
- <td align="center"><div class="tabletext"><#if state == enabledCode>Y<#else>N</#if></div></td>
- <td align="center"><div class="tabletext">${mgr.how_many_process()}</div></td>
+ <td align="left"><div>${mgr.name()}</div></td>
+ <td align="left"><div>${mgr.version()}</div></td>
+ <td align="left"><div>${mgr.category()}</div></td>
+ <td align="center"><div><#if state == enabledCode>Y<#else>N</#if></div></td>
+ <td align="center"><div>${mgr.how_many_process()}</div></td>
<#if state == enabledCode>
<td align="center"><a href="<@ofbizUrl>processes?disable=${mgr.name()?replace("#", "%23")}</...@ofbizUrl>" class="buttontext">Disable</a></td>
<#else>
@@ -62,5 +62,5 @@
<td> </td>
<a href="<@o...@ofbizUrl>" class="buttontext">Delete All Finished</a>
<#else>
- <div class="tabletext">No loaded processes.</div>
+ <div>No loaded processes.</div>
</#if>
Modified: ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processSteps.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processSteps.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processSteps.ftl (original)
+++ ofbiz/trunk/specialpurpose/shark/webapp/shark/process/processSteps.ftl Sat Jul 12 11:41:44 2008
@@ -20,7 +20,7 @@
<h2>Process Steps</h2>
<#if steps?has_content>
<div> </div>
- <div class="tabletext"><b>Process :</b> ${process.name()} - ${process.description()?default("N/A")} [${process.key()}]</div>
+ <div><b>Process :</b> ${process.name()} - ${process.description()?default("N/A")} [${process.key()}]</div>
<table cellpadding="2" cellspacing="0" border="1">
<tr>
@@ -36,16 +36,16 @@
<#list steps as step>
<#assign time = step.last_state_time().getTime()>
<tr>
- <td align="left"><div class="tabletext">${step.key()}</div></td>
- <td align="left"><div class="tabletext">${step.name()}</div></td>
- <td align="left"><div class="tabletext">${step.description()}</div></td>
- <td align="left"><div class="tabletext">${step.state()}</div></td>
- <td align="left"><div class="tabletext">${Static["org.ofbiz.base.util.UtilDateTime"].getTimestamp(time)}</div></td>
- <td align="center"><div class="tabletext">${step.priority()}</div></td>
- <td align="center"><div class="tabletext">${step.how_many_assignment()}</div></td>
+ <td align="left"><div>${step.key()}</div></td>
+ <td align="left"><div>${step.name()}</div></td>
+ <td align="left"><div>${step.description()}</div></td>
+ <td align="left"><div>${step.state()}</div></td>
+ <td align="left"><div>${Static["org.ofbiz.base.util.UtilDateTime"].getTimestamp(time)}</div></td>
+ <td align="center"><div>${step.priority()}</div></td>
+ <td align="center"><div>${step.how_many_assignment()}</div></td>
</tr>
</#list>
</table>
<#else>
- <div class="tabletext">No running activities.</div>
+ <div>No running activities.</div>
</#if>
Modified: ofbiz/trunk/specialpurpose/shark/webapp/shark/repository/showRepository.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/webapp/shark/repository/showRepository.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/webapp/shark/repository/showRepository.ftl (original)
+++ ofbiz/trunk/specialpurpose/shark/webapp/shark/repository/showRepository.ftl Sat Jul 12 11:41:44 2008
@@ -20,7 +20,7 @@
<h2>XPDL Repository</h2>
<#if packages?has_content>
<div> </div>
- <div class="tabletext">XPDL packages loaded into the repository.</div>
+ <div>XPDL packages loaded into the repository.</div>
<table cellpadding="2" cellspacing="0" border="1">
<tr>
<td><div>ID</div></td>
@@ -40,9 +40,9 @@
</#if>
<tr>
- <td align="left"><div class="tabletext">${packageId?default("??")}</div>
- <td align="left"><div class="tabletext">${version?default("??")}</div></td>
- <td align="center"><div class="tabletext"><#if open>Y<#else>N</#if></div>
+ <td align="left"><div>${packageId?default("??")}</div>
+ <td align="left"><div>${version?default("??")}</div></td>
+ <td align="center"><div><#if open>Y<#else>N</#if></div>
<td align="center"><a href="<@o...@ofbizUrl>" class="buttontext">Remove</a>
<td align="center"><a href="<@ofbizUrl>repository?<#if open>close=${packageId}&version=${version}<#e...@ofbizUrl>" class="buttontext"><#if open>Close<#else>Open</#if></a>
</tr>
@@ -50,7 +50,7 @@
</#list>
</table>
<#else>
- <div class="tabletext">Repository is empty.</div>
+ <div>Repository is empty.</div>
</#if>
<br/>
Modified: ofbiz/trunk/specialpurpose/shark/webapp/shark/tasklist/worklist.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/webapp/shark/tasklist/worklist.ftl?rev=676212&r1=676211&r2=676212&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/webapp/shark/tasklist/worklist.ftl (original)
+++ ofbiz/trunk/specialpurpose/shark/webapp/shark/tasklist/worklist.ftl Sat Jul 12 11:41:44 2008
@@ -48,18 +48,18 @@
<input type="hidden" name="resource" value="${assignm.assignee().resource_key()}">
<input type="hidden" name="mode" value="accept">
- <td align="left"><div class="tabletext">${assignm.assignee().resource_key()}</div></td>
- <td align="left"><div class="tabletext">${assignm.activity().name()}</div></td>
- <td align="left"><div class="tabletext">${assignm.activity().key()}</div></td>
+ <td align="left"><div>${assignm.assignee().resource_key()}</div></td>
+ <td align="left"><div>${assignm.activity().name()}</div></td>
+ <td align="left"><div>${assignm.activity().key()}</div></td>
<td align="center">
<input type="checkbox" name="accept" onclick="javascript:document.assignmentChange${formNumber}.submit();" value="Y" <#if assignm.get_accepted_status()>checked</#if>>
</td>
- <td align="center"><div class="tabletext">${assignm.activity().priority()}</div></td>
- <td align="left"><div class="tabletext">${assignm.activity().state()}</div></td>
+ <td align="center"><div>${assignm.activity().priority()}</div></td>
+ <td align="left"><div>${assignm.activity().state()}</div></td>
<#if (time > 0)>
- <td align="left"><div class="tabletext">${Static["org.ofbiz.base.util.UtilDateTime"].getTimestamp(time)}</div></td>
+ <td align="left"><div>${Static["org.ofbiz.base.util.UtilDateTime"].getTimestamp(time)}</div></td>
<#else>
- <td align="center"><div class="tabletext">N/A</div></td>
+ <td align="center"><div>N/A</div></td>
</#if>
<#if assignm.activity().state() == "open.running">
<td align="center"><a href="<@o...@ofbizUrl>" class="buttontext">Complete</a></td>
@@ -71,5 +71,5 @@
</#list>
</table>
<#else>
- <div class="tabletext">No tasks available.</div>
+ <div>No tasks available.</div>
</#if>