You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2016/05/24 06:01:26 UTC
svn commit: r1745303 - in /ofbiz/trunk: ./ themes/bizznesstime/template/
themes/droppingcrumbs/template/ themes/flatgrey/template/
themes/rainbowstone/template/includes/ themes/tomahawk/template/
Author: deepak
Date: Tue May 24 06:01:25 2016
New Revision: 1745303
URL: http://svn.apache.org/viewvc?rev=1745303&view=rev
Log:
(OFBIZ-7021) Corrected svninfo and gitinfo file name after renaming file I missed it to updated at some places.
Modified:
ofbiz/trunk/.gitignore
ofbiz/trunk/build.xml
ofbiz/trunk/themes/bizznesstime/template/Footer.ftl
ofbiz/trunk/themes/droppingcrumbs/template/Footer.ftl
ofbiz/trunk/themes/flatgrey/template/Footer.ftl
ofbiz/trunk/themes/rainbowstone/template/includes/Footer.ftl
ofbiz/trunk/themes/tomahawk/template/Footer.ftl
Modified: ofbiz/trunk/.gitignore
URL: http://svn.apache.org/viewvc/ofbiz/trunk/.gitignore?rev=1745303&r1=1745302&r2=1745303&view=diff
==============================================================================
--- ofbiz/trunk/.gitignore (original)
+++ ofbiz/trunk/.gitignore Tue May 24 06:01:25 2016
@@ -12,8 +12,8 @@ bin/
ofbiz.jar
changelog
runtime/git-rebase/*
-runtime/svninfo.ftl
-runtime/gitinfo.ftl
+runtime/SvnInfo.ftl
+runtime/GitInfo.ftl
runtime/test-list-build.xml
runtime/logs/access_log.*
runtime/logs/cobertura-base.dat
Modified: ofbiz/trunk/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=1745303&r1=1745302&r2=1745303&view=diff
==============================================================================
--- ofbiz/trunk/build.xml (original)
+++ ofbiz/trunk/build.xml Tue May 24 06:01:25 2016
@@ -222,14 +222,14 @@ under the License.
<tstamp>
<format property="dateTime" pattern="yyyy-MM-dd HH:mm:ss"/>
</tstamp>
- <echo message=" - Release-revision : ${releasePath}-r${info.entry.commit(revision)}, ${uiLabelMap.CommonBuiltOn} ${dateTime} ${uiLabelMap.CommonWith} Java ${java.version}" file="runtime/svninfo.ftl"/>
+ <echo message=" - Release-revision : ${releasePath}-r${info.entry.commit(revision)}, ${uiLabelMap.CommonBuiltOn} ${dateTime} ${uiLabelMap.CommonWith} Java ${java.version}" file="runtime/SvnInfo.ftl"/>
<delete file="runtime/svninfo_tmp.xml"/>
<echo message="Done!"/>
</target>
<target name="clean-svninfo">
<echo message="Resetting svninfo..."/>
- <echo message=" " file="runtime/svninfo.ftl"/>
+ <echo message=" " file="runtime/SvnInfo.ftl"/>
<echo message="Done!"/>
</target>
@@ -249,13 +249,13 @@ under the License.
<format property="dateTime" pattern="yyyy-MM-dd HH:mm:ss"/>
</tstamp>
<echo message="Found Branch-revision: ${branch}-${revision}"/>
- <echo message=" - Branch-revision: ${branch}-${revision}, ${uiLabelMap.CommonBuiltOn} ${dateTime} ${uiLabelMap.CommonWith} Java ${java.version}" file="runtime/gitinfo.ftl"/>
+ <echo message=" - Branch-revision: ${branch}-${revision}, ${uiLabelMap.CommonBuiltOn} ${dateTime} ${uiLabelMap.CommonWith} Java ${java.version}" file="runtime/GitInfo.ftl"/>
<echo message="Done!"/>
</target>
<target name="clean-gitinfo">
<echo message="Resetting gitinfo..."/>
- <echo message=" " file="runtime/gitinfo.ftl"/>
+ <echo message=" " file="runtime/GitInfo.ftl"/>
<echo message="Done!"/>
</target>
Modified: ofbiz/trunk/themes/bizznesstime/template/Footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/template/Footer.ftl?rev=1745303&r1=1745302&r2=1745303&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/template/Footer.ftl (original)
+++ ofbiz/trunk/themes/bizznesstime/template/Footer.ftl Tue May 24 06:01:25 2016
@@ -25,7 +25,7 @@ under the License.
</div>
<!-- footer -->
<div id="footer">
- <div class="poweredBy"><span>${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org" class="noicon">OFBiz</a></span><span>Copyright 2001-${nowTimestamp?string("yyyy")} <a href="http://www.apache.org" class="noicon">The Apache Software Foundation - www.apache.org</a></span><span><#include "ofbizhome://runtime/svninfo.ftl" /> <#include "ofbizhome://runtime/GitInfo.ftl" /></span></div>
+ <div class="poweredBy"><span>${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org" class="noicon">OFBiz</a></span><span>Copyright 2001-${nowTimestamp?string("yyyy")} <a href="http://www.apache.org" class="noicon">The Apache Software Foundation - www.apache.org</a></span><span><#include "ofbizhome://runtime/SvnInfo.ftl" /> <#include "ofbizhome://runtime/GitInfo.ftl" /></span></div>
</div>
<!-- footer -->
Modified: ofbiz/trunk/themes/droppingcrumbs/template/Footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/template/Footer.ftl?rev=1745303&r1=1745302&r2=1745303&view=diff
==============================================================================
--- ofbiz/trunk/themes/droppingcrumbs/template/Footer.ftl (original)
+++ ofbiz/trunk/themes/droppingcrumbs/template/Footer.ftl Tue May 24 06:01:25 2016
@@ -27,7 +27,7 @@ under the License.
<a href="http://validator.w3.org/check?uri=referer"><img src="<@o...@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 "ofbizhome://runtime/svninfo.ftl" /> <#include "ofbizhome://runtime/GitInfo.ftl" /></p>
+ ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a> <#include "ofbizhome://runtime/SvnInfo.ftl" /> <#include "ofbizhome://runtime/GitInfo.ftl" /></p>
</div>
<#if layoutSettings.VT_FTR_JAVASCRIPT?has_content>
<#list layoutSettings.VT_FTR_JAVASCRIPT as javaScript>
Modified: ofbiz/trunk/themes/flatgrey/template/Footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/template/Footer.ftl?rev=1745303&r1=1745302&r2=1745303&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/template/Footer.ftl (original)
+++ ofbiz/trunk/themes/flatgrey/template/Footer.ftl Tue May 24 06:01:25 2016
@@ -23,7 +23,7 @@ under the License.
<li class="last"><a href="<@o...@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 "ofbizhome://runtime/svninfo.ftl" /> <#include "ofbizhome://runtime/GitInfo.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" /> <#include "ofbizhome://runtime/GitInfo.ftl" />
</p>
</div>
</div>
Modified: ofbiz/trunk/themes/rainbowstone/template/includes/Footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/rainbowstone/template/includes/Footer.ftl?rev=1745303&r1=1745302&r2=1745303&view=diff
==============================================================================
--- ofbiz/trunk/themes/rainbowstone/template/includes/Footer.ftl (original)
+++ ofbiz/trunk/themes/rainbowstone/template/includes/Footer.ftl Tue May 24 06:01:25 2016
@@ -19,7 +19,7 @@ under the License.
<div id="footer-offset"></div>
<div id="footer">
<span>${nowTimestamp?datetime?string.short} - <a href="<@o...@ofbizUrl>">${timeZone.getDisplayName(timeZone.useDaylightTime(), Static["java.util.TimeZone"].LONG, locale)}</a></span>
- <span>${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" /></span>
+ <span>${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" /></span>
</div>
</div>
<#if layoutSettings.VT_FTR_JAVASCRIPT?has_content>
Modified: ofbiz/trunk/themes/tomahawk/template/Footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/template/Footer.ftl?rev=1745303&r1=1745302&r2=1745303&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/template/Footer.ftl (original)
+++ ofbiz/trunk/themes/tomahawk/template/Footer.ftl Tue May 24 06:01:25 2016
@@ -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 "ofbizhome://runtime/svninfo.ftl" /> <#include "ofbizhome://runtime/GitInfo.ftl" />
+ ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a> <#include "ofbizhome://runtime/SvnInfo.ftl" /> <#include "ofbizhome://runtime/GitInfo.ftl" />
</li>
<li class="opposed">${nowTimestamp?datetime?string.short} -
<a href="<@o...@ofbizUrl>">${timeZone.getDisplayName(timeZone.useDaylightTime(), Static["java.util.TimeZone"].LONG, locale)}</a>