From 3d137eb4de58aae263c4171930f36da01142e7d6 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Mon, 27 Mar 2017 11:51:07 +0000
Subject: [PATCH] SSDM-3501 : Search Bugfixes
SVN: 37971
---
.../eln-lims/1/as/webapps/eln-lims/html/css/style.css | 10 +++-------
.../eln-lims/html/js/controllers/MainController.js | 1 +
.../views/AdvancedSearch/AdvancedSearchController.js | 1 +
.../html/js/views/SideMenu/SideMenuWidgetView.js | 4 ++--
4 files changed, 7 insertions(+), 9 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 adbcda8295d..d6bc81dc369 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
@@ -17,11 +17,6 @@
/*
* General Overrides
*/
-.form-panel-one,
-.form-panel-two {
- overflow-y : auto;
- overflow-x : hidden;
-}
.table {
table-layout:fixed;
@@ -236,7 +231,7 @@ body,
padding-left: 5px;
}
-.navbar-form .search-query {
+.search-query {
padding-left: 30px;
background-image: url(../img/search-icon.png);
background-repeat: no-repeat;
@@ -247,7 +242,8 @@ body,
.search-query-searching {
background-image: url(../img/search-spinner.gif) !important;
- background-position: 12px 5px !important;
+ background-position: 95% 50% !important;
+ background-repeat: no-repeat;
}
.ui-fancytree,
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js
index a37040c6058..ce0288dd5fd 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js
@@ -837,6 +837,7 @@ function MainController(profile) {
var newView = null;
if(freeText) {
+ $("#search").addClass("search-query-searching");
newView = new AdvancedSearchController(this, freeText);
} else {
newView = new AdvancedSearchController(this);
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchController.js
index c0113d2032b..73c7f6720f1 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchController.js
@@ -92,6 +92,7 @@ function AdvancedSearchController(mainController, forceSearch) {
objects : dataList,
totalCount : results.totalCount
});
+ $("#search").removeClass("search-query-searching");
}
var fetchOptions = {};
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 2f166961e12..3f856ce84e2 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
@@ -47,8 +47,8 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) {
var searchDomainLabel = null;
if(domainIndex) {
- searchDomain = profile.getSearchDomains()[searchDomain].name;
- searchDomainLabel = profile.getSearchDomains()[searchDomain].label;
+ searchDomain = profile.getSearchDomains()[domainIndex].name;
+ searchDomainLabel = profile.getSearchDomains()[domainIndex].label;
} else {
searchDomain = profile.getSearchDomains()[0].name;
searchDomainLabel = profile.getSearchDomains()[0].label;
--
GitLab