From 9efe4fc933557fc58fa18801a6e46e9af9e2949e Mon Sep 17 00:00:00 2001
From: Doug Bell <doug@plainblack.com>
Date: Mon, 4 Oct 2010 14:44:57 -0500
Subject: [PATCH] search tab now back to where old dialog was

---
 www/extras/admin/admin.css | 34 +++++++++++++---------------------
 www/extras/admin/admin.js  | 22 ++++++++++++----------
 2 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/www/extras/admin/admin.css b/www/extras/admin/admin.css
index f5b5d9556..4ae3af8ae 100644
--- a/www/extras/admin/admin.css
+++ b/www/extras/admin/admin.css
@@ -134,50 +134,42 @@ input.disabled {
     text-align: right;
 }
 
-#search {
-    position: absolute;
-    z-index: 6000;
-    background-color: white;
-    width: 70%;
-    left: 15%;
-    right: 15%;
-    padding: 5px;
-    border: ridge #777;
-    border-width: 0 4px 4px 4px;
+.searchForm {
+    margin: 1em 8% 0;
 }
 
-#searchKeywords {
+.searchKeywords {
     display: block;
-    width:  83%;
+    width:  90%;
     height: 1.70em;
     margin-bottom: 5px;
 }
 
-#searchButton {
+.searchButton {
     display: block;
     float: right;
-    width: 14%;
+    width: 7%;
 }
 
-#searchButton-button {
+.searchButton-button {
     display: block;
     width: 100%;
 }
 
-#searchFilters {
+.searchFilters {
     clear: both;
     list-style-type: none;
     margin: 0;
     padding: 0;
 }
 
-#searchFilters .deleteIcon {
+.searchFilters .deleteIcon {
     display: block;
 }
 
-#searchFilters li { height: 28px; } /* autocomplete is position: absolute, so pretend some height */
+.searchFilters li { height: 28px; } /* autocomplete is position: absolute, so pretend some height */
 
-#searchFilters span.name {
+.searchFilters span.name {
     display: block;
     float: left;
     width: 9%;
@@ -186,7 +178,7 @@ input.disabled {
     line-height: 24px;
 }
 
-#searchFilterAdd {
+.searchFilterAdd {
     clear: both;
 }
 
@@ -196,7 +188,7 @@ input.disabled {
     width: 89%;
 }
 
-#searchFilters .yui-ac-bd li {
+.searchFilters .yui-ac-bd li {
     height: 50px;
 }
 
diff --git a/www/extras/admin/admin.js b/www/extras/admin/admin.js
index deb1e24a8..8f86b1336 100644
--- a/www/extras/admin/admin.js
+++ b/www/extras/admin/admin.js
@@ -1820,27 +1820,27 @@ WebGUI.Admin.Search
 
     // Fire when ready, Gridley
     this.admin.tabBar.addTab( newTab );
+    this.admin.tabBar.selectTab( this.admin.tabBar.get('tabs').length - 1 );
 
     var searchForm      = newForm.getElementsByTagName('form')[0];
     this.form           = searchForm;
+    this.form.className = "searchForm";
     var searchButton    = searchForm.elements['searchButton'];
-    this.searchButton   = searchButton;
-    new YAHOO.widget.Button( searchButton, {
+    this.searchSubmitButton   = new YAHOO.widget.Button( searchButton, {
         onclick     : { fn: this.requestSearch, scope: this }
     } );
+    this.searchSubmitButton.addClass( searchButton.className );
 
     var searchFilterSelect  = searchForm.elements['searchFilterSelect'];
     this.searchFilterSelect = searchFilterSelect;
     var searchFilterAdd     = searchForm.elements['searchFilterAdd'];
     this.searchFilterAdd    = searchFilterAdd;
-    new YAHOO.widget.Button( searchFilterAdd, {
-        type : "menu",
-        menu : searchFilterSelect
-    } );
-    var self = this;
-    YAHOO.util.Event.on( window, "load", function () {
-        self.filterSelect.getMenu().subscribe( "click", self.addFilter, newTab, true );
-    } );
+    this.searchFilterButton 
+        = new YAHOO.widget.Button( searchFilterAdd, {
+            type : "menu",
+            menu : searchFilterSelect
+        } );
+    this.searchFilterButton.getMenu().subscribe( "click", this.addFilter, this, true );
 
     var searchKeywords = searchForm.elements['searchKeywords'];
     this.searchKeywords = searchKeywords;
@@ -1850,6 +1850,8 @@ WebGUI.Admin.Search
 
     var searchFiltersContainer  = searchForm.getElementsByTagName('ul')[0];
     this.searchFiltersContainer = searchFiltersContainer;
+
+    this.filters    = [];
 };