Merge branch '642-logo-on-login-page' into 'devel_12.1.x'

Resolve "logo on login page doesn't work"

See merge request !586

CHANGELOG

+minerva (12.1.6) stable; urgency=medium
+  * Bug fix: logo on login page was broken with image link being full url
+
+ -- Piotr Gawron <piotr.gawron@uni.lu>  Fri, 10 Janc 2019 14:00:00 +0200
+
 minerva (12.1.5) stable; urgency=medium
   * Bug fix: Drugbank changed output format which crashed drug connector
   * Bug fix: word wrapping fixed in overlay table for long overlay names

frontend-js/src/main/js/minerva.js

@@ -492,6 +492,10 @@ function createFooter() {
     return ServerConnector.getConfigurationParam(ConfigurationType.LOGO_IMG);
   }).then(function (result) {
     logoImg = result;
+    if (!/^(f|ht)tps?:\/\//i.test(logoImg)) {
+      logoImg = GuiConnector.getImgPrefix() + logoImg;
+    }
+
     return ServerConnector.getConfiguration();
   }).then(function (configuration) {
     return functions.createElement({
@@ -500,7 +504,7 @@ function createFooter() {
       content: '<table width="100%" border="0" cellspacing="0" cellpadding="0">' +
         '<tr>' +
         '<td align="left"><a href="' + logoLink + '" title="' + logoText + '" target="_blank">' +
-        '<img src="' + GuiConnector.getImgPrefix() + logoImg + '" width="80" height="80" border="0" alt="' + logoText + '"/>' +
+        '<img src="' + logoImg + '" width="80" height="80" border="0" alt="' + logoText + '"/>' +
         '</a></td>' +
         '<td align="center" class="minerva-footer-text">MiNERVA version ' + configuration.getVersion() + ';<br/>' +
         'build ' + configuration.getBuildDate() + ';<br/>' +