svn commit: r1684030 - in /ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates: PostalAddress.fo.ftl PostalAddress_DEU.fo.ftl PostalAddress_USA.fo.ftl

Author: jleroux
Date: Sun Jun  7 13:00:27 2015
New Revision: 1684030

URL: http://svn.apache.org/r1684030
Log:
Ho functional changes, syntax improvements
Replaces "?if_exists" occurences by !
Removes a test on "?has_content" when not needed (! is enough).
Removes "?if_exists" when useless (after ?has_content)



Modified:
    ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.fo.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_DEU.fo.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_USA.fo.ftl

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.fo.ftl?rev=1684030&r1=1684029&r2=1684030&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.fo.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.fo.ftl Sun Jun  7 13:00:27 2015
@@ -17,9 +17,9 @@ specific language governing permissions
 under the License.
 -->
 <#escape x as x?xml>
-  <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}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId}</#if> ${postalAddress.postalCode?if_exists}</fo:block>
+  <fo:block>${postalAddress.address1!}</fo:block>
+  <#if postalAddress.address2?has_content><fo:block>${postalAddress.address2}</fo:block></#if>
+  <fo:block>${postalAddress.city!}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId}</#if> ${postalAddress.postalCode!}</fo:block>
   <#if postalAddress.countryGeoId?has_content>
     <fo:block>
       <#assign country = postalAddress.getRelatedOne("CountryGeo", true)>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_DEU.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_DEU.fo.ftl?rev=1684030&r1=1684029&r2=1684030&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_DEU.fo.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_DEU.fo.ftl Sun Jun  7 13:00:27 2015
@@ -17,13 +17,13 @@ specific language governing permissions
 under the License.
 -->
 <#escape x as x?xml>
-  <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.postalCode?if_exists} ${postalAddress.city?if_exists}</fo:block>
+  <fo:block>${postalAddress.address1!}</fo:block>
+  <#if postalAddress.address2?has_content><fo:block>${postalAddress.address2}</fo:block></#if>
+  <fo:block>${postalAddress.postalCode!} ${postalAddress.city!}</fo:block>
   <#if postalAddress.countryGeoId?has_content>
     <fo:block>
       <#assign country = postalAddress.getRelatedOne("CountryGeo", true)>
       ${country.get("geoName", locale)?default(country.geoId)}
     </fo:block>
   </#if>
-</#escape>
\ No newline at end of file
+</#escape>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_USA.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_USA.fo.ftl?rev=1684030&r1=1684029&r2=1684030&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_USA.fo.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_USA.fo.ftl Sun Jun  7 13:00:27 2015
@@ -18,7 +18,7 @@ under the License.
 -->
 <#escape x as x?xml>
   <fo:block>${postalAddress.address1!}</fo:block>
-  <#if postalAddress.address2?has_content><fo:block>${postalAddress.address2!}</fo:block></#if>
+  <#if postalAddress.address2?has_content><fo:block>${postalAddress.address2}</fo:block></#if>
   <fo:block>${postalAddress.city!}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId}</#if> ${postalAddress.postalCode!}</fo:block>
   <#if postalAddress.countryGeoId?has_content>
     <fo:block>