[Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-search.tmpl,1.1.2.3,1.1.2.4

[Owen Leonard]

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28496/koha-tmpl/opac-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	opac-search.tmpl 
Log Message:
Reformatting search page

Index: opac-search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-search.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** opac-search.tmpl	17 Feb 2005 21:31:18 -0000	1.1.2.3
--- opac-search.tmpl	17 Mar 2005 22:38:29 -0000	1.1.2.4
***************
*** 6,13 ****
  <!-- CONTENT -->
  <div id="main">
  <h1>Search the Catalog</h1>
  
- <form name="f" method="post" action="/cgi-bin/koha/opac-search.pl">
  <div class="form">
  <table>
  <tr><th><label for="keyword">Keyword</label></th><td><input type="hidden" name="op" value="do_search" />
--- 6,38 ----
  <!-- CONTENT -->
  <div id="main">
+ <form name="f" method="post" action="/cgi-bin/koha/opac-search.pl">
  <h1>Search the Catalog</h1>
  
  <div class="form">
+ 
+ <div id="search-sidebar"><div class="sidebar-box">
+ 			<h3>Results:</h3>
+ 			<p><label for="resultsperpage">Results per page:</label>
+ 			<select name="resultsperpage" id="resultsperpage" size="1">
+ 				<option value="20">20</option>
+ 				<option value="50">50</option>
+ 				<option value="100">100</option>
+ 			</select></p>
+ 		<p><label for="orderby">Ordered by:</label>
+ 			<select name="orderby" id="orderby" size="1">
+ 				<option value="biblio.title">Title</option>
+ 				<option value="biblio.author">Author</option>
+ 				<option value="biblioitems.dewey">Dewey</option>
+ 				<option value="biblioitems.publicationyear">Publication Year</option>
+ 				<option value="biblioitems.publishercode">Publisher</option>
+ 			</select>
+ 		</p>
+ </div>
+ <div class="sidebar-box">
+ 			<h3>More Searches:</h3>
+ 			<h4><a href="/format-search.php">Search by Format and Date</a></h4>
+ 			<p>Find the latest additions</p>
+ </div></div>
+ 
  <table>
  <tr><th><label for="keyword">Keyword</label></th><td><input type="hidden" name="op" value="do_search" />
***************
*** 46,56 ****
  			<input type="hidden" name="operator" value="=" />
  			<!-- TMPL_VAR name="CGIitemtype" --></td></tr>
! <tr><th><label for="branch">Location</label></th><td><input type="hidden" name="marclist" value="items.holdingbranch" />
  				<input type="hidden" name="and_or" value="and" />
  				<input type="hidden" name="excluding" value="" />
  				<input type="hidden" name="operator" value="=" />  
  				<!-- TMPL_VAR name="CGIbranch" --></td></tr>
! </table>
! <input type="submit" value="Search" class="submit" />
  <table>
  <caption>Other options:</caption>
--- 71,81 ----
  			<input type="hidden" name="operator" value="=" />
  			<!-- TMPL_VAR name="CGIitemtype" --></td></tr>
! <tr><th><label for="branch">Location</label></th><td><input type="hidden" name="marclist" value="items.homebranch" />
  				<input type="hidden" name="and_or" value="and" />
  				<input type="hidden" name="excluding" value="" />
  				<input type="hidden" name="operator" value="=" />  
  				<!-- TMPL_VAR name="CGIbranch" --></td></tr>
! </table>			
! <p><input type="submit" value="Search" class="submit" /></p>
  <table>
  <caption>Other options:</caption>
***************
*** 59,63 ****
  				<input type="hidden" name="and_or" value="and" />
  				<input type="hidden" name="excluding" value="" />
! 				<input type="hidden" name="operator" value="start" />
  				<input type="text" id="barcode" name="value" size="14" maxlength="14" /></td></tr>
  <tr><th><label for="dewey">Call Number</label></th><td><input type="hidden" name="marclist" value="biblioitems.dewey" />
--- 84,88 ----
  				<input type="hidden" name="and_or" value="and" />
  				<input type="hidden" name="excluding" value="" />
! 				<input type="hidden" name="operator" value="=" />
  				<input type="text" id="barcode" name="value" size="14" maxlength="14" /></td></tr>
  <tr><th><label for="dewey">Call Number</label></th><td><input type="hidden" name="marclist" value="biblioitems.dewey" />
***************
*** 87,109 ****
  			<input type="text" id="puband" name="value" size="6" maxlength="4" /></td></tr>
  </table>
! 		<p>Results per page :
! 			<select name="resultsperpage" size="1">
! 				<option value="20">20</option>
! 				<option value="50">50</option>
! 				<option value="100">100</option>
! 			</select>
! 		Ordered by
! 			<select name="orderby" size="1">
! 				<option value="biblio.title">Title</option>
! 				<option value="biblio.author">Author</option>
! 				<option value="biblioitems.dewey">Dewey</option>
! 				<option value="biblioitems.publicationyear">Publication Year</option>
! 				<option value="biblioitems.publishercode">Publisher</option>
! 			</select>
! 		</p>
! 		<p>	<input type="submit" value="Search" class="submit" /></p>
  	</div>
  </form>
  
  <script type="text/javascript">
  function sql_update() {
--- 112,135 ----
  			<input type="text" id="puband" name="value" size="6" maxlength="4" /></td></tr>
  </table>
! 		<p><input type="submit" value="Search" class="submit" /></p>
  	</div>
  </form>
  
+ <!-- Hide from NPL --><div class="content-block">
+ <h3>Recent acquisitions</h3>
+ 	<form action="/cgi-bin/koha/opac-search.pl">
+ 		<p>
+ 			<!-- TMPL_VAR name="CGIitemtype" --> acquired recently (the most recent being first)
+ 			<input type="hidden" name="marclist" value="biblioitems.itemtype" />
+ 			<input type="hidden" name="and_or" value="and" />
+ 			<input type="hidden" name="excluding" value="" />
+ 			<input type="hidden" name="operator" value="=" />
+ 			<input type="hidden" name="op" value="do_search" />
+ 			<input type="hidden" name="type" value="opac" />
+ 			<input type="hidden" name="orderby" value="biblio.timestamp desc">
+ 			<input type="submit" value="Search" class="submit" />
+ 		</p>
+ 	</form>
+ </div><!-- /Hide from NPL -->
  <script type="text/javascript">
  function sql_update() {