[gate-cvs] SF.net SVN: gate:[18071] mimir/branches/5.0/mimir-web/grails-app/taglib/ gate/mimir/web/MimirTagLib.groovy

[ian_roberts]

Revision: 18071
          http://sourceforge.net/p/gate/code/18071
Author:   ian_roberts
Date:     2014-06-11 18:00:40 +0000 (Wed, 11 Jun 2014)
Log Message:
-----------
Fixing logos in prod mode

Modified Paths:
--------------
    
mimir/branches/5.0/mimir-web/grails-app/taglib/gate/mimir/web/MimirTagLib.groovy

Modified: 
mimir/branches/5.0/mimir-web/grails-app/taglib/gate/mimir/web/MimirTagLib.groovy
===================================================================
--- 
mimir/branches/5.0/mimir-web/grails-app/taglib/gate/mimir/web/MimirTagLib.groovy
    2014-06-11 11:22:39 UTC (rev 18070)
+++ 
mimir/branches/5.0/mimir-web/grails-app/taglib/gate/mimir/web/MimirTagLib.groovy
    2014-06-11 18:00:40 UTC (rev 18071)
@@ -248,20 +248,28 @@
   }
 
   def logo = { attrs, body ->
-    def logoUri = grailsApplication.config.gate.mimir.logo.main ?: 
'/images/logo.png'
-    if(logoUri =~ /^https?:/) {
-      out << "<img src=\"${logoUri}\" alt=\"Logo\">"
+    def logoUri = grailsApplication.config.gate.mimir.logo.main
+    if(logoUri) {
+      if(logoUri =~ /^https?:/) {
+        out << "<img src=\"${logoUri}\" alt=\"Logo\">"
+      } else {
+        out << r.img(uri:logoUri, alt:'Logo')
+      }
     } else {
-      out << r.img(uri:logoUri, alt:'Logo')
+      out << r.img(dir:'images', file:'logo.png', alt:'Logo', 
plugin:'mimir-web')
     }
   }
 
   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\">"
+    def logoUri = grailsApplication.config.gate.mimir.logo.powered
+    if(logoUri) {
+      if(logoUri =~ /^https?:/) {
+        out << "<img src=\"${logoUri}\" alt=\"Powered by M&iacute;mir\">"
+      } else {
+        out << r.img(uri:logoUri, alt:'Powered by M&iacute;mir')
+      }
     } else {
-      out << r.img(uri:logoUri, alt:'Logo')
+      out << r.img(dir:'images', file:'logo-poweredby.png', alt:'Powered by 
M&iacute;mir', plugin:'mimir-web')
     }
   }
 }

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