Author: jacopoc
Date: Sun Oct 22 00:05:09 2006
New Revision: 466632
URL: http://svn.apache.org/viewvc?view=rev&rev=466632
Log:
Formatting fixes.
Modified:
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl
Modified:
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl?view=diff&rev=466632&r1=466631&r2=466632
==============================================================================
---
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl
(original)
+++
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl
Sun Oct 22 00:05:09 2006
@@ -21,9 +21,9 @@
<fo:table-row>
<fo:table-cell>
<fo:block text-align="left">
- <#if logoImageUrl?has_content>
- <fo:external-graphic src="${logoImageUrl}"
overflow="hidden" height="40px"/>
- </#if>
+ <#if logoImageUrl?has_content>
+ <fo:external-graphic src="${logoImageUrl}"
overflow="hidden" height="40px"/>
+ </#if>
</fo:block>
</fo:table-cell>
</fo:table-row>
@@ -31,15 +31,14 @@
<fo:table-cell>
<fo:block>${companyName}</fo:block>
<#if postalAddress?exists>
- <#if postalAddress?has_content>
- <fo:block>${postalAddress.address1?if_exists}</fo:block>
- <#if
postalAddress.address2?has_content><fo:block>${postalAddress.address2?if_exists}</fo:block></#if>
- <fo:block>${postalAddress.city?if_exists},
${stateProvinceAbbrv?if_exists} ${postalAddress.postalCode?if_exists},
${countryName?if_exists}</fo:block>
- </#if>
-
- <#else>
- <fo:block>${uiLabelMap.CommonNoPostalAddress}</fo:block>
- <fo:block>${uiLabelMap.CommonFor}: ${companyName}</fo:block>
+ <#if postalAddress?has_content>
+ <fo:block>${postalAddress.address1?if_exists}</fo:block>
+ <#if
postalAddress.address2?has_content><fo:block>${postalAddress.address2?if_exists}</fo:block></#if>
+ <fo:block>${postalAddress.city?if_exists},
${stateProvinceAbbrv?if_exists} ${postalAddress.postalCode?if_exists},
${countryName?if_exists}</fo:block>
+ </#if>
+ <#else>
+ <fo:block>${uiLabelMap.CommonNoPostalAddress}</fo:block>
+ <fo:block>${uiLabelMap.CommonFor}:
${companyName}</fo:block>
</#if>
<fo:table>
<fo:table-column column-width="15mm"/>
