From a1e74be9ee50eceb8585e1f968247438c58a5e98 Mon Sep 17 00:00:00 2001
From: oleonard <oleonard>
Date: Wed, 8 Mar 2006 20:01:21 +0000
Subject: [PATCH] Updating opac-main and opac-search with form from
 opac-recacquisitions

---
 koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl     | 28 +++++++++++------
 .../npl/en/opac-recacquisitions.tmpl          |  4 +--
 koha-tmpl/opac-tmpl/npl/en/opac-search.tmpl   | 31 +++++++++++++------
 3 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl b/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl
index 9d5e59d436..232361a113 100644
--- a/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl
+++ b/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl
@@ -43,22 +43,32 @@
 
 <div class="content-block">
 	<h3>Recent acquisitions</h3>
-	<form action="/cgi-bin/koha/opac-search.pl">
-		<p>
-			<!-- TMPL_VAR name="CGIitemtype" --><input type="hidden" name="marclist" value="biblioitems.itemtype" />
+<form name="f" method="post" action="/cgi-bin/koha/opac-search.pl">
+			<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" />
+			<!-- TMPL_VAR name="CGIitemtype" --> 
+			Acquired by
+			<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="=" />
+			<input type="hidden" name="op" value="do_search" />
+			<input type="hidden" name="type" value="opac" />
+                        <select name="value">
+                                <option value="">Any Branch</option>
+                        <!-- TMPL_LOOP name="branchloop" -->
+                                <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name
+="branchname" --></option>
+                        <!-- /TMPL_LOOP -->
+                        </select>
+			<br>over the last <input type="text" name="desc_or_asc" size="3" /> days
 			<input type="hidden" name="orderby" value="biblio.timestamp" />
-			<input type="hidden" name="desc_or_asc" value="desc" />
-			acquired in the last
-			<input type="text" name="desc_or_asc" size="3" value="30" />
-			days
 			<input type="submit" value="Search" class="submit" />
-		</p>
-	</form>
+</form>
 </div>
 	
 <!-- TMPL_IF NAME="loggedinusername" -->
diff --git a/koha-tmpl/opac-tmpl/npl/en/opac-recacquisitions.tmpl b/koha-tmpl/opac-tmpl/npl/en/opac-recacquisitions.tmpl
index 5f3632f749..2b270aeb99 100644
--- a/koha-tmpl/opac-tmpl/npl/en/opac-recacquisitions.tmpl
+++ b/koha-tmpl/opac-tmpl/npl/en/opac-recacquisitions.tmpl
@@ -1,6 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Recent Acquisitions
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_INCLUDE NAME="masthead_adv.inc" -->
+<!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
 <div id="main">
@@ -30,7 +30,7 @@
 ="branchname" --></option>
                         <!-- /TMPL_LOOP -->
                         </select>
-			over the last <input type="text" name="desc_or_asc" size="3" /> days
+			<br>over the last <input type="text" name="desc_or_asc" size="3" /> days
 			<input type="hidden" name="orderby" value="biblio.timestamp" />
 			<input type="submit" value="Search" class="submit" />
 </div>
diff --git a/koha-tmpl/opac-tmpl/npl/en/opac-search.tmpl b/koha-tmpl/opac-tmpl/npl/en/opac-search.tmpl
index e117cdb980..d8cc7843ca 100644
--- a/koha-tmpl/opac-tmpl/npl/en/opac-search.tmpl
+++ b/koha-tmpl/opac-tmpl/npl/en/opac-search.tmpl
@@ -119,22 +119,35 @@
 	</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)
+<div class="content-block">
+	<h3>Recent acquisitions</h3>
+<form name="f" method="post" action="/cgi-bin/koha/opac-search.pl">
 			<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" />
+			<!-- TMPL_VAR name="CGIitemtype" --> 
+			Acquired by
+			<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="=" />
+			<input type="hidden" name="op" value="do_search" />
+			<input type="hidden" name="type" value="opac" />
+                        <select name="value">
+                                <option value="">Any Branch</option>
+                        <!-- TMPL_LOOP name="branchloop" -->
+                                <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name
+="branchname" --></option>
+                        <!-- /TMPL_LOOP -->
+                        </select>
+			<br>over the last <input type="text" name="desc_or_asc" size="3" /> days
+			<input type="hidden" name="orderby" value="biblio.timestamp" />
 			<input type="submit" value="Search" class="submit" />
-		</p>
-	</form>
-</div><!-- /Hide from NPL -->
+</form>
+</div>
 <script type="text/javascript">
 function sql_update() {
 document.f.sql.value="";
-- 
2.39.5