[gate-cvs] SF.net SVN: gate:[18057] mimir/trunk

[ian_roberts]

Revision: 18057
          http://sourceforge.net/p/gate/code/18057
Author:   ian_roberts
Date:     2014-06-10 16:31:34 +0000 (Tue, 10 Jun 2014)
Log Message:
-----------
Config option to swap out the logos for alternative branding.

Modified Paths:
--------------
    mimir/trunk/mimir-cloud/grails-app/views/layouts/mimir.gsp
    mimir/trunk/mimir-web/grails-app/taglib/gate/mimir/web/MimirTagLib.groovy
    mimir/trunk/mimir-web/grails-app/views/layouts/main.gsp
    mimir/trunk/mimir-web/grails-app/views/layouts/mimir.gsp

Modified: mimir/trunk/mimir-cloud/grails-app/views/layouts/mimir.gsp
===================================================================
--- mimir/trunk/mimir-cloud/grails-app/views/layouts/mimir.gsp  2014-06-10 
15:42:30 UTC (rev 18056)
+++ mimir/trunk/mimir-cloud/grails-app/views/layouts/mimir.gsp  2014-06-10 
16:31:34 UTC (rev 18057)
@@ -23,14 +23,11 @@
                                <tr>
                                        <td valign="top" colSpan="3">
                                                <div align="left">
-                                                       <img alt="Mimir" 
align="top"
-                                                               
src="${resource(dir:'images', file:'logo.png', plugin:'mimir-web')}" />
+                                                       <mimir:logo />
                                                </div></td>
                                        <td valign="top" width="20%">
                                                <div align="right">
-                                                       <img alt="Powered by 
M&iacute;mir"
-                                                               
src="${resource(dir:'images', file:'logo-poweredby.png', plugin:'mimir-web')}"
-                                                               border="0" />
+                                                       <mimir:powered/>
                                                        <sec:ifLoggedIn>
                                                                <br />You are 
logged in as <strong><sec:username /></strong>. (<g:link
                                                                        
controller="logout">Log out</g:link>)</sec:ifLoggedIn>

Modified: 
mimir/trunk/mimir-web/grails-app/taglib/gate/mimir/web/MimirTagLib.groovy
===================================================================
--- mimir/trunk/mimir-web/grails-app/taglib/gate/mimir/web/MimirTagLib.groovy   
2014-06-10 15:42:30 UTC (rev 18056)
+++ mimir/trunk/mimir-web/grails-app/taglib/gate/mimir/web/MimirTagLib.groovy   
2014-06-10 16:31:34 UTC (rev 18057)
@@ -40,6 +40,8 @@
    * Autowired
    */
   def mimirIndexService
+
+  def grailsApplication
   
   static NumberFormat percentNumberInstance = 
NumberFormat.getPercentInstance(Locale.US)
 
@@ -244,4 +246,22 @@
       out << g.message(code:"gus.renderDocument.exception", args:[ex.message])
     }
   }
+
+  def logo = { attrs, body ->
+    def logoUri = grailsApplication.config.gate.mimir.logo.main ?: 
'/images/logo.png'
+    if(logoUri =~ /^https?:/) {
+      out << "<img src=\"${logoUri}\" alt=\"Logo\">"
+    } else {
+      out << r.img(uri:logoUri, alt:'Logo')
+    }
+  }
+
+  def powered = { attrs, body ->
+    def logoUri = grailsApplication.config.gate.mimir.logo.powered ?: 
'/images/logo-poweredby.png'
+    if(logoUri =~ /^https?:/) {
+      out << "<img src=\"${logoUri}\" alt=\"Powered by M&iacute;mir\">"
+    } else {
+      out << r.img(uri:logoUri, alt:'Logo')
+    }
+  }
 }

Modified: mimir/trunk/mimir-web/grails-app/views/layouts/main.gsp
===================================================================
--- mimir/trunk/mimir-web/grails-app/views/layouts/main.gsp     2014-06-10 
15:42:30 UTC (rev 18056)
+++ mimir/trunk/mimir-web/grails-app/views/layouts/main.gsp     2014-06-10 
16:31:34 UTC (rev 18057)
@@ -11,7 +11,7 @@
         <div id="spinner" class="spinner" style="display:none;">
             <img src="${resource(dir:'images',file:'spinner.gif')}" 
alt="Spinner" />
         </div> 
-        <div class="logo"><img src="${resource(dir:'images',file:'logo.png')}" 
alt="Logo" /></div>     
+        <div class="logo"><mimir:logo/></div>  
         <g:layoutBody />               
         <r:layoutResources />
     </body>    

Modified: mimir/trunk/mimir-web/grails-app/views/layouts/mimir.gsp
===================================================================
--- mimir/trunk/mimir-web/grails-app/views/layouts/mimir.gsp    2014-06-10 
15:42:30 UTC (rev 18056)
+++ mimir/trunk/mimir-web/grails-app/views/layouts/mimir.gsp    2014-06-10 
16:31:34 UTC (rev 18057)
@@ -26,12 +26,9 @@
             <tbody>
             <tr>
               <td  valign="top" colSpan="3">
-                <div align="left"><img alt="Mimir" align="top" 
-                src="${resource(dir:'images', file:'logo.png')}" /></div></td>
+                <div align="left"><mimir:logo /></div></td>
               <td valign="top" width="20%">
-                <div align="right"><img alt="Powered by M&iacute;mir"
-                src="${resource(dir:'images', file:'logo-poweredby.png')}"
-                border="0"/></div></td></tr></tbody></table>
+                <div 
align="right"><mimir:powered/></div></td></tr></tbody></table>
         </div>
         <div id="content">
           <g:layoutBody />

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
HPCC Systems Open Source Big Data Platform from LexisNexis Risk Solutions
Find What Matters Most in Your Big Data with HPCC Systems
Open Source. Fast. Scalable. Simple. Ideal for Dirty Data.
Leverages Graph Analysis for Fast Processing & Easy Data Exploration
http://p.sf.net/sfu/hpccsystems
_______________________________________________
GATE-cvs mailing list
GATE-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gate-cvs