[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/authorities auth_finder.tmpl,1.6,1.7 authorities-home.tmpl,1.3,1.4 searchresultlist-auth.tmpl,1.5,1.6
Paul POULAIN
tipaul at users.sourceforge.net
Tue Mar 1 14:42:00 CET 2005
Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20915/koha-tmpl/intranet-tmpl/default/en/authorities
Modified Files:
auth_finder.tmpl authorities-home.tmpl
searchresultlist-auth.tmpl
Log Message:
merging 2.2 branch with head. Sorry for not making it before, many many commits done here
Index: auth_finder.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** auth_finder.tmpl 8 Nov 2004 10:01:14 -0000 1.6
--- auth_finder.tmpl 1 Mar 2005 13:40:52 -0000 1.7
***************
*** 12,24 ****
<p>
<label class="label100">Authority type</label>
! <!-- TMPL_VAR NAME="category" -->
</p>
<p>
! <label class="label100">Search value</label><input type="text" name="value" value="<!-- TMPL_VAR name="resultstring" -->">
! <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="category" -->">
<input type="hidden" name="marclist" value="">
<input type="hidden" name="and_or" value="and">
<input type="hidden" name="excluding" value="">
! <input type="hidden" name="operator" value="contains">
<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
</p>
--- 12,38 ----
<p>
<label class="label100">Authority type</label>
! <!-- TMPL_VAR NAME="authtypecode" -->
! <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
</p>
<p>
! <label class="label100">Main entry</label><input type="text" name="value" value="<!-- TMPL_VAR name="resultstring" -->">
! <input type="hidden" name="marclist" value="mainentry">
! <input type="hidden" name="and_or" value="and">
! <input type="hidden" name="excluding" value="">
! <select name="operator">
! <option value="contains">contains</option>
! <option value="start">start by</option>
! </select>
! <input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
! </p>
! <p>
! <label class="label100">Anywhere</label><input type="text" name="value">
<input type="hidden" name="marclist" value="">
<input type="hidden" name="and_or" value="and">
<input type="hidden" name="excluding" value="">
! <select name="operator">
! <option value="contains">contains</option>
! <option value="start">start by</option>
! </select>
<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
</p>
Index: authorities-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/authorities/authorities-home.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** authorities-home.tmpl 19 Jul 2004 19:31:31 -0000 1.3
--- authorities-home.tmpl 1 Mar 2005 13:40:52 -0000 1.4
***************
*** 9,15 ****
<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
<div id="bloc25">
! <h2 class="authority">Search on</h2>
! <p>
! <label class="label100">Authority type</label>
<select name="authtypecode">
<!-- TMPL_LOOP NAME="authtypesloop" -->
--- 9,13 ----
<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
<div id="bloc25">
! <h2 class="authority">Search on
<select name="authtypecode">
<!-- TMPL_LOOP NAME="authtypesloop" -->
***************
*** 19,30 ****
<!-- /TMPL_LOOP -->
</select>
</p>
<p>
! <label class="label100">Search value</label>
<input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
<input type="hidden" name="marclist" value="">
<input type="hidden" name="and_or" value="and">
<input type="hidden" name="excluding" value="">
! <input type="hidden" name="operator" value="contains">
</p>
<p>
--- 17,42 ----
<!-- /TMPL_LOOP -->
</select>
+ </h2>
+ <p>
+ <label class="label100">Main entry</label>
+ <input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
+ <input type="hidden" name="marclist" value="mainentry">
+ <input type="hidden" name="and_or" value="and">
+ <input type="hidden" name="excluding" value="">
+ <select name="operator">
+ <option value="contains">contains</option>
+ <option value="start">start by</option>
+ </select>
</p>
<p>
! <label class="label100">Anywhere</label>
<input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
<input type="hidden" name="marclist" value="">
<input type="hidden" name="and_or" value="and">
<input type="hidden" name="excluding" value="">
! <select name="operator">
! <option value="contains">contains</option>
! <option value="start">start by</option>
! </select>
</p>
<p>
Index: searchresultlist-auth.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** searchresultlist-auth.tmpl 8 Nov 2004 10:03:14 -0000 1.5
--- searchresultlist-auth.tmpl 1 Mar 2005 13:40:52 -0000 1.6
***************
*** 11,23 ****
<p>
<label class="label100">Authority type</label>
! <!-- TMPL_VAR NAME="category" -->
</p>
<p>
! <label class="label100">Search value</label><input type="text" name="value" value="<!-- TMPL_VAR name="resultstring" -->">
! <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
<input type="hidden" name="marclist" value="">
<input type="hidden" name="and_or" value="and">
<input type="hidden" name="excluding" value="">
! <input type="hidden" name="operator" value="contains">
<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
</p>
--- 11,37 ----
<p>
<label class="label100">Authority type</label>
! <!-- TMPL_VAR NAME="authtypecode" -->
! <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
</p>
<p>
! <label class="label100">Main entry</label><input type="text" name="value" value="<!-- TMPL_VAR name="resultstring" -->">
! <input type="hidden" name="marclist" value="mainentry">
! <input type="hidden" name="and_or" value="and">
! <input type="hidden" name="excluding" value="">
! <select name="operator">
! <option value="contains">contains</option>
! <option value="start">start by</option>
! </select>
! <input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
! </p>
! <p>
! <label class="label100">Anywhere</label><input type="text" name="value">
<input type="hidden" name="marclist" value="">
<input type="hidden" name="and_or" value="and">
<input type="hidden" name="excluding" value="">
! <select name="operator">
! <option value="contains">contains</option>
! <option value="start">start by</option>
! </select>
<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
</p>
More information about the Koha-cvs
mailing list