From 5df2032d05e0b1c7ae5d3ffdbf1189ca901b5971 Mon Sep 17 00:00:00 2001 From: Piotr Gawron <piotr.gawron@uni.lu> Date: Tue, 27 Jun 2017 17:30:08 +0200 Subject: [PATCH] header added for export --- frontend-js/src/main/js/Export.js | 35 ++++++++++++++++++++++++---- frontend-js/src/main/js/minerva.js | 1 - web/src/main/webapp/export-new.xhtml | 2 ++ 3 files changed, 32 insertions(+), 6 deletions(-) diff --git a/frontend-js/src/main/js/Export.js b/frontend-js/src/main/js/Export.js index b751f71744..311d4d1067 100644 --- a/frontend-js/src/main/js/Export.js +++ b/frontend-js/src/main/js/Export.js @@ -2,11 +2,13 @@ var Promise = require("bluebird"); -var logger = require('./logger'); var CustomMapOptions = require('./map/CustomMapOptions'); -var Functions = require('./Functions'); +var Header = require('./gui/Header'); var ObjectWithListeners = require('./ObjectWithListeners'); +var logger = require('./logger'); +var Functions = require('./Functions'); + /** * Default constructor. * @@ -15,17 +17,33 @@ var ObjectWithListeners = require('./ObjectWithListeners'); * creation */ function Export(options) { - this._controls = []; - + var self = this; if (!(options instanceof CustomMapOptions)) { options = new CustomMapOptions(options); } - this.setProject(options.getProject()); + self.setProject(options.getProject()); + self.setElement(options.getElement()); + + self._createGui(); } Export.prototype = Object.create(ObjectWithListeners.prototype); Export.prototype.constructor = ObjectWithListeners; +Export.prototype._createGui = function() { + var self = this; + self.getElement().innerHTML = ""; + var headerDiv = Functions.createElement({ + type : "div" + }); + new Header({ + element : headerDiv, + customMap : null, + project : self.getProject(), + }); + self.getElement().appendChild(headerDiv); +} + Export.prototype.setProject = function(project) { this._project = project; }; @@ -33,4 +51,11 @@ Export.prototype.getProject = function() { return this._project; }; +Export.prototype.setElement = function(element) { + this._element = element; +}; +Export.prototype.getElement = function() { + return this._element; +}; + module.exports = Export; diff --git a/frontend-js/src/main/js/minerva.js b/frontend-js/src/main/js/minerva.js index 4cb860ad52..4e23889abc 100644 --- a/frontend-js/src/main/js/minerva.js +++ b/frontend-js/src/main/js/minerva.js @@ -567,7 +567,6 @@ function createExport(params) { return getProject(params); }).then(function(project) { params.setProject(project); - var element = params.getElement(); return new Export(params); }); } diff --git a/web/src/main/webapp/export-new.xhtml b/web/src/main/webapp/export-new.xhtml index 400068b007..81120e1679 100644 --- a/web/src/main/webapp/export-new.xhtml +++ b/web/src/main/webapp/export-new.xhtml @@ -9,6 +9,8 @@ <f:view contentType="text/html"> <h:head> + <script src="https://maps.google.com/maps/api/js?libraries=drawing&v=3.26" type="text/javascript"/> + <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" type="text/javascript"/> <script src="https://twitter.github.io/typeahead.js/releases/latest/typeahead.bundle.min.js" type="text/javascript"/> -- GitLab