svn commit: r1833173 - in /ofbiz/ofbiz-framework/trunk: VERSION themes/flatgrey/template/Footer.ftl themes/rainbowstone/template/includes/Footer.ftl themes/tomahawk/template/Footer.ftl

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1833173 - in /ofbiz/ofbiz-framework/trunk: VERSION themes/flatgrey/template/Footer.ftl themes/rainbowstone/template/includes/Footer.ftl themes/tomahawk/template/Footer.ftl

mbrohl
Author: mbrohl
Date: Fri Jun  8 14:42:18 2018
New Revision: 1833173

URL: http://svn.apache.org/viewvc?rev=1833173&view=rev
Log:
Improved: Add a VERSION file in root dir.
(OFBIZ-10141)

This adds a VERSION file to store the release version information
and changes the footer of the themes to show the release version.

Added:
    ofbiz/ofbiz-framework/trunk/VERSION
Modified:
    ofbiz/ofbiz-framework/trunk/themes/flatgrey/template/Footer.ftl
    ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Footer.ftl
    ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/Footer.ftl

Added: ofbiz/ofbiz-framework/trunk/VERSION
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/VERSION?rev=1833173&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/VERSION (added)
+++ ofbiz/ofbiz-framework/trunk/VERSION Fri Jun  8 14:42:18 2018
@@ -0,0 +1 @@
+trunk
\ No newline at end of file

Modified: ofbiz/ofbiz-framework/trunk/themes/flatgrey/template/Footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/flatgrey/template/Footer.ftl?rev=1833173&r1=1833172&r2=1833173&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/flatgrey/template/Footer.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/flatgrey/template/Footer.ftl Fri Jun  8 14:42:18 2018
@@ -27,6 +27,7 @@ under the License.
         <a href="http://ofbiz.apache.org" class="noicon">OFBiz </a></span><span class="footerTextColour">Copyright 2001-${nowTimestamp?string("yyyy")}
         <a href="http://www.apache.org" class="noicon">The Apache Software Foundation - www.apache.org</a></span>
         <span class="footerTextColour">
+            ${uiLabelMap.CommonRelease} <#include "ofbizhome://VERSION" ignore_missing=true/>
             <#include "ofbizhome://runtime/SvnInfo.ftl" ignore_missing=true/>
             <#include "ofbizhome://runtime/GitInfo.ftl" ignore_missing=true/>
         </span>

Modified: ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Footer.ftl?rev=1833173&r1=1833172&r2=1833173&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Footer.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Footer.ftl Fri Jun  8 14:42:18 2018
@@ -21,7 +21,8 @@ under the License.
     <span>${nowTimestamp?datetime?string.short} - <a href="<@ofbizUrl>ListTimezones</@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>
+        <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz.</a> ${uiLabelMap.CommonRelease}
+        <#include "ofbizhome://VERSION" ignore_missing=true/>
         <#include "ofbizhome://runtime/SvnInfo.ftl" ignore_missing=true/>
         <#include "ofbizhome://runtime/GitInfo.ftl" ignore_missing=true/>
     </span>

Modified: ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/Footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/Footer.ftl?rev=1833173&r1=1833172&r2=1833173&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/Footer.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/Footer.ftl Fri Jun  8 14:42:18 2018
@@ -23,7 +23,8 @@ 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>
+      ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a>  ${uiLabelMap.CommonRelease}
+       <#include "ofbizhome://VERSION" ignore_missing=true/>
        <#include "ofbizhome://runtime/SvnInfo.ftl" ignore_missing=true/>
        <#include "ofbizhome://runtime/GitInfo.ftl" ignore_missing=true/>
     </li>