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

footer with version is visible in the admin panel

parent 7831c0d9
No related branches found
No related tags found
1 merge request!259Resolve "Display of Minerva version"
Hide whitespace changes
Inline Side-by-side
frontend-js/package-lock.json
+ 27
− 27
View file @ 012cc1bf
...@@ -45,30 +45,38 @@ ...@@ -45,30 +45,38 @@
"litemol": "github:dsehnal/LiteMol#a5419c696faa84530dd93acd55b747cf8136902b" "litemol": "github:dsehnal/LiteMol#a5419c696faa84530dd93acd55b747cf8136902b"
}, },
"dependencies": { "dependencies": {
"ProtVista": {
"version": "git://github.com/davidhoksza/protvista.git#4e4bb737ba1e183291505bd25f8bae2e651ce21e",
"dev": true,
"requires": {
"d3": "3.5.17",
"file-saver": "1.3.3",
"jquery": "2.2.4",
"jszip": "3.1.4",
"underscore": "1.8.3"
},
"dependencies": {
"jquery": {
"version": "2.2.4",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz",
"integrity": "sha1-LInWiJterFIqfuoywUUhVZxsvwI=",
"dev": true
}
}
},
"jquery": { "jquery": {
"version": "3.3.1", "version": "3.3.1",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz", "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz",
"integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==", "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==",
"dev": true "dev": true
} },
} "litemol": {
}, "version": "github:dsehnal/LiteMol#a5419c696faa84530dd93acd55b747cf8136902b",
"ProtVista": { "dev": true,
"version": "git://github.com/davidhoksza/protvista.git#4e4bb737ba1e183291505bd25f8bae2e651ce21e", "requires": {
"dev": true, "@types/react": "15.6.14",
"requires": { "@types/react-dom": "15.5.7"
"d3": "3.5.17", }
"file-saver": "1.3.3",
"jquery": "2.2.4",
"jszip": "3.1.4",
"underscore": "1.8.3"
},
"dependencies": {
"jquery": {
"version": "2.2.4",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz",
"integrity": "sha1-LInWiJterFIqfuoywUUhVZxsvwI=",
"dev": true
} }
} }
}, },
...@@ -2050,14 +2058,6 @@ ...@@ -2050,14 +2058,6 @@
"immediate": "3.0.6" "immediate": "3.0.6"
} }
}, },
"litemol": {
"version": "github:dsehnal/LiteMol#a5419c696faa84530dd93acd55b747cf8136902b",
"dev": true,
"requires": {
"@types/react": "15.6.14",
"@types/react-dom": "15.5.7"
}
},
"lodash": { "lodash": {
"version": "4.17.4", "version": "4.17.4",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
......
frontend-js/src/main/css/global.css
+ 15
− 30
View file @ 012cc1bf
...@@ -196,34 +196,19 @@ ...@@ -196,34 +196,19 @@
border-left: 1px solid #e1e1e1; border-left: 1px solid #e1e1e1;
} }
.footerLinks { .minerva-footer-table {
position: absolute; position: absolute;
left: 0;
right: 0;
bottom: 0; bottom: 0;
height: 80px;
left: 0;
width: 100%;
z-index: -1;
} }
.footerLinks { .minerva-footer-text {
background-color: #333333;
color: #ffffff;
display: block;
float: left;
line-height: 35px;
height: 35px;
z-index: 10000
}
.footerLinks a:link, .footerLinks a:visited {
text-decoration: none;
font-size: 13px;
font-weight: 900; font-weight: 900;
color: #ffffff; font-size: 13px;
transition: all 0.4s ease-in-out 0s; color: #999999
}
.footerLinks a:hover {
color: #999999;
transition: all 0.4s ease-in-out 0s;
} }
/* twitter typeahead */ /* twitter typeahead */
...@@ -642,14 +627,14 @@ table.dataTable tbody td.no_padding, table.dataTable thead th.no_padding { ...@@ -642,14 +627,14 @@ table.dataTable tbody td.no_padding, table.dataTable thead th.no_padding {
.minerva-molstar-container { .minerva-molstar-container {
position: absolute; position: absolute;
left:0; left: 0;
top: 0; top: 0;
width: 100%; width: 100%;
height: 100vh; height: 100vh;
background-color: white; background-color: white;
border: 30px solid rgba(0,0,0,0.5); border: 30px solid rgba(0, 0, 0, 0.5);
-moz-background-clip: padding; /* Firefox 3.6 */ -moz-background-clip: padding; /* Firefox 3.6 */
-webkit-background-clip: padding; /* Safari 4? Chrome 6? */ -webkit-background-clip: padding; /* Safari 4? Chrome 6? */
background-clip: padding-box; background-clip: padding-box;
z-index: 100; z-index: 100;
display: none; display: none;
...@@ -661,7 +646,7 @@ table.dataTable tbody td.no_padding, table.dataTable thead th.no_padding { ...@@ -661,7 +646,7 @@ table.dataTable tbody td.no_padding, table.dataTable thead th.no_padding {
top: 3px; top: 3px;
font-size: 17px; font-size: 17px;
padding-top: 2px; padding-top: 2px;
background:rgba(0, 0, 0, 0.2); background: rgba(0, 0, 0, 0.2);
cursor: pointer; cursor: pointer;
width: 28px; width: 28px;
height: 28px; height: 28px;
...@@ -670,8 +655,8 @@ table.dataTable tbody td.no_padding, table.dataTable thead th.no_padding { ...@@ -670,8 +655,8 @@ table.dataTable tbody td.no_padding, table.dataTable thead th.no_padding {
z-index: 101 z-index: 101
} }
.minerva-molstar-close-button:hover{ .minerva-molstar-close-button:hover {
background:rgba(0, 0, 0, 0.4); background: rgba(0, 0, 0, 0.4);
} }
......
frontend-js/src/main/js/minerva.js
+ 12
− 9
View file @ 012cc1bf
...@@ -84,7 +84,7 @@ function insertGoogleAnalyticsCode() { ...@@ -84,7 +84,7 @@ function insertGoogleAnalyticsCode() {
}); });
} }
function createDivStructure(element) { function createDivStructure(element) {
var tableDiv = functions.createElement({ var tableDiv = functions.createElement({
type: "div", type: "div",
style: "display: table; width:100%; height: 100%" style: "display: table; width:100%; height: 100%"
...@@ -372,7 +372,7 @@ function create(params) { ...@@ -372,7 +372,7 @@ function create(params) {
} }
function createFooter(params) { function createFooter() {
var logoLink, logoText, logoImg; var logoLink, logoText, logoImg;
return ServerConnector.getConfigurationParam(ConfigurationType.LOGO_LINK).then(function (result) { return ServerConnector.getConfigurationParam(ConfigurationType.LOGO_LINK).then(function (result) {
logoLink = result; logoLink = result;
...@@ -384,23 +384,23 @@ function createFooter(params) { ...@@ -384,23 +384,23 @@ function createFooter(params) {
logoImg = result; logoImg = result;
return ServerConnector.getConfiguration(); return ServerConnector.getConfiguration();
}).then(function (configuration) { }).then(function (configuration) {
var div = functions.createElement({ return functions.createElement({
type: "div", id: "footerTable", type: "div",
className: "minerva-footer-table",
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">' +
'<h:graphicImage library="images" name="' + logoImg + '" width="80" height="80" border="0" alt="' + logoText + '"/>' + '<img src="' + GuiConnector.getImgPrefix() + logoImg + '" width="80" height="80" border="0" alt="' + logoText + '"/>' +
'</a></td>' + '</a></td>' +
'<td align="center" class="footerText">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/>' +
'git: ' + configuration.getGitHash() + '</td>' + 'git: ' + configuration.getGitHash() + '</td>' +
'<td align="right"><a href="http://wwwen.uni.lu/lcsb/" title="LCSB - Luxembourg Centre for Systems Biomedicine" target="_blank">' + '<td align="right"><a href="http://wwwen.uni.lu/lcsb/" title="LCSB - Luxembourg Centre for Systems Biomedicine" target="_blank">' +
'<h:graphicImage library="images" name="lcsb.png" width="80" height="80" border="0" alt="LCSB - Luxembourg Centre for Systems Biomedicine"/>' + '<img src="' + GuiConnector.getImgPrefix() + 'lcsb.png" width="80" height="80" border="0" alt="LCSB - Luxembourg Centre for Systems Biomedicine"/>' +
'</a></td>' + '</a></td>' +
'</tr>\n' + '</tr>\n' +
'</table>', xss: false '</table>', xss: false
}); });
return div;
}) })
} }
...@@ -515,7 +515,7 @@ function createLogin(params) { ...@@ -515,7 +515,7 @@ function createLogin(params) {
}).then(function (configuration) { }).then(function (configuration) {
var loginDiv = createLoginDiv(params); var loginDiv = createLoginDiv(params);
params.getElement().appendChild(loginDiv); params.getElement().appendChild(loginDiv);
return createFooter(params); return createFooter();
}).then(function (footer) { }).then(function (footer) {
params.getElement().appendChild(footer); params.getElement().appendChild(footer);
return insertGoogleAnalyticsCode(); return insertGoogleAnalyticsCode();
...@@ -567,6 +567,9 @@ function createAdmin(params) { ...@@ -567,6 +567,9 @@ function createAdmin(params) {
}).then(function (configuration) { }).then(function (configuration) {
params.setConfiguration(configuration); params.setConfiguration(configuration);
result = new Admin(params); result = new Admin(params);
return createFooter();
}).then(function (footer) {
params.getElement().appendChild(footer);
return result.init(); return result.init();
}).then(function () { }).then(function () {
return result; return result;
......
web/src/main/webapp/resources/css/admin.css
+ 0
− 4
View file @ 012cc1bf
...@@ -24,9 +24,6 @@ html, body {margin:0 !important; padding:0 !important; background-color:#EBEBEB; ...@@ -24,9 +24,6 @@ html, body {margin:0 !important; padding:0 !important; background-color:#EBEBEB;
font-weight:900; font-weight:900;
} }
#footerTable {position:absolute; bottom:0px; height:80px; left:0; width:100%; background-color:#EBEBEB;}
.ui-widget-content {padding:0 !important; margin:0 !important;} .ui-widget-content {padding:0 !important; margin:0 !important;}
#content {padding:20px 30px 20px 30px !important} #content {padding:20px 30px 20px 30px !important}
...@@ -70,7 +67,6 @@ textarea {border:none} ...@@ -70,7 +67,6 @@ textarea {border:none}
.textLighter {font-weight:900; color:#666666; line-height:30px; text-transform:uppercase} .textLighter {font-weight:900; color:#666666; line-height:30px; text-transform:uppercase}
.bold {font-weight:900} .bold {font-weight:900}
.imgMiddle {vertical-align: middle;} .imgMiddle {vertical-align: middle;}
.footerText {font-weight:900; font-size:13px; color:#999999}
.welcomeBox {width:300px; margin:100px auto; text-align:center} .welcomeBox {width:300px; margin:100px auto; text-align:center}
.welcomeBigText {color:#666666; font-size:24px;} .welcomeBigText {color:#666666; font-size:24px;}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment