Commit aff4902e authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch '356-display-of-minerva-version' into 'master'

Resolve "Display of Minerva version"

Closes #356

See merge request piotr.gawron/minerva!259
parents 7831c0d9 adea53c4
Pipeline #4383 passed with stage
in 1 minute and 48 seconds
...@@ -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,11 +655,45 @@ table.dataTable tbody td.no_padding, table.dataTable thead th.no_padding { ...@@ -670,11 +655,45 @@ 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);
} }
button:disabled { button:disabled {
color: graytext; color: graytext;
} }
a.adminLink:link, a.adminLink:visited {
font-size: 11px;
font-weight: 900;
text-decoration: none;
color: #666666
}
a.adminLink:hover {
color: #000000;
}
.minerva-login-form {
height: 100%;
background-color:#FFFFFF;
box-shadow:0 3px 30px #B9B9B9;
width:320px;
padding:20px;
margin:20px auto;
color:#666666;
font-size:13px;
font-weight:900;
}
.minerva-login-form-title {
font-weight: 900;
padding-bottom: 20px;
font-size: 19px;
}
.labelText {
font-size: 13px;
font-weight: 900
}
\ No newline at end of file
...@@ -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;
}) })
} }
...@@ -408,11 +408,11 @@ function createLoginDiv(params) { ...@@ -408,11 +408,11 @@ function createLoginDiv(params) {
var loggedIn = false; var loggedIn = false;
var result = functions.createElement({type: "center"}); var result = functions.createElement({type: "center"});
var resultDiv = functions.createElement({type: "div", className: "loginPanel", style: "text-align:left"}); var resultDiv = functions.createElement({type: "div", className: "minerva-login-form", style: "text-align:left"});
result.appendChild(resultDiv); result.appendChild(resultDiv);
resultDiv.appendChild(functions.createElement({ resultDiv.appendChild(functions.createElement({
type: "div", type: "div",
className: "headerFormTitle", className: "minerva-login-form-title",
content: "AUTHORIZATION FORM" content: "AUTHORIZATION FORM"
})); }));
var guiUtils = new GuiUtils(); var guiUtils = new GuiUtils();
...@@ -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;
......
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
<h:outputStylesheet library="css" name="style.css" /> <h:outputStylesheet library="css" name="style.css" />
<h:outputStylesheet library="css" name="minerva.css" /> <h:outputStylesheet library="css" name="minerva.css" />
<h:outputStylesheet library="css" name="admin.css" /> <link rel="stylesheet" type="text/css"
<link rel="stylesheet" type="text/css" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css"/> href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css" />
<script type="text/javascript"> <script type="text/javascript">
...@@ -47,7 +47,8 @@ ...@@ -47,7 +47,8 @@
</h:head> </h:head>
<h:body onload="init();"> <h:body onload="init();"
style="background-color: #EBEBEB; overflow:hidden">
<div id="minervaAppDiv" /> <div id="minervaAppDiv" />
</h:body> </h:body>
</html> </html>
\ No newline at end of file
html, body {margin:0 !important; padding:0 !important; background-color:#EBEBEB;}
.ui-menu {
background:#919191 !important; background:-moz-linear-gradient(top,#B0B0B0,#6B6B6B); background:-webkit-gradient(linear,left top,left bottom,from(#B0B0B0),to(#6B6B6B));
padding:0 !important; margin:0 !important; height:56px !important;
}
.ui-menuitem-link {line-height:40px !important; margin:0 !important; border:none !important; top:0 !important}
.ui-menuitem-text {font-size:13px !important; font-weight:900 !important; color:#ffffff !important; padding:0 6px !important; text-transform:uppercase;}
.ui-menuitem.ui-widget{padding:0 !important; margin:0 !important;top:0 !important}
.loginPanel {
height: 100%;
margin: 0;
background-color:#FFFFFF;
box-shadow:0 3px 30px #B9B9B9;
width:320px;
padding:20px;
margin:20px auto;
color:#666666;
font-size:13px;
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;}
#content {padding:20px 30px 20px 30px !important}
#content td {font-size:13px !important; color:#666666}
#content td a {font-size:13px !important; color:#666666}
.ui-layout-pane-south {height:70px !important;}
#south-resizer {display:none !important;}
h1 {font-size:22px; color:#999999; text-align:center; padding-bottom:10px; font-weight:400;}
.ui-dialog-content {padding:20px !important}
.ui-dialog-content td {font-size:13px; color:#666666; font-weight:600}
.ui-dialog-content select {border:none}
.addButton {background:none !important; color:#666666 !important; font-size:13px !important; font-weight:900 !important; text-transform:uppercase; text-align:left; width:140px; margin:0px 5px 10px 5px; transition: color 0.4s ease-in-out 0s; }
.addButton:before{font-family:FontAwesome; font-style:normal; font-weight:normal !important; content:"\f0fe"; float:left; display:inline; font-size:17px !important;font-weight:300 !improtant; width:20px; padding-top:4px; }
.addButton:hover {color:#999999 !important; transition:color 0.4s ease-in-out 0s; }
.ui-icon-search { background:url(images/icons/search_small2.png.xhtml) 50% 50% no-repeat !important; }
.ui-icon-refresh { background:url(images/icons/refresh.png.xhtml) 50% 50% no-repeat !important; }
.ui-icon-disk { background:url(images/icons/disk.png.xhtml) 50% 50% no-repeat !important; }
.ui-icon-document { background:url(images/icons/document.png.xhtml) 50% 50% no-repeat !important; }
.ui-icon-trash { background:url(images/icons/trash.png.xhtml) 50% 50% no-repeat !important; }
.ui-icon-close { background:url(images/icons/close.png.xhtml) 50% 50% no-repeat !important; }
.ui-tabs-nav.ui-helper-reset.ui-helper-clearfix.ui-widget-header {text-align:center; font-weight:900 !important; font-size:13px !important; text-transform:uppercase !important; height:30px;}
.ui-tabs-nav.ui-helper-reset.ui-helper-clearfix.ui-widget-header li {text-align:center; font-weight:900 !important; font-size:13px !important; text-transform:uppercase !important; height:30px;}
.ui-tabs .ui-tabs-nav li {width:auto; padding:0 8px !important; font-weight:900 !important;text-transform: uppercase;}
textarea {border:none}
.ui-blockui-content { padding:10px !important;}
.text {font-weight:900; color:#333333; line-height:30px; text-transform:uppercase}
.textBigger {font-size:120%}
.textLighter {font-weight:900; color:#666666; line-height:30px; text-transform:uppercase}
.bold {font-weight:900}
.imgMiddle {vertical-align: middle;}
.footerText {font-weight:900; font-size:13px; color:#999999}
.welcomeBox {width:300px; margin:100px auto; text-align:center}
.welcomeBigText {color:#666666; font-size:24px;}
.welcomeAdditionlInfo {color:#999999; font-size:18px; margin:20px 0}
.welcomeIcon {color:#66CC33; font-size:32px;}
a.adminLink:link, a.adminLink:visited {font-size:11px; font-weight:900; text-decoration:none; color: #666666}
a.adminLink:hover {color:#000000;}
.headerFormTitle {font-size:13px; font-weight:900; padding-bottom:20px; font-size:19px;}
.labelText {font-size:13px; font-weight:900}
\ No newline at end of file
.chemicalPanel {
height: 100%;
margin: 0;
background-color: #FFFFFF;
box-shadow: 0 3px 30px #B9B9B9;
width: 80%;
padding: 15px;
margin: 20px auto;
color: #666666;
font-size: 13px;
line-height: 19px;
}
.chemicalResultsDivClass {
position: absolute;
left: 0px;
top: 240px;
bottom: 0px;
right: 0px;
bottom: 0px;
background: #ffffff;
vertical-align: top;
}
.chemicalResultsDivClass .ui-tabs .ui-tabs-nav li {
width: auto;
padding: 0 8px !important;
font-weight: 900 !important;
text-transform: uppercase;
}
.ui-scrollpanel {
padding: 0 8px !important;
}
//
.ui-datalist-data {
display: block !important;
height: auto !important;
width: auto !important
}
.chemicalResultsDivClass2 {
background-color: #ffffff;
position: absolute;
left: 0px;
top: 0px;
bottom: 0px;
right: 0px;
height: 100%;
}
.chemicalResultsDivClass table td {
border: 1px solid #e1e1e1 !important;
}
\ No newline at end of file
.drugPanel {
height: 100%;
margin: 0;
background-color: #FFFFFF;
box-shadow: 0 3px 30px #B9B9B9;
width: 80%;
padding: 15px;
margin: 20px auto;
color: #666666;
font-size: 13px;
line-height: 19px;
}
.drugResultsDivClass {
position: absolute;
left: 0px;
top: 240px;
bottom: 0px;
right: 0px;
bottom: 0px;
background: #ffffff;
vertical-align: top;
}
.drugResultsDivClass .ui-tabs .ui-tabs-nav li {
width: auto;
padding: 0 8px !important;
font-weight: 900 !important;
text-transform: uppercase;
}
.ui-scrollpanel {
padding: 0 8px !important;
}
//
.ui-datalist-data {
display: block !important;
height: auto !important;
width: auto !important
}
.drugResultsDivClass2 {
background-color: #ffffff;
position: absolute;
left: 0px;
top: 0px;
bottom: 0px;
right: 0px;
height: 100%;
}
.drugResultsDivClass table td {
border: 1px solid #e1e1e1 !important;
}
\ No newline at end of file
.ui-tabs .ui-tabs-nav{margin:0 !important; padding:0 !important; background-color:#878787;}
.ui-tabs .ui-tabs-nav li{list-style:none; float:left; position:relative; margin:0 !important; padding:0 20px !important; white-space:nowrap; width:auto; border-right:1px solid #A3A3A3; border-top:none; font-size:13px; font-weight:900; text-transform:uppercase; top:0 !important;}
.ui-tabs .ui-tabs-nav li a{float:left;padding:8px 0 8px 0 !important;text-decoration:none; margin:0 !important; width:100%;}
.topAligned{vertical-align: top;}
.topAligned label{ text-transform:uppercase;}
label {font-size:13px; font-weight:900; color:#666666; min-width:110px; }
.ui-picklist-caption.ui-widget-header {font-size:13px; font-weight:900;text-transform:uppercase;}
.ui-picklist-item {font-size:12px}
.ui-widget-content.ui-picklist-list {height:160px}
td {border-bottom:1px solid #e1e1e1}
\ No newline at end of file
.infoPanel {
height: 100%;
margin: 0;
background-color:#FFFFFF;
box-shadow:0 3px 30px #B9B9B9;
width:80%;
padding:15px;
margin:20px auto;
color:#666666;
font-size:13px;
line-height:19px;
}
.infoPanelData td {
vertical-align: top;
padding: 6px 2px;
}
.layoutSelectedRow .highlightedColumn {
background: #EBEBEB;
}
.layoutSelectedRow .standardColumn {
}
.layoutPanel {
position: absolute;
left:0px;
top:82px;
bottom: 0px;
right:0px;
bottom:0px;
background:#ffffff;
vertical-align:top;
}
.layoutSubPanel {
margin: 0;
background-color:#FFFFFF;
box-shadow:0 3px 30px #B9B9B9;
width:80%;
padding:15px;
margin:20px auto;
color:#666666;
font-size:13px;
line-height:19px;
}
.title {font-size:13px; font-weight:900; text-transform:uppercase; margin-top:0px;}
.ui-panel-titlebar.ui-widget-header {font-size:13px; background:none; font-weight:900; color:#666666; padding-left:0; border-bottom:1px solid #e1e1e1;}
.ui-panel-content.ui-widget-content {padding:0 !important}
.ui-panel-titlebar.ui-widget-header {padding-left:0 !important}
.smallBoldText {font-size:11px;font-weight:900; color:#666666;line-height:12px;}
.mediumBoldText {font-size:13px;font-weight:900;}
.greenText {color:#66CC33; font-weight:900; font-size:13px;}
.redText {color:#CC3300; font-weight:900; font-size:13px;}
.loginPanel {
height: 100%;
margin: 0;
background-color:#FFFFFF;
box-shadow:0 3px 30px #B9B9B9;
width:80%;
padding:15px;
margin:20px auto;
color:#666666;
font-size:13px;
line-height:19px;
}
.headerText {font-size:13px; font-weight:900}
.tdText{font-size:11px; font-weight:900; width:90px !important; color:#666666 !important; line-height:40px;}
a.adminLink:link, a.adminLink:visited {font-size:11px; font-weight:900; text-decoration:none; color: #666666}
a.adminLink:hover {color:#000000;}
.submitFix {font-size:13px; font-weight:900 !important; margin-left:90px; padding:0px 20px; margin-top:5px}
\ No newline at end of file