From 87627a46f5dabacea1f1db941516450837214398 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Mon, 27 Mar 2017 10:30:13 +0000
Subject: [PATCH] SSDM-3501 : Drawing board view header
SVN: 37970
---
.../html/js/controllers/MainController.js | 4 ++--
.../DrawingBoards/DrawingBoardsController.js | 4 ++--
.../js/views/DrawingBoards/DrawingBoardsView.js | 15 +++++++++------
3 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js
index b3d6b72d7f4..a37040c6058 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js
@@ -661,10 +661,10 @@ function MainController(profile) {
}
this._showDrawingBoard = function() {
- var content = this._getBackwardsCompatibleMainContainer();
+ var views = this._getNewViewModel(true, true, false);
var drawingBoardsController = new DrawingBoardsController(this);
- drawingBoardsController.init(content);
+ drawingBoardsController.init(views);
this.currentView = drawingBoardsController;
}
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DrawingBoards/DrawingBoardsController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DrawingBoards/DrawingBoardsController.js
index 0d306e5564e..4791d7d6c67 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DrawingBoards/DrawingBoardsController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DrawingBoards/DrawingBoardsController.js
@@ -19,7 +19,7 @@ function DrawingBoardsController(mainController) {
this._drawingBoardsModel = new DrawingBoardsModel();
this._drawingBoardsView = new DrawingBoardsView(this, this._drawingBoardsModel);
- this.init = function($container) {
- this._drawingBoardsView.repaint($container);
+ this.init = function(views) {
+ this._drawingBoardsView.repaint(views);
}
}
\ No newline at end of file
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DrawingBoards/DrawingBoardsView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DrawingBoards/DrawingBoardsView.js
index ad4fcab3a56..d37f022ed4c 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DrawingBoards/DrawingBoardsView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DrawingBoards/DrawingBoardsView.js
@@ -18,16 +18,19 @@ function DrawingBoardsView(drawingBoardsController, drawingBoardsModel) {
this._drawingBoardsController = drawingBoardsController;
this._drawingBoardsModel = drawingBoardsModel;
- this.repaint = function($container) {
+ this.repaint = function(views) {
+ var $header = views.header;
+ var $container = views.content;
+
$container.empty();
- var $wrapper = $('<form>', { class : 'form-horizontal ', 'id' : 'mainDataSetForm', 'role' : 'form'});
+ var $wrapper = $('<form>', { 'id' : 'mainDataSetForm', 'role' : 'form'});
var $title = $('<h2>').append('Drawing Board');
- $wrapper.append($title);
+ $header.append($title);
var $createNewBtn = FormUtil.getButtonWithText('New Drawing Board', function() {
$container.empty();
- var containerWidth = $(document).width() - $("#sideMenu").width() - 20;
- var containerHeight = $(document).height() - 60;
+ var containerWidth = $container.width();
+ var containerHeight = $container.height() - 50;
var $drawingboard = $("<div>", { "id" : "scratchboard", "style" : "width: " + containerWidth + "px; height: " + containerHeight + "px; padding: 10px;" });
$container.append($drawingboard);
@@ -47,7 +50,7 @@ function DrawingBoardsView(drawingBoardsController, drawingBoardsModel) {
]
});
});
- $wrapper.append($createNewBtn);
+ $header.append($createNewBtn);
$container.append($wrapper);
}
}
\ No newline at end of file
--
GitLab