Author: erwan
Date: Tue Apr 17 10:50:19 2012
New Revision: 1327038
URL: http://svn.apache.org/viewvc?rev=1327038&view=rev
Log:
tabs to spaces, no functional change
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.fo.ftl
ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.ftl
ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_DEU.fo.ftl
ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_DEU.ftl
ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_USA.fo.ftl
ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_USA.ftl
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.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=1327038&r1=1327037&r2=1327038&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
Tue Apr 17 10:50:19 2012
@@ -21,7 +21,7 @@ under the License.
<fo:block>${postalAddress.city?if_exists}<#if
postalAddress.stateProvinceGeoId?has_content>,
${postalAddress.stateProvinceGeoId}</#if>
${postalAddress.postalCode?if_exists}</fo:block>
<#if postalAddress.countryGeoId?has_content>
<fo:block>
- <#assign country = postalAddress.getRelatedOneCache("CountryGeo")>
- ${country.get("geoName", locale)?default(country.geoId)}
+ <#assign country = postalAddress.getRelatedOneCache("CountryGeo")>
+ ${country.get("geoName", locale)?default(country.geoId)}
</fo:block>
</#if>
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.ftl?rev=1327038&r1=1327037&r2=1327038&view=diff
==============================================================================
---
ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.ftl
(original)
+++
ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress.ftl
Tue Apr 17 10:50:19 2012
@@ -17,27 +17,27 @@ specific language governing permissions
under the License.
-->
<div>
- <#if
postalAddress.toName?has_content><b>${uiLabelMap.PartyAddrToName}:</b>
${postalAddress.toName}<br /></#if>
- <#if
postalAddress.attnName?has_content><b>${uiLabelMap.PartyAddrAttnName}:</b>
${postalAddress.attnName}<br /></#if>
- ${postalAddress.address1?if_exists}<br />
- <#if postalAddress.address2?has_content>${postalAddress.address2}<br
/></#if>
- ${postalAddress.city?if_exists},
- <#if postalAddress.stateProvinceGeoId?has_content>
- <#assign stateProvince =
postalAddress.getRelatedOneCache("StateProvinceGeo")>
- ${stateProvince.abbreviation?default(stateProvince.geoId)}
- </#if>
- ${postalAddress.postalCode?if_exists}
- <#if postalAddress.countryGeoId?has_content><br />
- <#assign country = postalAddress.getRelatedOneCache("CountryGeo")>
- ${country.get("geoName", locale)?default(country.geoId)}
- </#if>
- </div>
- <#if !postalAddress.countryGeoId?has_content>
+ <#if
postalAddress.toName?has_content><b>${uiLabelMap.PartyAddrToName}:</b>
${postalAddress.toName}<br /></#if>
+ <#if
postalAddress.attnName?has_content><b>${uiLabelMap.PartyAddrAttnName}:</b>
${postalAddress.attnName}<br /></#if>
+ ${postalAddress.address1?if_exists}<br />
+ <#if postalAddress.address2?has_content>${postalAddress.address2}<br
/></#if>
+ ${postalAddress.city?if_exists},
+ <#if postalAddress.stateProvinceGeoId?has_content>
+ <#assign stateProvince =
postalAddress.getRelatedOneCache("StateProvinceGeo")>
+ ${stateProvince.abbreviation?default(stateProvince.geoId)}
+ </#if>
+ ${postalAddress.postalCode?if_exists}
+ <#if postalAddress.countryGeoId?has_content><br />
+ <#assign country = postalAddress.getRelatedOneCache("CountryGeo")>
+ ${country.get("geoName", locale)?default(country.geoId)}
+ </#if>
+ </div>
+ <#if !postalAddress.countryGeoId?has_content>
<#assign addr1 = postalAddress.address1?if_exists>
<#if addr1?has_content && (addr1.indexOf(" ") > 0)>
- <#assign addressNum = addr1.substring(0, addr1.indexOf(" "))>
- <#assign addressOther = addr1.substring(addr1.indexOf(" ")+1)>
- <a target="_blank"
href="${uiLabelMap.CommonLookupWhitepagesAddressLink}"
class="buttontext">${uiLabelMap.CommonLookupWhitepages}</a>
+ <#assign addressNum = addr1.substring(0, addr1.indexOf(" "))>
+ <#assign addressOther = addr1.substring(addr1.indexOf(" ")+1)>
+ <a target="_blank"
href="${uiLabelMap.CommonLookupWhitepagesAddressLink}"
class="buttontext">${uiLabelMap.CommonLookupWhitepages}</a>
</#if>
</#if>
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=1327038&r1=1327037&r2=1327038&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
Tue Apr 17 10:50:19 2012
@@ -21,7 +21,7 @@ under the License.
<fo:block>${postalAddress.postalCode?if_exists}
${postalAddress.city?if_exists}</fo:block>
<#if postalAddress.countryGeoId?has_content>
<fo:block>
- <#assign country = postalAddress.getRelatedOneCache("CountryGeo")>
- ${country.get("geoName", locale)?default(country.geoId)}
+ <#assign country = postalAddress.getRelatedOneCache("CountryGeo")>
+ ${country.get("geoName", locale)?default(country.geoId)}
</fo:block>
</#if>
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_DEU.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_DEU.ftl?rev=1327038&r1=1327037&r2=1327038&view=diff
==============================================================================
---
ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_DEU.ftl
(original)
+++
ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_DEU.ftl
Tue Apr 17 10:50:19 2012
@@ -17,13 +17,13 @@ specific language governing permissions
under the License.
-->
<div>
- <#if
postalAddress.toName?has_content><b>${uiLabelMap.PartyAddrToName}:</b>
${postalAddress.toName}<br /></#if>
- <#if
postalAddress.attnName?has_content><b>${uiLabelMap.PartyAddrAttnName}:</b>
${postalAddress.attnName}<br /></#if>
- ${postalAddress.address1?if_exists}<br />
- <#if postalAddress.address2?has_content>${postalAddress.address2}<br
/></#if>
- ${postalAddress.postalCode?if_exists} ${postalAddress.city?if_exists}
- <#if postalAddress.countryGeoId?has_content><br />
- <#assign country = postalAddress.getRelatedOneCache("CountryGeo")>
- ${country.get("geoName", locale)?default(country.geoId)}
- </#if>
+ <#if
postalAddress.toName?has_content><b>${uiLabelMap.PartyAddrToName}:</b>
${postalAddress.toName}<br /></#if>
+ <#if
postalAddress.attnName?has_content><b>${uiLabelMap.PartyAddrAttnName}:</b>
${postalAddress.attnName}<br /></#if>
+ ${postalAddress.address1?if_exists}<br />
+ <#if postalAddress.address2?has_content>${postalAddress.address2}<br
/></#if>
+ ${postalAddress.postalCode?if_exists} ${postalAddress.city?if_exists}
+ <#if postalAddress.countryGeoId?has_content><br />
+ <#assign country = postalAddress.getRelatedOneCache("CountryGeo")>
+ ${country.get("geoName", locale)?default(country.geoId)}
+ </#if>
</div>
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=1327038&r1=1327037&r2=1327038&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
Tue Apr 17 10:50:19 2012
@@ -21,7 +21,7 @@ under the License.
<fo:block>${postalAddress.city?if_exists}<#if
postalAddress.stateProvinceGeoId?has_content>,
${postalAddress.stateProvinceGeoId}</#if>
${postalAddress.postalCode?if_exists}</fo:block>
<#if postalAddress.countryGeoId?has_content>
<fo:block>
- <#assign country = postalAddress.getRelatedOneCache("CountryGeo")>
- ${country.get("geoName", locale)?default(country.geoId)}
+ <#assign country = postalAddress.getRelatedOneCache("CountryGeo")>
+ ${country.get("geoName", locale)?default(country.geoId)}
</fo:block>
</#if>
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_USA.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_USA.ftl?rev=1327038&r1=1327037&r2=1327038&view=diff
==============================================================================
---
ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_USA.ftl
(original)
+++
ofbiz/trunk/applications/party/webapp/partymgr/party/contactmechtemplates/PostalAddress_USA.ftl
Tue Apr 17 10:50:19 2012
@@ -17,27 +17,27 @@ specific language governing permissions
under the License.
-->
<div>
- <#if
postalAddress.toName?has_content><b>${uiLabelMap.PartyAddrToName}:</b>
${postalAddress.toName}<br /></#if>
- <#if
postalAddress.attnName?has_content><b>${uiLabelMap.PartyAddrAttnName}:</b>
${postalAddress.attnName}<br /></#if>
- ${postalAddress.address1?if_exists}<br />
- <#if postalAddress.address2?has_content>${postalAddress.address2}<br
/></#if>
- ${postalAddress.city?if_exists},
- <#if postalAddress.stateProvinceGeoId?has_content>
- <#assign stateProvince =
postalAddress.getRelatedOneCache("StateProvinceGeo")>
- ${stateProvince.abbreviation?default(stateProvince.geoId)}
- </#if>
- ${postalAddress.postalCode?if_exists}
- <#if postalAddress.countryGeoId?has_content><br />
- <#assign country = postalAddress.getRelatedOneCache("CountryGeo")>
- ${country.get("geoName", locale)?default(country.geoId)}
- </#if>
- </div>
- <#if !postalAddress.countryGeoId?has_content>
+ <#if
postalAddress.toName?has_content><b>${uiLabelMap.PartyAddrToName}:</b>
${postalAddress.toName}<br /></#if>
+ <#if
postalAddress.attnName?has_content><b>${uiLabelMap.PartyAddrAttnName}:</b>
${postalAddress.attnName}<br /></#if>
+ ${postalAddress.address1?if_exists}<br />
+ <#if postalAddress.address2?has_content>${postalAddress.address2}<br
/></#if>
+ ${postalAddress.city?if_exists},
+ <#if postalAddress.stateProvinceGeoId?has_content>
+ <#assign stateProvince =
postalAddress.getRelatedOneCache("StateProvinceGeo")>
+ ${stateProvince.abbreviation?default(stateProvince.geoId)}
+ </#if>
+ ${postalAddress.postalCode?if_exists}
+ <#if postalAddress.countryGeoId?has_content><br />
+ <#assign country = postalAddress.getRelatedOneCache("CountryGeo")>
+ ${country.get("geoName", locale)?default(country.geoId)}
+ </#if>
+ </div>
+ <#if !postalAddress.countryGeoId?has_content>
<#assign addr1 = postalAddress.address1?if_exists>
<#if addr1?has_content && (addr1.indexOf(" ") > 0)>
- <#assign addressNum = addr1.substring(0, addr1.indexOf(" "))>
- <#assign addressOther = addr1.substring(addr1.indexOf(" ")+1)>
- <a target="_blank"
href="${uiLabelMap.CommonLookupWhitepagesAddressLink}"
class="buttontext">${uiLabelMap.CommonLookupWhitepages}</a>
+ <#assign addressNum = addr1.substring(0, addr1.indexOf(" "))>
+ <#assign addressOther = addr1.substring(addr1.indexOf(" ")+1)>
+ <a target="_blank"
href="${uiLabelMap.CommonLookupWhitepagesAddressLink}"
class="buttontext">${uiLabelMap.CommonLookupWhitepages}</a>
</#if>
</#if>
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl?rev=1327038&r1=1327037&r2=1327038&view=diff
==============================================================================
---
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl
(original)
+++
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl
Tue Apr 17 10:50:19 2012
@@ -58,9 +58,9 @@ under the License.
</#list>
<#if "POSTAL_ADDRESS" = contactMech.contactMechTypeId>
<#if contactMechMap.postalAddress?has_content>
- <#assign postalAddress = contactMechMap.postalAddress>
- ${setContextField("postalAddress", postalAddress)}
-
${screens.render("component://party/widget/partymgr/PartyScreens.xml#postalAddressHtmlFormatter")}
+ <#assign postalAddress = contactMechMap.postalAddress>
+ ${setContextField("postalAddress", postalAddress)}
+
${screens.render("component://party/widget/partymgr/PartyScreens.xml#postalAddressHtmlFormatter")}
<#if postalAddress.geoPointId?has_content>
<#if contactMechPurposeType?has_content>
<#assign popUptitle =
contactMechPurposeType.get("description", locale) +
uiLabelMap.CommonGeoLocation>
