From 1d60a61c83b0e5874d374c5c71547c40b7314384 Mon Sep 17 00:00:00 2001 From: juanf <juanf> Date: Thu, 25 Jun 2015 11:55:18 +0000 Subject: [PATCH] SSDM-2032 : ELN: modify sample/experiment form layout (ongoing work) SVN: 34289 --- .../views/ExperimentForm/ExperimentFormView.js | 1 + .../html/js/views/ProjectForm/ProjectFormView.js | 16 +++++++++------- .../html/js/views/SampleForm/SampleFormView.js | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js index bfa5deb0b23..c3df20b0ea0 100644 --- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js +++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js @@ -67,6 +67,7 @@ function ExperimentFormView(experimentFormController, experimentFormModel) { .append($("<h2>").append(title)); } $formColumn.append($formTitle); + $formColumn.append($("<br>")); if(this._experimentFormModel.mode !== FormMode.CREATE) { //Delete diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormView.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormView.js index 7896db10390..e3e714c2a39 100644 --- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormView.js +++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormView.js @@ -45,10 +45,12 @@ function ProjectFormView(projectFormController, projectFormModel) { var $formTitle = $("<h2>").append(title); $formColumn.append($formTitle); + var $toolbar = $("<div>"); + $formColumn.append($toolbar); + if(this._projectFormModel.mode !== FormMode.CREATE) { //Delete - $formTitle.append(" "); - $formTitle.append(FormUtil.getDeleteButton(function(reason) { + $toolbar.append(FormUtil.getDeleteButton(function(reason) { _this._projectFormController.deleteProject(reason); }, true)); } @@ -68,17 +70,17 @@ function ProjectFormView(projectFormController, projectFormModel) { Util.unblockUI(); }); }); - $formTitle.append(" "); - $formTitle.append($createExpBtn); - $formTitle.append(" "); + $toolbar.append(" "); + $toolbar.append($createExpBtn); + $toolbar.append(" "); var $editBtn = $("<a>", { "class" : "btn btn-default"}).append("<span class='glyphicon glyphicon-edit'></span> Enable Editing"); $editBtn.click(function() { _this._projectFormController.enableEditing(); }); - $formTitle.append($editBtn); + $toolbar.append($editBtn); } - + $formColumn.append("<br>"); // // Metadata Fields // diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js index 23587713832..5d8aeff8ee0 100644 --- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js +++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js @@ -162,7 +162,7 @@ function SampleFormView(sampleFormController, sampleFormModel) { } $formColumn.append($formTitle); - + $formColumn.append($("<br>")); // // PREVIEW IMAGE // -- GitLab