Author: jacopoc
Date: Tue Apr 3 11:09:54 2012
New Revision: 1308817
URL: http://svn.apache.org/viewvc?rev=1308817&view=rev
Log:
Fixed path to svninfo.ftl file that was not working after the switch to
freemarker 2.3.19
Thanks to Scott for the solution.
Modified:
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java
ofbiz/trunk/themes/bizznesstime/includes/footer.ftl
ofbiz/trunk/themes/droppingcrumbs/includes/footer.ftl
ofbiz/trunk/themes/flatgrey/includes/footer.ftl
ofbiz/trunk/themes/tomahawk/includes/footer.ftl
Modified:
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java?rev=1308817&r1=1308816&r2=1308817&view=diff
==============================================================================
---
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java
(original)
+++
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java
Tue Apr 3 11:09:54 2012
@@ -650,8 +650,7 @@ public class FreeMarkerWorker {
}
public String getTemplateLocation() {
- // FIXME: this is a workaround to fix errors when loading included
templates with a relative path after the migration to Freemarker 2.3.19
- return (templateLocation != null &&
templateLocation.startsWith("component:/") &&
!templateLocation.startsWith("component://"))?
templateLocation.substring("component:/".length()):templateLocation;
+ return templateLocation;
}
public long getLastModified() {
Modified: ofbiz/trunk/themes/bizznesstime/includes/footer.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/includes/footer.ftl?rev=1308817&r1=1308816&r2=1308817&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/includes/footer.ftl (original)
+++ ofbiz/trunk/themes/bizznesstime/includes/footer.ftl Tue Apr 3 11:09:54 2012
@@ -25,7 +25,7 @@ under the License.
</div>
<!-- footer -->
<div id="footer">
- <div class="poweredBy"><span>Powered by <a href="http://ofbiz.apache.org";
class="noicon">OFBiz</a></span><span>Copyright 2001-2009 <a
href="http://www.apache.org"; class="noicon">The Apache Software Foundation -
www.apache.org</a></span><span><#include "../../../runtime/svninfo.ftl"
/></span></div>
+ <div class="poweredBy"><span>Powered by <a href="http://ofbiz.apache.org";
class="noicon">OFBiz</a></span><span>Copyright 2001-2009 <a
href="http://www.apache.org"; class="noicon">The Apache Software Foundation -
www.apache.org</a></span><span><#include "ofbizhome://runtime/svninfo.ftl"
/></span></div>
</div>
<!-- footer -->
Modified: ofbiz/trunk/themes/droppingcrumbs/includes/footer.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/includes/footer.ftl?rev=1308817&r1=1308816&r2=1308817&view=diff
==============================================================================
--- ofbiz/trunk/themes/droppingcrumbs/includes/footer.ftl (original)
+++ ofbiz/trunk/themes/droppingcrumbs/includes/footer.ftl Tue Apr 3 11:09:54
2012
@@ -27,7 +27,7 @@ under the License.
<a href="http://validator.w3.org/check?uri=referer";><img
src="<@ofbizContentUrl>/images/valid-xhtml10.png</@ofbizContentUrl>" alt="Valid
XHTML 1.0!"/></a></p>
<p>
${uiLabelMap.CommonCopyright} (c) 2001-${nowTimestamp?string("yyyy")} The
Apache Software Foundation - <a href="http://www.apache.org";
target="_blank">www.apache.org</a><br />
- ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org";
target="_blank">Apache OFBiz</a> <#include "../../../runtime/svninfo.ftl" /></p>
+ ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org";
target="_blank">Apache OFBiz</a> <#include "ofbizhome://runtime/svninfo.ftl"
/></p>
</div>
<#if layoutSettings.VT_FTR_JAVASCRIPT?has_content>
<#list layoutSettings.VT_FTR_JAVASCRIPT as javaScript>
Modified: ofbiz/trunk/themes/flatgrey/includes/footer.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/footer.ftl?rev=1308817&r1=1308816&r2=1308817&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/includes/footer.ftl (original)
+++ ofbiz/trunk/themes/flatgrey/includes/footer.ftl Tue Apr 3 11:09:54 2012
@@ -23,7 +23,7 @@ under the License.
<li class="last"><a
href="<@ofbizUrl>ListVisualThemes</@ofbizUrl>">${uiLabelMap.CommonVisualThemes}</a></li>
</ul>
<p>
- ${uiLabelMap.CommonCopyright} (c) 2001-${nowTimestamp?string("yyyy")} <a
href="http://www.apache.org"; target="_blank">The Apache Software
Foundation</a>. ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org";
target="_blank">Apache OFBiz.</a> <#include "../../../runtime/svninfo.ftl" />
+ ${uiLabelMap.CommonCopyright} (c) 2001-${nowTimestamp?string("yyyy")} <a
href="http://www.apache.org"; target="_blank">The Apache Software
Foundation</a>. ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org";
target="_blank">Apache OFBiz.</a> <#include "ofbizhome://runtime/svninfo.ftl" />
</p>
</div>
</div>
Modified: ofbiz/trunk/themes/tomahawk/includes/footer.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/includes/footer.ftl?rev=1308817&r1=1308816&r2=1308817&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/includes/footer.ftl (original)
+++ ofbiz/trunk/themes/tomahawk/includes/footer.ftl Tue Apr 3 11:09:54 2012
@@ -23,7 +23,7 @@ under the License.
<ul>
<li>
${uiLabelMap.CommonCopyright} (c) 2001-${nowTimestamp?string("yyyy")}
The Apache Software Foundation - <a href="http://www.apache.org";
target="_blank">www.apache.org</a><br/>
- ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org";
target="_blank">Apache OFBiz</a> <#include "../../../runtime/svninfo.ftl" />
+ ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org";
target="_blank">Apache OFBiz</a> <#include "ofbizhome://runtime/svninfo.ftl" />
</li>
<li class="opposed">${nowTimestamp?datetime?string.short} -
<a
href="<@ofbizUrl>ListTimezones</@ofbizUrl>">${timeZone.getDisplayName(timeZone.useDaylightTime(),
Static["java.util.TimeZone"].LONG, locale)}</a>
