From a7e52023740b3bf80813480295c065f9583ffea5 Mon Sep 17 00:00:00 2001 From: Piotr Gawron <piotr.gawron@uni.lu> Date: Tue, 11 Apr 2017 15:24:42 +0200 Subject: [PATCH] frontend use footer generated via javascript --- frontend-js/src/main/js/minerva.js | 6 ++++++ frontend-js/src/test/js/helper.js | 4 ++++ web/src/main/webapp/index.xhtml | 7 +------ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/frontend-js/src/main/js/minerva.js b/frontend-js/src/main/js/minerva.js index 2b9b7dd19f..1b11f25e40 100644 --- a/frontend-js/src/main/js/minerva.js +++ b/frontend-js/src/main/js/minerva.js @@ -12,6 +12,7 @@ var CustomMap = require('./map/CustomMap'); var DrugDbOverlay = require('./map/overlay/DrugDbOverlay'); var DrugPanel = require('./gui/DrugPanel'); var Header = require('./gui/Header'); +var Footer = require('./gui/Footer'); var MiRnaDbOverlay = require('./map/overlay/MiRnaDbOverlay'); var MiRnaPanel = require('./gui/MiRnaPanel'); var OverlayPanel = require('./gui/OverlayPanel'); @@ -262,6 +263,11 @@ function create(params) { customMap : result }); + var footer = new Footer({ + element : document.getElementById("footerPanel"), + customMap : result + }); + return new Promise(function(resolve, reject) { insertGoogleAnalyticsCode(result).then(function(){ diff --git a/frontend-js/src/test/js/helper.js b/frontend-js/src/test/js/helper.js index 77360d43ba..da029f50b4 100644 --- a/frontend-js/src/test/js/helper.js +++ b/frontend-js/src/test/js/helper.js @@ -97,6 +97,7 @@ Helper.prototype.createLeftPanelTab = function() { result.appendChild(this.createProjectInfoTab()); result.appendChild(this.createLegendDiv()); result.appendChild(this.createHeaderDiv()); + result.appendChild(this.createFooterDiv()); return result; }; @@ -106,6 +107,9 @@ Helper.prototype.createSearchTab = function() { Helper.prototype.createHeaderDiv = function() { return this.createPanelTab("headerPanel"); }; +Helper.prototype.createFooterDiv = function() { + return this.createPanelTab("footerPanel"); +}; Helper.prototype.createDrugTab = function() { return this.createPanelTab("drugTab"); diff --git a/web/src/main/webapp/index.xhtml b/web/src/main/webapp/index.xhtml index 11fd021e70..2ce3b38352 100644 --- a/web/src/main/webapp/index.xhtml +++ b/web/src/main/webapp/index.xhtml @@ -106,12 +106,7 @@ function initMap(){ </p:tabView > - <div class="footerLinks"> - <a href="admin.xhtml?id=#{mapMB.currentMapId}" style="float:left; padding-left:25px;"><i class="fa fa-lock" style="font-size:17px"></i> ADMIN</a> - <a href="#{configurationMB.userManual}" target="_user_manual_" style="float:left; padding-left:50px;"><i class="fa" style="font-size:17px"></i> MANUAL</a> - <a href="export.xhtml?id=#{mapMB.currentMapId}" style="float:right; padding-right:25px;">EXPORT <i class="fa fa-mail-forward" style="font-size:17px"></i></a> - </div> - + <div id="footerPanel" class="footerLinks"/> </div> <div style="display: table-cell;height:100%;width:100%;"> <div style="height:100%;width:100%;position:relative"> -- GitLab