You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by le...@apache.org on 2007/03/18 07:43:06 UTC
svn commit: r519566 -
/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl
Author: lektran
Date: Sat Mar 17 23:43:06 2007
New Revision: 519566
URL: http://svn.apache.org/viewvc?view=rev&rev=519566
Log:
Formatting clean up
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl
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?view=diff&rev=519566&r1=519565&r2=519566
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl Sat Mar 17 23:43:06 2007
@@ -19,138 +19,137 @@
<div class="screenlet">
<div class="screenlet-body">
- <table width="100%" border="0" cellpadding="1">
- <#-- order name -->
- <#if (orderName?exists)>
- <tr>
- <td align="right" valign="top" width="15%">
- <span class="tabletext"> <b>${uiLabelMap.OrderOrderName}</b> </span>
- </td>
- <td width="5"> </td>
- <td align="left" valign="top" width="80%" class="tabletext">
- ${orderName}
- </td>
- </tr>
- <tr><td colspan="7"><hr class="sepbar"/></td></tr>
- </#if>
- <#-- order for party -->
- <#if (orderForParty?exists)>
- <tr>
- <td align="right" valign="top" width="15%">
- <span class="tabletext"> <b>${uiLabelMap.OrderOrderFor}</b> </span>
- </td>
- <td width="5"> </td>
- <td align="left" valign="top" width="80%" class="tabletext">
- ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(orderForParty, false)} [${orderForParty.partyId}]
- </td>
- </tr>
- <tr><td colspan="7"><hr class="sepbar"/></td></tr>
- </#if>
- <#if orderTerms?has_content>
- <tr>
- <td align="right" valign="top" width="15%">
- <div class="tabletext"> <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>
- </tr>
- <tr><td colspan="4"><hr class="sepbar"/></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.description?default("")}</div></td>
- </tr>
- <#if orderTerms.size()<index>
- <tr><td colspan="4"><hr class="sepbar"/></td></tr>
- </#if>
- <#assign index=index+1/>
- </#list>
- </table>
- </td>
- </tr>
- <tr><td colspan="7"><hr class="sepbar"/></td></tr>
- </#if>
- <#-- tracking number -->
- <#if trackingNumber?has_content>
- <tr>
+ <table width="100%" border="0" cellpadding="1">
+ <#-- order name -->
+ <#if (orderName?exists)>
+ <tr>
+ <td align="right" valign="top" width="15%">
+ <span class="tabletext"> <b>${uiLabelMap.OrderOrderName}</b> </span>
+ </td>
+ <td width="5"> </td>
+ <td align="left" valign="top" width="80%" class="tabletext">
+ ${orderName}
+ </td>
+ </tr>
+ <tr><td colspan="7"><hr class="sepbar"/></td></tr>
+ </#if>
+ <#-- order for party -->
+ <#if (orderForParty?exists)>
+ <tr>
<td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.FacilityTrackingNumber}</b></div>
+ <span class="tabletext"> <b>${uiLabelMap.OrderOrderFor}</b> </span>
+ </td>
+ <td width="5"> </td>
+ <td align="left" valign="top" width="80%" class="tabletext">
+ ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(orderForParty, false)} [${orderForParty.partyId}]
+ </td>
+ </tr>
+ <tr><td colspan="7"><hr class="sepbar"/></td></tr>
+ </#if>
+ <#if orderTerms?has_content>
+ <tr>
+ <td align="right" valign="top" width="15%">
+ <div class="tabletext"> <b>${uiLabelMap.OrderOrderTerms}</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>
+ <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>
+ </tr>
+ <tr><td colspan="4"><hr class="sepbar"/></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.description?default("")}</div></td>
+ </tr>
+ <#if orderTerms.size()<index>
+ <tr><td colspan="4"><hr class="sepbar"/></td></tr>
+ </#if>
+ <#assign index=index+1/>
+ </#list>
+ </table>
</td>
- </tr>
+ </tr>
<tr><td colspan="7"><hr class="sepbar"/></td></tr>
- </#if>
-
- <#-- splitting preference -->
+ </#if>
+ <#-- tracking number -->
+ <#if trackingNumber?has_content>
<tr>
- <td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.OrderSplittingPreference}</b></div>
- </td>
- <td width="5"> </td>
- <td align="left" valign="top" width="80%">
- <div class="tabletext">
- <#if maySplit?default("N") == "N">${uiLabelMap.FacilityWaitEntireOrderReady}</#if>
- <#if maySplit?default("Y") == "Y">${uiLabelMap.FacilityShipAvailable}</#if>
- </div>
- </td>
- </tr>
- <#-- shipping instructions -->
- <#if shippingInstructions?has_content>
- <tr><td colspan="7"><hr class="sepbar"/></td></tr>
- <tr>
- <td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.CommonInstructions}</b></div>
+ <td align="right" valign="top" width="15%">
+ <div class="tabletext"> <b>${uiLabelMap.FacilityTrackingNumber}</b></div>
</td>
<td width="5"> </td>
<td align="left" valign="top" width="80%">
- <div class="tabletext">${shippingInstructions}</div>
- </td>
- </tr>
- </#if>
- <tr><td colspan="7"><hr class="sepbar"/></td></tr>
- <#if orderType != "PURCHASE_ORDER">
- <#-- gift settings -->
+ <#-- TODO: add links to UPS/FEDEX/etc based on carrier partyId -->
+ <div class="tabletext">${trackingNumber}</div>
+ </td>
+ </tr>
+ <tr><td colspan="7"><hr class="sepbar"/></td></tr>
+ </#if>
+ <#-- splitting preference -->
+ <tr>
+ <td align="right" valign="top" width="15%">
+ <div class="tabletext"> <b>${uiLabelMap.OrderSplittingPreference}</b></div>
+ </td>
+ <td width="5"> </td>
+ <td align="left" valign="top" width="80%">
+ <div class="tabletext">
+ <#if maySplit?default("N") == "N">${uiLabelMap.FacilityWaitEntireOrderReady}</#if>
+ <#if maySplit?default("Y") == "Y">${uiLabelMap.FacilityShipAvailable}</#if>
+ </div>
+ </td>
+ </tr>
+ <#-- shipping instructions -->
+ <#if shippingInstructions?has_content>
+ <tr><td colspan="7"><hr class="sepbar"/></td></tr>
<tr>
- <td align="right" valign="top" width="15%">
+ <td align="right" valign="top" width="15%">
+ <div class="tabletext"> <b>${uiLabelMap.CommonInstructions}</b></div>
+ </td>
+ <td width="5"> </td>
+ <td align="left" valign="top" width="80%">
+ <div class="tabletext">${shippingInstructions}</div>
+ </td>
+ </tr>
+ </#if>
+ <tr><td colspan="7"><hr class="sepbar"/></td></tr>
+ <#if orderType != "PURCHASE_ORDER">
+ <#-- gift settings -->
+ <tr>
+ <td align="right" valign="top" width="15%">
<div class="tabletext"> <b>${uiLabelMap.OrderGift}?</b></div>
- </td>
- <td width="5"> </td>
- <td align="left" valign="top" width="80%">
+ </td>
+ <td width="5"> </td>
+ <td align="left" valign="top" width="80%">
<div class="tabletext">
- <#if isGift?default("N") == "N">${uiLabelMap.OrderThisOrderNotGift}</#if>
- <#if isGift?default("N") == "Y">${uiLabelMap.OrderThisOrderGift}</#if>
- </div>
- </td>
- </tr>
- <tr><td colspan="7"><hr class="sepbar"/></td></tr>
- <#if giftMessage?has_content>
- <tr>
- <td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.OrderGiftMessage}</b></div>
- </td>
- <td width="5"> </td>
- <td align="left" valign="top" width="80%">
- <div class="tabletext">${giftMessage}</div>
+ <#if isGift?default("N") == "N">${uiLabelMap.OrderThisOrderNotGift}</#if>
+ <#if isGift?default("N") == "Y">${uiLabelMap.OrderThisOrderGift}</#if>
+ </div>
+ </td>
+ </tr>
+ <tr><td colspan="7"><hr class="sepbar"/></td></tr>
+ <#if giftMessage?has_content>
+ <tr>
+ <td align="right" valign="top" width="15%">
+ <div class="tabletext"> <b>${uiLabelMap.OrderGiftMessage}</b></div>
+ </td>
+ <td width="5"> </td>
+ <td align="left" valign="top" width="80%">
+ <div class="tabletext">${giftMessage}</div>
</td>
- </tr>
- <tr><td colspan="7"><hr class="sepbar"/></td></tr>
+ </tr>
+ <tr><td colspan="7"><hr class="sepbar"/></td></tr>
</#if>
- </#if>
- <#if shipAfterDate?has_content>
- <tr>
+ </#if>
+ <#if shipAfterDate?has_content>
+ <tr>
<td align="right" valign="top" width="15%">
<div class="tabletext"> <b>${uiLabelMap.OrderShipAfterDate}</b></div>
</td>
@@ -159,18 +158,18 @@
<div class="tabletext">${shipAfterDate}</div>
</td>
</tr>
- </#if>
- <#if shipBeforeDate?has_content>
+ </#if>
+ <#if shipBeforeDate?has_content>
<tr>
- <td align="right" valign="top" width="15%">
- <div class="tabletext"> <b>${uiLabelMap.OrderShipBeforeDate}</b></div>
- </td>
- <td width="5"> </td>
- <td align="left" valign="top" width="80%">
- <div class="tabletext">${shipBeforeDate}</div>
- </td>
- </tr>
- </#if>
+ <td align="right" valign="top" width="15%">
+ <div class="tabletext"> <b>${uiLabelMap.OrderShipBeforeDate}</b></div>
+ </td>
+ <td width="5"> </td>
+ <td align="left" valign="top" width="80%">
+ <div class="tabletext">${shipBeforeDate}</div>
+ </td>
+ </tr>
+ </#if>
</table>
</div>
-</div>
+</div>
\ No newline at end of file