From 263567a05f5642e3c0510ee10c63a3ca6921f742 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Tue, 28 Mar 2017 08:42:24 +0000
Subject: [PATCH] SSDM-3501 : Headers bugfix, allow headers to expand to fit
the title when needed.
SVN: 37983
---
.../html/js/controllers/LayoutManager.js | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/LayoutManager.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/LayoutManager.js
index ecd10d59481..6149538fb3f 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/LayoutManager.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/LayoutManager.js
@@ -2,6 +2,7 @@
// Requires Jquery, Jquery UI and Bootstrap
var LayoutManager = {
+ MIN_HEADER_HEIGHT : 120,
body : null,
mainContainer : null,
firstColumn : null,
@@ -185,11 +186,12 @@ var LayoutManager = {
if (view.header) {
- headerHeight = 157;
+ headerHeight = this.MIN_HEADER_HEIGHT;
this.secondColumnHeader.append(view.header);
this.secondColumnHeader.css({
display : "block",
- height : headerHeight
+ "min-height" : headerHeight,
+ "height" : "auto"
});
} else {
this.secondColumnHeader.css({ display : "none" });
@@ -241,11 +243,12 @@ var LayoutManager = {
});
if (view.header) {
- headerHeight = 157;
+ headerHeight = this.MIN_HEADER_HEIGHT;
this.secondColumnHeader.append(view.header);
this.secondColumnHeader.css({
display : "block",
- height : headerHeight
+ "min-height" : headerHeight,
+ "height" : "auto"
});
} else {
this.secondColumnHeader.css({ display : "none" });
@@ -305,7 +308,10 @@ var LayoutManager = {
}
if (view.header) {
- view.header.css("height", "auto");
+ view.header.css({
+ "min-height" : this.MIN_HEADER_HEIGHT,
+ "height" : "auto"
+ });
this.firstColumn.append(view.header);
}
--
GitLab