--- Webpacus/root/search.tt	2005/12/05 23:24:39	231
+++ Webpacus/root/search.tt	2006/02/19 18:12:57	403
@@ -2,6 +2,7 @@
 
 [% url = base _ 'search/suggest/' %]
 
+<!--
 [% c.prototype.form_remote_tag(
 	url => base _ 'search/results',
 	update => 'results',
@@ -12,12 +13,14 @@
 		name => 'results_form',
 	}
 ) %]
+-->
+<form action="[% base _ 'search/results' %]" method="get" id="results_form" name="results_form">
 
-<table>
+<table id="search_table" border="0">
 
 <tr>
 <td>
- Sve:
+ All:
 </td><td>
  <input autocomplete="off" id="sve_input" name="all" type="text" value="" size="60"/>
  <span id="sve_input_loading" style="display: none;">
@@ -26,7 +29,7 @@
 
  <div class="auto_complete" id="sve_input_auto_complete"></div>
 [% c.prototype.auto_complete_field( 'sve_input', {
-	url => url _ 'TitleProper',
+	url => url _ '?search=all&show=TitleProper',
 	indicator => 'sve_input_loading',
 	frequency => 0.8,
 } ) %]
@@ -37,7 +40,7 @@
 </tr><tr>
 
 <td>
- Naslov:
+ Title:
 </td><td>
  <input autocomplete="off" id="naslov_input" name="TitleProper" type="text" value="" size="60"/>
  <span id="naslov_input_loading" style="display: none;">
@@ -46,16 +49,19 @@
 
  <div class="auto_complete" id="naslov_input_auto_complete"></div>
 [% c.prototype.auto_complete_field( 'naslov_input', {
-	url => url _ 'TitleProper',
+	url => url _ '?search=TitleProper&show=TitleProper',
 	indicator => 'naslov_input_loading',
 	frequency => 0.8,
 } ) %]
+ 
+ <input type="hidden" name="_TitleProper" value="AND" />
+
 </td>
 
 </tr><tr>
 
 <td>
- Autor:
+ Author:
 </td><td>
  <input autocomplete="off" id="autor_input" name="Names" type="text" value="" size="60"/>
  <span id="autor_input_loading" style="display: none;">
@@ -63,10 +69,13 @@
  </span>
 <div class="auto_complete" id="autor_input_auto_complete"></div>
 [% c.prototype.auto_complete_field( 'autor_input', {
-	url => url _ 'Names',
+	url => url _ '?search=Names&show=Names',
 	indicator => 'autor_input_loading',
 	frequency => 0.8,
 } ) %]
+ 
+ <input type="hidden" name="_Names" value="AND" />
+
 </td>
 
 </tr>
@@ -75,22 +84,39 @@
 <!-- additional fields which might get updated by javascript -->
 <input name="_template" type="hidden" id="template_name" />
 <input name="_page" type="hidden" id="page_nr" />
+<input name="_reset" type="hidden" id="_reset" value="sve_input,naslov_input,autor_input"/>
+
+<div class="databases">
+<a href="#" onclick="return toggleLinkAndElement( this, 'database_list', 'Sakrij knjižnice!');">Pokaži knjižnice!</a>
+ <ul id="database_list" style="display: none;">
+  [% FOREACH db = c.comp('Model::WebPAC').list_nodes( site ).sort('label') %]
+   <li><input type="checkbox" name="_database" value="[% db.name %]" onclick="return checkbox_click();"><a href="#" onclick="return checkbox_single('_database','[% db.name %]');">[% db.label %]</a></li>
+  [% END %]
+ </ul>
+</div>
+
+<div class="buttons">
 
 <input type="submit" name="_submit" value="Search" 
 	onclick="reset_page_nr( 1 ); return true;"
 />
 
 <span id="searching" style="display: none;">
-   Search in progress...
-   <img src="/img/indicator.gif" />
+ Search in progress...
+ <img src="/img/indicator.gif" />
 </span>
 
-<input type="reset" name="_reset" value="Clear" />
+<input type="button" name="_reset_button" value="Clear" onclick="return reset_form();" />
+
+</div>
+
 
 </form>
 
 <div id="results">
+[% IF results ; results ; ELSE %]
 <span class="notice">No results yet.</span>
+[% END %]
 </div>
 
 [% INCLUDE footer.tt %]