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

styling moved to css

parent 4bbe9b50
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",!553Resolve "allow to open multiple data overlays using url GET param"
...@@ -36,6 +36,15 @@ ...@@ -36,6 +36,15 @@
transition: background-color 0.4s ease-in-out 0s; transition: background-color 0.4s ease-in-out 0s;
} }
.minerva-header .minerva-loading-div {
display: none;
float: right;
}
.minerva-header .minerva-loading-div img {
height: 35px;
}
.minerva-checkbox-grid li { .minerva-checkbox-grid li {
display: block; display: block;
float: left; float: left;
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
/* exported logger */ /* exported logger */
var AbstractGuiElement = require('./AbstractGuiElement'); var AbstractGuiElement = require('./AbstractGuiElement');
var GuiConnector = require('../GuiConnector');
var PanelControlElementType = require('./PanelControlElementType'); var PanelControlElementType = require('./PanelControlElementType');
var Functions = require('../Functions'); var Functions = require('../Functions');
var OptionsMenu = require('./OptionsMenu'); var OptionsMenu = require('./OptionsMenu');
...@@ -18,6 +17,7 @@ var xss = require('xss'); ...@@ -18,6 +17,7 @@ var xss = require('xss');
* @param {Object} params * @param {Object} params
* @param {HTMLElement} params.element * @param {HTMLElement} params.element
* @param {CustomMap} params.customMap * @param {CustomMap} params.customMap
* @param {boolean} params.optionsMenu
* @param {Configuration} params.configuration * @param {Configuration} params.configuration
* @param {Project} [params.project] * @param {Project} [params.project]
* @param {ServerConnector} [params.serverConnector] * @param {ServerConnector} [params.serverConnector]
...@@ -55,15 +55,13 @@ Header.prototype._createHeaderGui = function (guiParams) { ...@@ -55,15 +55,13 @@ Header.prototype._createHeaderGui = function (guiParams) {
var loadingDiv = Functions.createElement({ var loadingDiv = Functions.createElement({
type: "div", type: "div",
style: "display:none; " className: "minerva-loading-div"
}); });
loadingDiv.style.float = "right";
var loadingImg = Functions.createElement({ var loadingImg = Functions.createElement({
type: "img", type: "img",
src: 'resources/images/icons/ajax-loader.gif' src: 'resources/images/icons/ajax-loader.gif'
}); });
loadingImg.style.height = "35px";
loadingDiv.appendChild(loadingImg); loadingDiv.appendChild(loadingImg);
this.setControlElement(PanelControlElementType.FOOTER_LOADING_DIV, loadingDiv); this.setControlElement(PanelControlElementType.FOOTER_LOADING_DIV, loadingDiv);
...@@ -151,7 +149,7 @@ Header.prototype.init = function () { ...@@ -151,7 +149,7 @@ Header.prototype.init = function () {
self._loadMessages = []; self._loadMessages = [];
self._onDataLoadStart = function (e) { self._onDataLoadStart = function (e) {
self.addLoadMessage(e.arg); self.addLoadMessage(e.arg);
div.style.display = "block"; $(div).show();
div.title = e.arg; div.title = e.arg;
}; };
...@@ -160,7 +158,7 @@ Header.prototype.init = function () { ...@@ -160,7 +158,7 @@ Header.prototype.init = function () {
if (self._loadMessages.length > 0) { if (self._loadMessages.length > 0) {
div.title = self._loadMessages[0]; div.title = self._loadMessages[0];
} else { } else {
div.style.display = "none"; $(div).hide();
} }
}; };
ServerConnector.addListener("onDataLoadStart", self._onDataLoadStart); ServerConnector.addListener("onDataLoadStart", self._onDataLoadStart);
......
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