From e30aaece82badea48c8c88df21415158f5919a3b Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Fri, 17 Jun 2016 13:39:07 +0000
Subject: [PATCH] SSDM-3733 : Exports form, ongoing work
SVN: 36705
---
.../eln-lims/1/as/webapps/eln-lims/html/css/style.css | 1 +
.../1/as/webapps/eln-lims/html/js/util/FormUtil.js | 7 ++++++-
.../eln-lims/html/js/views/Export/ExportTreeView.js | 3 ++-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/css/style.css b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/css/style.css
index 8482009a4c2..44035260733 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/css/style.css
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/css/style.css
@@ -222,6 +222,7 @@ h1, h2, legend {
.ui-fancytree {
color: #777;
+ background-color: transparent !important;
border: none !important;
}
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js
index f89360eacf8..0c0f779d2db 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js
@@ -799,8 +799,13 @@ var FormUtil = new function() {
return link;
}
+ this.getBox = function() {
+ var $box = $("<div>", { style : "background-color:#f8f8f8; margin-right:10px; padding:10px; border-color: #e7e7e7; border-style: solid; border-width: 1px;"});
+ return $box;
+ }
+
this.getInfoBox = function(title, lines) {
- var $infoBox = $("<div>", { style : "background-color:#f8f8f8; margin:10px; padding:10px; border-color: #e7e7e7; border-style: solid; border-width: 1px;"});
+ var $infoBox = this.getBox();
$infoBox.append($("<span>", { class : 'glyphicon glyphicon-info-sign' })).append(" " + title);
for(var lIdx = 0; lIdx < lines.length; lIdx++) {
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/Export/ExportTreeView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/Export/ExportTreeView.js
index 4ec4bb80234..bb8f3bd339c 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/Export/ExportTreeView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/Export/ExportTreeView.js
@@ -41,7 +41,8 @@ function ExportTreeView(exportTreeController, exportTreeModel) {
"If you select a node, and you expand it, it means you want to export only that entity because the entities under it will be unselected by default."
]));
var $tree = $("<div>", { "id" : "exportsTree" });
- $formColumn.append($tree);
+ $formColumn.append($("<br>"));
+ $formColumn.append(FormUtil.getBox().append($tree));
$container.append($form);
--
GitLab