From 6e9331371eea49142d86c44631b700cfceed29ab Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Thu, 7 Jul 2016 09:02:25 +0000
Subject: [PATCH] SSDM-3815 : Cosmetic Fixes
SVN: 36804
---
.../js/views/SideMenu/SideMenuWidgetView.js | 24 +++++++++----------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js
index eb009cc9418..a3843d61f05 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js
@@ -65,7 +65,6 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) {
.append($("<span>", {"class": "glyphicon glyphicon-resize-full"}))
);
- var dropDownSearch = "";
var searchDomains = profile.getSearchDomains();
var searchFunction = function() {
@@ -86,8 +85,9 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) {
mainController.changeView("showSearchPage", argsMapStr);
};
-
- if (searchDomains.length > 1) {
+
+ var dropDownSearch = null;
+ if (searchDomains.length > 0) {
//Default Selected for the prefix
var defaultSelected = "";
if (searchDomains[0].label.length > 3) {
@@ -130,14 +130,16 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) {
var searchElement = $("<input>", {"id": "search", "type": "text", "class": "form-control search-query", "placeholder": "Search"});
searchElement.change(searchFunction);
-
+ searchElement.css({"width" : "68%"});
+ searchElement.css({"padding-right" : "0px"});
+ searchElement.css({"margin-right" : "2px"});
+
var $searchForm = $("<li>")
- .append($("<form>", {"class": "navbar-form", "onsubmit": "return false;", "style": "padding-right:0px;"})
- .append(searchElement));
+ .append($("<form>", {"class": "navbar-form", "onsubmit": "return false;" })
+ .append(searchElement)
+ .append(dropDownSearch)
+ );
$searchForm.css({"width" : "100%"});
- var $searchFormDropdown = $("<li>")
- .append($("<form>", {"class": "navbar-form", "onsubmit": "return false;"})
- .append(dropDownSearch));
var logoutButton = $("<a>", {"id": "logout-button", "href": ""}).append($("<span>", {"class": "glyphicon glyphicon-off"}));
logoutButton.click(function() {
@@ -153,10 +155,6 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) {
$headerItemList.append($toggleButton);
$headerItemList.append($searchForm);
- if(dropDownSearch !== "") {
- $headerItemList.append($searchFormDropdown);
- }
-
var $body = $("<div>", {"id": "sideMenuBody"});
$widget
.append($header)
--
GitLab