diff --git a/frontend-js/src/main/css/global.css b/frontend-js/src/main/css/global.css index 727a2b54e03f78686e3312f28d23b53758f6aab9..5789b8878460c40f479b2fb43a5af220a961bf4f 100644 --- a/frontend-js/src/main/css/global.css +++ b/frontend-js/src/main/css/global.css @@ -477,4 +477,12 @@ table.minerva-window-drug-table, table.minerva-window-drug-table th, .minerva-open-submap-button { padding: 2px; margin: 2px; +} + +h1 { + font-size: 22px; + color: #999999; + text-align: center; + padding-bottom: 10px; + font-weight: 400; } \ No newline at end of file diff --git a/frontend-js/src/main/js/Admin.js b/frontend-js/src/main/js/Admin.js index 8500d5f680485f92713225a0aaa6c40e595eb5fd..8687c63e7e934e565d0d3cd6935b61f1e3f72c31 100644 --- a/frontend-js/src/main/js/Admin.js +++ b/frontend-js/src/main/js/Admin.js @@ -137,6 +137,7 @@ Admin.prototype.addTab = function(params, navElement, contentElement) { this._panels.push(new params.panelClass({ element : contentDiv, + name : params.name, project : self.getProject(), configuration : self.getConfiguration(), })); diff --git a/frontend-js/src/main/js/gui/admin/AbstractAdminPanel.js b/frontend-js/src/main/js/gui/admin/AbstractAdminPanel.js new file mode 100644 index 0000000000000000000000000000000000000000..81c2db02b632575a1917df70f64973819cf1d519 --- /dev/null +++ b/frontend-js/src/main/js/gui/admin/AbstractAdminPanel.js @@ -0,0 +1,32 @@ +"use strict"; + +/* exported logger */ + +var Panel = require('../Panel'); + +var GuiConnector = require('../../GuiConnector'); +var logger = require('../../logger'); +var Functions = require('../../Functions'); +var Promise = require("bluebird"); + +function AbstractAdminPanel(params) { + params.scrollable = true; + Panel.call(this, params); + this._createHeader(params.name); +} + +AbstractAdminPanel.prototype = Object.create(Panel.prototype); +AbstractAdminPanel.prototype.constructor = AbstractAdminPanel; + +AbstractAdminPanel.prototype._createHeader = function(name) { + this.getElement().appendChild(Functions.createElement({ + type : "h1", + content : name + })); +} + +AbstractAdminPanel.prototype.init = function() { + +}; + +module.exports = AbstractAdminPanel; diff --git a/frontend-js/src/main/js/gui/admin/CommentsAdminPanel.js b/frontend-js/src/main/js/gui/admin/CommentsAdminPanel.js index c4b80659b160f963c291607a94d767a3a4ce60ef..78db63128e1a3569519c2e28db3bc7832f4901d5 100644 --- a/frontend-js/src/main/js/gui/admin/CommentsAdminPanel.js +++ b/frontend-js/src/main/js/gui/admin/CommentsAdminPanel.js @@ -2,7 +2,7 @@ /* exported logger */ -var Panel = require('../Panel'); +var AbstractAdminPanel = require('./AbstractAdminPanel'); var Functions = require('../../Functions'); var logger = require('../../logger'); @@ -10,13 +10,12 @@ var logger = require('../../logger'); var Promise = require("bluebird"); function CommentsAdminPanel(params) { - params.scrollable = true; - Panel.call(this, params); + AbstractAdminPanel.call(this, params); this._createGui(); } -CommentsAdminPanel.prototype = Object.create(Panel.prototype); +CommentsAdminPanel.prototype = Object.create(AbstractAdminPanel.prototype); CommentsAdminPanel.prototype.constructor = CommentsAdminPanel; CommentsAdminPanel.prototype._createGui = function() { diff --git a/frontend-js/src/main/js/gui/admin/ConfigurationAdminPanel.js b/frontend-js/src/main/js/gui/admin/ConfigurationAdminPanel.js index 43f8ec6a08d919f4695f31e6209894ef56867bc9..094597a4586a1ed95debe82829f87466b866748d 100644 --- a/frontend-js/src/main/js/gui/admin/ConfigurationAdminPanel.js +++ b/frontend-js/src/main/js/gui/admin/ConfigurationAdminPanel.js @@ -2,17 +2,16 @@ /* exported logger */ -var Panel = require('../Panel'); +var AbstractAdminPanel = require('./AbstractAdminPanel'); var Promise = require("bluebird"); function ConfigurationAdminPanel(params) { - params.scrollable = true; - Panel.call(this, params); + AbstractAdminPanel.call(this, params); } -ConfigurationAdminPanel.prototype = Object.create(Panel.prototype); +ConfigurationAdminPanel.prototype = Object.create(AbstractAdminPanel.prototype); ConfigurationAdminPanel.prototype.constructor = ConfigurationAdminPanel; ConfigurationAdminPanel.prototype.init = function() { diff --git a/frontend-js/src/main/js/gui/admin/MapsAdminPanel.js b/frontend-js/src/main/js/gui/admin/MapsAdminPanel.js index 32afe0ce966c341775cef682c7c3a589846e8413..b772c38c3362e2daaa5d78b271eec48b8d9938b9 100644 --- a/frontend-js/src/main/js/gui/admin/MapsAdminPanel.js +++ b/frontend-js/src/main/js/gui/admin/MapsAdminPanel.js @@ -2,17 +2,16 @@ /* exported logger */ -var Panel = require('../Panel'); +var AbstractAdminPanel = require('./AbstractAdminPanel'); var Promise = require("bluebird"); function MapsAdminPanel(params) { - params.scrollable = true; - Panel.call(this, params); + AbstractAdminPanel.call(this, params); } -MapsAdminPanel.prototype = Object.create(Panel.prototype); +MapsAdminPanel.prototype = Object.create(AbstractAdminPanel.prototype); MapsAdminPanel.prototype.constructor = MapsAdminPanel; MapsAdminPanel.prototype.init = function() { diff --git a/frontend-js/src/main/js/gui/admin/ServicesAdminPanel.js b/frontend-js/src/main/js/gui/admin/ServicesAdminPanel.js index a13151a7223b4431fc443c87d91a472017cd6e1e..70fb723f5994b8b8f7f9c9c4d16da161116cbe7b 100644 --- a/frontend-js/src/main/js/gui/admin/ServicesAdminPanel.js +++ b/frontend-js/src/main/js/gui/admin/ServicesAdminPanel.js @@ -2,17 +2,16 @@ /* exported logger */ -var Panel = require('../Panel'); +var AbstractAdminPanel = require('./AbstractAdminPanel'); var Promise = require("bluebird"); function ServicesAdminPanel(params) { - params.scrollable = true; - Panel.call(this, params); + AbstractAdminPanel.call(this, params); } -ServicesAdminPanel.prototype = Object.create(Panel.prototype); +ServicesAdminPanel.prototype = Object.create(AbstractAdminPanel.prototype); ServicesAdminPanel.prototype.constructor = ServicesAdminPanel; ServicesAdminPanel.prototype.init = function() { diff --git a/frontend-js/src/main/js/gui/admin/UsersAdminPanel.js b/frontend-js/src/main/js/gui/admin/UsersAdminPanel.js index 16277062e1cad1783b2fbc4a815143d7fbd5cc76..6faa02555e494cfaef3da30f83d8db0ef6b1454a 100644 --- a/frontend-js/src/main/js/gui/admin/UsersAdminPanel.js +++ b/frontend-js/src/main/js/gui/admin/UsersAdminPanel.js @@ -2,17 +2,16 @@ /* exported logger */ -var Panel = require('../Panel'); +var AbstractAdminPanel = require('./AbstractAdminPanel'); var Promise = require("bluebird"); function UsersAdminPanel(params) { - params.scrollable = true; - Panel.call(this, params); + AbstractAdminPanel.call(this, params); } -UsersAdminPanel.prototype = Object.create(Panel.prototype); +UsersAdminPanel.prototype = Object.create(AbstractAdminPanel.prototype); UsersAdminPanel.prototype.constructor = UsersAdminPanel; UsersAdminPanel.prototype.init = function() { diff --git a/web/src/main/webapp/admin-new.xhtml b/web/src/main/webapp/admin-new.xhtml index 4e7805363de34c76de86e07b44d9ff59179d4da8..b64491c9cd7ffa89cd883605150a508e030f0d00 100644 --- a/web/src/main/webapp/admin-new.xhtml +++ b/web/src/main/webapp/admin-new.xhtml @@ -45,9 +45,9 @@ function initMap(){ </h:head> <h:body onload="initMap();" > <h:outputStylesheet library="css" name="style.css"/> -<h:outputStylesheet library="css" name="minerva.css" /> <h:outputStylesheet library="css" name="pileup.css"/> <h:outputStylesheet library="css" name="bootstrap.min.css"/> +<h:outputStylesheet library="css" name="minerva.css" /> <h:outputScript library="primefaces" name="jquery/jquery.js" target="head" /> <div id="minervaAppDiv" style="height: 100%;width: 100%;margin: 0;"/>