[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue searchresults.tmpl,1.3.2.2,1.3.2.3 subject.tmpl,1.1.2.4,1.1.2.5
Steve Tonnesen
tonnesen at users.sourceforge.net
Fri Nov 8 21:15:43 CET 2002
Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue
In directory usw-pr-cvs1:/tmp/cvs-serv511/koha-tmpl/intranet-tmpl/default/en/catalogue
Modified Files:
Tag: rel-1-2
searchresults.tmpl subject.tmpl
Log Message:
Fixes bugs with characters in search strings that require escaping in the URL
(space, =, &, etc.). Also uses the same set up as the opac search results
templates now. ie the FORMINPUTS template variable is sent as variable and
value pairs so that the value can be url escaped by HTML::Template
Index: searchresults.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C2 -r1.3.2.2 -r1.3.2.3
*** searchresults.tmpl 8 Nov 2002 18:45:35 -0000 1.3.2.2
--- searchresults.tmpl 8 Nov 2002 20:15:40 -0000 1.3.2.3
***************
*** 22,26 ****
<!-- Row of numbers corresponding to search result pages -->
<TMPL_IF NAME=displayprev>
! <a href=search.pl?startfrom=<TMPL_VAR NAME="prevstartfrom">&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=line>&</TMPL_LOOP>><img src=/images/numbers/prev.gif border=0></a>
<TMPL_ELSE>
<img src=/images/numbers/placeholder.gif border=0>
--- 22,26 ----
<!-- Row of numbers corresponding to search result pages -->
<TMPL_IF NAME=displayprev>
! <a href=search.pl?startfrom=<TMPL_VAR NAME="prevstartfrom"><TMPL_LOOP NAME='FORMINPUTS'>&<TMPL_VAR NAME='field'>=<TMPL_VAR NAME='value' ESCAPE=URL></TMPL_LOOP>><img src=/images/numbers/prev.gif border=0></a>
<TMPL_ELSE>
<img src=/images/numbers/placeholder.gif border=0>
***************
*** 30,38 ****
<img src=/images/numbers/<TMPL_VAR NAME=number>-highlight.gif>
<TMPL_ELSE>
! <a href=search.pl?startfrom=<TMPL_VAR NAME=startfrom>&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=line>&</TMPL_LOOP>><img src=/images/numbers/<TMPL_VAR NAME=number>.gif border=0></a>
</TMPL_IF>
</TMPL_LOOP>
<TMPL_IF NAME=displaynext>
! <a href=search.pl?startfrom=<TMPL_VAR NAME="nextstartfrom">&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=line>&</TMPL_LOOP>><img src=/images/numbers/next.gif border=0></a>
<TMPL_ELSE>
<img src=/images/numbers/placeholder.gif border=0>
--- 30,38 ----
<img src=/images/numbers/<TMPL_VAR NAME=number>-highlight.gif>
<TMPL_ELSE>
! <a href=search.pl?startfrom=<TMPL_VAR NAME=startfrom><TMPL_LOOP NAME='FORMINPUTS'>&<TMPL_VAR NAME='field'>=<TMPL_VAR NAME='value' ESCAPE=URL></TMPL_LOOP>><img src=/images/numbers/<TMPL_VAR NAME=number>.gif border=0></a>
</TMPL_IF>
</TMPL_LOOP>
<TMPL_IF NAME=displaynext>
! <a href=search.pl?startfrom=<TMPL_VAR NAME="nextstartfrom"><TMPL_LOOP NAME='FORMINPUTS'>&<TMPL_VAR NAME='field'>=<TMPL_VAR NAME='value' ESCAPE=URL></TMPL_LOOP>><img src=/images/numbers/next.gif border=0></a>
<TMPL_ELSE>
<img src=/images/numbers/placeholder.gif border=0>
***************
*** 74,78 ****
<tr bgcolor=#ccccff background="/images/background-mem.gif"><td align=left>
<TMPL_IF NAME=displayprev>
! <a href=search.pl?startfrom=<TMPL_VAR NAME="prevstartfrom">&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=line>&</TMPL_LOOP>>Previous Records</a>
<TMPL_ELSE>
--- 74,78 ----
<tr bgcolor=#ccccff background="/images/background-mem.gif"><td align=left>
<TMPL_IF NAME=displayprev>
! <a href=search.pl?startfrom=<TMPL_VAR NAME="prevstartfrom"><TMPL_LOOP NAME='FORMINPUTS'>&<TMPL_VAR NAME='field'>=<TMPL_VAR NAME='value' ESCAPE=URL></TMPL_LOOP>>Previous Records</a>
<TMPL_ELSE>
***************
*** 80,84 ****
</td><td align=right>
<TMPL_IF NAME=displaynext>
! <a href=search.pl?startfrom=<TMPL_VAR NAME="nextstartfrom">&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=line>&</TMPL_LOOP>>Next Records</a>
<TMPL_ELSE>
--- 80,84 ----
</td><td align=right>
<TMPL_IF NAME=displaynext>
! <a href=search.pl?startfrom=<TMPL_VAR NAME="nextstartfrom"><TMPL_LOOP NAME='FORMINPUTS'>&<TMPL_VAR NAME='field'>=<TMPL_VAR NAME='value' ESCAPE=URL></TMPL_LOOP>>Next Records</a>
<TMPL_ELSE>
Index: subject.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/subject.tmpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -r1.1.2.4 -r1.1.2.5
*** subject.tmpl 8 Nov 2002 18:45:35 -0000 1.1.2.4
--- subject.tmpl 8 Nov 2002 20:15:41 -0000 1.1.2.5
***************
*** 11,15 ****
<!-- Row of numbers corresponding to search result pages -->
<TMPL_IF NAME=displayprev>
! <a href=search.pl?startfrom=<TMPL_VAR NAME="prevstartfrom">&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=line>&</TMPL_LOOP>><img src=/images/numbers/prev.gif border=0></a>
<TMPL_ELSE>
<img src=/images/numbers/placeholder.gif border=0>
--- 11,15 ----
<!-- Row of numbers corresponding to search result pages -->
<TMPL_IF NAME=displayprev>
! <a href=search.pl?startfrom=<TMPL_VAR NAME="prevstartfrom"><TMPL_LOOP NAME='FORMINPUTS'>&<TMPL_VAR NAME='field'>=<TMPL_VAR NAME='value' ESCAPE=URL></TMPL_LOOP>><img src=/images/numbers/prev.gif border=0></a>
<TMPL_ELSE>
<img src=/images/numbers/placeholder.gif border=0>
***************
*** 19,27 ****
<img src=/images/numbers/<TMPL_VAR NAME=number>-highlight.gif>
<TMPL_ELSE>
! <a href=search.pl?startfrom=<TMPL_VAR NAME=startfrom>&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=line>&</TMPL_LOOP>><img src=/images/numbers/<TMPL_VAR NAME=number>.gif border=0></a>
</TMPL_IF>
</TMPL_LOOP>
<TMPL_IF NAME=displaynext>
! <a href=search.pl?startfrom=<TMPL_VAR NAME="nextstartfrom">&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=line>&</TMPL_LOOP>><img src=/images/numbers/next.gif border=0></a>
<TMPL_ELSE>
<img src=/images/numbers/placeholder.gif border=0>
--- 19,27 ----
<img src=/images/numbers/<TMPL_VAR NAME=number>-highlight.gif>
<TMPL_ELSE>
! <a href=search.pl?startfrom=<TMPL_VAR NAME=startfrom><TMPL_LOOP NAME='FORMINPUTS'>&<TMPL_VAR NAME='field'>=<TMPL_VAR NAME='value' ESCAPE=URL></TMPL_LOOP>><img src=/images/numbers/<TMPL_VAR NAME=number>.gif border=0></a>
</TMPL_IF>
</TMPL_LOOP>
<TMPL_IF NAME=displaynext>
! <a href=search.pl?startfrom=<TMPL_VAR NAME="nextstartfrom"><TMPL_LOOP NAME='FORMINPUTS'>&<TMPL_VAR NAME='field'>=<TMPL_VAR NAME='value' ESCAPE=URL></TMPL_LOOP>><img src=/images/numbers/next.gif border=0></a>
<TMPL_ELSE>
<img src=/images/numbers/placeholder.gif border=0>
***************
*** 43,47 ****
<tr><td align=left>
<TMPL_IF NAME=displayprev>
! <a href=search.pl?startfrom=<TMPL_VAR NAME="prevstartfrom">&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=line>&</TMPL_LOOP>>Previous Records</a>
<TMPL_ELSE>
--- 43,47 ----
<tr><td align=left>
<TMPL_IF NAME=displayprev>
! <a href=search.pl?startfrom=<TMPL_VAR NAME="prevstartfrom"><TMPL_LOOP NAME='FORMINPUTS'>&<TMPL_VAR NAME='field'>=<TMPL_VAR NAME='value' ESCAPE=URL></TMPL_LOOP>>Previous Records</a>
<TMPL_ELSE>
***************
*** 51,55 ****
<TMPL_IF NAME=displaynext>
! <a href=search.pl?startfrom=<TMPL_VAR NAME="nextstartfrom">&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=line>&</TMPL_LOOP>>Next Records</a>
<TMPL_ELSE>
--- 51,55 ----
<TMPL_IF NAME=displaynext>
! <a href=search.pl?startfrom=<TMPL_VAR NAME="nextstartfrom"><TMPL_LOOP NAME='FORMINPUTS'>&<TMPL_VAR NAME='field'>=<TMPL_VAR NAME='value' ESCAPE=URL></TMPL_LOOP>>Next Records</a>
<TMPL_ELSE>
More information about the Koha-cvs
mailing list