You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2007/02/14 09:28:55 UTC
svn commit: r507435 - in /ofbiz/trunk/applications:
ecommerce/webapp/ecommerce/includes/header.ftl
order/webapp/ordermgr/entry/catalog/quickadd.ftl
order/webapp/ordermgr/order/companyHeader.fo.ftl
order/webapp/ordermgr/order/viewimage.ftl
Author: jleroux
Date: Wed Feb 14 00:28:54 2007
New Revision: 507435
URL: http://svn.apache.org/viewvc?view=rev&rev=507435
Log:
A patch from Chris Howe "Using hardwired /images instead of <@ofbizContentUrl> in .ftl files" (https://issues.apache.org/jira/browse/OFBIZ-111).
Modified:
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/includes/header.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/viewimage.ftl
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/includes/header.ftl?view=diff&rev=507435&r1=507434&r2=507435
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/includes/header.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/includes/header.ftl Wed Feb 14 00:28:54 2007
@@ -53,9 +53,9 @@
<div id="ecom-header">
<div id="left">
<#if sessionAttributes.overrideLogo?exists>
- <img src="${sessionAttributes.overrideLogo}" alt="Logo"/>
+ <img src="<@o...@ofbizContentUrl>" alt="Logo"/>
<#elseif catalogHeaderLogo?exists>
- <img src="${catalogHeaderLogo}" alt="Logo"/>
+ <img src="<@o...@ofbizContentUrl>" alt="Logo"/>
<#elseif (productStore.headerLogo)?has_content>
<img src="<@o...@ofbizContentUrl>" alt="Logo"/>
</#if>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl?view=diff&rev=507435&r1=507434&r2=507435
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl Wed Feb 14 00:28:54 2007
@@ -45,7 +45,7 @@
<td align="left" valign="top" width="0" colspan='2'>
<div class="tabletext">
<#if productCategory.categoryImageUrl?exists>
- <img src="${productCategory.categoryImageUrl}" vspace="5" hspace="5" border="1" height='100' align="left">
+ <img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" border="1" height='100' align="left">
</#if>
${productCategory.longDescription?if_exists}
</div>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl?view=diff&rev=507435&r1=507434&r2=507435
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl Wed Feb 14 00:28:54 2007
@@ -19,7 +19,7 @@
<#escape x as x?xml>
<fo:block text-align="left">
- <#if logoImageUrl?has_content><fo:external-graphic src="${logoImageUrl}" overflow="hidden" height="40px" content-height="scale-to-fit"/></#if>
+ <#if logoImageUrl?has_content><fo:external-graphic src="<@o...@ofbizContentUrl>" overflow="hidden" height="40px" content-height="scale-to-fit"/></#if>
</fo:block>
<fo:block font-size="8pt">
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/viewimage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/viewimage.ftl?view=diff&rev=507435&r1=507434&r2=507435
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/viewimage.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/viewimage.ftl Wed Feb 14 00:28:54 2007
@@ -17,4 +17,4 @@
under the License.
-->
<#assign imageUrl = wrapper.get("${orderContentTypeId}")>
-<image src="${imageUrl}"/>
+<image src="<@o...@ofbizContentUrl>"/>