oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

search tab now back to where old dialog was

Browse source
This commit is contained in:
Doug Bell 2010-10-04 14:44:57 -05:00
parent 0751872e21
commit 9efe4fc933
2 changed files with 25 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

34
www/extras/admin/admin.css
View file

@ -134,50 +134,42 @@ input.disabled {
text-align: right; text-align: right;
} }
#search { .searchForm {
position: absolute; margin: 1em 8% 0;
z-index: 6000;
background-color: white;
width: 70%;
left: 15%;
right: 15%;
padding: 5px;
border: ridge #777;
border-width: 0 4px 4px 4px;
} }
#searchKeywords { .searchKeywords {
display: block; display: block;
width: 83%; width: 90%;
height: 1.70em; height: 1.70em;
margin-bottom: 5px; margin-bottom: 5px;
} }
#searchButton { .searchButton {
display: block; display: block;
float: right; float: right;
width: 14%; width: 7%;
} }
#searchButton-button { .searchButton-button {
display: block; display: block;
width: 100%; width: 100%;
} }
#searchFilters { .searchFilters {
clear: both; clear: both;
list-style-type: none; list-style-type: none;
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
#searchFilters .deleteIcon { .searchFilters .deleteIcon {
display: block; 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; display: block;
float: left; float: left;
width: 9%; width: 9%;
@ -186,7 +178,7 @@ input.disabled {
line-height: 24px; line-height: 24px;
} }
#searchFilterAdd { .searchFilterAdd {
clear: both; clear: both;
} }
@ -196,7 +188,7 @@ input.disabled {
width: 89%; width: 89%;
} }
#searchFilters .yui-ac-bd li { .searchFilters .yui-ac-bd li {
height: 50px; height: 50px;
} }

22
www/extras/admin/admin.js
View file

@ -1820,27 +1820,27 @@ WebGUI.Admin.Search
// Fire when ready, Gridley // Fire when ready, Gridley
this.admin.tabBar.addTab( newTab ); this.admin.tabBar.addTab( newTab );
this.admin.tabBar.selectTab( this.admin.tabBar.get('tabs').length - 1 );
var searchForm = newForm.getElementsByTagName('form')[0]; var searchForm = newForm.getElementsByTagName('form')[0];
this.form = searchForm; this.form = searchForm;
this.form.className = "searchForm";
var searchButton = searchForm.elements['searchButton']; var searchButton = searchForm.elements['searchButton'];
this.searchButton = searchButton; this.searchSubmitButton = new YAHOO.widget.Button( searchButton, {
new YAHOO.widget.Button( searchButton, {
onclick : { fn: this.requestSearch, scope: this } onclick : { fn: this.requestSearch, scope: this }
} ); } );
this.searchSubmitButton.addClass( searchButton.className );
var searchFilterSelect = searchForm.elements['searchFilterSelect']; var searchFilterSelect = searchForm.elements['searchFilterSelect'];
this.searchFilterSelect = searchFilterSelect; this.searchFilterSelect = searchFilterSelect;
var searchFilterAdd = searchForm.elements['searchFilterAdd']; var searchFilterAdd = searchForm.elements['searchFilterAdd'];
this.searchFilterAdd = searchFilterAdd; this.searchFilterAdd = searchFilterAdd;
new YAHOO.widget.Button( searchFilterAdd, { this.searchFilterButton
type : "menu", = new YAHOO.widget.Button( searchFilterAdd, {
menu : searchFilterSelect type : "menu",
} ); menu : searchFilterSelect
var self = this; } );
YAHOO.util.Event.on( window, "load", function () { this.searchFilterButton.getMenu().subscribe( "click", this.addFilter, this, true );
self.filterSelect.getMenu().subscribe( "click", self.addFilter, newTab, true );
} );
var searchKeywords = searchForm.elements['searchKeywords']; var searchKeywords = searchForm.elements['searchKeywords'];
this.searchKeywords = searchKeywords; this.searchKeywords = searchKeywords;
@ -1850,6 +1850,8 @@ WebGUI.Admin.Search
var searchFiltersContainer = searchForm.getElementsByTagName('ul')[0]; var searchFiltersContainer = searchForm.getElementsByTagName('ul')[0];
this.searchFiltersContainer = searchFiltersContainer; this.searchFiltersContainer = searchFiltersContainer;
this.filters = [];
}; };