Author: jleroux
Date: Mon Sep 19 07:19:23 2016
New Revision: 1761392

URL: http://svn.apache.org/viewvc?rev=1761392&view=rev
Log:
Improves: Use ignore_missing option of the <#include Freemarker directive when 
fixed
(OFBIZ-8292)

This is a no functional change except for the flatgrey and blueligth themes 
where svn and git info are added

Working on OFBIZ-8250 and after Deepak at OFBIZ-7942 (too bad I missed that :/) 
 I found that the ignore_missing option of the <#include Freemarker directive 
does not work. I reported to the Freemarker incubating project.
Hopefully this will be fixed. It will then remove the need of creating empty 
files for the svn and git info footers when building. 

In the meantime this provides the change in the themes footers.
I have also added the svn and git info to the flatgrey footer. The result is 
barely legible there but is also used (include) by the bluelight theme where 
it's OK
I have also formatted the related div where it was barely legible (too large)

Modified:
    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/themes/bizznesstime/template/Footer.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/template/Footer.ftl?rev=1761392&r1=1761391&r2=1761392&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/template/Footer.ftl (original)
+++ ofbiz/trunk/themes/bizznesstime/template/Footer.ftl Mon Sep 19 07:19:23 2016
@@ -25,7 +25,14 @@ 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" ignore_missing=true/>
+            <#include "ofbizhome://runtime/GitInfo.ftl" ignore_missing=true/>
+        </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=1761392&r1=1761391&r2=1761392&view=diff
==============================================================================
--- ofbiz/trunk/themes/droppingcrumbs/template/Footer.ftl (original)
+++ ofbiz/trunk/themes/droppingcrumbs/template/Footer.ftl Mon Sep 19 07:19:23 
2016
@@ -27,7 +27,9 @@ 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 "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" ignore_missing=true/>
+  <#include "ofbizhome://runtime/GitInfo.ftl" ignore_missing=true/></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=1761392&r1=1761391&r2=1761392&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/template/Footer.ftl (original)
+++ ofbiz/trunk/themes/flatgrey/template/Footer.ftl Mon Sep 19 07:19:23 2016
@@ -23,7 +23,15 @@ 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}
+    <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" ignore_missing=true/>
+            <#include "ofbizhome://runtime/GitInfo.ftl" ignore_missing=true/>
+        </span>
+    </div>
+  
   </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=1761392&r1=1761391&r2=1761392&view=diff
==============================================================================
--- ofbiz/trunk/themes/rainbowstone/template/includes/Footer.ftl (original)
+++ ofbiz/trunk/themes/rainbowstone/template/includes/Footer.ftl Mon Sep 19 
07:19:23 2016
@@ -19,7 +19,12 @@ under the License.
 <div id="footer-offset"></div>
 <div id="footer">
     <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> <#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" ignore_missing=true/>
+        <#include "ofbizhome://runtime/GitInfo.ftl" ignore_missing=true/>
+    </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=1761392&r1=1761391&r2=1761392&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/template/Footer.ftl (original)
+++ ofbiz/trunk/themes/tomahawk/template/Footer.ftl Mon Sep 19 07:19:23 2016
@@ -23,7 +23,9 @@ 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" ignore_missing=true/>
+       <#include "ofbizhome://runtime/GitInfo.ftl" ignore_missing=true/>
     </li>
     <li class="opposed">${nowTimestamp?datetime?string.short} -
   <a 
href="<@ofbizUrl>ListTimezones</@ofbizUrl>">${timeZone.getDisplayName(timeZone.useDaylightTime(),
 Static["java.util.TimeZone"].LONG, locale)}</a>


Reply via email to