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

[<ian...@us...>]

Revision: 18410
          http://sourceforge.net/p/gate/code/18410
Author:   ian_roberts
Date:     2014-10-27 18:01:25 +0000 (Mon, 27 Oct 2014)
Log Message:
-----------
Merging a few fixes that were made on the 5.0 branch.

Modified Paths:
--------------
    mimir/trunk/README.txt
    mimir/trunk/mimir-web/grails-app/taglib/gate/mimir/web/MimirTagLib.groovy

Property Changed:
----------------
    mimir/trunk/mimir-web/

Modified: mimir/trunk/README.txt
===================================================================
--- mimir/trunk/README.txt	2014-10-27 17:38:21 UTC (rev 18409)
+++ mimir/trunk/README.txt	2014-10-27 18:01:25 UTC (rev 18410)
@@ -12,14 +12,9 @@
     (http://www.h2database.com/) 
   - measurements: specialised SAH providing advanced support for Measurement
     annotations
-  - ordi: *deprecated* generic SAH implementation using OWLIM via ORDI.
-  - sesame: generic SAH implementation using OWLIM via Sesame.
   - sparql: SAH implementation that uses semantic queries against a SPARQL
     end-point to filter the results of standard Mímir queries. 
 - mimir-test: Unit tests for mimir-core and mimir plugins.
-- mimir-demo (automatically generated using Apache Ant): a very simple Grails
-  application demonstrating the use of the Mímir Grails plugin to create a
-  fully-working web application. 
 - mimir-cloud: the Grails application used for the Mímir installs on 
   http://GATECloud.net. Unlike mimir-demo, this is a fully-fledged application, 
   which includes support for security. In most cases, if you need a simple way

Index: mimir/trunk/mimir-web
===================================================================
--- mimir/trunk/mimir-web	2014-10-27 17:38:21 UTC (rev 18409)
+++ mimir/trunk/mimir-web	2014-10-27 18:01:25 UTC (rev 18410)

Property changes on: mimir/trunk/mimir-web
___________________________________________________________________
Modified: svn:mergeinfo
## -1,2 +1,3 ##
 /mimir/branches/3.4/mimir-web:14546,14623,14634-14643,14687
 /mimir/branches/4.0/mimir-web:15380-15383,15385-15386,15388
+/mimir/branches/5.0/mimir-web:18071
\ No newline at end of property
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-10-27 17:38:21 UTC (rev 18409)
+++ mimir/trunk/mimir-web/grails-app/taglib/gate/mimir/web/MimirTagLib.groovy	2014-10-27 18:01:25 UTC (rev 18410)
@@ -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.