SSDM-3501 : Search Bugfixes

SVN: 37971

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,

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);

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 = {};

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;