[Koha-cvs] koha/koha-tmpl/opac-tmpl/prog/en kohaerror.tmpl...

paul poulain paul at koha-fr.org
Fri Mar 9 15:48:06 CET 2007


CVSROOT:	/sources/koha
Module name:	koha
Changes by:	paul poulain <tipaul>	07/03/09 14:48:06

Modified files:
	koha-tmpl/opac-tmpl/prog/en: kohaerror.tmpl opac-ISBDdetail.tmpl 
	                             opac-MARCdetail.tmpl 
	                             opac-account.tmpl 
	                             opac-addbookbybiblionumber.tmpl 
	                             opac-auth.tmpl opac-basket.tmpl 
	                             opac-detail.tmpl 
	                             opac-detailprint.tmpl 
	                             opac-full-serial-issues.tmpl 
	                             opac-main.tmpl opac-passwd.tmpl 
	                             opac-readingrecord.tmpl 
	                             opac-recacquisitions.tmpl 
	                             opac-reserve.tmpl 
	                             opac-sendbasket.tmpl 
	                             opac-sendbasketform.tmpl 
	                             opac-serial-issues.tmpl 
	                             opac-shelves.tmpl 
	                             opac-suggestions.tmpl 
	                             opac-user.tmpl 
	                             opac-userdetails.tmpl 
	                             opac-userupdate.tmpl 

Log message:
	rel_3_0 moved to HEAD

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/kohaerror.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-MARCdetail.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-account.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-addbookbybiblionumber.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-auth.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-detailprint.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-full-serial-issues.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-passwd.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-readingrecord.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-recacquisitions.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-reserve.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-sendbasket.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-sendbasketform.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-serial-issues.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-suggestions.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-user.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-userdetails.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-userupdate.tmpl?cvsroot=koha&r1=1.1&r2=1.2

Patches:
Index: kohaerror.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/kohaerror.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- kohaerror.tmpl	3 Mar 2006 20:10:26 -0000	1.1
+++ kohaerror.tmpl	9 Mar 2007 14:48:06 -0000	1.2
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- An Error Has Occurred
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- An Error Has Occurred
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->

Index: opac-ISBDdetail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- opac-ISBDdetail.tmpl	3 Mar 2006 20:10:26 -0000	1.1
+++ opac-ISBDdetail.tmpl	9 Mar 2007 14:48:06 -0000	1.2
@@ -1,14 +1,44 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- ISBD
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- ISBD
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
-<div id="main">
-	<h3>ISBD</h3>
-	<p><!-- TMPL_VAR name="ISBD" --></p>
+    <div id="action">
+        <!-- TMPL_UNLESS NAME="norequests" -->
+        	<!-- TMPL_IF NAME="RequestOnOpac" -->
+        <a href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+            Place Reserve
+        </a>
+        	<!-- /TMPL_IF -->
+        <!-- /TMPL_UNLESS -->
+        <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+            Normal View
+        </a>
+        <a href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+            ISBD
+        </a>
+        <a href="/cgi-bin/koha/opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">
+            Print
+        </a>
+        <!-- TMPL_IF name="virtualshelves" -->
+            <!-- TMPL_IF NAME="loggedinusername" -->
+            <a href="/cgi-bin/koha/opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">
+                Add to My Book List
+            </a>
+            <!-- /TMPL_IF -->
+        <!-- /TMPL_IF -->
+        <a href="#" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">
+            Add to My Book Bag
+        </a>
+    </div>
 	
+    <h1>ISBD</h1>
+    <!-- TMPL_VAR name="ISBD" -->
 		<!-- TMPL_IF name="subscriptionsnumber" -->
-		<h2>We have <!-- TMPL_VAR name="subscriptionsnumber" --> subscription(s) associated with this title.</h2> 
+        <h2>
+            We have <!-- TMPL_VAR name="subscriptionsnumber" --> subscription(s) associated with this title.
+        </h2>
 		<p>Below is a list of the three latest issues :</p>
 		<!-- TMPL_LOOP Name="subscriptions" -->
 				<!-- TMPL_IF name="subscriptionnotes"-->
@@ -48,22 +78,72 @@
 		<!-- /TMPL_LOOP -->
 		<p><a href="/cgi-bin/koha/opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" title="Serial issues">Click here</a> for more information on subscription(s) history</p>
  	<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="reviewson" -->
+    <!-- TMPL_IF NAME="reviews" -->
+    <h2>Reviews by members:</h2>
+        <!--TMPL_LOOP NAME="reviews"-->
+        <p>
+            <b>
+                Review by
+                <!--TMPL_VAR NAME="title"-->
+                <!--TMPL_VAR NAME="surname"-->
+                <!--TMPL_VAR NAME="firstname"-->
+            </b>
+            <br />
+            <small>
+                <!--TMPL_VAR NAME="datereviewed"-->
+            </small>
+        </p>
+        <p>
+          <!--TMPL_VAR NAME="review"-->
+        </p>
+        <br />
+        <!--/TMPL_LOOP-->
+    <!-- TMPL_ELSE  -->
+        <b>No reviews has been writed on this biblio.</b>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="loggedinusername" -->
+        <a href="javascript:Dopop('/cgi-bin/koha/opac-review.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber"-->');">
+            Write or modify your reviews on this biblio.
+        </a>
+    <!-- TMPL_ELSE -->
+        <br /><a href="/cgi-bin/koha/opac-user.pl">Log in to your account</a> to write a review here.
+    <!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
 	
-	<!-- TMPL_UNLESS NAME="norequests" -->
-    <form action="/cgi-bin/koha/opac-reserve.pl" method="post">
-    <input type="submit" name="submit"  value="Place Reserve" />
-    <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-    </form>
-<!-- /TMPL_UNLESS -->
-
-<form action="opac-MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="MARC View" /></form>
+<!-- TMPL_IF NAME="AmazonContent" -->
+<!-- Amazon Reviews -->
+<div id="itemReviews">
+        <h2>Amazon Reader Reviews:</h2>
+        <h4>
+    <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
+    <!-- TMPL_IF NAME="isbn" -->
+        <a href="http://www.amazon.com/gp/customer-reviews/write-a-review.html/002-2970817-7876066?%5Fencoding=UTF8&asin=<!-- TMPL_VAR NAME="isbn" -->&store=books">Add your own review</a></h4>
+    <!-- /TMPL_IF -->
+    <!-- /TMPL_LOOP --><br/>
 
-<form action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="Simple View" /></form>
+        <!-- TMPL_IF NAME="rating" -->
+            <h4>Rating (from Amazon.com):</h4>
+        <div id="starMT"><div id="starFull" style="width:<!-- TMPL_VAR NAME="rating" -->px"></div></div>
+
+        <!-- TMPL_LOOP NAME="AMAZONREVIEWS" -->
+            <div class="content_set">
+            <!-- TMPL_IF NAME="summary" -->
+            <h4 class="underline">  <!-- TMPL_VAR NAME="summary" --></h4>
+            <!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="comment" -->
+                <p><!-- TMPL_VAR NAME="comment" -->
+            </p><!-- /TMPL_IF -->
+            </div>
+    <!-- /TMPL_LOOP -->
+    <!-- TMPL_ELSE -->
 
-<form action="opac-detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="Print" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form>
+    <div class="content_set">
+    <p class="error"> Sorry, there are no reviews available for this title. </p>
+    </div>
 
-<form action="opac-addbookbybiblionumber.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" value="Add to Shelf" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;" /></form>
+    <!-- /TMPL_IF -->
+</div> <!-- itemReviews -->
+<!-- /TMPL_IF-->
 
-<form><input type="submit"  onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
-</div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->

Index: opac-MARCdetail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-MARCdetail.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- opac-MARCdetail.tmpl	3 Mar 2006 20:10:26 -0000	1.1
+++ opac-MARCdetail.tmpl	9 Mar 2007 14:48:06 -0000	1.2
@@ -1,122 +1,134 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- MARC Details for Record No. <!-- TMPL_VAR name="biblionumber" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- MARC Details for Record No. <!-- TMPL_VAR name="biblionumber" -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
-<div id="main">
-<h2>MARC View</h2>
-<!-- TMPL_UNLESS NAME="norequests" -->
-    <form action="/cgi-bin/koha/opac-reserve.pl" method="post">
-    <input type="submit" name="submit"  VALUE="Place Reserve" />
-    <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-    </form>
-<!-- /TMPL_UNLESS -->
-<!-- Hide from NPL --><form action="opac-ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="ISBD" /></form><!-- /Hide from NPL -->
-
-<form action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="Normal View" /></form>
-
-<form action="opac-detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="Print" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form>
-
-<!-- TMPL_IF name="virtualshelves" --><form action="/cgi-bin/koha/opac-addbookbybiblionumber.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" value="Add to My Book List" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;" /></form><!-- /TMPL_IF -->
-
-<form><input type="submit" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
-
-		<table><!-- TMPL_LOOP name="0XX" -->
-		<tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag" --></td></tr>
-		<!-- TMPL_LOOP name="subfield" -->
-				<tr><td class="marcsubfieldletter"><!-- TMPL_VAR name="marc_subfield" --></td>
-					<td class="marcsubfieldname"><!-- TMPL_VAR name="marc_lib" --></td>
-					<td class="subfieldvalue"><!-- TMPL_VAR name="marc_value" --></td>
+<div id="action">
+    <!-- TMPL_UNLESS NAME="norequests" -->
+    	<!-- TMPL_IF NAME="RequestOnOpac" -->
+    <a href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+        Place Reserve
+    </a>
+    	<!-- /TMPL_IF -->
+    <!-- /TMPL_UNLESS -->
+    <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+        Normal View
+    </a>
+    <a href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+        ISBD
+    </a>
+    <a href="/cgi-bin/koha/opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">
+        Print
+    </a>
+    <!-- TMPL_IF name="virtualshelves" -->
+    <a href="/cgi-bin/koha/opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">
+        Add to My Book List
+    </a>
+    <!-- /TMPL_IF -->
+    <a href="#" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">
+        Add to My Book Bag
+    </a>
+</div>
+
+<h1>MARC View</h1>
+
+    <table style="border:0px;">
+        <!-- TMPL_LOOP name="0XX" -->
+        <tr><td colspan="3" style="border:0px;" ><b><!-- TMPL_VAR name="tag" --></b></td></tr>
+        <!-- TMPL_LOOP name="subfield" -->
+                <tr><td style="border:0px;">&nbsp;</td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_lib" --></td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_value" --></td>
 				</tr>
 			<!-- /TMPL_LOOP -->
 		<!-- /TMPL_LOOP -->
-
 		<!-- TMPL_LOOP name="1XX" -->
-		<tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag" --></td></tr>
+        <tr><td colspan="3" style="border:0px;" ><b><!-- TMPL_VAR name="tag" --></b></td></tr>
 		<!-- TMPL_LOOP name="subfield" -->
-				<tr><td class="marcsubfieldletter"><!-- TMPL_VAR name="marc_subfield" --></td>
-					<td class="marcsubfieldname"><!-- TMPL_VAR name="marc_lib" --></td>
-					<td class="subfieldvalue"><!-- TMPL_VAR name="marc_value" --></td>
+                <tr><td style="border:0px;" >&nbsp;</td>
+                    <td  style="border:0px;" ><!-- TMPL_VAR name="marc_lib" --></td>
+                    <td  style="border:0px;" ><!-- TMPL_VAR name="marc_value" --></td>
 				</tr>
 			<!-- /TMPL_LOOP -->
 		<!-- /TMPL_LOOP -->
 
 		<!-- TMPL_LOOP name="2XX" -->
-		<tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag" --></td></tr>
+        <tr><td colspan="3" style="border:0px;" ><b><!-- TMPL_VAR name="tag" --></b></td></tr>
 		<!-- TMPL_LOOP name="subfield" -->
-				<tr><td class="marcsubfieldletter"><!-- TMPL_VAR name="marc_subfield" --></td>
-					<td class="marcsubfieldname"><!-- TMPL_VAR name="marc_lib" --></td>
-					<td class="subfieldvalue"><!-- TMPL_VAR name="marc_value" --></td>
+                <tr><td style="border:0px;" >&nbsp;</td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_lib" --></td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_value" --></td>
 				</tr>
 			<!-- /TMPL_LOOP -->
 		<!-- /TMPL_LOOP -->
 
 		<!-- TMPL_LOOP name="3XX" -->
-		<tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag" --></td></tr>
+        <tr><td colspan="3" style="border:0px;" ><b><!-- TMPL_VAR name="tag" --></b></td></tr>
 		<!-- TMPL_LOOP name="subfield" -->
-				<tr><td class="marcsubfieldletter"><!-- TMPL_VAR name="marc_subfield" --></td>
-					<td class="marcsubfieldname"><!-- TMPL_VAR name="marc_lib" --></td>
-					<td class="subfieldvalue"><!-- TMPL_VAR name="marc_value" --></td>
+                <tr><td style="border:0px;" >&nbsp;</td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_lib" --></td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_value" --></td>
 				</tr>
 			<!-- /TMPL_LOOP -->
 		<!-- /TMPL_LOOP -->
 
 		<!-- TMPL_LOOP name="4XX" -->
-		<tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag" --></td></tr>
+        <tr><td colspan="3" style="border:0px;" ><!-- TMPL_VAR name="tag" --></td></tr>
 		<!-- TMPL_LOOP name="subfield" -->
-				<tr><td class="marcsubfieldletter"><!-- TMPL_VAR name="marc_subfield" --></td>
-					<td class="marcsubfieldname"><!-- TMPL_VAR name="marc_lib" --></td>
-					<td class="subfieldvalue"><!-- TMPL_VAR name="marc_value" --></td>
+                <tr><td style="border:0px;" >&nbsp;</td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_lib" --></td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_value" --></td>
 				</tr>
 			<!-- /TMPL_LOOP -->
 		<!-- /TMPL_LOOP -->
 
 		<!-- TMPL_LOOP name="5XX" -->
-		<tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag" --></td></tr>
+        <tr><td colspan="3" style="border:0px;" ><b><!-- TMPL_VAR name="tag" --></b></td></tr>
 		<!-- TMPL_LOOP name="subfield" -->
-				<tr><td class="marcsubfieldletter"><!-- TMPL_VAR name="marc_subfield" --></td>
-					<td class="marcsubfieldname"><!-- TMPL_VAR name="marc_lib" --></td>
-					<td class="subfieldvalue"><!-- TMPL_VAR name="marc_value" --></td>
+                <tr><td style="border:0px;" >&nbsp;</td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_lib" --></td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_value" --></td>
 				</tr>
 			<!-- /TMPL_LOOP -->
 		<!-- /TMPL_LOOP -->
 
 		<!-- TMPL_LOOP name="6XX" -->
-		<tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag" --></td></tr>
+        <tr><td colspan="3" style="border:0px;"><b><!-- TMPL_VAR name="tag" --></b></td></tr>
 		<!-- TMPL_LOOP name="subfield" -->
-				<tr><td class="marcsubfieldletter"><!-- TMPL_VAR name="marc_subfield" --></td>
-					<td class="marcsubfieldname"><!-- TMPL_VAR name="marc_lib" --></td>
-					<td class="subfieldvalue"><!-- TMPL_VAR name="marc_value" --></td>
+                <tr><td style="border:0px;">&nbsp;</td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_lib" --></td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_value" --></td>
 				</tr>
 			<!-- /TMPL_LOOP -->
 		<!-- /TMPL_LOOP -->
 
 		<!-- TMPL_LOOP name="7XX" -->
-		<tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag" --></td></tr>
+        <tr><td colspan="3" style="border:0px;" ><b><!-- TMPL_VAR name="tag" --></b></td></tr>
 		<!-- TMPL_LOOP name="subfield" -->
-				<tr><td class="marcsubfieldletter"><!-- TMPL_VAR name="marc_subfield" --></td>
-					<td class="marcsubfieldname"><!-- TMPL_VAR name="marc_lib" --></td>
-					<td class="subfieldvalue"><!-- TMPL_VAR name="marc_value" --></td>
+                <tr><td style="border:0px;" >&nbsp;</td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_lib" --></td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_value" --></td>
 				</tr>
 			<!-- /TMPL_LOOP -->
 		<!-- /TMPL_LOOP -->
 
 		<!-- TMPL_LOOP name="8XX" -->
-		<tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag" --></td></tr>
+        <tr><td colspan="3" style="border:0px;" ><b><!-- TMPL_VAR name="tag" --></b></td></tr>
 		<!-- TMPL_LOOP name="subfield" -->
-				<tr><td class="marcsubfieldletter"><!-- TMPL_VAR name="marc_subfield" --></td>
-					<td class="marcsubfieldname"><!-- TMPL_VAR name="marc_lib" --></td>
-					<td class="subfieldvalue"><!-- TMPL_VAR name="marc_value" --></td>
+                <tr><td style="border:0px;" >&nbsp;</td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_lib" --></td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_value" --></td>
 				</tr>
 			<!-- /TMPL_LOOP -->
 		<!-- /TMPL_LOOP -->
 
 		<!-- TMPL_LOOP name="9XX" -->
-		<tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag" --></td></tr>
+        <tr><td colspan="3" style="border:0px;" ><b><!-- TMPL_VAR name="tag" --></b></td></tr>
 		<!-- TMPL_LOOP name="subfield" -->
-				<tr><td class="marcsubfieldletter"><!-- TMPL_VAR name="marc_subfield" --></td>
-					<td class="marcsubfieldname"><!-- TMPL_VAR name="marc_lib" --></td>
-					<td class="subfieldvalue"><!-- TMPL_VAR name="marc_value" --></td>
+                <tr><td style="border:0px;" >&nbsp;</td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_lib" --></td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_value" --></td>
 				</tr>
 			<!-- /TMPL_LOOP -->
 		<!-- /TMPL_LOOP -->
@@ -126,9 +138,9 @@
 		<table>
 				<tr>
 					<!-- TMPL_LOOP name="item_header_loop" -->
-						<th>
+                        <tr>
 							<!-- TMPL_VAR name="header_value" -->
-						</th>
+                        </tr>
 					<!-- /TMPL_LOOP -->
 				</tr>
 				<!-- TMPL_LOOP name="item_loop" -->
@@ -139,5 +151,4 @@
 		</table><!-- TMPL_ELSE -->
 		<p>No copies available.</p>
 	<!-- /TMPL_IF -->
-</div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->

Index: opac-account.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-account.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- opac-account.tmpl	3 Mar 2006 20:10:26 -0000	1.1
+++ opac-account.tmpl	9 Mar 2007 14:48:06 -0000	1.2
@@ -1,46 +1,48 @@
-<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Account for <!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
+<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Account for <!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
 <!-- TMPL_INCLUDE name="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE name="masthead.inc" -->
 <!-- TMPL_INCLUDE name="navigation.inc" -->
 
 <!--CONTENT-->
+    <!-- TMPL_LOOP NAME="BORROWER_INFO" -->
+        <!-- TMPL_INCLUDE name="usermenu.inc" -->
+        <h1>Account for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
+    <!-- /TMPL_LOOP -->
+    
+    <!-- TMPL_IF NAME="ACCOUNT_LINES" -->
+        <h3>Fines and Charges</h3>
+        <table>
+            <thead>
+                <tr>
+                    <th>Date</th>
+                    <th>Description</th>
+                    <th>Fine Amount</th>
+                    <th>Amount Outstanding</th>
+                </tr>
+            </thead>
+            
+            <tfoot>
+            <tr>
+                <th colspan="3">Total Due</th>
+                <td class="sum">$<!-- TMPL_VAR NAME="total" --></td>
+            </tr>
+            </tfoot>
+            
+            <tbody>
+                <!-- TMPL_LOOP NAME="ACCOUNT_LINES" -->
+                    <!-- TMPL_IF NAME="odd" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
+                        <td><!-- TMPL_VAR NAME="date" --></td>
+                        <td><!-- TMPL_VAR NAME="description" -->
+                        <!-- TMPL_IF NAME="print_title" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_IF --></td>
+                        <!-- TMPL_IF NAME="amountcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF -->$<!-- TMPL_VAR NAME="amount" --></td>
+                        <!-- TMPL_IF NAME="amountoutstandingcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF -->$<!-- TMPL_VAR NAME="amountoutstanding" --></td>
+                    </tr>
+                <!-- /TMPL_LOOP -->
+            </tbody>
+        
+        </table>
+    <!-- TMPL_ELSE -->
+        <h4>You have no Fines or Charges</h4>
+    <!-- /TMPL_IF -->
 
-<!-- TMPL_LOOP NAME="BORROWER_INFO" -->
-<div id="main">
-<h1>Account for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
-<!-- /TMPL_LOOP -->
-
-<ul><li>	 <a href="/cgi-bin/koha/opac-account.pl">my fines</a> </li> <li> 
-	<a href="/cgi-bin/koha/opac-userdetails.pl">my personal details</a>		<!-- TMPL_IF name="OpacPasswordChange" --> </li> <li> <a href="/cgi-bin/koha/opac-passwd.pl">change my password</a> <!-- /TMPL_IF --><!-- TMPL_IF NAME="opacreadinghistory" --></li> <li> <a href="/cgi-bin/koha/opac-readingrecord.pl">my reading history</a><!-- /TMPL_IF -->	<!-- TMPL_IF name="virtualshelves" --> </li> <li> <a href="/cgi-bin/koha/opac-shelves.pl" class="button">my book lists</a> <!-- /TMPL_IF --><!-- TMPL_IF name="suggestion" --></li> <li> <a href="/cgi-bin/koha/opac-suggestions.pl">purchase suggestions</a><!-- /TMPL_IF --></li></ul>
-
-<!-- TMPL_IF NAME="ACCOUNT_LINES" -->
-<h3>Fines and Charges</h3>
-<table>
-<thead>
-<tr><th>Date</th>
-<th>Description</th>
-<th>Fine Amount</th>
-<th>Amount Outstanding</th>
-</tr>
-</thead>
-
-<tfoot><tr>
-<th colspan="3">Total Due</th>
-<td class="sum">$<!-- TMPL_VAR NAME="total" --></td>
-</tr></tfoot>
-
-<tbody>
-<!-- TMPL_LOOP NAME="ACCOUNT_LINES" -->
-<!-- TMPL_IF NAME="odd" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
-<td><!-- TMPL_VAR NAME="date" --></td>
-<td><!-- TMPL_VAR NAME="description" -->
-<!-- TMPL_IF NAME="print_title" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_IF --></td>
-<!-- TMPL_IF NAME="amountcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF -->$<!-- TMPL_VAR NAME="amount" --></td>
-<!-- TMPL_IF NAME="amountoutstandingcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF -->$<!-- TMPL_VAR NAME="amountoutstanding" --></td></tr>
-<!-- /TMPL_LOOP -->
-</tbody>
-
-</table>
-<!-- TMPL_ELSE --><h4>You have no Fines or Charges</h4><!-- /TMPL_IF -->
-</div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->

Index: opac-addbookbybiblionumber.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-addbookbybiblionumber.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- opac-addbookbybiblionumber.tmpl	3 Mar 2006 20:10:26 -0000	1.1
+++ opac-addbookbybiblionumber.tmpl	9 Mar 2007 14:48:06 -0000	1.2
@@ -1,24 +1,62 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Add to My Book List<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="window">
-<h3>Add <i><!-- TMPL_VAR NAME="title" --></i> <!-- TMPL_IF NAME="author" -->by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --> to a Book List</h3><form action="/cgi-bin/koha/opac-addbookbybiblionumber.pl" method="post">
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Add to My Book List
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
-<h3>Select a Book List:</h3>
-<p><label for="shelfnumber">Add to Existing List</label> <!-- TMPL_VAR NAME="CGIbookshelves" --></p>
+
+<!-- TMPL_IF NAME="multiple"-->
+    <h1>Add these <!-- TMPL_VAR NAME="total"--> biblios to a shelf</h1>
+        <!-- TMPL_LOOP NAME="biblios"-->
+            <b><!-- TMPL_VAR NAME="title"--></b> 
+            <!-- TMPL_IF NAME="author"-->by <!-- TMPL_VAR NAME="author"--><!-- /TMPL_IF -->
+            <br /><br />
+        <!-- /TMPL_LOOP -->
+<!-- TMPL_ELSE -->
+<h1>Add 
+    <i><!-- TMPL_VAR NAME="title" --></i>
+    <!-- TMPL_IF NAME="author" -->
+        by <!-- TMPL_VAR NAME="author" -->
+    <!-- /TMPL_IF --> to a Virtual Shelf
+</h1>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="CGIbookshelves"-->
+<form name="f1" action="/cgi-bin/koha/opac-addbookbybiblionumber.pl" method="POST">
+    <p><b>Select an Existing Bookshelf</b></p>
+    <label>Add to virtual shelf</label> <!-- TMPL_VAR NAME="CGIbookshelves" -->
+    <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
+    <input type="hidden" name="modifyshelfcontents" value="1" />
+    <input type="submit" value="Add to virtual shelf" class="submit" />
 </form>
-<h4>...or...</h4>
-<form action="/cgi-bin/koha/opac-addbookbybiblionumber.pl" method="post">
+<p>...or...</p>
+<!-- /TMPL_IF -->
 
-<h3>Add to a new Book List:</h3>
-<p><label for="newbookshelf">New List Name:</label><input type="text" id="newbookshelf" name="newbookshelf" maxlength="40" size="40">
-	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->"></p>
-<p><label for="category">List Type: </label></th><td><select id="category" name="category">
+<form name="f2" method="POST" action="/cgi-bin/koha/opac-addbookbybiblionumber.pl">
+    <b>Add to a New Bookshelf:</b>
+        <p>
+            <label for="newbookshelf">
+                Shelf Name:
+            </label>
+            <input type="text" name="newbookshelf" id="newbookshelf" size="40" />
+        </p>
+            <label for="category">Category:</label>
+            <select name="category" id="category">
 			<option value="1">Private</option>
 			<option value="2">Public</option>
-			<option value="3">Free</option>
-		</select></p>
+            </select>
+    <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
+    <input type="submit" value="Add to virtual shelf" class="submit" /> 
+</form>
+
+<p align="center">
+    <br /><br />
+    <a href="javascript:closePopup();">close this window.</a>
+</p>
 
+<script type="text/javascript" language="javascript">
+    function closePopup () {
+        window.close();
+    }
+</script>
 
-	<p><input type="hidden" name="category" value="1" /><input type="submit" value="Add to My Book List"></p></form>
-</div>
 </body>
 </html>

Index: opac-auth.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-auth.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- opac-auth.tmpl	3 Mar 2006 20:10:26 -0000	1.1
+++ opac-auth.tmpl	9 Mar 2007 14:48:06 -0000	1.2
@@ -1,10 +1,9 @@
-<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Log in to Your Account
+<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Log in to Your Account
 <!-- TMPL_INCLUDE name="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE name="masthead.inc" -->
 <!-- TMPL_INCLUDE name="navigation.inc" -->
 
 <!--CONTENT-->
-<div id="main">
 <!-- TMPL_IF NAME="loginprompt" -->
 <!-- login prompt time-->
 <h3>Log In to Your Account</h3>
@@ -44,5 +43,4 @@
 
 
 <!-- /TMPL_IF -->
-</div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->

Index: opac-basket.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- opac-basket.tmpl	3 Mar 2006 20:10:26 -0000	1.1
+++ opac-basket.tmpl	9 Mar 2007 14:48:06 -0000	1.2
@@ -1,85 +1,227 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Your Book Bag<!-- TMPL_IF NAME="print_basket" --><!-- TMPL_INCLUDE NAME="doc-head-close-basket-print.inc" --><!-- TMPL_ELSE --><!-- TMPL_INCLUDE NAME="doc-head-close-basket.inc" --><!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<!-- TMPL_VAR NAME="LibraryNameTitle" -->
+    Catalog -- Your Book Bag
+    <!-- TMPL_IF NAME="print_basket" -->
+        <!-- TMPL_INCLUDE NAME="doc-head-close-basket-print.inc" -->
+    <!-- TMPL_ELSE -->
+    <!-- TMPL_INCLUDE NAME="doc-head-close-basket.inc" -->
+<!-- /TMPL_IF -->
 
-<div id="window">
-	<!-- TMPL_UNLESS NAME="print_basket" --><h3>Your Book Bag</h3>
-	<!-- MENUS -->
+<div> <!-- main -->
 	
-<!-- TMPL_IF NAME="verbose" -->
-<form action="opac-basket.pl" method="get"><input type="submit" onclick="showLess(); return false;" value="Brief Display" /></form>
-<!-- TMPL_ELSE -->
-<form action="opac-basket.pl" method="get"><input type="submit" onclick="showMore(); return false;" value="More Details" /></form>
+<!-- TMPL_UNLESS NAME="print_basket" -->
+<h1>Your Book Bag</h1>
+
+<div id="action">
+        <!-- TMPL_IF NAME="verbose" -->
+        <a href="opac-basket.pl" onclick="showLess(); return false;">Brief Display</a>
+        <!-- TMPL_ELSE -->
+        <a href="opac-basket.pl" onclick="showMore(); return false;">More Details</a>
+        <!-- /TMPL_IF -->
+        <a href="opac-basket.pl" onclick="sendBasket(); return false;">Send</a>
+        <a href="opac-basket.pl" onclick="printBasket(); return false;">Print</a>
+        <a href="opac-basket.pl" onclick="delBasket(); return false;">Empty and Close</a>
+        <a href="opac-basket.pl" onclick="quit(); return false;">Hide Window</a>
+        <!-- /TMPL_UNLESS -->
+</div>
+<br />
+<p>
+<b>Selected items :</b>
+<a href="javascript:delSelRecords();">
+    Remove
+</a> | 
+<!-- TMPL_IF NAME="loggedinusername" -->
+    <a href="javascript:addSelToShelf();">
+        Add to a shelf
+    </a>
 <!-- /TMPL_IF -->
-<form action="opac-basket.pl" method="get"><input type="submit" onclick="delSelRecords(); return false;" value="Remove Selected Items" /></form>
+</p>
 
-<form action="opac-basket.pl" method="get"><input type="submit" onclick="sendBasket(); return false;" value="Send" /></form>
+<!-- TMPL_IF NAME="verbose" -->
+    <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
+    <h3>
+        <!-- TMPL_IF NAME="print_basket" -->
+            <!-- TMPL_VAR NAME="title" -->
+                <!-- TMPL_IF name="subtitle" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF -->
+        <!-- TMPL_ELSE -->
+            <form>
+                <input type="checkbox"
+                        value="<!-- TMPL_VAR NAME="biblionumber" -->"
+                        name="bib<!-- TMPL_VAR NAME="biblionumber" -->"
+                        id="bib<!-- TMPL_VAR NAME="biblionumber" -->"
+                        onclick="selRecord(value,checked)" />
+                <!-- TMPL_VAR NAME="title" -->
+                <!-- TMPL_IF name="subtitle" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF -->
+            </form>
+        <!-- /TMPL_IF -->
+    </h3>
+    <table>
 
-<form action="opac-basket.pl" method="get"><input type="submit" onclick="printBasket(); return false;" value="Print" /></form>
+        <!-- TMPL_IF name="isbn" -->
+        <tr>
+            <th scope="row">ISBN</th>
+            <td><!-- TMPL_VAR NAME="isbn" --></td>
+        </tr>
+        <!-- /TMPL_IF -->
 
-		<form action="opac-basket.pl" method="get"><input type="submit" onclick="delBasket(); return false;" value="Empty and Close" /></form> 
-<form action="opac-basket.pl" method="get"><input type="submit" onclick="quit(); return false;" value="Hide Window" /></form>
-<!-- /TMPL_UNLESS -->
+        <!-- TMPL_IF name="MARCAUTHORS" -->
+        <tr>
+            <th scope="row">Authors</th>
+            <td>
+                <!-- TMPL_LOOP NAME="MARCAUTHORS" -->
+                    <!-- TMPL_VAR NAME="value" -->
+            <!-- /TMPL_LOOP -->
+            </td>
+        </tr>
+        <!-- /TMPL_IF -->
 			
+        <!-- TMPL_IF NAME="publishercode" -->
+            <tr>
+                <th scope="row">Publisher</th>
+                <td><!-- TMPL_VAR NAME="place" --> <!-- TMPL_VAR NAME="publishercode" --> <!-- TMPL_VAR NAME="publicationyear" -->
+                </td>
+            </tr>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="pages" -->
+            <tr>
+                <th scope="row">Details</th>
+                <td><!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" --></td>
+            </tr>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF name="seriestitle" -->
+        <tr>
+            <th scope="row">Collection</th>
+            <td> <!-- TMPL_VAR NAME="seriestitle" --></td>
+        </tr>
+        <!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME="verbose" -->
-<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
-<h3><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF name="subtitle" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF --></h3>
-<table>
-				<!-- TMPL_UNLESS NAME="print_basket" --><tr><td colspan="2"><form><label for="bib<!-- TMPL_VAR NAME="biblionumber" -->"><input type="checkbox" value="<!-- TMPL_VAR NAME="biblionumber" -->" name="bib<!-- TMPL_VAR NAME="biblionumber" -->" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" onclick="selRecord(value,checked)"> Select this Item</label></form></td></tr><!-- /TMPL_UNLESS -->
-
-				<!-- TMPL_IF name="isbn" --><tr><th scope="row">ISBN:</th><td><!-- TMPL_VAR NAME="ISBN" --></td></tr><!-- /TMPL_IF -->
-						
-						<!-- TMPL_IF name="author" --><tr><th scope="row">Author:</th><td> <!-- TMPL_VAR NAME="author" --></td></tr><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="additional" --><tr><th scope="row">Additional authors:</th><td><!-- TMPL_VAR NAME="additional" --></td></tr><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="publishercode" -->
-	    <tr><th scope="row">Publisher:</th><td><!-- TMPL_VAR NAME="place" --> <!-- TMPL_VAR NAME="publishercode" --> <!-- TMPL_VAR NAME="publicationyear" --></td></tr>
-<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="pages" -->
-	<tr><th scope="row">Details: </th><td><!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" --></td></tr>
-<!-- /TMPL_IF -->
-						<!-- TMPL_IF name="collection" --><tr><th scope="row">Collection:</th><td> <!-- TMPL_VAR NAME="seriestitle" --></td></tr><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="subject" --><tr><th scope="row">Subject:</th><td> <!-- TMPL_VAR NAME="subject" --></td></tr><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="copyrightdate" --><tr><th scope="row">Copyright:</th><td> <!-- TMPL_VAR NAME="copyrightdate" --></td></tr><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="notes" --><tr><th scope="row">Notes:</th><td> <!-- TMPL_VAR NAME="notes" --></td></tr><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="unititle" --><tr><th scope="row">Unified title:</th><td> <!-- TMPL_VAR NAME="unititle" --></td></tr><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="serial" --><tr><th scope="row">Serial:</th><td><!-- TMPL_VAR NAME="serial" --></td></tr><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="dewey" --><tr><th scope="row">Dewey:</th><td><!-- TMPL_VAR name="dewey" --></td></tr><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="classification" --><tr><th scope="row">Call Number:</th><td> <!-- TMPL_VAR name="classification" --></td></tr><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="lccn" --><tr><th scope="row">LCCN:</th><td> <!-- TMPL_VAR name="lccn" --></td></tr><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="url" --><tr><th scope="row">URL:</th><td> <!-- TMPL_VAR NAME="url" --></td></tr><!-- /TMPL_IF -->
-			</table>
-							<table><tr>
-					<th>Location: </th>
-					<th>Barcode: </th>
+        <!-- TMPL_IF name="MARCSUBJCTS" -->
+        <tr>
+            <th scope="row">Subjects</th>
+            <td>
+                <!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
+                    <p><!-- TMPL_VAR NAME="label" --></p>
+            <!-- /TMPL_LOOP -->
+            </td>
 				</tr>
-				<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
+        <!-- /TMPL_IF -->
+    
+        <!-- TMPL_IF name="copyrightdate" -->
+            <tr><th scope="row">Copyright</th>
+                <td> <!-- TMPL_VAR NAME="copyrightdate" --></td>
+            </tr>
+        <!-- /TMPL_IF -->
+    
+        <!-- TMPL_IF name="MARCNOTES" -->
 					<tr>
+            <th scope="row">Notes</th>
 						<td>
+            <!-- TMPL_LOOP NAME="MARCNOTES" -->
+                <p>- <!-- TMPL_VAR NAME="marcnote" --></p>
+            <!-- /TMPL_LOOP -->
+            </td>
+        </tr>
+        <!-- /TMPL_IF -->
+    
+        <!-- TMPL_IF name="unititle" -->
+        <tr>
+            <th scope="row">Unified title</th>
+            <td> <!-- TMPL_VAR NAME="unititle" --></td>
+        </tr>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF name="serial" -->
+        <tr>
+            <th scope="row">Serial</th>
+            <td><!-- TMPL_VAR NAME="serial" --></td>
+        </tr>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF name="dewey" -->
+        <tr>
+            <th scope="row">Dewey</th>
+            <td><!-- TMPL_VAR name="dewey" --></td>
+        </tr>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF name="classification" -->
+        <tr>
+            <th scope="row">Classification</th>
+            <td> <!-- TMPL_VAR name="classification" --></td>
+        </tr>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF name="lccn" -->
+        <tr>
+            <th scope="row">LCCN</th>
+            <td> <!-- TMPL_VAR name="lccn" --></td>
+        </tr>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF name="url" -->
+        <tr>
+            <th scope="row">URL</th>
+            <td> <!-- TMPL_VAR NAME="url" --></td>
+        </tr><!-- /TMPL_IF -->
+        <tr>
+            <th scope="row">Location</th>
+            <td>
+                <!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
+                <p>
 							<!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_VAR NAME="location" --> 
 							<!-- TMPL_IF name="itemcallnumber" -->
 								(<!-- TMPL_VAR NAME="itemcallnumber" -->)
 							<!-- /TMPL_IF -->
+                </p>
+                <!-- /TMPL_LOOP -->
 						</td>
-						<td><!-- TMPL_VAR NAME="barcode" --></td>
 					</tr>
-				<!-- /TMPL_LOOP --></table>
-			<br>
-<!-- /TMPL_LOOP -->
+    </table>
+    <!-- /TMPL_LOOP -->
+
 <!-- TMPL_ELSE -->
-<table><!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
-				<!-- BIBLIO RECORD TABLE -->
-<!-- TMPL_IF NAME="even" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
-<td><form><!-- TMPL_UNLESS NAME="print_basket" --><label for="bib<!-- TMPL_VAR NAME="biblionumber" -->"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" /></label><br><input type="checkbox" value="<!-- TMPL_VAR NAME="biblionumber" -->" name="bib<!-- TMPL_VAR NAME="biblionumber" -->" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" onclick="selRecord(value,checked);"><!-- /TMPL_UNLESS --></form></td><td><p><a href="#" onclick="openBiblio('<!-- TMPL_VAR name="dest" -->',<!-- TMPL_VAR name="biblionumber" -->)"><!-- TMPL_VAR NAME="title" --></a> <!-- TMPL_VAR NAME="author" -->
+    <table>
+        <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
+            <!-- TMPL_IF NAME="even" -->
+                <tr class="highlight">
+            <!-- TMPL_ELSE -->
+                <tr>
+            <!-- /TMPL_IF -->
+            <td>
+                <form>
+                    <!-- TMPL_UNLESS NAME="print_basket" -->
+                        <label for="bib<!-- TMPL_VAR NAME="biblionumber" -->">
+                        </label>
+                        <br />
+                        <input type="checkbox"
+                            value="<!-- TMPL_VAR NAME="biblionumber" -->"
+                            name="bib<!-- TMPL_VAR NAME="biblionumber" -->"
+                            id="bib<!-- TMPL_VAR NAME="biblionumber" -->"
+                            onclick="selRecord(value,checked);">
+                    <!-- /TMPL_UNLESS -->
+                </form>
+            </td>
+            <td><!-- TMPL_VAR name="itemtype" --></td>
+            <td>
+                <p>
+                    <a href="#" onclick="openBiblio('<!-- TMPL_VAR name="dest" -->',<!-- TMPL_VAR name="biblionumber" -->)">
+                        <!-- TMPL_VAR NAME="title" -->
+                    </a>
+                        <!-- TMPL_VAR NAME="author" -->
 						<!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" -->
 						<!-- TMPL_IF name="place" --> <!-- TMPL_VAR name="place" --><!-- /TMPL_IF --><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="pages" --> - <!-- TMPL_VAR name="pages" --><!-- TMPL_IF name="size" --> <!-- TMPL_VAR name="size" --><!-- /TMPL_IF --><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="notes" --><p><!-- TMPL_VAR name="notes" --></p><!-- /TMPL_IF -->
-					</p></td><td><!-- TMPL_VAR NAME="classification" --></td></tr>
+                        <!-- TMPL_IF name="pages" --> - <!-- TMPL_VAR name="pages" --><!-- TMPL_IF name="size" --> <!-- TMPL_VAR name="size" -->
+                        <!-- /TMPL_IF -->
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="notes" -->
+                        <p><!-- TMPL_VAR name="notes" --></p>
+                        <!-- /TMPL_IF -->
+            </td>
+            <td><!-- TMPL_VAR NAME="classification" --></td>
+            </tr>
 	<!-- /TMPL_LOOP -->
-</table>
+    </table>
 <!-- /TMPL_IF -->
+
 <!-- TMPL_UNLESS NAME="print_basket" -->
-<form name="myform"><input type="hidden" name="records"></form>
+<form name="myform">
+    <input type="hidden" name="records" id="records" />
+</form>
 <!-- /TMPL_UNLESS -->
-</div>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->

Index: opac-detail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- opac-detail.tmpl	3 Mar 2006 20:10:26 -0000	1.1
+++ opac-detail.tmpl	9 Mar 2007 14:48:06 -0000	1.2
@@ -1,152 +1,215 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Details for: <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_LOOP -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Details for: <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_LOOP -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
-<div id="main">
-<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
-
-<!-- TMPL_IF NAME="AmazonContent" --><!-- TMPL_IF NAME="isbn" --><a href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="isbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="isbn" -->.01._PIdp-schmooS,TopRight,7,-26_SCMZZZZZZZ_.jpg" alt="Book Cover Image" /></a><!-- TMPL_ELSE --><img border="0" src="http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif" alt="Book Cover Image" /><!-- /TMPL_IF --><!-- /TMPL_IF -->
-
-
-<ul>
-<!-- TMPL_UNLESS NAME="norequests" --><li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Place Reserve</a></li><!-- /TMPL_UNLESS -->
-<li><a class="detail" href="/cgi-bin/koha/opac-MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">MARC View</a></li>
-<!-- Hide from NPL --> <li><a class="isbd" href="/cgi-bin/koha/opac-ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">ISBD</a></li> <!-- Hide from NPL -->
-<li><a class="print" href="/cgi-bin/koha/opac-detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Print</a></li>
-<!-- TMPL_IF name="virtualshelves" --><li><a class="shelf" href="/cgi-bin/koha/opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Add to My Book List</a></li><!-- /TMPL_IF -->
-<li><a class="cart" href="#" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Add to My Book Bag</a></li>
-</ul>
-
-
-<h4>Search for this title in:</h4>
-<ul>
-<li><a href="http://www.google.com/search?q=<!-- TMPL_VAR NAME="title" ESCAPE="url" -->+site:worldcatlibraries.org">Other Libraries(WorldCat)</a></li>
-<li><a href="http://www.scholar.google.com/scholar?q=<!-- TMPL_VAR NAME="title" ESCAPE="url" -->">Other Databases (Google Scholar)</a></li></ul>
-
-<h2><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF NAME="subtitle" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF --></h2>
-<!-- TMPL_IF NAME="author" --><h3>By <a href="/cgi-bin/koha/opac-search.pl?marclist=biblio.author&amp;and_or=and&amp;excluding=&amp;operator=contains&amp;value=<!-- TMPL_VAR NAME="author" -->&amp;resultsperpage=20&amp;orderby=biblio.title&amp;op=do_search"><!-- TMPL_VAR NAME="author" --></a></h3><!-- /TMPL_IF --> 
-
-<table>
-
-<!-- TMPL_UNLESS NAME="MARCNOTES" -->
-
-<!-- TMPL_IF NAME="notes" -->
-<tr><th scope="row">Notes:</th><td><!-- TMPL_VAR NAME="notes" --></td></tr><!-- /TMPL_IF -->
-
-<!-- /TMPL_UNLESS -->
-	
-<!-- TMPL_UNLESS NAME="MARCSUBJCTS" -->
-
-<!-- TMPL_IF name="subjects" --><tr><th>Subject(s):</th><td><!-- TMPL_LOOP name="subjects" --><a href="/cgi-bin/koha/opac-search.pl?op=do_search&amp;marclist=bibliosubject.subject&amp;and_or=and&amp;operator=contains&amp;value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP --></td></tr><!-- /TMPL_IF -->
+<div id="action">
 
+<!-- TMPL_UNLESS NAME="norequests" -->
+	<!-- TMPL_IF NAME="RequestOnOpac" -->
+		<a href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+		Place Reserve
+		</a>
+	<!-- /TMPL_IF -->
 <!-- /TMPL_UNLESS -->
-
-<!-- TMPL_IF NAME="MARCNOTES" -->
-		<tr>
-			<th scope="row">Detailed notes:</th>
-			<td scope="row"><ul><!-- TMPL_LOOP NAME="MARCNOTES" --><li><!-- TMPL_VAR NAME="marcnote" --></li><!-- /TMPL_LOOP --></ul></td></tr>
+        <a href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+            MARC View
+        </a>
+        <a href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+            ISBD
+        </a>
+        <a href="/cgi-bin/koha/opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">
+            Print
+        </a>
+<!-- TMPL_IF name="virtualshelves" -->
+    <!-- TMPL_IF NAME="loggedinusername" -->
+        <a href="/cgi-bin/koha/opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">
+            Add to My Book List
+        </a>
 	<!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+        <a href="#" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">
+            Add to My Book Bag
+        </a>
+</div>
 
-<!-- TMPL_IF NAME="MARCSUBJCTS" -->
-		<tr>
-			<th scope="row">Related links:</th>
-			<td><ul><!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
-							<!-- TMPL_IF name="linkvalue" -->
-								<li><a href="/cgi-bin/koha/opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR name="link" -->&amp;and_or=and&amp;operator==&amp;value=<!-- TMPL_VAR NAME="linkvalue" escape="HTML"-->"><!-- TMPL_VAR NAME="marcsubjct" --></a></li>
+<div id="catalogue_detail_biblio">
+    <!-- TMPL_IF NAME="AmazonContent" -->
+        <!-- TMPL_IF NAME="isbn" -->
+        <a href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="isbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link">
+            <img border="0" src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="isbn" -->.01._PIdp-schmooS,TopRight,7,-26_SCMZZZZZZZ_.jpg" alt="Book Cover Image" />
+        </a><!-- TMPL_ELSE -->
+        <img border="0" src="http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif" alt="Book Cover Image" />
+        <!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+    <h1>
+        <!-- TMPL_VAR NAME="title" -->
+        <!-- TMPL_IF NAME="author" -->(<!-- TMPL_VAR NAME="author" -->)<!-- /TMPL_IF -->
+        <!-- TMPL_VAR NAME="class" -->
+    </h1>
+    
+    <!-- TMPL_IF name="subtitles" -->
+    <p><label><b>Subtitle(s):</b></label>
+        <!-- TMPL_LOOP name="subtitles" -->
+        <!-- TMPL_VAR NAME="subtitle" --> ;
+        <!-- /TMPL_LOOP -->
+        &nbsp;
+    </p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF name="author" -->
+    <p><label><b>Author: </b></label>
+        <a href="/cgi-bin/koha/opac-search.pl?q=au:<!-- TMPL_VAR NAME="author" -->">
+            <!-- TMPL_VAR NAME="author" -->&nbsp;
+        </a>
+    </p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MARCAUTHORS" -->
+    <p><label><b>Additional Author:</b></label>
+        <!-- TMPL_LOOP NAME="MARCAUTHORS" -->
+        <a href="/cgi-bin/koha/opac-search.pl?q=au:<!-- TMPL_VAR NAME="value" -->">
+            <!-- TMPL_VAR NAME="value" -->
+        </a>&nbsp;
+        <!-- /TMPL_LOOP -->
+    </p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF name="illus" -->
+    <p><label><b>Illus:</b></label><!-- TMPL_VAR name="illus" -->&nbsp;</p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF name="publishercode" -->
+    <p><label><b>Published by :</b></label>
+        <a href="/cgi-bin/koha/opac-search.pl?q=pb:<!-- TMPL_VAR NAME="publishercode"-->">
+            <!-- TMPL_VAR NAME="publishercode" -->
+        </a>&nbsp;
+    </p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF name="publicationyear" -->
+    <p><label><b>in</b></label><!-- TMPL_VAR NAME="publicationyear" -->&nbsp;</p>
+    <!-- /TMPL_IF -->
+    <p>
+        <!-- TMPL_IF name="pages" --> <label><b>Size: </b></label><!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
+        <!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" -->&nbsp;
+    </p>
+    <!-- TMPL_IF name="isbn" -->
+    <p><label><b>ISBN: </b></label><!-- TMPL_VAR NAME="isbn" -->&nbsp;</p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF name="issn" -->
+    <p><label><b>ISSN:</b></label><!-- TMPL_VAR NAME="issn" -->&nbsp;</p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF name="seriestitle" -->
+    <p><label><b>Collection: </b></label>
+        <!-- TMPL_VAR NAME="seriestitle" -->
+        <!-- TMPL_IF name="volume" -->vol. <!-- TMPL_VAR name="volume" --> <!-- TMPL_VAR name="volumedate" --><!-- /TMPL_IF -->
+        <!-- TMPL_VAR name="volumedesc" -->&nbsp;
+    </p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MARCSUBJCTS" -->
+    <p><label><b>Subjects: </b></label></p>
+    <p>
+        <!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
+        <a href="/cgi-bin/koha/opac-search.pl?q=<!-- TMPL_VAR NAME="link" ESCAPE="URL"-->"><!-- TMPL_VAR NAME="label" --></a>
+        &nbsp;
+        <!-- /TMPL_LOOP -->
+    </p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF name="copyrightdate" -->
+    <p><label><b>Year : </b></label><!-- TMPL_VAR NAME="copyrightdate" --></p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MARCNOTES" -->
+    <p><label><b>Notes: </b></label></p>
+    <p>
+        <!-- TMPL_LOOP NAME="MARCNOTES" -->
+        <p>- <!-- TMPL_VAR NAME="marcnote" --></p>
+        <!-- /TMPL_LOOP -->
+    </p>
 							<!-- TMPL_ELSE -->
-								<li><a href="/cgi-bin/koha/opac-search.pl?op=do_search&amp;marclist=bibliosubject.subject&amp;and_or=and&amp;operator=contains&amp;value=<!-- TMPL_VAR NAME="marcsubjct" escape="HTML"-->"><!-- TMPL_VAR NAME="marcsubjct" --></a></li>
+    <!-- TMPL_IF name="notes" -->
+    <p><label><b>Notes: </b></label><!-- TMPL_VAR NAME="notes" --></p>
 							<!-- /TMPL_IF -->
-
-<!-- /TMPL_LOOP --></ul></td></tr>
 	<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="item_description" -->
-<tr>
-<th scope="row">Item Description (from Amazon.com):</th>
-<td><ul><li><!-- TMPL_VAR NAME="item_description" --></li></ul></td></tr>
-<!-- /TMPL_IF -->
-
-
-
-<!-- TMPL_IF NAME="abstract" --><tr><th scope="row">Format:</th><td><!-- TMPL_VAR NAME="abstract" --></td></tr><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="copyrightdate" -->
-    <tr><th scope="row">Copyright:</th><td><!-- TMPL_VAR NAME="copyrightdate" --></td></tr>
-<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="seriestitle" --><tr><th scope="row">Series Title:</th><td><a href="/cgi-bin/koha/opac-search.pl?marclist=biblio.seriestitle&amp;and_or=and&amp;excluding=&amp;operator=contains&amp;value=<!-- TMPL_VAR NAME="seriestitle" ESCAPE=URL -->&amp;resultsperpage=20&amp;orderby=biblio.title&amp;op=do_search"><!-- TMPL_VAR NAME="seriestitle" --></a><!-- TMPL_IF NAME="volume" --><!-- TMPL_VAR NAME="volume" --><!-- /TMPL_IF --></td></tr><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="isbn" -->
-	    <tr><th scope="row">ISBN:</th><td><!-- TMPL_VAR NAME="isbn" --></td></tr>
-<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="lccn" -->
-	    <tr><th scope="row">LCCN:</th><td><!-- TMPL_VAR NAME="lccn" --></td></tr>
-<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="publishercode" -->
-	    <tr><th scope="row">Publisher:</th><td><!-- TMPL_VAR NAME="place" --> <!-- TMPL_VAR NAME="publishercode" --> <!-- TMPL_VAR NAME="publicationyear" --></td></tr>
-<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="pages" -->
-	<tr><th scope="row">Physical Details: </th><td><!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" --></td></tr>
-<!-- /TMPL_IF -->
-<!-- /TMPL_LOOP -->
-
- <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
- <tr><th scope="row">Record No.:</th><td><!-- TMPL_VAR NAME="biblionumber" --></td></tr> <!-- /TMPL_LOOP -->
-</table>
-<table>
-<!-- TMPL_IF NAME="MARCURLS" -->
-		<tr><th scope="row">Related URLs: </th><td><ul><!-- TMPL_LOOP NAME="MARCURLS" --><li><a href="<!-- TMPL_VAR NAME="MARCURL" -->"><!-- TMPL_VAR NAME="MARCURL" --></a></li><!-- /TMPL_LOOP --></ul></td></tr>
+    <!-- TMPL_IF name="unititle" -->
+    <p><label><b>Alt title: </b></label><!-- TMPL_VAR NAME="unititle" --></p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF name="classification" -->
+    <p><label><b>classification:</b></label><!-- TMPL_VAR name="subclass" --><!-- TMPL_VAR name="classification" --></p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF name="dewey" -->
+    <p><label><b>Dewey:</b></label><!-- TMPL_VAR name="dewey" --></p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF name="URLS" -->
+    <p><label><b>URL: </b></label>
+        <!-- TMPL_LOOP name="URLS" -->
+        <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a>&nbsp;
+        <!-- /TMPL_LOOP -->
+    </p>
+    <!-- /TMPL_IF -->
+    <p><label><b>Item type : </b></label>
+        <!-- TMPL_IF name="description" -->
+        <!-- TMPL_VAR name="description" -->
+        <!-- TMPL_ELSE -->
+        <!-- TMPL_VAR NAME="itemtype" -->
 	<!-- /TMPL_IF -->
-</table>
-<br clear="right" />
+    </p>
 </div>
 
-<!-- TMPL_IF NAME="ITEM_RESULTS" -->
-<table>
-<!--HOLDINGS INFORMATION HEADER TABLE ROWS-->
-<tr><!-- <th>&nbsp;</th> -->
-<th>Type/Format</th>
-<th>Call Number</th>
-<th>Location</th>
-<th>Status</th>
-<th>Due Date</th>
-<th>Last Seen</th>
-<!-- <th>Barcode</th> --></tr>
-<tbody>
-<!--INFORMATION ROWS-->
-<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
-<tr><td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="description" -->.gif" align="left" title="<!-- TMPL_VAR NAME="barcode" -->" alt="" /><!-- TMPL_VAR NAME="description" --></td>
-<td><!-- TMPL_VAR NAME="classification" --></td>
-				<td>
-					<!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_VAR NAME="location" --> 
-					<!-- TMPL_IF name="itemcallnumber" -->
-						(<!-- TMPL_VAR NAME="itemcallnumber" -->)
-					<!-- /TMPL_IF -->
-				</td>
+<!-- TMPL_IF name="count" -->
+<div id="catalogue_detail_items">
+    <h2><!-- TMPL_VAR NAME="count" --> items</h2>
+    <table>
+        <tr>
+            <th>Item type</th>
+            <th>Location</th>
+            <th>Status</th>
+            <th>Date Due</th>
+            <th>Volume</th>
+        </tr>
+        <!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
+        <tr>
+            <td><!-- TMPL_VAR NAME="description" --></td>
+            <td><!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_IF NAME="itemcallnumber" --> <!-- TMPL_VAR NAME="itemcallnumber" --><!-- /TMPL_IF --></td>
 				<td>
 					<!-- TMPL_IF name="datedue" -->
-						On loan
+                On issue to <!-- TMPL_VAR NAME="cardnumber" -->
+                <!-- TMPL_ELSE -->
+                <!-- TMPL_IF name="notforloan" -->
+                <!-- TMPL_VAR name="notforloan" -->
 					<!-- TMPL_ELSE -->
-						<!-- TMPL_IF name="notforloantext" -->
-							<!-- TMPL_VAR name="notforloantext" -->
+                <!-- TMPL_IF name="itemlost"-->
+                Item lost
 						<!-- TMPL_ELSE -->
-							Available
+                <!-- TMPL_IF NAME="wthdrawn" -->Item Cancelled<!-- TMPL_ELSE -->Available<!-- /TMPL_IF -->
+                <!-- /TMPL_IF -->
 						<!-- /TMPL_IF -->
 					<!-- /TMPL_IF -->
 				</td>
-<td><!-- TMPL_VAR NAME="datedue" --></td>
-<td><!-- TMPL_VAR NAME="datelastseen" --></td>
-<!-- <td><!-- TMPL_VAR NAME="barcode" --></td> --></tr>
-<!-- /TMPL_LOOP -->
-</tbody>
-</table>
+            <td><!-- TMPL_VAR NAME="datedue" --></td>
+            <td><!-- TMPL_VAR NAME="volumeddesc" --></td>
+            <!-- TMPL_IF NAME="type" -->
+            <td>
+                <a href="/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&amp;item=<!-- TMPL_VAR NAME="itemtype" -->">Fix Itemtype</a>
+            </td>
+            <!-- /TMPL_IF -->
+        </tr>
+        <!-- /TMPL_LOOP -->
+    </table>
+</div>
 <!-- TMPL_ELSE -->
-<table><tr><td>No copies available.</td></tr></table>
+<p>we don't have any physical item for this document</p>
 <!-- /TMPL_IF -->
-	<!-- TMPL_IF name="subscriptionsnumber" -->
-		<p>This is a serial subscription (There are <!-- TMPL_VAR name="subscriptionsnumber" --> subscriptions associated with this title).</p> 
+<!-- TMPL_IF name="subscriptionsnumber" -->
+<div id="catalogue_detail_subscriptions">
+    <h2>This is a serial subscription</h2>
+    <p> (We have <!-- TMPL_VAR name="subscriptionsnumber" --> subscriptions associated with this title).</p>
 		<!-- TMPL_LOOP Name="subscriptions" -->
-				<!-- TMPL_IF NAME="subscriptionnotes" --><p><!--TMPL_VAR Name="subscriptionnotes"--> </p><!-- /TMPL_IF -->
-				<!--TMPL_IF Name="latestserials"-->
+    <!-- TMPL_IF NAME="subscriptionnotes" --><p><!--TMPL_VAR NAME="subscriptionnotes"--> </p><!-- /TMPL_IF -->
+    <!--TMPL_IF NAME="latestserials"-->
 				<p> The three latest issues related to this subscription:</p>
 				<table>
+        <tr>
+            <th>Issue #</th>
+            <th>Date</th>
+            <th>Status</th>
+            <th>Note</th>
 				<!--TMPL_LOOP Name="latestserials"-->
 					<tr>
 						<td>
@@ -171,13 +234,50 @@
 								<!--/TMPL_IF-->
 							<!--/TMPL_IF-->
 						</td>
+                <td>
+                    <!--TMPL_VAR Name="notes"-->
+                </td>
 					</tr>
 				<!--/TMPL_LOOP -->
 				</table>
 				<!-- /TMPL_IF -->
 		<!-- /TMPL_LOOP -->
-		<p> For more information: View a record of <a href="/cgi-bin/koha/opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" title="Serial issues">this subscription's issues</a></p>
+    </div>
  	<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="reviewson" -->
+    <!-- TMPL_IF NAME="reviews" -->
+    <h2>Reviews by members:</h2>
+        <!--TMPL_LOOP NAME="reviews"-->
+        <p>
+            <b>
+                Review by
+                <!--TMPL_VAR NAME="title"-->
+                <!--TMPL_VAR NAME="surname"-->
+                <!--TMPL_VAR NAME="firstname"-->
+            </b>
+            <br />
+            <small>
+                <!--TMPL_VAR NAME="datereviewed"-->
+            </small>
+        </p>
+        <p>
+          <!--TMPL_VAR NAME="review"-->
+        </p>
+        <br />
+        <!--/TMPL_LOOP-->
+    <!-- TMPL_ELSE  -->
+        <b>No reviews has been writed on this biblio.</b>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="loggedinusername" -->
+        <a href="javascript:Dopop('/cgi-bin/koha/opac-review.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber"-->');">
+            Write or modify your reviews on this biblio.
+        </a>
+    <!-- TMPL_ELSE -->
+        <br /><a href="/cgi-bin/koha/opac-user.pl">Log in to your account</a> to write a review here.
+    <!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+
 <!-- TMPL_IF NAME="AmazonContent" -->
 <!-- Amazon Reviews -->
 <div id="itemReviews">
@@ -193,7 +293,7 @@
         	<h4>Rating (from Amazon.com):</h4>
 		<div id="starMT"><div id="starFull" style="width:<!-- TMPL_VAR NAME="rating" -->px"></div></div>
 
-		<!-- TMPL_LOOP NAME="REVIEWS" -->
+        <!-- TMPL_LOOP NAME="AMAZONREVIEWS" -->
         	<div class="content_set">
         	<!-- TMPL_IF NAME="summary" -->
 			<h4 class="underline">  <!-- TMPL_VAR NAME="summary" --></h4>
@@ -213,5 +313,16 @@
 </div> <!-- itemReviews -->
 <!-- /TMPL_IF-->
 
-</div>
+<script language="javascript" type="text/javascript">
+    function Dopop(link) {
+        newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
+    }
+    function confirm_deletion() {
+        var is_confirmed = confirm('Are you sure you want to delete this biblio?');
+        if ( is_confirmed ) {
+            window.location="/cgi-bin/koha/cataloguing/addbiblio.pl?op=delete&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->";
+        }
+    }
+</script>
+
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->

Index: opac-detailprint.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-detailprint.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- opac-detailprint.tmpl	3 Mar 2006 20:10:26 -0000	1.1
+++ opac-detailprint.tmpl	9 Mar 2007 14:48:06 -0000	1.2
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Details for: <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_LOOP -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Details for: <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_LOOP -->
 <!-- TMPL_INCLUDE NAME="doc-head-close-basket-print.inc" -->
 
 <div id="window">

Index: opac-full-serial-issues.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-full-serial-issues.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- opac-full-serial-issues.tmpl	3 Mar 2006 20:10:26 -0000	1.1
+++ opac-full-serial-issues.tmpl	9 Mar 2007 14:48:06 -0000	1.2
@@ -1,80 +1,75 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Serials
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Serials
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
 
-
 <!-- TMPL_UNLESS name="popup" -->
-<div id="main">
-	<h2>Subscription information for <em><!-- TMPL_VAR name="bibliotitle" --></em></h2>
-	<form action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon brief" value="Normal View" /></form>
+    <h1 class="catalogue">Subscription information for <!-- TMPL_VAR name="bibliotitle" --></h1>
+    <a href="opac-detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">Back to biblio</a>
 <!-- /TMPL_UNLESS -->
-
-	<div class="tabs">
+    <div class="tabsubs">
 	<!-- TMPL_LOOP NAME="years" -->
 		<!-- TMPL_IF NAME="year" -->
-			<a href="#" onclick="active(<!-- TMPL_VAR NAME="year" -->); return false;" id="link<!-- TMPL_VAR NAME="year" -->"><!-- TMPL_VAR NAME="year" --></a>
+            <a  class="tabsubs" href="javascript:showlayer(<!-- TMPL_VAR NAME="year" -->)"><!-- TMPL_VAR NAME="year" --></a>
 		<!-- /TMPL_IF -->
 	<!-- /TMPL_LOOP -->
+    <a class="tabsubs" href="opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->&selectview=small">Compact view</a>
 	</div>
 
 	<!-- TMPL_LOOP NAME="years" -->
-	<div name="<!-- TMPL_VAR NAME="year" -->" id="<!-- TMPL_VAR NAME="year" -->" class="tab" <!--TMPL_IF Name="first" -->style="visibility:visible"<!--/TMPL_IF -->>
-		<table>
-			<caption><!-- TMPL_VAR NAME="year" --> Issues</caption>
+    <div name="yeardata" id="<!-- TMPL_VAR NAME="year" -->" class="tabsub" <!--TMPL_IF Name="first" -->style="visibility:visible"<!--/TMPL_IF -->>
+        <table width="400px">
 			<tr>
-				<th> Date
+                <th>Date
 				</th>
-				<th> Number
+                <th>Date received
 				</th>
-				<th> Status
+                <th>Number
+                </th>
+                <th>Status
 				</th>
 			</tr>
 			<!-- TMPL_LOOP Name="serials" -->
 			<tr>
 				<td>
+                    <!-- TMPL_VAR Name="publisheddate" -->
+                </td>
+                <td>
 					<!-- TMPL_VAR Name="planneddate" -->
 				</td>
 				<td>
 					<!-- TMPL_VAR Name="serialseq" -->
 				</td>
 				<td>
-					<!-- TMPL_IF Name="status1" -->Arrived<!-- /TMPL_IF -->
-					<!-- TMPL_IF Name="status2" -->Waited<!-- /TMPL_IF -->
+                    <!-- TMPL_IF Name="status1" -->Waited<!-- /TMPL_IF -->
+                    <!-- TMPL_IF Name="status2" -->Arrived<!-- /TMPL_IF -->
 					<!-- TMPL_IF Name="status3" -->Late<!-- /TMPL_IF -->
 					<!-- TMPL_IF Name="status4" -->Missing<!-- /TMPL_IF -->
+                    <!-- TMPL_IF Name="status5" -->Not Published<!-- /TMPL_IF -->
+                    <!-- TMPL_IF name="notes" -->(<!-- TMPL_VAR name="notes" -->)<!-- /TMPL_IF -->
 				</td>
 			</tr>
 			<!-- /TMPL_LOOP -->
 		</table>
 	</div>
 	<!--/TMPL_LOOP -->
-</div>
 <script language="JavaScript" type="text/javascript">
-function active(numlayer)
+showlayer(<!-- TMPL_VAR name="yearmin" -->);
+function showlayer(numlayer)
 {
-	for (i=<!--TMPL_VAR Name="yearmin"-->; i<=<!--TMPL_VAR Name="yearmax"-->; i++ ) {
-		ong = i;
-		link = "link"+i;
-		if (numlayer==i) {
-			document.getElementById(ong).style.visibility="visible";
-			document.getElementById(link).style.color="#000066";
-			document.getElementById(link).style.backgroundColor="#FFFFCC";
+    var yeardata=document.getElementsByName("yeardata");
+    for (i=0; i<yeardata.length; i++ ) {
+        ong=yeardata[i].getAttribute('id');
+        if (numlayer==ong) {
+            yeardata[i].style.visibility="visible";
 		} else {
-			document.getElementById(ong).style.visibility="hidden";
-			if (document.getElementById(link)) {
-			document.getElementById(link).style.color="#669999";
-			document.getElementById(link).style.backgroundColor="#D8DEB8";
-			}
+            yeardata[i].style.visibility="hidden";
 		}
 	}
 }
-<!-- TMPL_LOOP name="years" -->
-<!-- TMPL_IF NAME="first" -->
-	active(<!-- TMPL_VAR NAME="year" -->);
-<!-- /TMPL_IF -->
-	<!--/TMPL_LOOP -->
+
 </script>
 </body>
 </html>

Index: opac-main.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- opac-main.tmpl	3 Mar 2006 20:10:26 -0000	1.1
+++ opac-main.tmpl	9 Mar 2007 14:48:06 -0000	1.2
@@ -1,85 +1,145 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> -- Library Catalog
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<!-- TMPL_VAR NAME="LibraryNameTitle" --> -- Library Catalog
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
-<div id="main">
-
-<div>
-
-<!-- TMPL_IF NAME="loggedinusername" -->
-<!-- TMPL_ELSE -->
-<form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth">
-<h3>Log in to Check Your Account</h3>
-<p><label for="userid">Card Number:</label><input type="text" id="userid" size="10" name="userid" /></p>
-<p><label for="password">Password:</label> <input type="password" id="password" size="10" name="password" /></p>
-<p><input type="submit" value="Log In" class="submit" /></p>
-</form>
-<!-- /TMPL_IF -->
-
-<form action="/cgi-bin/koha/opac-search.pl">
-<h3>Search the Library Catalog</h3>
-<p>
-<label for="value">Enter Keyword(s):</label>
-			<input type="hidden" name="op" value="do_search" />
-			<input type="hidden" name="type" value="opac" />
-			<input type="hidden" name="marclist" value="" />
-			<input type="hidden" name="and_or" value="and" />
-			<input type="hidden" name="excluding" value="" />
-			<input type="hidden" name="operator" value="contains" />
-			<input type="text" size="27" name="value" id="value" /></p>
-		<p><input type="submit" value="Search" class="submit" /></p>
-		<p>
-			<a href="/cgi-bin/koha/opac-search.pl">Advanced Search (More Options)</a>
-		</p>
-
-	</form>
+<!-- TMPL_IF name="koha_news_count" -->
+<div id="news">
+    <table>
+    <!-- TMPL_LOOP name="koha_news" -->
+    <tr>
+        <th>
+            <!-- TMPL_VAR name="title" -->
+        </th>
+        <tr><td>
+                <p><!-- TMPL_VAR name="new" --></p>
+                <p><i>(published on <!-- TMPL_VAR name="newdate" -->)</i></p>
+            </td></tr>
+    <!-- /TMPL_LOOP -->
+    </table>
 </div>
+<!-- /TMPL_IF -->
 
-<div>
-	<h3>Recent acquisitions</h3>
-	<form action="/cgi-bin/koha/opac-search.pl">
-		<p>
-			<!-- TMPL_VAR name="CGIitemtype" --><input type="hidden" name="marclist" value="biblioitems.itemtype" />
-			<input type="hidden" name="and_or" value="and" />
-			<input type="hidden" name="excluding" value="" />
-			<input type="hidden" name="operator" value="=" />
-			<input type="hidden" name="op" value="do_search" />
-			<input type="hidden" name="type" value="opac" />
-			<input type="hidden" name="orderby" value="biblio.timestamp" />
-			<input type="hidden" name="desc_or_asc" value="desc" />
-			acquired in the last
-			<input type="text" name="desc_or_asc" size="3" value="30" />
-			days
+<div id="opac-main-search">
+<h1>Search our catalogue</h1>
+    <ul><li>
+    <label for="masthead_search">Query the catalogue</label>
+    <form name="searchform" method="POST" action="/cgi-bin/koha/opac-search.pl" id="searchform">
+        <input type="text" name="q" style="width: 30%;"/>
 			<input type="submit" value="Search" class="submit" />
-		</p>
 	</form>
+    <i>(<a href="/cgi-bin/koha/opac-search.pl">more search options</a>)</i>
+    </li>
+    <!-- TMPL_IF name="OpacBrowser" -->
+        <li><a href="/cgi-bin/koha/opac-browser.pl">Browse the Catalogue</a>, through a hierarchy of subjects</li>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF name="OpacAuthorities" -->
+        <li>Query the <a href="/cgi-bin/koha/opac-authorities-home.pl">authorities</a></li>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF name="OpacCloud" -->
+        <li>Dig into <a href="/cgi-bin/koha/opac-tags_subject.pl">tag cloud</a></li>
+    <!-- /TMPL_IF -->
+        <li>
+            <form name="recent-acqui" action="/cgi-bin/koha/opac-main.pl" method="POST">
+                <label for="recentacqui">Get the last</label>
+                <input id="recentacqui" type="text" name="recentacqui" value="30" size="3"/>
+                acquisitions
+                <input type="submit" value=" OK " />
+        </li>
+    </ul>
 </div>
 	
-<!-- TMPL_IF NAME="loggedinusername" -->
-<div>
-<h3>You're logged in as <em><!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></em> (<a href="/cgi-bin/koha/opac-logout.pl">Click here</a> if you're not <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->)<!-- /TMPL_LOOP --></h3>
-
-<ul><li><a href="/cgi-bin/koha/opac-user.pl">my library home</a> </li> <li> <a href="/cgi-bin/koha/opac-account.pl">my fines</a> </li> <li> 
-	<a href="/cgi-bin/koha/opac-userdetails.pl">my personal details</a> </li> <li> <a href="/cgi-bin/koha/opac-passwd.pl">change my password</a>	<!-- TMPL_IF NAME="opacreadinghistory" --></li> <li> <a href="/cgi-bin/koha/opac-readingrecord.pl">my reading history</a><!-- /TMPL_IF -->	<!-- TMPL_IF name="virtualshelves" --> </li> <li> <a href="/cgi-bin/koha/opac-shelves.pl" class="button">my book lists</a> <!-- /TMPL_IF --><!-- TMPL_IF name="suggestion" --></li> <li> <a href="/cgi-bin/koha/opac-suggestions.pl">purchase suggestions</a><!-- /TMPL_IF --></li></ul>
-		<!-- TMPL_IF name="textmessaging"-->
-			<h3>Message from the library</h3>
-			<p class="error"><!-- TMPL_VAR name="textmessaging" --></p>
-		<!-- /TMPL_IF -->
-<form method="post" action="/cgi-bin/koha/opac-logout.pl">
-<p><input type="submit" class="submit" name="logout" value="Log Out" /></p>
-</form>
-</div><!-- /TMPL_IF -->
-
-	<!-- TMPL_IF NAME="opaclanguagesdisplay" --><div class="content-block">
-	<h4 class="inline">Change Language:</h3>
-	<form action="/cgi-bin/koha/changelanguage.pl" method="post" class="inline">
-		<select name="language">
+<!-- TMPL_IF NAME="languages" -->
+<div id="opac-main-changelanguage">
+    <h1>Change language</h1>
+    <ul>
+    <form action="/cgi-bin/koha/changelanguage.pl" method="POST">
+        <label for="selectlang">Set language to</label>
+        <select id="selectlang" name="language" onchange="javascript:submit();">
 			<!-- TMPL_LOOP NAME="languages" -->
-				<option value="<TMPL_VAR NAME="language">"><!-- TMPL_VAR NAME="language" --></option>
+                <option value="<TMPL_VAR NAME="language">">
+                    <!-- TMPL_VAR NAME="language" -->
+                </option>
 			<!-- /TMPL_LOOP -->
 		</select>
-		<input type="submit" value="Switch" class="submit">
-	</form></div><!-- /TMPL_IF -->
+    </form>
+    </ul>
 </div>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="recentacquiloop"-->
+    <div class="searchresults">
+        <table>
+        <tr>
+            <th>
+                Title
+            </th>
+            <th>
+                Author
+            </th>
+            <th>
+                copyright
+            </th>
+            <th>
+                publication year
+            </th>
+            <th>
+                Date
+            </th>
+        </tr>
+        <!-- TMPL_LOOP NAME="recentacquiloop" -->
+        <tr>
+            <td>
+                <p>
+                    <!-- TMPL_IF name="BiblioDefaultViewmarc" -->
+                    <a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
+                    <!-- TMPL_IF NAME="title"-->
+                        <!-- TMPL_VAR NAME="title" -->
+                    <!-- TMPL_ELSE -->
+                        <span class="problem">(no title)</span>
+                    <!-- /TMPL_IF -->
+                    </a>
+                    <!-- TMPL_ELSE -->
+                    <!-- TMPL_IF name="BiblioDefaultViewisbd" -->
+                    <a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
+                    <!-- TMPL_IF NAME="title"-->
+                        <!-- TMPL_VAR NAME="title" -->
+                    <!-- TMPL_ELSE -->
+                        <span class="problem">(no title)</span>
+                    <!-- /TMPL_IF -->
+                    </a>
+                    <!-- TMPL_ELSE -->
+                    <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
+                    <!-- TMPL_IF NAME="title"-->
+                        <!-- TMPL_VAR NAME="title" -->
+                    <!-- TMPL_ELSE -->
+                        <span class="problem">(no title)</span>
+                    <!-- /TMPL_IF -->
+                    </a>
+                    <!-- /TMPL_IF -->
+                    <!-- /TMPL_IF -->
+                </p>
+            </td>
+            <td>
+                <a href="/cgi-bin/koha/opac-search.pl?q=au:<!-- TMPL_VAR NAME="author" -->">
+                    <!-- TMPL_VAR NAME="author" -->
+                </a>
+            </td>
+            <td>
+                <!-- TMPL_VAR NAME="copyrightdate" -->
+            </td>
+            <td>
+                <!-- TMPL_VAR NAME="publicationyear" -->
+            </td>
+            <td>
+                <!-- TMPL_VAR NAME="timestamp" -->
+            </td>
+        </tr>
+        <!-- /TMPL_LOOP -->
+        </table>
+     </div>
+<!-- /TMPL_IF -->
+
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->

Index: opac-passwd.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-passwd.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- opac-passwd.tmpl	3 Mar 2006 20:10:26 -0000	1.1
+++ opac-passwd.tmpl	9 Mar 2007 14:48:06 -0000	1.2
@@ -1,16 +1,14 @@
-<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Change Your Password
+<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Account for <!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
 <!-- TMPL_INCLUDE name="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE name="masthead-user.inc" -->
+<!-- TMPL_INCLUDE name="masthead.inc" -->
 <!-- TMPL_INCLUDE name="navigation.inc" -->
 
-<!-- CONTENT -->
-<div id="main">
+<!--CONTENT-->
+    <!-- TMPL_INCLUDE name="usermenu.inc" -->
 
-
-
-<!-- TMPL_IF NAME= "Error_messages" -->
-<h3>There was a problem with your submission</h3>
-<p class="error">
+    <!-- TMPL_IF NAME= "Error_messages" -->
+        <h3>There was a problem with your submission</h3>
+        <p class="error">
 	<!-- TMPL_IF NAME= "PassMismatch" -->
 	Passwords do not match.  Please re-type your new password.
 	<!-- /TMPL_IF -->
@@ -19,28 +17,27 @@
 	<!-- /TMPL_IF -->
 	<!-- TMPL_IF NAME= "WrongPass" -->
 	Your current password was entered incorrectly.  If this problem persists, please ask a librarian to re-set your password for you.	
-	<!-- /TMPL_IF --></p>
-<!-- /TMPL_IF -->
+            <!-- /TMPL_IF -->
+        </p>
+    <!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME= "Ask_data" -->
-<h1>Change your Password</h1>
-<form action="/cgi-bin/koha/opac-passwd.pl" name="mainform" id="mainform" method="get">
-<div class="form">
-<table><tr><th><label for="password">Current Password:</label></th><td><input type="password" id="Oldkey" size="25"  name="Oldkey" /></td></tr>
-<tr><th><label for="Newkey">New Password:</label></th><td><input type="password" id="Newkey"  size="25"  name="Newkey" /></td></tr>
-<tr>	<th><label for="Confirm">Re-Type New Password:</label></th><td><input type="password"  id="Confirm" size="25" name="Confirm" /></td></tr></table>
+    <!-- TMPL_IF NAME= "Ask_data" -->
+        <h1>Change your Password</h1>
+        <form action="/cgi-bin/koha/opac-passwd.pl" name="mainform" id="mainform" method="get">
+            <p><label for="password">Current Password:</label><input type="password" id="Oldkey" size="25"  name="Oldkey" /></p>
+            <p><label for="Newkey">New Password:</label><input type="password" id="Newkey"  size="25"  name="Newkey" /></p>
+            <p><label for="Confirm">Re-Type New Password:</label><input type="password"  id="Confirm" size="25" name="Confirm" /></p>
 	<p><input type="submit" value="Submit Changes" class="submit" /></p>
-<!-- /TMPL_IF -->
+    <!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME= "password_updated" -->
-<h1>Password Updated</h1>
+    <!-- TMPL_IF NAME= "password_updated" -->
+        <h1>Password Updated</h1>
 	Your password has been changed
 	<form action="/cgi-bin/koha/opac-user.pl" method="post">
 		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
 		<p><input type="submit" class="icon back" value="Return to Your Record" /></p>
 	</form>
-<!-- /TMPL_IF -->
-</form>
+    <!-- /TMPL_IF -->
+    </form>
 
-</div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->

Index: opac-readingrecord.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-readingrecord.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- opac-readingrecord.tmpl	3 Mar 2006 20:10:26 -0000	1.1
+++ opac-readingrecord.tmpl	9 Mar 2007 14:48:06 -0000	1.2
@@ -1,9 +1,10 @@
-<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Library Home for  <!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
+<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Account for <!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
 <!-- TMPL_INCLUDE name="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE name="masthead-user.inc" -->
+<!-- TMPL_INCLUDE name="masthead.inc" -->
 <!-- TMPL_INCLUDE name="navigation.inc" -->
 
-<div id="main">
+<!--CONTENT-->
+    <!-- TMPL_INCLUDE name="usermenu.inc" -->
 <h3>Reading History of <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h3>
 
 <!-- TMPL_UNLESS NAME="count" -->
@@ -14,14 +15,15 @@
 <tr><td colspan="4">Showing All Items | <a href="opac-readingrecord.pl?limit=">Show Last 50 Items Only</a></td></tr><!-- TMPL_ELSE -->
 <tr><td colspan="4">Showing Last 50 Items | <a href="opac-readingrecord.pl?limit=full">Show All Items</a></td></tr>
 <!-- /TMPL_IF --><tr>
-<tr><th><!-- TMPL_UNLESS NAME="orderbytitle" --><a href="/cgi-bin/koha/opac-readingrecord.pl?order=title">Title</a><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_UNLESS NAME="orderbyauthor"--></th>
+<tr><th><!-- TMPL_UNLESS NAME="orderbytitle" --><a href="/cgi-bin/koha/opac-readingrecord.pl?order=title">Title</a><!-- TMPL_ELSE -->&nbsp;
+        <!-- /TMPL_UNLESS --></th>
 <th><!-- TMPL_UNLESS --><a href="/cgi-bin/koha/opac-readingrecord.pl?order=author">Author</a><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_UNLESS --></th>
 <th><!-- TMPL_UNLESS NAME="orderbydate" --><a href="/cgi-bin/koha/opac-readingrecord.pl">Date</a><!-- TMPL_ELSE -->Date<!-- /TMPL_UNLESS --></th></tr>
 
 <!-- TMPL_LOOP NAME="READING_RECORD" -->
 
 <!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
-<td><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
+<td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
 <td><!-- TMPL_VAR NAME="author" --></td>
 <td><!-- TMPL_IF NAME="returndate" --><!-- TMPL_VAR NAME="returndate" --><!-- TMPL_ELSE --><em>(Checked out)</em><!-- /TMPL_IF --></td>
 </tr>
@@ -31,5 +33,4 @@
 
 <!-- /TMPL_UNLESS -->
 
-</div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->

Index: opac-recacquisitions.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-recacquisitions.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- opac-recacquisitions.tmpl	3 Mar 2006 20:10:26 -0000	1.1
+++ opac-recacquisitions.tmpl	9 Mar 2007 14:48:06 -0000	1.2
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Recent Acquisitions
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Recent Acquisitions
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!--TMPL_INCLUDE NAME="masthead_adv.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->

Index: opac-reserve.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-reserve.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- opac-reserve.tmpl	3 Mar 2006 20:10:26 -0000	1.1
+++ opac-reserve.tmpl	9 Mar 2007 14:48:06 -0000	1.2
@@ -1,30 +1,68 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Reserving <!-- TMPL_VAR NAME="title" --> for <!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- /TMPL_LOOP -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Reserving <!-- TMPL_VAR NAME="title" --> for <!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- /TMPL_LOOP -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
-<!--CONTENT-->
 <!-- TMPL_IF NAME="message" -->
-<div id="main">
-<!-- TMPL_IF NAME="GNA" --><p class="error"><strong>Sorry</strong>, you cannot place reserves because the library doesn't have up-to-date <a href="/cgi-bin/koha/opac-userdetails.pl">contact information</a> on file. </p><p class="error">Please contact your librarian, or use the <a href="/cgi-bin/koha/opac-userupdate.pl">online update form</a> to submit current information (<em>Please note:</em> there may be a delay in restoring your account if you submit online)</p><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="lost" --><p class="error"><strong>Sorry</strong>, you cannot place reserves because your library card has been marked as lost or stolen. </p><p class="error"> If this is an error, please take your card to the circulation desk at your local library and the error will be corrected.</p><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="debarred" --><p class="error"><strong>Sorry</strong>, you cannot place reserves because your account has been frozen.</p><p class="error">Usually the reason for freezing an account is old overdues or damage fees.  If <a href="/cgi-bin/koha/opac-user.pl">your account page</a> shows your account to be clear, please consult a librarian.</p><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="too_much_oweing" --><p class="error">Sorry, you cannot make reserves because you owe <!-- TMPL_VAR NAME="too_much_oweing" -->. </p> <!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="too_many_reserves" --><p class="error">Sorry, you cannot make more than <!-- TMPL_VAR NAME="too_many_reserves" --> reserves. </p><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="already_reserved" --><p class="error">You already have a reserve placed on this item.
-<form action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="icon back" value="Return to Item Detail Screen" /></form></p>
-<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="no_items_selected" --><p class="error">You must select at least one item.</p><!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="no_branch_selected" --><p class="error">You must select a branch for pickup!</p><!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="GNA" -->
+    <p class="problem">
+        <strong>Sorry</strong>, you cannot place reserves because the library doesn't have up-to-date <a href="/cgi-bin/koha/opac-userdetails.pl">contact information</a> on file.
+    </p>
+    <p class="problem">Please contact your librarian, or use the <a href="/cgi-bin/koha/opac-userupdate.pl">online update form</a> to submit current information (<em>Please note:</em> there may be a delay in restoring your account if you submit online)
+    </p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="lost" -->
+    <p class="problem">
+        <strong>Sorry</strong>, you cannot place reserves because your library card has been marked as lost or stolen.
+    </p>
+    <p class="problem">
+        If this is an error, please take your card to the circulation desk at your local library and the error will be corrected.
+    </p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="debarred" -->
+    <p class="error">
+        <strong>Sorry</strong>, you cannot place reserves because your account has been frozen.
+    </p>
+    <p class="problem">Usually the reason for freezing an account is old overdues or damage fees.   If <a href="/cgi-bin/koha/opac-user.pl">your account page</a> shows your account to be clear, please consult a librarian.
+    </p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="too_much_oweing" -->
+    <p class="problem">
+        Sorry, you cannot make reserves because you owe <!-- TMPL_VAR NAME="too_much_oweing" -->.
+    </p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="too_many_reserves" -->
+        <p class="error">Sorry, you cannot make more than <!-- TMPL_VAR NAME="too_many_reserves" --> reserves.
+        </p>
+        <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="already_reserved" -->
+    <p class="problem">
+        You already have a reserve placed on this item.
+        <form action="/cgi-bin/koha/opac-detail.pl" method="POST">
+            <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
+            <input type="submit" class="icon back" value="Return to Item Detail Screen" />
+        </form>
+    </p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="no_items_selected" -->
+    <p class="problem">
+        You must select at least one item.
+    </p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="no_branch_selected" -->
+    <p class="error">
+        You must select a branch for pickup!
+    </p>
+    <!-- /TMPL_IF -->
 </div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="select_item_types" -->
 <!-- The first time round you select which bibitems you want -->
-<div id="main">
 <form action="/cgi-bin/koha/opac-reserve.pl" method="post">
 <input type="hidden" name="item_types_selected" value="1">
-<input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->">
+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
 <h2>Reservation Details</h2>
 <div class="form">
 <table>
@@ -40,7 +78,7 @@
 <!-- TMPL_IF NAME="onlyone" -->
 <!-- If there is only one type -->
 
-</div><p><input type="submit" class="submit" value="Next &gt;&gt;">
+<p><input type="submit" class="submit" value="Next &gt;&gt;">
 <input type="hidden" name="all" value="1"></p>
 </form>
 
@@ -48,8 +86,10 @@
 <!-- If there is more than one type -->
 
     <h4>Choose Either...</h4>
-      <p><input class="checkbox" type="checkbox" name="all" value="next-available">
-        Next Available Copy (any format)</p>
+        <p>
+            <input id="checknextavailable" type="checkbox" name="all" value="next-available">
+            <label for="checknextavailable">Next Available Copy (any format)</label>
+        </p>
     <h4>
      ...Or Choose Acceptable Formats
     </h4>
@@ -69,19 +109,16 @@
 </div>
 <p><input type="submit" class="submit" value="Confirm Reservation &gt;&gt;"></p>
 </form>
-</div>
 <!-- /TMPL_IF -->
 
-
 <!-- end of the first form -->
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="item_types_selected" -->
 <!-- if the bibitems have already been selected -->
-<div id="main">
 <form action="/cgi-bin/koha/opac-reserve.pl" method="post">
 <input type="hidden" name="place_reserve" value="1">
-<input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->"><h3>Confirm Reservation</h3>
+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->"><h3>Confirm Reservation</h3>
 <div class="details">
 	<table>
 		<tr><th>Title: </th><td><span class="title"><!-- TMPL_VAR NAME="title" --></span></td></tr>
@@ -102,6 +139,4 @@
 </FORM>
 
 <!-- /TMPL_IF -->
-</div>
-</body>
-</html>
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc"-->

Index: opac-sendbasket.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-sendbasket.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- opac-sendbasket.tmpl	3 Mar 2006 20:10:26 -0000	1.1
+++ opac-sendbasket.tmpl	9 Mar 2007 14:48:06 -0000	1.2
@@ -9,9 +9,25 @@
 
 <MESSAGE>
 ---------------------------------------------
-<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_IF name="subtitle" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF --><!-- TMPL_IF name="isbn" -->
-Author: <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><!-- TMPL_IF name="additional" -->
-Additional authors: <!-- TMPL_VAR NAME="additional" --><!-- /TMPL_IF --><!-- TMPL_IF name="publishercode" -->
+
+<!-- TMPL_IF NAME="comment" -->
+    <!-- TMPL_VAR NAME="comment" -->
+<!-- /TMPL_IF -->
+
+<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
+    <!-- TMPL_VAR NAME="title" -->
+    <!-- TMPL_IF name="subtitle" -->
+       <!-- TMPL_VAR NAME="subtitle" -->
+    <!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="MARCAUTHORS" -->
+<!-- TMPL_LOOP NAME="MARCAUTHORS"-->
+    Authors: <!-- TMPL_VAR NAME="value" -->
+<!-- /TMPL_LOOP -->
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="publishercode" -->
+
 ISBN: <!-- TMPL_VAR NAME="ISBN" --><!-- /TMPL_IF --><!-- TMPL_IF name="author" -->
 Published by: <!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF --><!-- TMPL_IF name="publicationyear" --> in <!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" --><!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" --><!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><!-- TMPL_IF name="collection" -->
 Collection: <!-- TMPL_VAR NAME="seriestitle" --><!-- /TMPL_IF --><!-- TMPL_IF name="subject" -->

Index: opac-sendbasketform.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-sendbasketform.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- opac-sendbasketform.tmpl	3 Mar 2006 20:10:26 -0000	1.1
+++ opac-sendbasketform.tmpl	9 Mar 2007 14:48:06 -0000	1.2
@@ -1,24 +1,44 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Sending Your Book Bag
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Sending Your Book Bag
 <!-- TMPL_INCLUDE NAME="doc-head-close-basket.inc" -->
 
 <div id="window">
 <h3>Sending your book bag</h3>
 
 <!-- TMPL_IF NAME="email_add" -->
+
 	<!-- TMPL_IF NAME="SENT" -->
 	<p>The book bag was sent to: <!-- TMPL_VAR NAME="email_add" --></p>
-	<!-- TMPL_ELSE -->
+	<!-- /TMPL_IF  -->
+	<!-- TMPL_IF NAME="error" -->
 	<p>Problem sending the book bag...</p>
 	<!-- /TMPL_IF -->
+	
 <!-- TMPL_ELSE -->
+
 <form action="<!-- TMPL_VAR NAME="url" -->" method="post">
-<p>		<label for="email_add">E-mail Address:</label> <input type="text" id="email_add" name="email_add" size="35" /></p>
 	
-<p><input type="submit" value="Send" />
-	<input type="hidden" name="bib_list" value="<!-- TMPL_VAR NAME="bib_list" -->" /></p>
+    <p>
+        <label for="email_add">E-mail Address:</label>
+        <input type="text" id="email_add" name="email_add" size="35" />
+    </p>
+    <p>
+            <label for="comment">Comment</label><br />
+            <textarea id="comment" name="comment" rows="7" cols="50"></textarea>
+    </p>
+    <p>
+        <input type="submit" value="Send" />
+        <input type="hidden" name="bib_list" value="<!-- TMPL_VAR NAME="bib_list" -->" />
+    </p>
 </form>
+
 <!-- /TMPL_IF -->
-<p><form action="opac-sendbasket.pl" method="get" /><input type="submit" value="Close Window" onclick="window.close(); return false;" /></form></p>
+<p>
+
+    <form action="opac-sendbasket.pl" method="get" />
+        <input type="submit" value="Close Window" onclick="window.close(); return false;" />
+    </form>
+</p>
+
 </div>
-</body>
-</html>
\ No newline at end of file
+
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->

Index: opac-serial-issues.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-serial-issues.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- opac-serial-issues.tmpl	3 Mar 2006 20:10:26 -0000	1.1
+++ opac-serial-issues.tmpl	9 Mar 2007 14:48:06 -0000	1.2
@@ -1,11 +1,11 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Serials
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Serials
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_INCLUDE NAME="masthead_adv.inc" -->
+<!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
-<div id="main">
 <h1>Issues for a subscription</h1>
-	<form action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="Normal View" /></form>
+	<a href="opac-detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button">Normal View</a>
+	<a href="opac-serial-issues.pl?selectview=full&amp;biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button">Full History</a>
 
 <form method="post" name="f">
 <!-- TMPL_LOOP name="subscription_LOOP" -->
@@ -85,6 +85,5 @@
 		</p>
 	<!-- /TMPL_IF -->
 <!-- /TMPL_LOOP -->
-</div>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->

Index: opac-shelves.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- opac-shelves.tmpl	3 Mar 2006 20:10:26 -0000	1.1
+++ opac-shelves.tmpl	9 Mar 2007 14:48:06 -0000	1.2
@@ -1,48 +1,124 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- <!-- TMPL_IF Name="viewshelf" -->Contents of <!-- TMPL_VAR Name="shelfname" --><!-- TMPL_ELSE -->List of Virtual Shelves<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- <!-- TMPL_IF Name="viewshelf" -->Contents of <!-- TMPL_VAR Name="shelfname" --><!-- TMPL_ELSE -->List of Virtual Shelves<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
-<div id="main">
-
-<ul><li>	 <a href="/cgi-bin/koha/opac-account.pl">my fines</a> </li> <li> 
-	<a href="/cgi-bin/koha/opac-userdetails.pl">my personal details</a>		<!-- TMPL_IF name="OpacPasswordChange" --> </li> <li> <a href="/cgi-bin/koha/opac-passwd.pl">change my password</a> <!-- /TMPL_IF --><!-- TMPL_IF NAME="opacreadinghistory" --></li> <li> <a href="/cgi-bin/koha/opac-readingrecord.pl">my reading history</a><!-- /TMPL_IF -->	<!-- TMPL_IF name="virtualshelves" --> </li> <li> <a href="/cgi-bin/koha/opac-shelves.pl" class="button">my book lists</a> <!-- /TMPL_IF --><!-- TMPL_IF name="suggestion" --></li> <li> <a href="/cgi-bin/koha/opac-suggestions.pl">purchase suggestions</a><!-- /TMPL_IF --></li></ul>
+<!-- TMPL_INCLUDE NAME="usermenu.inc" -->
 
 <!-- TMPL_IF Name="viewshelf" -->
 
 <h3>Contents of <!-- TMPL_VAR Name="shelfname" --></h3>
 
-<form class="inline" action="/cgi-bin/koha/opac-shelves.pl" method="post" name="mainform">
+<a class="button" href="/cgi-bin/koha/opac-shelves.pl">Back to Virtual Shelves</a>
+
+<!-- TMPL_IF name="manageshelf" -->
+ | <a class="button" href="/cgi-bin/koha/opac-shelves.pl?op=modif&shelf=<!-- TMPL_VAR Name="shelfnumber" -->">
+ Modify this Shelf</a>
+<!-- /TMPL_IF -->
+
+<form action="/cgi-bin/koha/opac-shelves.pl"
+      method="POST"
+      name="mainform"
+      onsubmit="return checkForm(this);">
+    
+    <!-- TMPL_IF NAME="itemsloop" -->
     <table>
+        <input type="hidden" name="viewshelf" value="<!-- TMPL_VAR Name="shelfnumber" -->" />
+        <input type="hidden" name="modifyshelfcontents" value="1" />
     		<tr>
-			<th><a href="/cgi-bin/koha/opac-shelves.pl" onclick="CheckAll(); return false;"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/checkall.gif" height="18" width="18" alt="Check All" title="Check All" border="0" /></a></th><th>&nbsp;</th><th>Title</th><th>Author</th><th>Call No.</th><!-- TMPL_UNLESS NAME="itemsloop" --><th>&nbsp;</th><!-- /TMPL_UNLESS -->
+                <th>
+                    <a style="color:white;" href="/cgi-bin/koha/opac-shelves.pl" onclick="CheckAll(); return false;">Check All</a>
+                </th>
+                <th>&nbsp;</th>
+                <th>Title</th>
+                <th>Author</th>
+                <th>Call No.</th>
 		</tr>
-		<!-- TMPL_IF NAME="itemsloop" -->
 		<!-- TMPL_LOOP Name="itemsloop" -->
 			<tr<!-- TMPL_IF name="color" --> class="highlight"<!-- /TMPL_IF -->>
-					<td><input type="checkbox" name="REM-<!-- TMPL_VAR Name="itemnumber" -->" /><input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->" />
-	<input type="hidden" name="modifyshelfcontents" value="1" />
-	<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR Name="shelfnumber" -->" /></td>
-					<td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" /></td>
-					<td><a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR Name="title" --></a></td>
+                    <td>
+                        <input type="checkbox" name="MOD-<!-- TMPL_VAR Name="itemnumber" -->" />
+                        <input type="hidden" name="ModBiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
+                    </td>
+                    <td>
+                        <img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" />
+                    </td>
+                    <td>
+                         <!-- TMPL_IF name="BiblioDefaultViewmarc" -->
+                                        <a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
+                                            <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" -->
+                                        </a>
+                                    <!-- TMPL_ELSE -->
+                                        <!-- TMPL_IF name="BiblioDefaultViewisbd" -->
+                                            <a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
+                                                <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" -->
+                                            </a>
+                                        <!-- TMPL_ELSE -->
+                                            <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
+                                                <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" -->
+                                            </a>
+                                        <!-- /TMPL_IF -->
+                                    <!-- /TMPL_IF -->
+                        </a>
+                    </td>
 					<td><!-- TMPL_VAR Name="author" --></td>
 					<td><!-- TMPL_VAR NAME="classification" --></td>
-		</tr><!-- /TMPL_LOOP --><!-- TMPL_ELSE -->
-		<tr><td colspan="6">This shelf is empty.</td><!-- TMPL_UNLESS NAME="itemsloop" --><td><input type="hidden" name="DEL-<!-- TMPL_VAR NAME="shelfnumber" -->" /><input type="hidden" name="shelves" value="1" /><input type="submit" class="icon delete" value="Delete this Shelf" onclick="return confirmDelete('Are you sure you want to delete this shelf?')" /></td><!-- /TMPL_UNLESS --></tr>
-		<!-- /TMPL_IF -->
+        </tr>
+        <!-- /TMPL_LOOP -->
 	</table>
-	<!-- TMPL_IF name="manageshelf" --><!-- TMPL_IF NAME="itemsloop" --><input type="submit" value="Remove Selected Items" class="icon delete" onclick="return confirmDelete('Are you sure you want to remove these items from the shelf?')" /><!-- /TMPL_IF --><!-- /TMPL_IF --></form><!-- TMPL_IF name="manageshelf" --> <form class="inline" method="get" action="/cgi-bin/koha/opac-shelves.pl"><input type="hidden" name="op" value="modif" /><input type="hidden" value="<!-- TMPL_VAR Name="shelfnumber" -->" name="shelf" /><input type="submit" value="Modify this Shelf" class="icon edit" /></form>
-<br /><br />
+    <!-- TMPL_ELSE -->
+    <b>This shelf is empty.</b>
+    <!-- TMPL_UNLESS NAME="itemsloop" -->
+        <input type="hidden" name="DEL-<!-- TMPL_VAR NAME="shelfnumber" -->" />
+        <input type="hidden" name="shelves" value="1" />
+        <input type="submit" class="icon delete"
+               value="Delete this Shelf"
+               onclick="return confirmDelete('Are you sure you want to delete this shelf?')" />
+        <!-- /TMPL_UNLESS -->
+        <!-- /TMPL_IF -->
+    <!-- TMPL_IF name="manageshelf" -->
+        <!-- TMPL_IF NAME="itemsloop" -->
+            <h2>With selected items :</h2>
+            <p>
+            <label for="check-remove">remove</label>
+            <input id="check-remove"
+                   type="checkbox"
+                   name="remove"
+                   />
+            </p>
+            <p>
+            <label for="check-addbb">Add to bookbag</label>
+            <input id="check-addbb"
+                   type="checkbox"
+                   name="addToBookBag"
+                   />
+            </p>
+            <p><input type="submit"
+                   value=" GO "
+                   />
+            </p>
+        <!-- /TMPL_IF -->
+        <!-- /TMPL_IF -->
+</form>
+    <!-- TMPL_IF name="manageshelf" -->
+
+<br />
 <form action="/cgi-bin/koha/opac-shelves.pl" method="post">
 	<table>
 		<tr><th colspan="2">Add an Item to this Shelf by Barcode</th></tr>
 		<tr>
-			<td><label for="addbarcode">Barcode:</label></td>
-			<td><input name="addbarcode" type="text" id="addbarcode" size="14" maxlength="14" /><input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->" /><input type="hidden" name="viewshelf" value="<!-- TMPL_VAR Name="shelfnumber" -->" /><input type="hidden" name="modifyshelfcontents" value="1" /><input type="submit" value="Save" /></td>
+            <td>
+                <label for="addbarcode">Barcode:</label>
+            </td>
+            <td>
+                <input name="addbarcode" type="text" id="addbarcode" size="14" maxlength="14" />
+                <input type="hidden" name="viewshelf" value="<!-- TMPL_VAR Name="shelfnumber" -->" />
+                <input type="hidden" name="modifyshelfcontents" value="1" />
+                <input type="submit" value=" Add " />
+            </td>
 		</tr>
 	</table>
 </form>
 <!-- /TMPL_IF -->
-<form class="inline" method="get" action="opac-shelves.pl"><input type="submit" value="Back to Virtual Shelves" /></form>
 <!-- TMPL_ELSE -->
 	<!-- TMPL_IF Name="shelves" -->
 		<!-- TMPL_IF Name="status1" -->
@@ -53,7 +129,7 @@
 				<p class="error"><!-- TMPL_VAR Name="string" --></p>
 			<!-- /TMPL_IF -->
 		<!-- /TMPL_LOOP -->
-<form method="post" action="/cgi-bin/koha/opac-shelves.pl">
+    <form method="post" action="/cgi-bin/koha/opac-shelves.pl">
 		<input type="hidden" name="shelves" value="1">
 		<h3>Create a New a Virtual Shelf</h3>
 		<table>
@@ -128,12 +204,50 @@
 <tr<!-- TMPL_IF name="color" --> class="highlight"<!-- /TMPL_IF -->><td><a href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->"><!-- TMPL_VAR Name="shelfname" --></a></td><td><!-- TMPL_IF NAME="category1" -->Private<!-- /TMPL_IF --><!-- TMPL_IF NAME="category2" -->Public<!-- /TMPL_IF --><!-- TMPL_IF NAME="category3" -->Free<!-- /TMPL_IF --></td><td><!-- TMPL_VAR Name="shelfbookcount" --> item(s)</td><td><!-- TMPL_IF name="mine" --><a href="opac-shelves.pl?op=modif&amp;shelf=<!-- TMPL_VAR NAME="shelf" -->">Modify</a><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
 			<!-- /TMPL_LOOP -->
 		</table>
-		<p><form action="opac-shelves.pl" method="get"><input type="hidden" value="1" name="shelves" /><input type="submit" value="Add or Remove Book Shelves" /></form></p>
+        <p><form action="/cgi-bin/koha/opac-shelves.pl" method="get"><input type="hidden" value="1" name="shelves" /><input type="submit" value="Add or Remove Book Shelves" /></form></p>
 	<!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
 
 <br clear="both" />
-</div>
-</body>
-</html>
 
+<script type="text/javascript" language="javascript">
+    // Set the focus the barcode input if it exists.
+    var barcodeInput;
+    if (barcodeInput = document.getElementById('addbarcode')) {
+        barcodeInput.focus();
+    }
+    /**
+     *  Function checkForm
+     *  This function check the form beform submited it.
+     *  If there are items to add to bookbag then add it there.
+     */
+    function checkForm(form){
+        if( form.addToBookBag.checked ) { // add to BookBag
+            AddCheckedToBookBag(form);
+        }
+        return true;
+    }
+
+    /**
+     *  Function AddCheckedToBookBag
+     *  This function add the checked item to bookbag.
+     */
+        function AddCheckedToBookBag(form) {
+            var inputs = form.getElementsByTagName('input');
+            for(var i=0,num=inputs.length; i < num; i++){
+                var input = inputs[i].getAttribute('type');
+                if (input == "checkbox") {
+                    if( inputs[i].checked ) {
+                        var itemnumber   = inputs[i].getAttribute('name');
+                        var regexp       = /MOD-/;
+                        if(itemnumber.match(regexp)){
+                            var biblionumber = inputs[i+1].value;
+                            addRecord(biblionumber,null,1); // function from basket.js
+                        }
+                    }
+                }
+            }
+        }
+</script>
+
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc"-->

Index: opac-suggestions.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-suggestions.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- opac-suggestions.tmpl	3 Mar 2006 20:10:26 -0000	1.1
+++ opac-suggestions.tmpl	9 Mar 2007 14:48:06 -0000	1.2
@@ -1,11 +1,10 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- 
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- 
 <!-- TMPL_IF name="op_add" -->Enter a new purchase suggestion<!-- /TMPL_IF -->
 <!-- TMPL_IF name="op_else" -->Purchase Suggestions<!-- /TMPL_IF -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
-<div id="main">
 <!-- TMPL_IF name="op_add" -->
 	<h1>Enter a new purchase suggestion</h1>
 
@@ -13,7 +12,7 @@
 	<p>No fields are mandatory. Enter whatever information you have. The "Notes" field can be used to provide any additional information.</p>
 	<form action="/cgi-bin/koha/opac-suggestions.pl" method="post">
 	<table>
-	<tr><th scope="row"><label for="">Title</label></th><td><input type="text" id="title" name="title" size="50" maxlentgh="80" /></td></tr>
+    <tr><th scope="row"><label for="">Summary</label></th><td><input type="text" id="title" name="title" size="50" maxlentgh="80" /></td></tr>
 	<tr><th scope="row"><label for="">Author</label></th><td><input type="text" id="author" name="author" size="50" maxlength="80" /></td></tr>
 	<tr><th scope="row"><label for="">Copyright date</label></th><td><input type="text" id="copyrightdate" name="copyrightdate" size="4" maxlength="4" /></td></tr>
 	<tr><th scope="row"><label for="">Publisher</label></th><td><input type="text" id="publishercode" name="publishercode" size="50" maxlength="80" /></td></tr>
@@ -30,17 +29,14 @@
 	<table>
 		<tr>
 			<th>&nbsp;</th>
-			<th>Title</th>
-			<th>Author</th>
-			<th>&copy;</th>
-			<th>Publisher</th>
+            <th>Summary</th>
 			<th>Status</th>
 			<th>Suggested by</th>
 			<th>Managed by</th>
 			<th>Note</th>
 		</tr>
 		<tr>
-			<form action="/cgi-bin/koha/opac-suggestions.pl" method="post">
+            <form action="/cgi-bin/koha/opac-suggestions.pl" method="get">
 				<th>
 					Filter by:
 				</th>
@@ -48,48 +44,12 @@
 					<input type="text" name="title" value="<!-- TMPL_VAR name="title"-->" />
 				</td>
 				<td>
-					<input type="text" name="author" value="<!-- TMPL_VAR name="author" -->" />
-				</td>
-				<td>
 					&nbsp;
 				</td>
 				<td>
-					<input type="text" name="publishercode" value="<!-- TMPL_VAR name="publishercode"-->" />
-				</td>
-				<td>
-<select name="status">
-						<option value="">Any</option>
-						<!-- TMPL_IF name="ASKED" -->
-							<option value="ASKED" selected="selected">Requested</option>
-						<!-- TMPL_ELSE -->
-							<option value="ASKED">Asked</option>
-						<!-- /TMPL_IF -->
-						<!-- TMPL_IF name="ACCEPTED" -->
-							<option value="ACCEPTED" selected="selected">Accepted</option>
-						<!-- TMPL_ELSE -->
-							<option value="ACCEPTED">Accepted</option>
-						<!-- /TMPL_IF -->
-						<!-- TMPL_IF name="ORDERED" -->
-							<option value="ORDERED" selected="selected">Ordered</option>
-						<!-- TMPL_ELSE -->
-							<option value="ORDERED">Ordered</option>
-						<!-- /TMPL_IF -->
-						<!-- TMPL_IF name="REJECTED" -->
-							<option value="REJECTED" selected="selected">Declined</option>
-						<!-- TMPL_ELSE -->
-							<option value="REJECTED">Declined</option>
-						<!-- /TMPL_IF -->
-						<!-- TMPL_IF name="AVAILABLE" -->
-							<option value="AVAILABLE" selected="selected">Available</option>
-						<!-- TMPL_ELSE -->
-							<option value="AVAILABLE">Available</option>
-						<!-- /TMPL_IF -->
-					</select>
-				</td>
-				<td>
 					<select name="suggestedbyme">
-						<!-- TMPL_IF NAME="suggestedbyme" --><option value="1" selected="selected"><!-- TMPL_ELSE --><option value="1"><!-- /TMPL_IF -->Me</option>
-						<!-- TMPL_UNLESS name="suggestedbyme" --><option value="0" selected="selected"><!-- TMPL_ELSE --><option value="0"><!-- /TMPL_UNLESS -->Anybody</option>
+                        <option value="0">Anyone</option>
+                        <option value="1">Me</option>
 					</select>
 				</td>
 				<td>
@@ -108,28 +68,25 @@
 					<input type="checkbox" name="delete_field" value="<!--TMPL_VAR name="suggestionid" -->" />
 				</td>
 				<td>
-					<!-- TMPL_VAR NAME="title" -->
-				</td>
-				<td>
-					<!-- TMPL_VAR NAME="author" -->
-				</td>
-				<td>
-					<!-- TMPL_VAR NAME="copyrightdate" -->
-				</td>
-				<td>
-					<!-- TMPL_VAR name="publishercode" -->
+                    <p><!-- TMPL_VAR NAME="title" --></p>
+                    <p><!-- TMPL_IF name="author" --><!-- TMPL_VAR NAME="author" -->,<!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="copyrightdate" --> - <!-- TMPL_VAR NAME="copyrightdate" -->,<!-- /TMPL_IF --> 
+                        <!-- TMPL_IF name="publishercode" --> - <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
+                    </p>
 				</td>
 				<td>
 					<!-- TMPL_IF name="ASKED" -->Requested<!-- /TMPL_IF -->
+                    <!-- TMPL_IF name="ACCEPTED" -->Accepted by the library<!-- /TMPL_IF -->
 					<!-- TMPL_IF name="ORDERED" -->Ordered by the library<!-- /TMPL_IF -->
-					<!-- TMPL_IF name="REJECTED" -->Suggestion declined<!-- /TMPL_IF -->
+                    <!-- TMPL_IF name="REJECTED" -->Suggestion declined <!-- /TMPL_IF -->
 					<!-- TMPL_IF name="AVAILABLE" -->Available in the library<!-- /TMPL_IF -->
+                    <!-- TMPL_IF name="reason" -->(<!-- TMPL_VAR name="reason" -->)<!-- /TMPL_IF -->
 				</td>
 				<td>
 					<!-- TMPL_VAR name="surnamesuggestedby" --><!-- TMPL_IF name="firstnamesuggestedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR name="firstnamesuggestedby" -->
 				</td>
 				<td>
-					<!-- TMPL_VAR name="usermanagedby" --><!-- TMPL_IF name="firstnamemanagedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR name="firstnamemanagedby" -->
+					<!-- TMPL_VAR name="surnamemanagedby" --><!-- TMPL_IF name="firstnamemanagedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR name="firstnamemanagedby" -->
 				</td>
 				<td>
 					<!-- TMPL_VAR name="note" -->
@@ -148,8 +105,5 @@
 		<input type="hidden" name="op" value="add" />
 		<input type="submit" value="Enter a new purchase suggestion" />
 	</form>
-	<p>Note : if you're viewing purchase suggestions submitted by anybody, the results will contain only <em>new</em> purchase suggestions. Suggestions being processed by a librarian will not be shown.</p>
 <!-- /TMPL_IF -->
-</div>
-</body>
-</html>
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->

Index: opac-user.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-user.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- opac-user.tmpl	3 Mar 2006 20:10:26 -0000	1.1
+++ opac-user.tmpl	9 Mar 2007 14:48:06 -0000	1.2
@@ -1,52 +1,71 @@
-<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Library Home for  <!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
+<!-- TMPL_INCLUDE name="doc-head-open.inc" -->
+<!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Library Home for
+<!-- TMPL_LOOP name="BORROWER_INFO" -->
+    <!-- TMPL_VAR name="firstname" --><!-- TMPL_VAR name="surname" -->
+<!-- /TMPL_LOOP -->
 <!-- TMPL_INCLUDE name="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE name="masthead.inc" -->
 <!-- TMPL_INCLUDE name="navigation.inc" -->
 
+<!-- TMPL_INCLUDE name="usermenu.inc" -->
 <!-- CONTENT -->
-<div id="main">
-<!-- TMPL_LOOP NAME="BORROWER_INFO" -->
-<h2>Welcome <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<a href="/cgi-bin/koha/opac-logout.pl">Click here</a> if you're not <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->)</h2>
-<ul><li>	 <a href="/cgi-bin/koha/opac-account.pl">my fines</a> </li> <li> 
-	<a href="/cgi-bin/koha/opac-userdetails.pl">my personal details</a>		<!-- TMPL_IF name="OpacPasswordChange" --> </li> <li> <a href="/cgi-bin/koha/opac-passwd.pl">change my password</a> <!-- /TMPL_IF --><!-- TMPL_IF NAME="opacreadinghistory" --></li> <li> <a href="/cgi-bin/koha/opac-readingrecord.pl">my reading history</a><!-- /TMPL_IF -->	<!-- TMPL_IF name="virtualshelves" --> </li> <li> <a href="/cgi-bin/koha/opac-shelves.pl" class="button">my book lists</a> <!-- /TMPL_IF --><!-- TMPL_IF name="suggestion" --></li> <li> <a href="/cgi-bin/koha/opac-suggestions.pl">purchase suggestions</a><!-- /TMPL_IF --></li></ul>
+    <!-- TMPL_LOOP NAME="BORROWER_INFO" -->
+        <br />
+        <h2>
+            Welcome <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> 
+        </h2>
+        (<a href="/cgi-bin/koha/opac-logout.pl">Click here</a> if you're not <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->)
 		<!-- TMPL_IF name="textmessaging"-->
 			<h3>Message from the library</h3>
 			<p><!-- TMPL_VAR name="textmessaging" --></p>
 		<!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="flagged" --><ul><!-- TMPL_IF NAME="debarred" --><li><strong>Please note:</strong> Your account has been frozen. Usually the reason for freezing an account is old overdues or damage fees.  If <a href="/cgi-bin/koha/opac-user.pl">your account page</a> shows your account to be clear, please consult a librarian.</li><!--
- /TMPL_IF -->
- <!-- TMPL_IF NAME="gonenoaddress" --><li><strong>Please note:</strong> According to our records, we don't have up-to-date <a href="/cgi-bin/koha/opac-userdetails.pl">contact information</a> on file.  Please contact your librarian, or use the <a href="/cgi-bin/koha/opac-userupdate.pl">online update form</a> to submit current information (<em>Please note:</em> there may be a delay in restoring your account if you submit online)</li><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="lost" --><li><strong>Please note: </strong> Your library card has been marked as lost or stolen. If this is an error, please take your card to the circulation desk at your local library and the error will be corrected.</li><!-- /TMPL_IF --></ul><!-- /TMPL_IF -->
-<!-- FINES BOX -->
-<!-- TMPL_IF NAME="amountoverfive" -->
-<h3>Fines and Charges</h3>
-<table>
-<tr><th colspan="2">Amount</th></tr>
-<tr><td>You currently owe fines and charges amounting to:</td><td><a href="/cgi-bin/koha/opac-account.pl"><!-- TMPL_VAR NAME="amountoutstanding" --></a></td></tr>
-</table>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="amountoverzero" -->
-<h3>Fines and Charges</h3>
-<table>
-<tr><th colspan="2">Amount</th></tr>
-<tr><td>You currently owe fines and charges amounting to:</td>
+        <!-- TMPL_IF NAME="flagged" -->
+        <ul>
+            <!-- TMPL_IF NAME="debarred" -->
+                <li><strong>Please note:</strong> Your account has been frozen. Usually the reason for freezing an account is old overdues or damage fees.If <a href="/cgi-bin/koha/opac-user.pl">your account page</a> shows your account to be clear, please consult a librarian.</li>
+            <!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="gonenoaddress" -->
+                <li><strong>Please note:</strong> According to our records, we don't have up-to-date <a href="/cgi-bin/koha/opac-userdetails.pl">contact information</a> on file.  Please contact your librarian, or use the <a href="/cgi-bin/koha/opac-userupdate.pl">online update form</a> to submit current information (<em>Please note:</em> there may be a delay in restoring your account if you submit online)</li>
+            <!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="lost" -->
+                <li><strong>Please note: </strong> Your library card has been marked as lost or stolen. If this is an error, please take your card to the circulation desk at your local library and the error will be corrected.</li>
+            <!-- /TMPL_IF -->
+        </ul>
+        <!-- /TMPL_IF -->
+        <!-- FINES BOX -->
+        <!-- TMPL_IF NAME="amountoverfive" -->
+            <h3>Fines and Charges</h3>
+            <table>
+                <tr><th colspan="2">Amount</th></tr>
+                <tr>
+                    <td>You currently owe fines and charges amounting to:</td>
+                    <td><a href="/cgi-bin/koha/opac-account.pl"><!-- TMPL_VAR NAME="amountoutstanding" --></a></td>
+                </tr>
+            </table>
+        <!-- /TMPL_IF -->
+
+        <!-- TMPL_IF NAME="amountoverzero" -->
+            <h3>Fines and Charges</h3>
+            <table>
+                <tr><th colspan="2">Amount</th></tr>
+                <tr><td>You currently owe fines and charges amounting to:</td>
  <td><a href="/cgi-bin/koha/opac-account.pl"><!-- TMPL_VAR NAME="amountoutstanding" --></a></td></tr>
-</table>
-<!-- /TMPL_IF -->
+            </table>
+        <!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME"amountlessthanzero" -->
-<h3>Credits</h3>
-<table>
-<tr><th colspan="2">Amount</th></tr>
-<tr><td>You have a credit of:</td><td><a href="/cgi-bin/koha/opac-account.pl"><!-- TMPL_VAR NAME="amountoutstanding" --></a></td></tr>
-</table>
-<!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME"amountlessthanzero" -->
+            <h3>Credits</h3>
+            <table>
+            <tr><th colspan="2">Amount</th></tr>
+            <tr><td>You have a credit of:</td><td><a href="/cgi-bin/koha/opac-account.pl"><!-- TMPL_VAR NAME="amountoutstanding" --></a></td></tr>
+            </table>
+        <!-- /TMPL_IF -->
 	
-<!-- /TMPL_LOOP -->
+    <!-- /TMPL_LOOP -->
 
-<!-- TMPL_IF NAME="waiting_count" -->
-<h3>Reserved Items Waiting</h3>
+    <!-- TMPL_IF NAME="waiting_count" -->
+    <!-- TMPL_IF NAME="atdestination" -->
+    <h3>Reserved Items Waiting</h3>
 	<table>
 		<tr>
 			<th colspan="2">Title</th>
@@ -54,53 +73,80 @@
 			<th>Pick Up Branch</th>
 		</tr>
 		<!-- TMPL_LOOP NAME="WAITING" -->
-			<!-- TMPL_IF NAME="atdestination" --><tr>
-			<td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" /></td>
+                <tr>
 				<td>
-					<a href="opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a><span class="item-details">
-<!-- TMPL_VAR NAME="author" --></span></td><td><!-- TMPL_VAR NAME="reservedate" --></td><td><!-- TMPL_IF NAME="atdestination" -->
+                        <img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" />
+                    </td>
+                    <td>
+                        <a href="opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+                            <!-- TMPL_VAR NAME="waiting_title" -->
+                        </a>
+                        <span class="item-details">
+                            <!-- TMPL_VAR NAME="author" -->
+                        </span>
+                    </td>
+                    <td>
+                        <!-- TMPL_VAR NAME="reservedate" -->
+                    </td>
+                    <td>
+                        <!-- TMPL_IF NAME="atdestination" -->
 				<strong>Waiting</strong> at <!-- TMPL_VAR Name="branch" -->
 				<!-- TMPL_ELSE -->
 				In transit from <!-- TMPL_VAR NAME="holdingbranch" --> to <!-- TMPL_VAR Name="branch" -->
-				<!-- /TMPL_IF --></td>
-			</tr><!-- /TMPL_IF -->
+                        <!-- /TMPL_IF -->
+                    </td>
+                </tr>
 		<!-- /TMPL_LOOP -->
 	</table>
-<!-- /TMPL_IF -->
-
-
-
-<!-- TMPL_IF NAME="issues_count" -->
-<h3>Issues (<!-- TMPL_VAR NAME="issues_count" --> total)</h3>
-<table>
-<!-- ISSUES TABLE ROWS --><tr>
-<th colspan="2">Title</th>
-<th>Call No.</th>
-<th>Due</th>
-<th>Renew</th>
-<th>Fines</th>
-</tr>
-
-<!-- TMPL_LOOP NAME="ISSUES" -->
-
-<!-- TMPL_IF NAME="overdue" --><tr class="overdue"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
-<td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /></td>
-<td><!-- Display for NPL // <!-- TMPL_IF NAME="isbn" --><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><img src="http://images.amazon.com/images/P/<!-- TMPL_VAR name="isbn" -->.01.THUMBZZZ.jpg" alt="Book Cover Image" class="thumbnail" /></a><!-- /TMPL_IF --> //Display for NPL --><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><span class="item-details">
-<!-- TMPL_VAR NAME="author" --></span></td>
-<td><!-- TMPL_VAR NAME="classification" --></td>
-<!-- TMPL_IF NAME="overdue" --><td class="overdue"><!-- TMPL_VAR NAME="date_due" --></td><!-- TMPL_ELSE --><td><!-- TMPL_VAR NAME="date_due" --></td><!-- /TMPL_IF -->
-<td>
-<!-- TMPL_IF NAME="status" -->
-<a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bornum=<!-- TMPL_VAR NAME="borrowernumber" -->">Renew</a>
-<!-- TMPL_ELSE -->
-Not renewable
-<!-- /TMPL_IF -->
-</td>
-<td><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
-</tr>
-<!-- /TMPL_LOOP -->
-</table>
+        <!-- /TMPL_IF -->
+    <!-- /TMPL_IF -->
 
+    <!-- TMPL_IF NAME="issues_count" -->
+        <h3>Issues (<!-- TMPL_VAR NAME="issues_count" --> total)</h3>
+        <table>
+        <!-- ISSUES TABLE ROWS --><tr>
+        <th colspan="2">Title</th>
+        <th>Call No.</th>
+        <th>Due</th>
+        <th>Renew</th>
+        <th>Fines</th>
+        </tr>
+        <!-- TMPL_LOOP NAME="ISSUES" -->
+            <!-- TMPL_IF NAME="overdue" -->
+                <tr class="overdue">
+            <!-- TMPL_ELSE -->
+                <tr>
+            <!-- /TMPL_IF -->
+                <td>
+                    <!-- TMPL_IF name="imageurl" -->
+                        <img src="<!-- TMPL_VAR name="imageurl" -->" title="<!-- TMPL_VAR name="description" -->"/>
+                    <!-- TMPL_ELSE -->
+                        <!-- TMPL_VAR name="description" -->
+                    <!-- /TMPL_IF -->
+                </td>
+                <td>
+                    <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
+                    <span class="item-details">
+                        <!-- TMPL_VAR NAME="author" -->
+                    </span>
+                </td>
+                <td><!-- TMPL_VAR NAME="classification" --></td>
+                <!-- TMPL_IF NAME="overdue" -->
+                    <td class="overdue"><!-- TMPL_VAR NAME="date_due" --></td>
+                <!-- TMPL_ELSE -->
+                    <td><!-- TMPL_VAR NAME="date_due" --></td>
+                <!-- /TMPL_IF -->
+                <td>
+                    <!-- TMPL_IF NAME="status" -->
+                        <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Renew</a>
+                    <!-- TMPL_ELSE -->
+                        Not renewable
+                    <!-- /TMPL_IF -->
+                </td>
+                <td><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+            </tr>
+        <!-- /TMPL_LOOP -->
+        </table>
 	<!-- TMPL_ELSE -->
 	<table>
 		<caption>Issues</caption>
@@ -108,31 +154,30 @@
 	</table>
 	<!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME="reserves_count" -->
-<h3>Reserves (<!-- TMPL_VAR NAME="reserves_count" --> total)</h3>
-<table>
-<!-- RESERVES TABLE ROWS -->
-<tr>
-<th>Title</th>
-<th>Placed On</th>
-<th>Pick Up Location</th>
-<th>Status</th>
-</tr>
-<!-- TMPL_LOOP NAME="RESERVES" -->
-<tr>
-<td><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a>
-<!-- TMPL_VAR NAME="author" --></td>
-<td><!-- TMPL_VAR NAME="reservedate" --></td>
-<td><!-- TMPL_VAR Name="branch" --></td>
-<td><!-- TMPL_IF NAME="atdestination" -->
+    <!-- TMPL_IF NAME="reserves_count" -->
+        <h3>Reserves (<!-- TMPL_VAR NAME="reserves_count" --> total)</h3>
+        <table>
+            <!-- RESERVES TABLE ROWS -->
+            <tr>
+                <th>Title</th>
+                <th>Placed On</th>
+                <th>Pick Up Location</th>
+                <th>Status</th>
+            </tr>
+            <!-- TMPL_LOOP NAME="RESERVES" -->
+            <tr>
+                <td>
+                    <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="reserves_title" --></a>
+                    <!-- TMPL_VAR NAME="author" -->
+                </td>
+                <td><!-- TMPL_VAR NAME="reservedate" --></td>
+                <td><!-- TMPL_VAR Name="branch" --></td>
+                <td><!-- TMPL_IF NAME="atdestination" -->
 				Waiting at <!-- TMPL_VAR Name="branch" --><!-- TMPL_ELSE --><!-- TMPL_IF NAME="holdingbranch" -->In transit from <!-- TMPL_VAR NAME="holdingbranch" --> to <!-- TMPL_VAR Name="branch" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --><!-- /TMPL_IF --></td>
-</tr>
-<!-- /TMPL_LOOP -->
-</table>
-
-<p>If you no longer want a reserve, please send us an e-mail, or go to the circulation desk at your library to get it removed.</p>
-
-<!-- /TMPL_IF -->
+            </tr>
+            <!-- /TMPL_LOOP -->
+        </table>
+        <p>If you no longer want a reserve, please send us an e-mail, or go to the circulation desk at your library to get it removed.</p>
+    <!-- /TMPL_IF -->
 
-</div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->

Index: opac-userdetails.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-userdetails.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- opac-userdetails.tmpl	3 Mar 2006 20:10:26 -0000	1.1
+++ opac-userdetails.tmpl	9 Mar 2007 14:48:06 -0000	1.2
@@ -1,15 +1,12 @@
-<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Personal Details for <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" -->
+<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Personal Details for <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" -->
 <!-- TMPL_INCLUDE name="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE name="masthead.inc" -->
 <!-- TMPL_INCLUDE name="navigation.inc" -->
 
-
 <!--CONTENT-->
-<div id="main">
-<h2>Personal Details: <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h2>
 
-<ul><li>	 <a href="/cgi-bin/koha/opac-account.pl">my fines</a> </li> <li> 
-	<a href="/cgi-bin/koha/opac-userdetails.pl">my personal details</a>		<!-- TMPL_IF name="OpacPasswordChange" --> </li> <li> <a href="/cgi-bin/koha/opac-passwd.pl">change my password</a> <!-- /TMPL_IF --><!-- TMPL_IF NAME="opacreadinghistory" --></li> <li> <a href="/cgi-bin/koha/opac-readingrecord.pl">my reading history</a><!-- /TMPL_IF -->	<!-- TMPL_IF name="virtualshelves" --> </li> <li> <a href="/cgi-bin/koha/opac-shelves.pl" class="button">my book lists</a> <!-- /TMPL_IF --><!-- TMPL_IF name="suggestion" --></li> <li> <a href="/cgi-bin/koha/opac-suggestions.pl">purchase suggestions</a><!-- /TMPL_IF --></li></ul>
+    <!-- TMPL_INCLUDE name="usermenu.inc" -->
+<h2>Personal Details: <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h2>
 
 
 <table>
@@ -22,19 +19,19 @@
 <h3>Contact Details</h3>
 
 <table>
-<tr><th scope="row">Mailing Address:</th><td><!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR NAME="city" --></td></tr>
+<tr><th scope="row">Mailing Address:</th><td><!-- TMPL_VAR NAME="address" -->, <!-- TMPL_VAR NAME="city" --></td></tr>
 
-<tr><th scope="row">Permanent Address:</th><td> <!-- TMPL_VAR NAME="altstreetaddress" -->, <!-- TMPL_VAR NAME="altcity" --></td></tr>
+<tr><th scope="row">Permanent Address:</th><td> <!-- TMPL_VAR NAME="B_address" -->, <!-- TMPL_VAR NAME="B_city" --></td></tr>
 
 <tr><th scope="row">Phone (Home):</th><td><!-- TMPL_IF NAME="phone" --><!-- TMPL_VAR NAME="phone" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
 
-<tr><th scope="row">Phone (Daytime):</th><td><!-- TMPL_IF NAME="phoneday" --><!-- TMPL_VAR NAME="phoneday" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
+<tr><th scope="row">Phone (Daytime):</th><td><!-- TMPL_IF NAME="mobile" --><!-- TMPL_VAR NAME="mobile" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
 
-<tr><th scope="row">Fax:</th><td><!-- TMPL_IF NAME="faxnumber" --><!-- TMPL_VAR NAME="faxnumber" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
+<tr><th scope="row">Fax:</th><td><!-- TMPL_IF NAME="fax" --><!-- TMPL_VAR NAME="fax" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
 
-<tr><th scope="row">E-mail:</th><td><!-- TMPL_IF NAME="emailaddress" --><a href="mailto:<!-- TMPL_VAR NAME="emailaddress" -->"><!-- TMPL_VAR NAME="emailaddress" --></a><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
+<tr><th scope="row">E-mail:</th><td><!-- TMPL_IF NAME="email" --><a href="mailto:<!-- TMPL_VAR NAME="email" -->"><!-- TMPL_VAR NAME="email" --></a><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
 
-<tr><th scope="row">Textmessaging:</th><td><!-- TMPL_IF NAME="textmessaging" --><!-- TMPL_VAR NAME="textmessaging" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
+<tr><th scope="row">Textmessaging:</th><td><!-- TMPL_IF NAME="opacnote" --><!-- TMPL_VAR NAME="opacnote" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
 </table>
 
 
@@ -44,43 +41,39 @@
 
 <tr><th scope="row">Membership Category:</th><td>  <!-- TMPL_VAR NAME="categorycode" --></td></tr>
 
-<!-- <td>Area:</th><td>  <!-- TMPL_VAR NAME="area" --></td> -->
-
 <!-- <td>Fee:</th><td>  /year, Paid</td> -->
 
 <tr><th scope="row">Joined:</th><td><!-- TMPL_VAR NAME="dateenrolled" --></td></tr>
 
-<tr><th scope="row">Expires:</th><td><!-- TMPL_VAR NAME="expiry" --></td></tr>
+<tr><th scope="row">Expires:</th><td><!-- TMPL_VAR NAME="dateexpiry" --></td></tr>
 
 <!-- TMPL_IF NAME="joiningbranch" --><tr><th>Joining Branch:</th><td><!-- TMPL_VAR NAME="joiningbranch" --></td></tr><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></table>
 
 
-
 <h3>Identity Details</h3>
 
 <table><tr><th scope="row">DoB:</th><td> <!-- TMPL_IF NAME="dateofbirth" --><!-- TMPL_VAR NAME="dateofbirth" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
 
 <tr><th scope="row">Sex:</th><td><!-- TMPL_IF NAME="sex" --><!-- TMPL_VAR NAME="sex" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr></table>
 
-
 <h3>Alternate Contact Details</h3>
-
-
+<!-- TMPL_IF NAME="contactname"-->
 <table><tr><th scope="row">Alternate Contact:</th><td> <!-- TMPL_IF NAME="contactname" --><!-- TMPL_VAR NAME="contactname" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
 
-<tr><th scope="row">Phone:</th><td> <!-- TMPL_IF NAME="altphone" --><!-- TMPL_VAR NAME="altphone" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
+<tr><th scope="row">Phone:</th><td> <!-- TMPL_IF NAME="B_phone" --><!-- TMPL_VAR NAME="B_phone" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
 
-<tr><th scope="row">Relationship:</th><td> <!-- TMPL_IF NAME="altrelationship" --><!-- TMPL_VAR NAME="altrelationship" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->  </td></tr>
+<tr><th scope="row">Relationship:</th><td> <!-- TMPL_IF NAME="relationship" --><!-- TMPL_VAR NAME="relationship" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->  </td></tr>
 
-<tr><th scope="row">Notes:</th><td> <!-- TMPL_IF NAME="altnotes" --><!-- TMPL_VAR NAME="altnotes" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --> </td></tr>
+<tr><th scope="row">Notes:</th><td> <!-- TMPL_IF NAME="contactnote" --><!-- TMPL_VAR NAME="contactnote" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --> </td></tr>
 
-<tr><th scope="row">Guarantor:</th><td> <!-- TMPL_IF NAME="guarantor" --><!-- TMPL_VAR NAME="guarantor" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --> </td></tr></table>
+<tr><th scope="row">Guarantor:</th><td> <!-- TMPL_IF NAME="guarantorid" --><!-- TMPL_VAR NAME="guarantorid" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --> </td></tr></table>
 
+<!-- TMPL_ELSE -->
+No alternate contact.<br /><br />
+<!-- /TMPL_IF -->
 
 <form action="/cgi-bin/koha/opac-userupdate.pl" method="post">
 <input type="submit" name="Modify" value="Modify Your Record" />
 </form>
 
-</div>
-</body>
-</html>
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc"-->

Index: opac-userupdate.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-userupdate.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- opac-userupdate.tmpl	3 Mar 2006 20:10:26 -0000	1.1
+++ opac-userupdate.tmpl	9 Mar 2007 14:48:06 -0000	1.2
@@ -1,13 +1,9 @@
-<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Updating Details for <!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
+<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Updating Details for <!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
 <!-- TMPL_INCLUDE name="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE name="masthead.inc" -->
 <!-- TMPL_INCLUDE name="navigation.inc" -->
 
-<!--CONTENT-->
-<ul><li>	 <a href="/cgi-bin/koha/opac-account.pl">my fines</a> </li> <li> 
-	<a href="/cgi-bin/koha/opac-userdetails.pl">my personal details</a>		<!-- TMPL_IF name="OpacPasswordChange" --> </li> <li> <a href="/cgi-bin/koha/opac-passwd.pl">change my password</a> <!-- /TMPL_IF --><!-- TMPL_IF NAME="opacreadinghistory" --></li> <li> <a href="/cgi-bin/koha/opac-readingrecord.pl">my reading history</a><!-- /TMPL_IF -->	<!-- TMPL_IF name="virtualshelves" --> </li> <li> <a href="/cgi-bin/koha/opac-shelves.pl" class="button">my book lists</a> <!-- /TMPL_IF --><!-- TMPL_IF name="suggestion" --></li> <li> <a href="/cgi-bin/koha/opac-suggestions.pl">purchase suggestions</a><!-- /TMPL_IF --></li></ul>
-
-<div id="main">
+<!-- TMPL_INCLUDE name="usermenu.inc" -->
 <!-- TMPL_LOOP name="BORROWER_INFO" -->
 <h3>Updating Details for <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --></h3>
 <p>Please make any necessary changes to your record.  Submitting the form will notify a library staff member, who will make the changes permanent.</p>
@@ -18,22 +14,26 @@
 
 <tr><th><label for="firstname">First Name</label></th><td><input id="firstname" type="text"  size="25" value="<!-- TMPL_VAR name="firstname" -->"  name="firstname"></td></tr>
 
-<tr><th><label for="streetaddress">Mailing Address</label></th><td><input id="streetaddress" type="text"  size="25" value="<!-- TMPL_VAR name="streetaddress" -->"  name="streetaddress"></td></tr>
+<tr>
+    <th><label for="streetaddress">Mailing Address</label></th>
+    <td>
+        <textarea id="streetaddress" cols="25"  name="streetaddress"><!--TMPL_VAR NAME="streetnumber"--> <!-- TMPL_VAR name="address" --> <!-- TMPL_VAR NAME="zipcode"--></textarea>
+    </td>
+</tr>
 
 <tr><th><label for="city">City, State</label></th><td><input id="city" type="text"  size="25" value="<!-- TMPL_VAR name="city" -->"  name="city"></td></tr>
 
 <tr><th><label for="phone">Home Phone</label></th><td><input id="phone" type="text"  size="25" value="<!-- TMPL_VAR name="phone" -->"  name="phone"></td></tr>
 
-<tr><th><label for="faxnumber">Work/Fax phone</label></th><td><input id="faxnumber"  type="text"  size="25" value="<!-- TMPL_VAR name="faxnumber" -->"  name="faxnumber"></td></tr>
+<tr><th><label for="faxnumber">Work/Fax phone</label></th><td><input id="faxnumber"  type="text"  size="25" value="<!-- TMPL_VAR name="fax" -->"  name="faxnumber"></td></tr>
 
-<tr><th><label for="emailaddress">Email</label></th><td><input id="emailaddress" type="text"  size="40" value="<!-- TMPL_VAR name="emailaddress" -->"  name="emailaddress"></td></tr>
+<tr><th><label for="emailaddress">Email</label></th><td><input id="emailaddress" type="text"  size="25" value="<!-- TMPL_VAR name="email" -->"  name="emailaddress"></td></tr>
 </table>
 <p>Clicking 'Submit Changes' will send an email to a library staff member with the information you've entered.  You will then be returned to your patron record.</p>
 <p><input type="submit" value="Submit Changes"></p>
 </form>
 
-
 <!-- /TMPL_LOOP -->
-</div>
+
 </body>
 </html>





More information about the Koha-cvs mailing list