Remove search field on group button

Hide the search bar when showing the groups listed for a user, and resotre it when doing other searches.

The enroll button is added only on the groups page, and removed along with anything else in the searchButtons div when a new search is started.

3 files changed, 8 insertions, 7 deletions

diff --git a/install/static/index.xhtml b/install/static/index.xhtml
index a33b08364..b22a5bacc 100644
--- a/install/static/index.xhtml
+++ b/install/static/index.xhtml
@@ -49,8 +49,8 @@
     </div>
 
     <div id="search"  style="visibility:hidden">
-      <div class="searchControls" >
-	<span class="filter"  >
+      <div id="searchControls"  class="searchControls" >
+	<span id="filter" class="filter"  >
 	  <input id="queryFilter" type="text"/>
 	  <input id="query" type="submit" value="find" />
 	  <input id="new" type="submit" value="new" />
diff --git a/install/static/search.js b/install/static/search.js
index 6b0be6d47..de11f2eda 100644
--- a/install/static/search.js
+++ b/install/static/search.js
@@ -15,6 +15,9 @@ function showSearch(){
     $('#content').css("visibility","hidden");
     $('#search').css("display","block");
     $('#content').css("display","none");
+    $("#filter").css("display","block");
+    $("#searchButtons").html("");
+    
 
 }
 
diff --git a/install/static/user.js b/install/static/user.js
index f91fc01be..53a84359d 100644
--- a/install/static/user.js
+++ b/install/static/user.js
@@ -66,7 +66,7 @@ function renderUserLinks(current, cell){
     }).appendTo(cell);
 
     $("<a/>",{
-	href: "#tab=user&facet=details&pkey="+current.uid,
+	href: "#?tab=user&facet=group&pkey="+current.uid,
 	click:setupUserGroupMembership,
 	html: "[G]"
     }).appendTo(cell);
@@ -243,16 +243,14 @@ function populateUserEnrollments(userData){
 
 function setupUserGroupMembership(){
 
-    $("#searchButtons").html("");
-
+    showSearch();    
+    $("#filter").css("display","none");
     $("<input/>",{
 	type:  'button',
 	value: 'enroll',
 	click: setupUserGroupEnrollmentSearch
     }).appendTo("#searchButtons");
 
-
-    showSearch();
     var columnHeaders  = document.createElement("tr");
     for (var i =0 ; i != groupMembershipColumns.length ;i++){
 	var th = document.createElement("th");