[Koha-cvs] koha/koha-tmpl/opac-tmpl/npl/en opac-main.tmpl ... [rel_2_2]

[Owen Leonard]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_2_2
Changes by:     Owen Leonard <address@hidden>   06/03/08 20:01:21

Modified files:
        koha-tmpl/opac-tmpl/npl/en: opac-main.tmpl 
                                    opac-recacquisitions.tmpl 
                                    opac-search.tmpl 

Log message:
        Updating opac-main and opac-search with form from opac-recacquisitions

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl.diff?only_with_tag=rel_2_2&tr1=1.3.2.10&tr2=1.3.2.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-recacquisitions.tmpl.diff?only_with_tag=rel_2_2&tr1=1.1.2.1&tr2=1.1.2.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-search.tmpl.diff?only_with_tag=rel_2_2&tr1=1.1.2.10&tr2=1.1.2.11&r1=text&r2=text

Patches:
Index: koha/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl
diff -u koha/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl:1.3.2.10 
koha/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl:1.3.2.11
--- koha/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl:1.3.2.10     Sat Mar  4 
06:52:22 2006
+++ koha/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl      Wed Mar  8 20:01:21 2006
@@ -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" -->
Index: koha/koha-tmpl/opac-tmpl/npl/en/opac-recacquisitions.tmpl
diff -u koha/koha-tmpl/opac-tmpl/npl/en/opac-recacquisitions.tmpl:1.1.2.1 
koha/koha-tmpl/opac-tmpl/npl/en/opac-recacquisitions.tmpl:1.1.2.2
--- koha/koha-tmpl/opac-tmpl/npl/en/opac-recacquisitions.tmpl:1.1.2.1   Wed Mar 
 1 19:47:03 2006
+++ koha/koha-tmpl/opac-tmpl/npl/en/opac-recacquisitions.tmpl   Wed Mar  8 
20:01:21 2006
@@ -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>
Index: koha/koha-tmpl/opac-tmpl/npl/en/opac-search.tmpl
diff -u koha/koha-tmpl/opac-tmpl/npl/en/opac-search.tmpl:1.1.2.10 
koha/koha-tmpl/opac-tmpl/npl/en/opac-search.tmpl:1.1.2.11
--- koha/koha-tmpl/opac-tmpl/npl/en/opac-search.tmpl:1.1.2.10   Tue Feb  7 
23:40:21 2006
+++ koha/koha-tmpl/opac-tmpl/npl/en/opac-search.tmpl    Wed Mar  8 20:01:21 2006
@@ -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="";