[Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-main.tmpl,1.3.2.6,1.3.2.7 opac-search.tmpl,1.1.2.7,1.1.2.8

[Owen Leonard]

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

Modified Files:
      Tag: rel_2_2
        opac-main.tmpl opac-search.tmpl 
Log Message:
Synching with default template

Index: opac-main.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl,v
retrieving revision 1.3.2.6
retrieving revision 1.3.2.7
diff -C2 -r1.3.2.6 -r1.3.2.7
*** opac-main.tmpl      2 Aug 2005 21:38:07 -0000       1.3.2.6
--- opac-main.tmpl      28 Sep 2005 21:09:35 -0000      1.3.2.7
***************
*** 43,48 ****
        <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="" />
--- 43,47 ----
        <form action="/cgi-bin/koha/opac-search.pl">
                <p>
!                       <!-- TMPL_VAR name="CGIitemtype" --><input 
type="hidden" name="marclist" value="biblioitems.itemtype" />
                        <input type="hidden" name="and_or" value="and" />
                        <input type="hidden" name="excluding" value="" />
***************
*** 52,55 ****
--- 51,57 ----
                        <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>

Index: opac-search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-search.tmpl,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -C2 -r1.1.2.7 -r1.1.2.8
*** opac-search.tmpl    9 Jun 2005 18:21:40 -0000       1.1.2.7
--- opac-search.tmpl    28 Sep 2005 21:09:35 -0000      1.1.2.8
***************
*** 51,60 ****
                        <input type="hidden" name="excluding" value="" />
                        <input type="hidden" name="operator" value="contains" />
!                       <input type="text" id="title" name="value" /><a 
href="javascript:Dopop('opac-dictionary.pl?marclist=biblio.title&amp;type=intranet&amp;index=1',1)"><strong>...</strong></a></td></tr>
  <tr><th><label for="author">Author</label></th><td><input type="hidden" 
name="marclist" value="biblio.author" />
                        <input type="hidden" name="and_or" value="and" />
                        <input type="hidden" name="excluding" value="" />
                        <input type="hidden" name="operator" value="contains" />
!                       <input type="text" id="author" name="value" /><a 
href="javascript:Dopop('opac-dictionary.pl?marclist=biblio.author&amp;type=intranet&amp;index=2',2)"><strong>...</strong></a></td></tr>
  <tr><th><label for="subject">Subject</label></th><td>                 
                        <input type="hidden" name="marclist" 
value="bibliosubject.subject" />
--- 51,60 ----
                        <input type="hidden" name="excluding" value="" />
                        <input type="hidden" name="operator" value="contains" />
!                       <input type="text" id="title" name="value" /><!-- 
TMPL_UNLESS NAME="Disable_Dictionary" --><a 
href="javascript:Dopop('opac-dictionary.pl?marclist=biblio.title&amp;type=intranet&amp;index=1',1)"><strong>...</strong></a><!--
 /TMPL_UNLESS --></td></tr>
  <tr><th><label for="author">Author</label></th><td><input type="hidden" 
name="marclist" value="biblio.author" />
                        <input type="hidden" name="and_or" value="and" />
                        <input type="hidden" name="excluding" value="" />
                        <input type="hidden" name="operator" value="contains" />
!                       <input type="text" id="author" name="value" /><!-- 
TMPL_UNLESS NAME="Disable_Dictionary" --><a 
href="javascript:Dopop('opac-dictionary.pl?marclist=biblio.author&amp;type=intranet&amp;index=2',2)"><strong>...</strong></a><!--
 /TMPL_UNLESS --></td></tr>
  <tr><th><label for="subject">Subject</label></th><td>                 
                        <input type="hidden" name="marclist" 
value="bibliosubject.subject" />
***************
*** 62,66 ****
                        <input type="hidden" name="excluding" value="" />
                        <input type="hidden" name="operator" value="contains" 
/>  
!                       <input type="text" id="subject" name="value" size="35" 
/><a 
href="javascript:Dopop('opac-dictionary.pl?marclist=bibliosubject.subject&amp;type=intranet&amp;index=3',3)"><strong>...</strong></a></td></tr>
  <tr><th><label for="seriestitle">Series title</label></th><td>                
        
                        <input type="hidden" name="marclist" 
value="biblio.seriestitle" />
--- 62,66 ----
                        <input type="hidden" name="excluding" value="" />
                        <input type="hidden" name="operator" value="contains" 
/>  
!                       <input type="text" id="subject" name="value" size="35" 
/><!-- TMPL_UNLESS NAME="Disable_Dictionary" --><a 
href="javascript:Dopop('opac-dictionary.pl?marclist=bibliosubject.subject&amp;type=intranet&amp;index=3',3)"><strong>...</strong></a><!--
 /TMPL_UNLESS --></td></tr>
  <tr><th><label for="seriestitle">Series title</label></th><td>                
        
                        <input type="hidden" name="marclist" 
value="biblio.seriestitle" />