[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue searchresults.tmpl,1.3.2.1,1.3.2.2 subject.tmpl,1.1.2.3,1.1.2.4

Steve Tonnesen tonnesen at users.sourceforge.net
Fri Nov 8 19:45:37 CET 2002 

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue
In directory usw-pr-cvs1:/tmp/cvs-serv2099

Modified Files:
      Tag: rel-1-2
	searchresults.tmpl subject.tmpl 
Log Message:
Removed all of the <TMPL_IF name="opac"> junk that is no longer needed.  OPAC
now has its own templates.


Index: searchresults.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** searchresults.tmpl	21 Oct 2002 17:05:07 -0000	1.3.2.1
--- searchresults.tmpl	8 Nov 2002 18:45:35 -0000	1.3.2.2
***************
*** 1,7 ****
! <TMPL_IF NAME="opac">
!     <TMPL_INCLUDE NAME="opac-top.inc">
! <TMPL_ELSE>
!     <TMPL_INCLUDE NAME="cat-top.inc">
! </TMPL_IF>
  <center>
  
--- 1,4 ----
! <TMPL_INCLUDE NAME="cat-top.inc">
! 
  <center>
  
***************
*** 25,29 ****
      <!-- 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>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>><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=line>&</TMPL_LOOP>><img src=/images/numbers/prev.gif border=0></a>
      <TMPL_ELSE>
  	<img src=/images/numbers/placeholder.gif border=0>
***************
*** 33,41 ****
  	    <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>type=<TMPL_IF NAME=opac>opac<TMPL_ELSE>intra</TMPL_IF>><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>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>><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=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>
***************
*** 51,60 ****
  
      <table border=0 cellspacing=0 cellpadding=2 width=90%>
!     <tr <TMPL_IF NAME="opac">bgcolor=#99cccc background=/images/background-opac.gif<TMPL_ELSE> background="/images/background-mem.gif"</TMPL_IF>>
  	    <th align=left>Title</th><th align=left>Author</th><th>&copy;</th><th>Item Count</th><th>Location</th>
- 	  <TMPL_IF NAME="opac">
- 	  <TMPL_ELSE>
  	    <th>&nbsp;</th>
- 	  </TMPL_IF>
      </tr>
  
--- 48,54 ----
  
      <table border=0 cellspacing=0 cellpadding=2 width=90%>
!     <tr background="/images/background-mem.gif">
  	    <th align=left>Title</th><th align=left>Author</th><th>&copy;</th><th>Item Count</th><th>Location</th>
  	    <th>&nbsp;</th>
      </tr>
  
***************
*** 65,77 ****
      <TMPL_LOOP NAME=SEARCH_RESULTS>
        <tr>
!       <td><a href=/cgi-bin/koha/detail.pl?type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>&bib=<TMPL_VAR NAME=biblionumber ESCAPE=HTML>><TMPL_VAR NAME=title></a></td>
!       <td><a href=/cgi-bin/koha/search.pl?author=<TMPL_VAR NAME=authorhtmlescaped>&type=<TMPL_IF NAME=opac>opac<TMPL_ELSE>intra</TMPL_IF>><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>
!       <TMPL_IF NAME="opac">
!       <TMPL_ELSE>
! 	<td> <a href=/cgi-bin/koha/request.pl?bib=<TMPL_VAR NAME="biblionumber">>Request</a></td>
!       </TMPL_IF>
        </tr>
      </TMPL_LOOP>
--- 59,68 ----
      <TMPL_LOOP NAME=SEARCH_RESULTS>
        <tr>
!       <td><a href=/cgi-bin/koha/detail.pl?&bib=<TMPL_VAR NAME=biblionumber ESCAPE=HTML>><TMPL_VAR NAME=title></a></td>
!       <td><a href=/cgi-bin/koha/search.pl?author=<TMPL_VAR NAME=authorhtmlescaped>&><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>
!       <td> <a href=/cgi-bin/koha/request.pl?bib=<TMPL_VAR NAME="biblionumber">>Request</a></td>
        </tr>
      </TMPL_LOOP>
***************
*** 79,87 ****
  
  
!     <tr <TMPL_IF NAME="opac">bgcolor=#99cccc background=/images/background-opac.gif<TMPL_ELSE>bgcolor=#ccccff background="/images/background-mem.gif"</TMPL_IF>><td colspan=6>
  	<table border=0 cellpadding=0 cellspacing=0 width=100%">
! 	<tr <TMPL_IF NAME="opac">bgcolor=#99cccc background=/images/background-opac.gif<TMPL_ELSE>bgcolor=#ccccff background="/images/background-mem.gif"</TMPL_IF>><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>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>>Previous Records</a>
  	<TMPL_ELSE>
  	    &nbsp;
--- 70,78 ----
  
  
!     <tr bgcolor=#ccccff background="/images/background-mem.gif"><td colspan=6>
  	<table border=0 cellpadding=0 cellspacing=0 width=100%">
! 	<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>
  	    &nbsp;
***************
*** 89,93 ****
  	</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>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>>Next Records</a>
  	<TMPL_ELSE>
  	    &nbsp;
--- 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>
  	    &nbsp;
***************
*** 109,115 ****
  
  
! <TMPL_IF NAME="opac">
!     <TMPL_INCLUDE NAME="opac-bottom.inc">
! <TMPL_ELSE>
!     <TMPL_INCLUDE NAME="cat-bottom.inc">
! </TMPL_IF>
--- 100,102 ----
  
  
! <TMPL_INCLUDE NAME="cat-bottom.inc">

Index: subject.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/subject.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** subject.tmpl	29 Oct 2002 16:48:53 -0000	1.1.2.3
--- subject.tmpl	8 Nov 2002 18:45:35 -0000	1.1.2.4
***************
*** 1,7 ****
! <TMPL_IF NAME="opac">
!     <TMPL_INCLUDE NAME="opac-top.inc">
! <TMPL_ELSE>
!     <TMPL_INCLUDE NAME="cat-top.inc">
! </TMPL_IF>
  
  <TMPL_IF NAME="loggedinuser">
--- 1,3 ----
! <TMPL_INCLUDE NAME="cat-top.inc">
  
  <TMPL_IF NAME="loggedinuser">
***************
*** 15,19 ****
      <!-- 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>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>><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=line>&</TMPL_LOOP>><img src=/images/numbers/prev.gif border=0></a>
      <TMPL_ELSE>
  	<img src=/images/numbers/placeholder.gif border=0>
***************
*** 23,31 ****
  	    <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>type=<TMPL_IF NAME=opac>opac<TMPL_ELSE>intra</TMPL_IF>><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>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>><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=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>
***************
*** 36,51 ****
  
  <table border=0 cellspacing=0 cellpadding=2>
! <tr <TMPL_IF NAME="opac">bgcolor=#99cccc background=/images/background-opac.gif<TMPL_ELSE> background="/images/background-mem.gif"</TMPL_IF>>
  <th>Subject</th></tr>
  <TMPL_LOOP NAME=SEARCH_RESULTS>
    <tr>
!   <td><a href=/cgi-bin/koha/search.pl?type=<TMPL_IF NAME=opac>opac<TMPL_ELSE>intra</TMPL_IF>&subjectitems=<TMPL_VAR NAME=subject2 ESCAPE=HTML>><TMPL_VAR NAME=subject></a></td>
    </tr>
  </TMPL_LOOP>
! <tr <TMPL_IF NAME="opac">bgcolor=#99cccc background=/images/background-opac.gif<TMPL_ELSE> background="/images/background-mem.gif"</TMPL_IF>><td colspan=4>
      <table border=0 cellpadding=0 cellspacing=0 width=100%>
      <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>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>>Previous Records</a>
  	<TMPL_ELSE>
  	    &nbsp;
--- 32,47 ----
  
  <table border=0 cellspacing=0 cellpadding=2>
! <tr background="/images/background-mem.gif">
  <th>Subject</th></tr>
  <TMPL_LOOP NAME=SEARCH_RESULTS>
    <tr>
!   <td><a href=/cgi-bin/koha/search.pl?subjectitems=<TMPL_VAR NAME=subject2 ESCAPE=HTML>><TMPL_VAR NAME=subject></a></td>
    </tr>
  </TMPL_LOOP>
! <tr background="/images/background-mem.gif"><td colspan=4>
      <table border=0 cellpadding=0 cellspacing=0 width=100%>
      <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>
  	    &nbsp;
***************
*** 55,59 ****
  
  	<TMPL_IF NAME=displaynext>
! 	    <a href=search.pl?startfrom=<TMPL_VAR NAME="nextstartfrom">&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=line>&</TMPL_LOOP>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>>Next Records</a>
  	<TMPL_ELSE>
  	    &nbsp;
--- 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>
  	    &nbsp;
***************
*** 69,75 ****
  <hr>
  
! <TMPL_IF NAME="opac">
!     <TMPL_INCLUDE NAME="opac-bottom.inc">
! <TMPL_ELSE>
!     <TMPL_INCLUDE NAME="cat-bottom.inc">
! </TMPL_IF>
--- 65,67 ----
  <hr>
  
! <TMPL_INCLUDE NAME="cat-bottom.inc">

More information about the Koha-cvs mailing list