small changes

diff --git a/koha-tmpl/opac-tmpl/default/en/opac-main.tmpl b/koha-tmpl/opac-tmpl/default/en/opac-main.tmpl
index 0844d7d..2398974 100644 (file)
--- a/koha-tmpl/opac-tmpl/default/en/opac-main.tmpl
+++ b/koha-tmpl/opac-tmpl/default/en/opac-main.tmpl
@@ -51,7 +51,7 @@ cellspacing=0 cellpadding=0 border=0 >
        <img src="<TMPL_VAR NAME='themelang'>/images/koha.gif" width=200 height=128\r
        alt="Koha: Horowhenua Library Trust Catalogue and Member Services" hspace=0 vspace=0></td>\r
 \r
-       <td background=" "  colspan=3><font size=+2><a href="./opacsearch.pl"><img src="<TMPL_VAR NAME='themelang'>/images/heading-search.gif" width=272        height=38\r
+       <td background=" "  colspan=3><font size=+2><a href="/cgi-bin/koha/opac-search.pl"><img src="<TMPL_VAR NAME='themelang'>/images/heading-search.gif" width=272   height=38\r
        alt="Search the Catalogue" hspace=0 vspace=0 border=0></a></font></td>\r
 \r
   </tr>\r
@@ -59,14 +59,14 @@ cellspacing=0 cellpadding=0 border=0 >
 \r
 <tr valign=top >\r
        <td>&nbsp; &nbsp; </td>\r
-       <FORM ACTION="./search.pl" name=catsearch>\r
+       <FORM ACTION="/cgi-bin/koha/opac-searchresults.pl" name=catsearch>\r
        <input type=hidden name=type value=opac>\r
        <td background=" " >\r
 \r
        <input type=text size="27" name="keyword"><br>\r
        </font>\r
        <b>Type in the box and press the enter                  key.</b><br>\r
-       <a href="./opacsearch.pl">\r
+       <a href="/cgi-bin/koha/opac-search.pl">\r
       \r
        <img src="<TMPL_VAR NAME='themelang'>/images/front-arrow.gif" width=27 height=22\r
        alt="-" hspace=0 vspace=0 border=0 align=middle >Advanced Search (More Options)</a><br>\r
@@ -75,9 +75,9 @@ cellspacing=0 cellpadding=0 border=0 >
        alt=" " hspace=0 vspace=0>\r
        <p>\r
        <TMPL_IF NAME="loggedinuser">\r
-           <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a href="./logout.pl">Log Out</a>]</p>\r
+           <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a href="/cgi-bin/koha/logout.pl">Log Out</a>]</p>\r
        <TMPL_ELSE>\r
-           <p align=left><a href="./userpage.pl">Log In</a> to Koha</p>\r
+           <p align=left><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>\r
        </TMPL_IF>\r
        </td>\r
        </form>\r
@@ -87,14 +87,14 @@ cellspacing=0 cellpadding=0 border=0 >
  \r
 \r
 <!--\r
-  <tr valign=top ><form action="./member.pl" method=get >\r
+  <tr valign=top ><form action="/cgi-bin/koha/member.pl" method=get >\r
        <td background=" "  colspan=3><img src="<TMPL_VAR NAME='themelang'>/images/heading-login.gif" width=279                 height=38\r
        alt="Member Login" hspace=0 vspace=0 border=0></td>\r
 \r
   </tr>\r
 <tr valign=top >\r
         <td></td>\r
-       <form action="./member.pl" method=get >\r
+       <form action="/cgi-bin/koha/member.pl" method=get >\r
        <td background=" " >\r
        <font size=3 face="arial narrow,arial,helvetica">Card Number &nbsp;</font></td>\r
        <td background=" " ><input type=text size="12" name="card"></td>\r
@@ -116,7 +116,7 @@ cellspacing=0 cellpadding=0 border=0 >
 \r
   <tr valign=top >\r
        <td></td>\r
-       <td background=" " colspan=4><A href="./join.html"><img src="<TMPL_VAR NAME='themelang'>/images/heading-member.gif" width=331           height=38\r
+       <td background=" " colspan=4><A href="/cgi-bin/koha/join.html"><img src="<TMPL_VAR NAME='themelang'>/images/heading-member.gif" width=331               height=38\r
        alt="Become a Website Member" hspace=0 vspace=0 border=0></a>\r
        </td>\r
        <td>\r

diff --git a/koha-tmpl/opac-tmpl/default/en/opac-search.tmpl b/koha-tmpl/opac-tmpl/default/en/opac-search.tmpl
index 7a648b7..08514a7 100644 (file)
--- a/koha-tmpl/opac-tmpl/default/en/opac-search.tmpl
+++ b/koha-tmpl/opac-tmpl/default/en/opac-search.tmpl
@@ -8,7 +8,7 @@
 \r
 \r
 <CENTER>\r
-<FORM ACTION="./dosearch.pl" method=get>\r
+<FORM ACTION="/cgi-bin/koha/opac-searchresults.pl" method=get>\r
 <TABLE >\r
 \r
 <tr valign=top>\r

diff --git a/koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl b/koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl
index 3cd2072..f6200f6 100644 (file)
--- a/koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl
+++ b/koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl
@@ -21,7 +21,7 @@
 
     <!-- Row of numbers corresponding to search result pages -->
     <TMPL_IF NAME="displayprev">
-       <a href=./dosearch.pl?startfrom=<TMPL_VAR NAME="prevstartfrom"><TMPL_LOOP NAME="FORMINPUTS">&<TMPL_VAR NAME="field">=<TMPL_VAR NAME="value" ESCAPE=URL></TMPL_LOOP>><img src=<TMPL_VAR NAME="themelang">/images/numbers/prev.gif border=0></a>
+       <a href=/cgi-bin/koha/opac-searchresults.pl?startfrom=<TMPL_VAR NAME='prevstartfrom'><TMPL_LOOP NAME='FORMINPUTS'>&<TMPL_VAR NAME='field'>=<TMPL_VAR NAME='value' ESCAPE=URL></TMPL_LOOP>><img src=<TMPL_VAR NAME=themelang'>/images/numbers/prev.gif border=0></a>
     <TMPL_ELSE>
        <img src=<TMPL_VAR NAME="themelang">/images/numbers/placeholder.gif border=0>
     </TMPL_IF>
@@ -29,11 +29,11 @@
        <TMPL_IF NAME="highlight">
            <img src=<TMPL_VAR NAME="themelang">/images/numbers/<TMPL_VAR NAME=number>-highlight.gif> 
        <TMPL_ELSE>
-           <a href=./dosearch.pl?startfrom=<TMPL_VAR NAME="startfrom"><TMPL_LOOP NAME="FORMINPUTS">&<TMPL_VAR NAME="field">=<TMPL_VAR NAME="value" ESCAPE=URL></TMPL_LOOP>><img src=<TMPL_VAR NAME="themelang">/images/numbers/<TMPL_VAR NAME=number>.gif border=0></a> 
+           <a href=/cgi-bin/koha/opac-searchresults.pl?startfrom=<TMPL_VAR NAME="startfrom"><TMPL_LOOP NAME="FORMINPUTS">&<TMPL_VAR NAME="field">=<TMPL_VAR NAME="value" ESCAPE=URL></TMPL_LOOP>><img src=<TMPL_VAR NAME="themelang">/images/numbers/<TMPL_VAR NAME=number>.gif border=0></a> 
        </TMPL_IF>
     </TMPL_LOOP>
     <TMPL_IF NAME="displaynext">
-       <a href=./dosearch.pl?startfrom=<TMPL_VAR NAME="nextstartfrom"><TMPL_LOOP NAME="FORMINPUTS">&<TMPL_VAR NAME="field">=<TMPL_VAR NAME="value" ESCAPE=URL></TMPL_LOOP>><img src=<TMPL_VAR NAME="themelang">/images/numbers/next.gif border=0></a>
+       <a href=/cgi-bin/koha/opac-searchresults.pl?startfrom=<TMPL_VAR NAME="nextstartfrom"><TMPL_LOOP NAME="FORMINPUTS">&<TMPL_VAR NAME="field">=<TMPL_VAR NAME="value" ESCAPE=URL></TMPL_LOOP>><img src=<TMPL_VAR NAME="themelang">/images/numbers/next.gif border=0></a>
     <TMPL_ELSE>
        <img src=<TMPL_VAR NAME="themelang">/images/numbers/placeholder.gif border=0>
     </TMPL_IF>
@@ -43,9 +43,26 @@
 
 
 <!-- Search Results Table -->
-
 <TMPL_IF NAME="numrecords">
 
+<!-- If we have a subject table -->
+    <TMPL_IF NAME="subjectsearch">
+    <table border=0 cellspacing=0 cellpadding=2>
+    <tr bgcolor=#99cccc background=<TMPL_VAR NAME="themelang">/images/background-opac.gif>
+    <th>Subject</th></tr>
+       <TMPL_LOOP NAME=SEARCH_RESULTS>
+       <tr>
+       <td><a href=/cgi-bin/koha/opac-searchresults.pl?&subjectitems=<TMPL_VAR NAME=subject ESCAPE=URL>><TMPL_VAR NAME=subject></a></td>
+       </tr>
+       </TMPL_LOOP>
+    <tr bgcolor=#99cccc background=<TMPL_VAR NAME="themelang">/images/background-opac.gif><td colspan=4>
+    &nbsp;</td></tr>
+    </table>
+    
+<!-- Else we have a list of items -->    
+    <TMPL_ELSE>
+
+
     <table border=0 cellspacing=0 cellpadding=2 width=90%>
     <tr bgcolor=#99cccc background=<TMPL_VAR NAME="themelang">/images/background-opac.gif>
            <th align=left>Title</th><th align=left>Author</th><th>&copy;</th><th>Item Count</th><th>Location</th>
@@ -57,8 +74,8 @@
 
     <TMPL_LOOP NAME="SEARCH_RESULTS">
       <tr>
-      <td><a href=./detail.pl?bib=<TMPL_VAR NAME="biblionumber" ESCAPE=URL>><TMPL_VAR NAME="title"></a></td>
-      <td><a href=./dosearch.pl?author=<TMPL_VAR NAME="author" ESCAPE=URL>><TMPL_VAR NAME="author"></a></td>
+      <td><a href=/cgi-bin/koha/opac-detail.pl?bib=<TMPL_VAR NAME="biblionumber" ESCAPE=URL>><TMPL_VAR NAME="title"></a></td>
+      <td><a href=/cgi-bin/koha/opac-searchresults.pl?author=<TMPL_VAR NAME="author" ESCAPE=URL>><TMPL_VAR NAME="author"></a></td>
       <td align=center> <TMPL_VAR NAME="copyrightdate"> </td>
       <td align=center> <TMPL_VAR NAME="itemcount"> </td>
       <td> <TMPL_VAR NAME="location"> </td>
@@ -71,7 +88,7 @@
        <table border=0 cellpadding=0 cellspacing=0 width=100%>
        <tr bgcolor=#99cccc background=<TMPL_VAR NAME="themelang">/images/background-opac.gif><td align=left>
        <TMPL_IF NAME="displayprev">
-           <a href=dosearch.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>
+           <a href=/cgi-bin/koha/opac-searchresults.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>
            &nbsp;
        </TMPL_IF>
@@ -79,7 +96,7 @@
 
        </td><td align=right>
        <TMPL_IF NAME="displaynext">
-           <a href=dosearch.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>
+           <a href=/cgi-bin/koha/opac-searchresults.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>
            &nbsp;
        </TMPL_IF>
@@ -87,6 +104,7 @@
        </table>
     </td></tr>
     </table>
+    </TMPL_IF>
 
     <br>
     Results <TMPL_VAR NAME="startfrom"> through <TMPL_VAR NAME="endat"> of <TMPL_VAR NAME="numrecords"> records.
@@ -96,7 +114,7 @@
 <TMPL_ELSE>
 Sorry, there were no results <br>
 </TMPL_IF>
-    Try another <a href=./opacsearch.pl>search</a>
+    Try another <a href=/cgi-bin/koha/opac-search.pl>search</a>
 
 
 <TMPL_INCLUDE NAME="opac-bottom.inc">