From f77b357a73b37244dc2d5075a44b0bcd67925537 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Mon, 14 Dec 2015 15:48:00 +0000
Subject: [PATCH] SSDM-2960 : ELN: Layout Improvements - Side Menu as tree
SVN: 35313
---
.../eln-lims/1/as/webapps/eln-lims/html/css/style.css | 10 ++++++++--
.../html/js/views/SideMenu/SideMenuWidgetView.js | 9 ++++++---
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/css/style.css b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/css/style.css
index a9c61ae705a..9d33baabcb7 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/css/style.css
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/css/style.css
@@ -165,7 +165,13 @@ h1, h2, legend {
/*
* Navigation bar - Search
*/
-
+
+.navbar.navbar-default,
+.nav.navbar-nav,
+.nav.navbar-nav > ul {
+ width: 100%;
+}
+
.navbar-form {
padding-left: 5px;
}
@@ -175,8 +181,8 @@ h1, h2, legend {
background-image: url(../img/search-icon.png);
background-repeat: no-repeat;
background-position: 12px 9px;
- width: 145px;
border-radius: 15px 15px 15px 15px;
+ width: 80%;
}
.search-query-searching {
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js
index 22a75f057a1..b8af6aca8c2 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js
@@ -96,8 +96,9 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) {
//
var $header = $("<div>", {"id": "sideMenuHeader"});
var $headerItemList = $("<ul>", {"class": "nav navbar-nav"});
+ var $headerItemList2 = $("<ul>", {"class": "nav navbar-nav"});
$header.append($("<nav>", {"class": "navbar navbar-default", "role": "navigation", "style": "margin:0px; border-left-width:0px; border-right-width:0px;"})
- .append($headerItemList)
+ .append($headerItemList).append($("<br>")).append($headerItemList2)
);
var $toggleButton = $("<li>")
@@ -187,6 +188,7 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) {
var $searchForm = $("<li>")
.append($("<form>", {"class": "navbar-form", "onsubmit": "return false;", "style": "padding-right:0px;"})
.append(searchElement));
+ $searchForm.css({"width" : "100%"});
var $searchFormDropdown = $("<li>")
.append($("<form>", {"class": "navbar-form", "onsubmit": "return false;"})
.append(dropDownSearch));
@@ -205,9 +207,10 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) {
$headerItemList.append($toggleButton);
$headerItemList.append($toggleMenuButton);
$headerItemList.append($toggleNavButton);
- $headerItemList.append($searchForm);
+
+ $headerItemList2.append($searchForm);
if(dropDownSearch !== "") {
- $headerItemList.append($searchFormDropdown);
+ $headerItemList2.append($searchFormDropdown);
}
var $body = $("<div>", {"id": "sideMenuBody"});
--
GitLab