[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue searchresults.tmpl,1.15,1.16 subject.tmpl,1.7,1.8

Owen Leonard oleonard at users.sourceforge.net
Fri Nov 19 22:37:24 CET 2004 

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10950/koha-tmpl/intranet-tmpl/default/en/catalogue

Modified Files:
	searchresults.tmpl subject.tmpl 
Log Message:
Updating for CSS-based design

Index: searchresults.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** searchresults.tmpl	8 Nov 2004 19:52:29 -0000	1.15
--- searchresults.tmpl	19 Nov 2004 21:37:20 -0000	1.16
***************
*** 4,18 ****
  	<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
  <!-- /TMPL_IF -->
! <center>
  
! 
! <!-- TMPL_IF NAME="searchdesc" -->
  	You searched on <b><!-- TMPL_VAR NAME="searchdesc" --></b>
  <!-- TMPL_ELSE -->
  	You did not specify any seach criteria<br>
! <!-- /TMPL_IF -->
  
! <!-- TMPL_VAR NAME="numrecords" --> results found
! <p>
  <!-- Row of numbers corresponding to search result pages -->
  <!-- TMPL_IF NAME="displayprev" -->
--- 4,18 ----
  	<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
  <!-- /TMPL_IF -->
! <div id="mainbloc">
  
! <h1 class="catalogue">Search results</h1>
! <p><!-- TMPL_IF NAME="searchdesc" -->
  	You searched on <b><!-- TMPL_VAR NAME="searchdesc" --></b>
  <!-- TMPL_ELSE -->
  	You did not specify any seach criteria<br>
! <!-- /TMPL_IF --></p>
  
! <p><!-- TMPL_VAR NAME="numrecords" --> results found</p>
! <div id="resultnumber">
  <!-- Row of numbers corresponding to search result pages -->
  <!-- TMPL_IF NAME="displayprev" -->
***************
*** 33,50 ****
  	<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif" border="0">
  <!-- /TMPL_IF -->
  
! <p>
  <!-- Search Results Table -->
  <!-- TMPL_IF NAME="numrecords" -->
! <table border="0" cellspacing="0" cellpadding="2" width="90%">
! 	<!-- TMPL_IF NAME="opac" -->
! 		<tr bgcolor="#99cccc" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-opac.gif">
! 	<!-- TMPL_ELSE --> 
! 		<tr bgcolor="#ccfff" background="<!-- TMPL_VAR NAME="themelang" -->/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>
--- 33,44 ----
  	<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif" border="0">
  <!-- /TMPL_IF -->
+ </div>
  
! <div id="resultlist">
  <!-- Search Results Table -->
  <!-- TMPL_IF NAME="numrecords" -->
! <table>
! 		<tr>
! 	<th class="catalogue">Title</th><th class="catalogue">Author</th><th class="catalogue">&copy;</th><th class="catalogue">Item Count</th><th class="catalogue">Location</th><th class="catalogue">&nbsp;</th>
  	<!-- /TMPL_IF -->
  </tr>
***************
*** 52,81 ****
  <!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
  	<tr>
! 		<!-- TMPL_IF NAME="opac" -->
! 			<td>
! 				<a href="/cgi-bin/koha/<!-- TMPL_VAR NAME="script" -->?type=opac&amp;bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">
! 					<!-- TMPL_VAR NAME="title" -->
! 				</a>
! 			</td>
! 			<td>
! 				<a href="/cgi-bin/koha/search.pl?author=<!-- TMPL_VAR NAME="authorhtmlescaped" -->&amp;type=opac">
! 					<!-- TMPL_VAR NAME="author" -->
! 				</a>
! 			</td>
! 		<!-- TMPL_ELSE -->
! 			<td>
  				<a href="/cgi-bin/koha/<!-- TMPL_VAR NAME="script" -->?type=intra&amp;bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">
  					<!-- TMPL_VAR NAME="title" -->
  				</a>
  			</td>
! 			<td>
  				<a href="/cgi-bin/koha/search.pl?author=<!-- TMPL_VAR NAME="authorhtmlescaped" -->&amp;type=intra">
  					<!-- TMPL_VAR NAME="author" -->
  				</a>
  			</td>
! 		<!-- /TMPL_IF -->
! 		<td align="center"> <!-- TMPL_VAR NAME="copyrightdate" --> </td>
! 		<td align="center"> <!-- TMPL_VAR NAME="itemcount" --> </td>
! 		<td>
  		<!-- TMPL_IF NAME=use-location-flags-p -->
  		<!-- TMPL_IF NAME=location-only --><!-- TMPL_VAR NAME=location-only --><br><!-- /TMPL_IF -->
--- 46,62 ----
  <!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
  	<tr>
! 			<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
  				<a href="/cgi-bin/koha/<!-- TMPL_VAR NAME="script" -->?type=intra&amp;bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">
  					<!-- TMPL_VAR NAME="title" -->
  				</a>
  			</td>
! 			<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
  				<a href="/cgi-bin/koha/search.pl?author=<!-- TMPL_VAR NAME="authorhtmlescaped" -->&amp;type=intra">
  					<!-- TMPL_VAR NAME="author" -->
  				</a>
  			</td>
! 		<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->> <!-- TMPL_VAR NAME="copyrightdate" --> </td>
! 		<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->> <!-- TMPL_VAR NAME="itemcount" --> </td>
! 		<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
  		<!-- TMPL_IF NAME=use-location-flags-p -->
  		<!-- TMPL_IF NAME=location-only --><!-- TMPL_VAR NAME=location-only --><br><!-- /TMPL_IF -->
***************
*** 91,149 ****
  		<!-- TMPL_ELSE -->
  			<!-- TMPL_UNLESS name="norequests" -->
! 				<td> <a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Request</a></td>
  			<!-- TMPL_ELSE -->
! 				<td>Not Reservable</td>
  			<!-- /TMPL_UNLESS -->
  		<!-- /TMPL_IF -->
  	</tr>
  <!-- /TMPL_LOOP -->
  
- <!-- TMPL_IF NAME="opac" -->
- 	<tr bgcolor="#99CCCC" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-opac.gif">
- <!-- TMPL_ELSE -->
- 	<tr bgcolor="#CCCCFF" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
- <!-- /TMPL_IF -->
  
! 	<td colspan="6">
! 		<table border="0" cellpadding="0" cellspacing="0" width="100%">
! 			<!-- TMPL_IF NAME="opac" -->
! 				<tr bgcolor="#99cccc" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-opac.gif">
! 			<!-- TMPL_ELSE --> 
! 				<tr bgcolor="#ccfff" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
! 			<!-- /TMPL_IF -->
! 			<td align="left">
! 				<!-- TMPL_IF NAME="displayprev" -->
  				<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->&amp;<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->">Previous Records</a>
  				<!-- TMPL_ELSE -->
  				&nbsp;
  				<!-- /TMPL_IF -->
! 			</td>
! 			<td align="right">
  				<!-- TMPL_IF NAME="displaynext" -->
  				<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->&amp;<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->">Next Records</a>
  				<!-- TMPL_ELSE -->
  				&nbsp;
! 				<!-- /TMPL_IF -->
! 			</td>
! 			</tr>
! 		</table>
! 	</td>
! </tr>
! </table>
  
- <br>
- Results <b><!-- TMPL_VAR NAME="startfrom" --></b> through <b><!-- TMPL_VAR NAME="endat" --></b> of <b><!-- TMPL_VAR NAME="numrecords" --></b> records.
- <hr>
  
- Try another <a href="/cgi-bin/koha/catalogue-home.pl">search</a>
  
! <!-- TMPL_ELSE -->
!     Try another <a href="/cgi-bin/koha/catalogue-home.pl">search</a>
! <!-- /TMPL_IF -->
  
  
! <!-- TMPL_IF NAME="opac" -->
!     <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
! <!-- TMPL_ELSE -->
      <!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
- <!-- /TMPL_IF -->
--- 72,106 ----
  		<!-- TMPL_ELSE -->
  			<!-- TMPL_UNLESS name="norequests" -->
! 				<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->> <a class="button catalogue" href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Request</a></td>
  			<!-- TMPL_ELSE -->
! 				<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>Not Reservable</td>
  			<!-- /TMPL_UNLESS -->
  		<!-- /TMPL_IF -->
  	</tr>
  <!-- /TMPL_LOOP -->
+ </table>
  
  
! <p>				<!-- TMPL_IF NAME="displayprev" -->
  				<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->&amp;<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->">Previous Records</a>
  				<!-- TMPL_ELSE -->
  				&nbsp;
  				<!-- /TMPL_IF -->
! 
  				<!-- TMPL_IF NAME="displaynext" -->
  				<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->&amp;<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->">Next Records</a>
  				<!-- TMPL_ELSE -->
  				&nbsp;
! 				<!-- /TMPL_IF --></p>
  
  
  
! <p>Results <b><!-- TMPL_VAR NAME="startfrom" --></b> through <b><!-- TMPL_VAR NAME="endat" --></b> of <b><!-- TMPL_VAR NAME="numrecords" --></b> records.</p>
  
  
! <p>Try another <a href="/cgi-bin/koha/catalogue-home.pl">search</a></p>
! 
! 
! </div>
! 
      <!-- 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.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** subject.tmpl	19 Jul 2004 19:51:03 -0000	1.7
--- subject.tmpl	19 Nov 2004 21:37:21 -0000	1.8
***************
*** 1,49 ****
! <!-- TMPL_IF NAME="opac" -->
! 	<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
! <!-- TMPL_ELSE -->
! 	<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
! <!-- /TMPL_IF -->
! 
! <table border="0" cellspacing="0" cellpadding="2" align="center">
! <!-- TMPL_IF NAME="opac" -->
! 	<tr bgcolor="#99cccc" background="/images/background-opac.gif">
! <!-- TMPL_ELSE -->
! 	<tr 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 -->&amp;subjectitems=<!-- TMPL_VAR NAME=subject2 ESCAPE=HTML -->"><!-- TMPL_VAR NAME="subject" --></a>
  		</td>
  	</tr>
  <!-- /TMPL_LOOP -->
- <!-- TMPL_IF NAME="opac" -->
- 	<tr bgcolor="#99cccc" background="/images/background-opac.gif">
- <!-- TMPL_ELSE -->
- 	<tr background="/images/background-mem.gif">
- <!-- /TMPL_IF -->
- 		<td colspan="4">
- 			<table border="0" cellpadding="0" cellspacing="0" width="100%">
- 			<tr>
- 				<td align="left">
- 					<a href="search.pl?<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="line" -->&amp;<!-- /TMPL_LOOP -->startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->">Previous Records</a>
- 				</td>
- 				<td align="right">
- 					<a href="search.pl?<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="line" -->&amp;<!-- /TMPL_LOOP -->startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->">Next Records</a>
- 				</td>
- 			</tr>
- 			</table>
- 		</td>
- 	</tr>
  </table>
! <br>
! Results <b><!-- TMPL_VAR NAME="startfrom" --></b> through <b><!-- TMPL_VAR NAME="endat" --> of <!-- TMPL_VAR NAME="numrecords" --></b> records.
! <hr>
! 
! <!-- TMPL_IF NAME="opac" -->
!     <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
! <!-- TMPL_ELSE -->
!     <!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
! <!-- /TMPL_IF -->
--- 1,25 ----
! <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
! 
! <div id="mainbloc">
! 
! <h1 class="catalogue">Subject search results</h1>
! 
! <div id="resultnumber"><p>Results <b><!-- TMPL_VAR NAME="startfrom" --></b> through <b><!-- TMPL_VAR NAME="endat" --> of <!-- TMPL_VAR NAME="numrecords" --></b> records.<br></p></div>
! 
! <table>
! <tr>
! 		<th class="catalogue">Subject headings</th>
  	</tr>
  <!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
  	<tr>
! 		<td<!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
  			<a href="/cgi-bin/koha/search.pl?type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->&amp;subjectitems=<!-- TMPL_VAR NAME=subject2 ESCAPE=HTML -->"><!-- TMPL_VAR NAME="subject" --></a>
  		</td>
  	</tr>
  <!-- /TMPL_LOOP -->
  </table>
! <p><a  class="button catalogue" href="search.pl?<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="line" -->&amp;<!-- /TMPL_LOOP -->startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->">Previous Records</a> <a class="button catalogue" href="search.pl?<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="line" -->&amp;<!-- /TMPL_LOOP -->startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->">Next Records</a></p>
! 
! </div>
! <!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
!

More information about the Koha-cvs mailing list