From 2744755bbc05bb796068bdfe1d2987d7a73c4b7f Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Thu, 2 Sep 2004 16:30:57 +0000
Subject: [PATCH] minor modifs & improvements

---
 koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl   |  2 +-
 .../opac-tmpl/css/en/opac-moredetail.tmpl     | 64 +++++++---------
 koha-tmpl/opac-tmpl/css/en/opac-search.tmpl   | 74 +++++++++++--------
 .../opac-tmpl/css/en/opac-searchresults.tmpl  |  1 +
 koha-tmpl/opac-tmpl/css/en/subject.tmpl       | 22 +++---
 5 files changed, 84 insertions(+), 79 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl
index 6e027ccf51..e5fc2851e0 100644
--- a/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl
@@ -50,7 +50,7 @@
 				<!-- TMPL_IF name="seriestitle" --><b>Collection:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="seriestitle" --><br />
 				<!-- TMPL_IF name="subject" --><b>Subject:</b><!-- /TMPL_IF --> 
 					<!-- TMPL_LOOP name="subjects" -->
-						<a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" -->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP -->
+						<a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP -->
 					<br />
 				<!-- TMPL_IF name="copyrightdate" --><b>Year :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="copyrightdate" --><br />
 				<!-- TMPL_IF name="notes" --><b>Notes:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="notes" --><br />
diff --git a/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl
index ad314e0902..31351fa290 100644
--- a/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl
+++ b/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl
@@ -6,26 +6,23 @@
 <a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">
 	<img src="/images/requests.gif" width=120 height=42 border=0 align=right border=0>
 </a>
-<FONT SIZE=6><em><a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->&type=intra"><!-- TMPL_VAR NAME="title" -->
-(<!-- TMPL_VAR NAME="author" -->)</a></em></FONT><P>
+<h1><a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->&type=intra"><!-- TMPL_VAR NAME="title" -->
+(<!-- TMPL_VAR NAME="author" -->)</a></h1>
 <p>
 <form action="/cgi-bin/koha/modbibitem.pl">
-<input type=hidden name=bibitem value=<!-- TMPL_VAR NAME="biblioitemnumber" -->>
-<input type=hidden name=biblio value=<!-- TMPL_VAR NAME="biblionumber" -->>
-<!-------------------BIBLIO ITEM------------>
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align="left">
-<TR VALIGN=TOP>
-<td  bgcolor="99cc33" background="/images/background-mem.gif"
-><B><!-- TMPL_VAR NAME="biblioitemnumber" --> GROUP - <!-- TMPL_VAR NAME="description" --> </b> </TD>
-</TR>
-<tr VALIGN=TOP  >
-<TD width=210 >
-<INPUT TYPE="image" name="submit"  VALUE="modify" height=42  WIDTH=93
-BORDER=0 src="/images/modify-mem.gif">
-<INPUT TYPE="image" name="delete"  VALUE="delete" height=42  WIDTH=93
-BORDER=0 src="/images/delete-mem.gif">
+<input type=hidden name=bibitem value="<!-- TMPL_VAR NAME="biblioitemnumber" -->">
+<input type=hidden name=biblio value="<!-- TMPL_VAR NAME="biblionumber" -->">
+<table>
+<tr>
+<td><b><!-- TMPL_VAR NAME="biblioitemnumber" --> GROUP - <!-- TMPL_VAR NAME="description" --> </b> </td>
+</tr>
+<tr>
+<td width=210 >
+<input TYPE="image" name="submit"  value="modify" height=42  WIDTH=93
+border=0 src="/images/modify-mem.gif">
+<input TYPE="image" name="delete"  value="delete" height=42  WIDTH=93
+border=0 src="/images/delete-mem.gif">
 <br>
-<FONT SIZE=2  face="arial, helvetica">
 <b>Biblionumber:</b> <!-- TMPL_VAR NAME="biblionumber" --><br>
 <b>Item Type:</b> <!-- TMPL_VAR NAME="itemtype" --><br>
 <b>URL:</b> <!-- TMPL_VAR NAME="url" --><br>
@@ -42,31 +39,29 @@ BORDER=0 src="/images/delete-mem.gif">
 <b>Size:</b> <!-- TMPL_VAR NAME="size" --><br>
 <b>Notes:</b> <!-- TMPL_VAR NAME="bnotes" --><br>
 <b>No. of Items:</b> <!-- TMPL_VAR NAME="count" -->
-</font>
-</TD>
+</td>
 </tr>
 </table>
 </form>
 <!-- /TMPL_LOOP -->
 <!-- TMPL_LOOP NAME="ITEM_DATA" -->
 <img src="/images/holder.gif" width=16 height=300 align=left>
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width=220 >
-<TR VALIGN=TOP>
-<td  bgcolor="99cc33" background="/images/background-mem.gif"><B>BARCODE
-<!-- TMPL_VAR NAME="barcode" --></b></TD>
-</TR>
-<tr VALIGN=TOP>
-<TD width=220>
-<form action=/cgi-bin/koha/moditem.pl method=post>
+<TABLE>
+<tr>
+<td><b>BARCODE
+<!-- TMPL_VAR NAME="barcode" --></b></td>
+</tr>
+<tr>
+<td>
+<form action="/cgi-bin/koha/moditem.pl" method=post>
 <input type=hidden name=bibitem value=<!-- TMPL_VAR NAME="biblionumber" -->>
 <input type=hidden name=item value=<!-- TMPL_VAR NAME="itemnumber" -->>
 <input type=hidden name=type value=<!-- TMPL_VAR NAME="type" -->>
-<INPUT TYPE="image" name="submit"  VALUE="modify" height=42  WIDTH=93
-BORDER=0 src="/images/modify-mem.gif">
-<INPUT TYPE="image" name="delete"  VALUE="delete" height=42  WIDTH=93
-BORDER=0 src="/images/delete-mem.gif">
+<input TYPE="image" name="submit"  value="modify" height=42  width=93
+border=0 src="/images/modify-mem.gif">
+<input type="image" name="delete"  value="delete" height=42  width=93
+border=0 src="/images/delete-mem.gif">
 <br>
-<FONT SIZE=2  face="arial, helvetica">
 <b>Home Branch:</b> <!-- TMPL_VAR NAME="homebranch" --><br>
 <b>Last seen:</b> <!-- TMPL_VAR NAME="datelastseen" --><br>
 <b>Last borrowed:</b> <!-- TMPL_VAR NAME="timestamp0" --><br>
@@ -89,10 +84,7 @@ Issues:</a></b> <!-- TMPL_VAR NAME="issues" --><br>
 <b>Group Number:</b> <!-- TMPL_VAR NAME="biblioitemnumber" --> <br>
 <b>Biblio number:</b> <!-- TMPL_VAR NAME="biblionumber" --> <br>
 
-
-
-</font>
-</TD>
+</td>
 </tr>
 </table>
 </form>
diff --git a/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl
index ebd4f976f4..5765f61904 100644
--- a/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl
+++ b/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl
@@ -5,7 +5,7 @@
 
 <form name="f" method="post" action="<!-- TMPL_VAR name="SCRIPT_NAME" -->">
 	
-	<div>
+	<div id="bloc20">
 		<h2 class="catalogue">Search on</h2>
 		<p>
 			<input type="hidden" name="op" value="do_search" />
@@ -32,36 +32,12 @@
 			<input type="hidden" name="operator" value="contains" />
 			<input type="text" name="value" onchange="sql_update()" />
 		</p>
-		<p>
-				<label class="label20">Barcode</label>
-				<input type="hidden" name="marclist" value="items.barcode" />
-				<input type="hidden" name="and_or" value="and" />
-				<input type="hidden" name="excluding" value="" />
-				<input type="hidden" name="operator" value="contains" />
-				<input type="text" name="value" onchange="sql_update()" /> 
-		</p>
-		<p>
-			<label class="label20">Illustrator</label>
-			<input type="hidden" name="marclist" value="biblioitems.illus" />
-			<input type="hidden" name="and_or" value="and" />
-			<input type="hidden" name="excluding" value="" />
-			<input type="hidden" name="operator" value="contains" />
-			<input type="text" name="value" onchange="sql_update()" />
-		</p>
-		<p>
-			<label class="label20">Dewey</label>
-			<input type="hidden" name="marclist" value="biblioitems.dewey" />
-			<input type="hidden" name="and_or" value="and" />
-			<input type="hidden" name="excluding" value="" />
-			<input type="hidden" name="operator" value="contains" />
-			<input type="text" name="value" onchange="sql_update()" />
-		</p>
 		<p>
 			<label class="label20">Subject</label>
 			<input type="hidden" name="marclist" value="bibliosubject.subject" />
 			<input type="hidden" name="and_or" value="and" />
 			<input type="hidden" name="excluding" value="" />
-			<input type="hidden" name="operator" value="=" />  
+			<input type="hidden" name="operator" value="contains" />  
 			<input type="text" name="value" onchange="sql_update()" />
 		</p>
 		<p>
@@ -80,15 +56,52 @@
 				<input type="hidden" name="operator" value="=" />  
 				<!-- TMPL_VAR name="CGIbranch" -->
 		</p>
+		<p>
+			<input type="submit" value="Start search" class="button catalogue" />
+		</p>
 	</div>
-	<div>
+	<div id="bloc20">
+		<h2>Other options</h2>
+		<p>
+				<label class="label20">Item barcode</label>
+				<input type="hidden" name="marclist" value="items.barcode" />
+				<input type="hidden" name="and_or" value="and" />
+				<input type="hidden" name="excluding" value="" />
+				<input type="hidden" name="operator" value="contains" />
+				<input type="text" name="value" onchange="sql_update()" /> 
+		</p>
+		<p>
+			<label class="label20">Call Number</label>
+			<input type="hidden" name="marclist" value="items.itemcallnumber" />
+			<input type="hidden" name="and_or" value="and" />
+			<input type="hidden" name="excluding" value="" />
+			<input type="hidden" name="operator" value="contains" />
+			<input type="text" name="value" onchange="sql_update()" />
+		</p>
+		<p>
+			<label class="label20">ISBN</label>
+			<input type="hidden" name="marclist" value="biblioitems.isbn" />
+			<input type="hidden" name="and_or" value="and" />
+			<input type="hidden" name="excluding" value="" />
+			<input type="hidden" name="operator" value="=" />
+			<input type="text" name="value" onchange="sql_update()" />
+		</p>
+		<p>
+			<label class="label20">Publisher</label>
+			<input type="hidden" name="marclist" value="biblioitems.publishercode" />
+			<input type="hidden" name="and_or" value="and" />
+			<input type="hidden" name="excluding" value="" />
+			<input type="hidden" name="operator" value="contains" />
+			<input type="text" name="value" onchange="sql_update()" />
+		</p>
 		<p>Results per page :
 			<select name="resultsperpage" size="1">
 				<option value="20">20</option>
 				<option value="50">50</option>
 				<option value="100">100</option>
 			</select>
-		Ordered by
+		</p>
+		<p>Ordered by
 			<select name="orderby" size="1">
 				<option value="biblio.title">Title</option>
 				<option value="biblio.author">Author</option>
@@ -97,9 +110,8 @@
 				<option value="biblioitems.publishercode">Publisher</option>
 			</select>
 		</p>
-		<p>
-			<input type="submit" value="Start search" class="button catalogue" />
-		</p>
+		<p>&nbsp;</p>
+		<p>&nbsp;</p>
 	</div>
 </form>
 
diff --git a/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl
index 9a6be66e68..c720a3638d 100644
--- a/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl
+++ b/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl
@@ -52,6 +52,7 @@
 					<p>
 						<p><b><a class="transparent" href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a></b></p>
 						<p><!-- TMPL_VAR NAME="author" -->
+						<!-- TMPL_IF name="publicationyear" --> - <!-- TMPL_VAR name="publicationyear" --><!-- /TMPL_IF -->
 						<!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
 						<!-- TMPL_IF name="place" --> ; <!-- TMPL_VAR name="place" --><!-- /TMPL_IF -->
 						<!-- TMPL_IF name="pages" --> - <!-- TMPL_VAR name="pages" --><!-- /TMPL_IF -->
diff --git a/koha-tmpl/opac-tmpl/css/en/subject.tmpl b/koha-tmpl/opac-tmpl/css/en/subject.tmpl
index 5f69922036..a7978d54d0 100644
--- a/koha-tmpl/opac-tmpl/css/en/subject.tmpl
+++ b/koha-tmpl/opac-tmpl/css/en/subject.tmpl
@@ -3,38 +3,38 @@
 <center>
 
 <table border=0 cellspacing=0 cellpadding=2>
-<tr bgcolor=#99cccc background=<!-- TMPL_VAR NAME="themelang" -->/images/background-opac.gif>
+<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=./dosearch.pl?&subjectitems=<!-- TMPL_VAR NAME=subject2 ESCAPE=URL -->><!-- TMPL_VAR NAME=subject --></a></td>
+  <td><a href="./dosearch.pl?&subjectitems=<!-- TMPL_VAR NAME=subject2 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>
+<tr bgcolor="#99cccc" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-opac.gif"><td colspan=4>
 &nbsp;</td></tr>
 </table>
 <br>
 Results <!-- TMPL_VAR NAME="startfrom" --> through <!-- TMPL_VAR NAME="endat" --> of <!-- TMPL_VAR NAME="numrecords" --> records.
 <br>
     <!-- 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="./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>
     <!-- TMPL_ELSE -->
-	<img src=<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif border=0>
+		<img src=<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif border=0>
     <!-- /TMPL_IF -->
     <!-- TMPL_LOOP NAME="numbers" -->
 	<!-- TMPL_IF NAME="highlight" -->
-	    <img src=<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif> 
+	    <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="./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> 
 	<!-- /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="./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>
     <!-- TMPL_ELSE -->
-	<img src=<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif border=0>
+	<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif" border=0>
     <!-- /TMPL_IF -->
-
-
 <hr>
 
 
-- 
2.39.5