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

Merge branch '526-minerva-logo-in-the-left-panel' into 'master'

Resolve "Minerva logo in the left panel"

Closes #526

See merge request !439
parents 44168fd6 d505e859
No related branches found
No related tags found
2 merge requests!630WIP: Resolve "The privileges of a new user are not saved in some cases",!439Resolve "Minerva logo in the left panel"
Pipeline #6677 passed
......@@ -239,7 +239,6 @@
height: 80px;
left: 0;
width: 100%;
z-index: -1;
}
.minerva-footer-text {
......@@ -248,6 +247,30 @@
color: #999999
}
.minerva-logo-footer {
background-color: #333333;
color: white;
position: absolute;
bottom: 0;
left: 0;
right: 0;
padding: 5px;
text-align: center;
text-shadow: 1px 1px 0 #444;
font-size: 13px;
font-weight: 900;
}
.minerva-logo-footer img {
margin-right: 6px;
width: 25px;
}
.minerva-logo-footer a {
color: white;
text-decoration: none;
}
.minerva-logo {
height: auto;
width: auto;
......
......@@ -335,6 +335,11 @@ Panel.prototype.onresize = function () {
var self = this;
var footerPosition = window.innerHeight;
var footerHeight = Math.max(0, $(".minerva-logo-footer").outerHeight());
footerHeight = Math.max(footerHeight, $(".minerva-footer-table").outerHeight());
footerPosition -= footerHeight;
// compute the width (we can only compute it for visible elements)
var size = 100000;
......
......@@ -51,8 +51,7 @@ LeftPanel.prototype._createPanelGui = function () {
var panels = self.getPanelsDefinition();
var headerDiv = Functions.createElement({
type: "div",
id: "headerPanel"
type: "div"
});
var header = new Header({
element: headerDiv,
......@@ -64,7 +63,6 @@ LeftPanel.prototype._createPanelGui = function () {
var loginDialogDiv = Functions.createElement({
type: "div",
name: "loginDialog",
style: "display:none"
});
self.getElement().appendChild(loginDialogDiv);
......@@ -78,7 +76,6 @@ LeftPanel.prototype._createPanelGui = function () {
self.setHeader(header);
self.elementInfoDiv = Functions.createElement({
name: "elementInfoDiv",
type: "div",
style: "background-color:#f3f3f3",
className: "minerva-element-info-div"
......@@ -87,6 +84,15 @@ LeftPanel.prototype._createPanelGui = function () {
for (var i = 0; i < panels.length; i++) {
self.getGuiUtils().addTab(self, panels[i]);
}
self.getElement().appendChild(Functions.createElement({
type: "div",
className: "minerva-logo-footer",
content: "<a href='https://minerva.pages.uni.lu/doc/' target='_blank'>" +
"<img src='resources/images/minerva-logo.png'/> Powered by MINERVA Platform" +
"</a>",
xss: false
}));
};
/**
......
web/src/main/webapp/resources/images/minerva-logo.png

52.5 KiB

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