Skip to content
Snippets Groups Projects
Commit 8dfb8d2d authored by Piotr Gawron's avatar Piotr Gawron
Browse files

when logo is provided as full url the image is not broken on the login page

parent 57d429dd
No related branches found
No related tags found
2 merge requests!603Merge 12.1.6,!586Resolve "logo on login page doesn't work"
...@@ -492,6 +492,10 @@ function createFooter() { ...@@ -492,6 +492,10 @@ function createFooter() {
return ServerConnector.getConfigurationParam(ConfigurationType.LOGO_IMG); return ServerConnector.getConfigurationParam(ConfigurationType.LOGO_IMG);
}).then(function (result) { }).then(function (result) {
logoImg = result; logoImg = result;
if (!/^(f|ht)tps?:\/\//i.test(logoImg)) {
logoImg = GuiConnector.getImgPrefix() + logoImg;
}
return ServerConnector.getConfiguration(); return ServerConnector.getConfiguration();
}).then(function (configuration) { }).then(function (configuration) {
return functions.createElement({ return functions.createElement({
...@@ -500,7 +504,7 @@ function createFooter() { ...@@ -500,7 +504,7 @@ function createFooter() {
content: '<table width="100%" border="0" cellspacing="0" cellpadding="0">' + content: '<table width="100%" border="0" cellspacing="0" cellpadding="0">' +
'<tr>' + '<tr>' +
'<td align="left"><a href="' + logoLink + '" title="' + logoText + '" target="_blank">' + '<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>' + '</a></td>' +
'<td align="center" class="minerva-footer-text">MiNERVA version ' + configuration.getVersion() + ';<br/>' + '<td align="center" class="minerva-footer-text">MiNERVA version ' + configuration.getVersion() + ';<br/>' +
'build ' + configuration.getBuildDate() + ';<br/>' + 'build ' + configuration.getBuildDate() + ';<br/>' +
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment