From 8dfb8d2dfab043dedc96713f3b5da1cc88b685ac Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Tue, 22 Jan 2019 08:51:13 +0100
Subject: [PATCH] when logo is provided as full url the image is not broken on
the login page
---
frontend-js/src/main/js/minerva.js | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/frontend-js/src/main/js/minerva.js b/frontend-js/src/main/js/minerva.js
index 50d7f1cd06..4c1b380de3 100644
--- a/frontend-js/src/main/js/minerva.js
+++ b/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/>' +
--
GitLab