Modified HTML to move towards validity (quoted attributes, close tags, etc), linked...

diff --git a/koha-tmpl/opac-tmpl/default/en/opac-user.tmpl b/koha-tmpl/opac-tmpl/default/en/opac-user.tmpl
index 5eccb58..0b6767d 100644 (file)
--- a/koha-tmpl/opac-tmpl/default/en/opac-user.tmpl
+++ b/koha-tmpl/opac-tmpl/default/en/opac-user.tmpl
@@ -2,39 +2,41 @@
 
 <!-- TMPL_LOOP NAME="BORROWER_INFO" -->
 
-<table align=right cellpadding=5 cellspacing=0 border=1 width=200 >
-       <tr   bgcolor="#fecc99" >
-               <td><b>ARE OUR RECORDS CORRECT?</B></td>
+<table align="right" cellpadding="5" cellspacing="0" border="1" width="200">
+       <tr bgcolor="#fecc99" >
+               <td><b>ARE OUR RECORDS CORRECT?</b></td>
        </tr>
        <tr>
-               <td><font size=2 face="arial,helvetica">Library Card: <!-- TMPL_VAR NAME="cardnumber" --> <br/>
+               <td><font size="2" face="arial, helvetica, sans-serif">Library Card: <!-- TMPL_VAR NAME="cardnumber" --> <br>
                        <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="title" -->) <br>
                        <!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR NAME="city" --><br>
                        <!-- TMPL_VAR NAME="phone" --> (hm)<br>
                        <!-- TMPL_VAR NAME="faxnumber" --> (wk)<br>
-                       <!-- TMPL_VAR NAME="emailaddress" --><br/>
-                       <p>Something new ?</p>
+                       <!-- TMPL_VAR NAME="emailaddress" --><br>
+                       <br>Something new ?<br><br>
                        <a href="/cgi-bin/koha/opac-userupdate.pl">Update Record</a>
+                       </font>
                </td>
        </tr>
 </table>
 
+
 <!-- TMPL_IF NAME="amountoverfive" -->
-       <table cellpadding=5 cellspacing=0 border=1>
+       <table cellpadding="5" cellspacing="0" border="1">
                <tr bgcolor="#fecc99">
                        <td>
-                               <font face="arial,helvetica" color="red" size=+2><B>You have outstanding charges and fines of <!-- TMPL_VAR NAME="amountoutstanding" --></B></font>
+                               <font face="arial, helvetica, sans-serif" color="red" size="+2"><b>You have outstanding charges and fines of <!-- TMPL_VAR NAME="amountoutstanding" --></b></font>
                        </td>
                </tr>
        </table>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="amountoverzero" -->
-       <table cellpadding=5 cellspacing=0 border=1>
+       <table cellpadding="5" cellspacing="0" border="1">
                <tr bgcolor="#fecc99">
                        <td>
-                               <font face="arial,helvetica" size=+2>
-                                       <B>You have outstanding charges and fines of <!-- TMPL_VAR NAME="amountoutstanding" --></B>
+                               <font face="arial, helvetica, sans-serif" size="+2">
+                                       <b>You have outstanding charges and fines of <!-- TMPL_VAR NAME="amountoutstanding" --></b>
                                </font>
                        </td>
                </tr>
@@ -42,85 +44,89 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME"amountlessthanzero" -->
-       <table cellpadding=5 cellspacing=0 border=1>
+       <table border="1" cellspacing="0" cellpadding="5">
                <tr bgcolor="#fecc99">
                        <td>
-                               <font face="arial,helvetica" size=+2>
-                                       <B>You have a credit of <!-- TMPL_VAR NAME="amountoutstanding" --></B>
+                               <font face="arial, helvetica, sans-serif" size="+2">
+                                       <b>You have a credit of <!-- TMPL_VAR NAME="amountoutstanding" --></b>
                                </font>
                        </td>
                </tr>
        </table>
 <!-- /TMPL_IF -->
-<a href='/cgi-bin/koha/opac-account.pl'>View Accounts</a>
+<p><a href="/cgi-bin/koha/opac-account.pl">View Accounts</a></p>
 
 <!-- /TMPL_LOOP -->
 
 <!-- TMPL_IF NAME="waiting_count" -->
-       <table  cellpadding=5 cellspacing=0 border=0>
+       <table  cellpadding="5" cellspacing="0" border="1">
                <tr bgcolor="#fecc99" >
-                       <td colspan=2>
-                               <font color="red" face="arial,helvetica" size=+2>
-                                       <B>     You have reserved items waiting:</B>
+                       <td colspan="4">
+                               <font color="red" face="arial, helvetica, sans-serif" size="+2">
+                                       <b>     You have reserved items waiting:</b>
                                </font>
-                               <P>
                        </td>
                </tr>
+               <tr valign="top" bgcolor="#99CCCC" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-opac.gif">
+                       <th>Title</th>
+                       <th>Author</th>
+                       <th>Reserve date</th>
+                       <th>Pick Up Branch</th>
+               </tr>
                <!-- TMPL_LOOP NAME="WAITING" -->
                        <tr>
                                <td>
-                                       <b><!-- TMPL_VAR NAME="btitle" --></b></td><td>pick up at: <b><!-- TMPL_VAR NAME="branch" --></b>
+                                       <b><a href="opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a></b></td><td><!-- TMPL_IF NAME="author" --><!-- TMPL_VAR NAME="author" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td><td><!-- TMPL_VAR NAME="reservedate" --></td><td><b><!-- TMPL_VAR NAME="branch" --></b>
                                </td>
                        </tr>
                <!-- /TMPL_LOOP -->
-       </table>
+       </table><p>&nbsp;</p>
 <!-- /TMPL_IF -->
 
-<p>
+
 
 <!-- TMPL_IF NAME="issues_count" -->
 
-       You have <!-- TMPL_VAR NAME="issues_count" --> items currently issued.<br>
-       <TABLE  CELLPADDING=5  CELLSPACING=0 border=1 >
-               <TR VALIGN=TOP  bgcolor="#99cccc"  background='<!-- TMPL_VAR NAME="themelang" -->/images/background-opac.gif'>
-                       <TD><B>Title</B></TD>
-                       <TD><B>Author</B></TD>
-                       <TD><B>Due date</B></TD>
-                       <TD><B>Itemtype</B></TD>
-                       <TD><B>Charges</B></TD>
-                       <TD><B>Current Loan</B></TD>
-               </TR>
+<p>    You have <!-- TMPL_VAR NAME="issues_count" --> items currently issued.</p>
+       <table border="1" cellspacing="0" cellpadding="5">
+               <tr valign="top" bgcolor="#99CCCC" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-opac.gif">
+                       <th>Title</th>
+                       <th>Author</th>
+                       <th>Due date</th>
+                       <th>Itemtype</th>
+                       <th>Charges</th>
+                       <th>Current Loan</th>
+               </tr>
                <!-- TMPL_LOOP NAME="ISSUES" -->
-                       <TR VALIGN=TOP>
-                               <TD><!-- TMPL_VAR NAME="title" --></TD>
-                               <TD><!-- TMPL_VAR NAME="author" --></TD>
-                               <TD><!-- TMPL_VAR NAME="date_due" --></TD>
-                               <TD><!-- TMPL_VAR NAME="itemtype" --></TD>
-                               <TD><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></TD>
-                               <TD><!-- TMPL_IF NAME="status" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></TD>
-                       </TR>
+                       <tr valign="top">
+                               <td><a href="opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
+                               <td><!-- TMPL_IF NAME="author" --><!-- TMPL_VAR NAME="author" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
+                               <td><!-- TMPL_VAR NAME="date_due" --></td>
+                               <td><!-- TMPL_VAR NAME="itemtype" --></td>
+                               <td><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+                               <td><!-- TMPL_IF NAME="status" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+                       </tr>
                <!-- /TMPL_LOOP -->
        </table>
 <!-- TMPL_ELSE -->
 <p>You have no items on issue.</p>
 <!-- /TMPL_IF -->
 
-<p>
 
 <!-- TMPL_IF NAME="reserves_count" -->
-       You have <!-- TMPL_VAR NAME="reserves_count" --> items currently reserved.<br>
-       <TABLE  CELLPADDING=5  CELLSPACING=0 border=1 >
-               <TR VALIGN=TOP  bgcolor="#99cccc" background='<!-- TMPL_VAR NAME="themelang" -->/images/background-opac.gif'>
-                       <TD><B>Title</B></TD>
-                       <TD><B>Author</B></TD>
-                       <TD><B>Reserve date</B></TD>
-               </TR>
+<p>    You have <!-- TMPL_VAR NAME="reserves_count" --> items currently reserved.</p>
+       <table border="1" cellspacing="0" cellpadding="5">
+               <tr valign="top" bgcolor="#99CCCC" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-opac.gif">
+                       <th>Title</th>
+                       <th>Author</th>
+                       <th>Reserve date</th>
+               </tr>
                <!-- TMPL_LOOP NAME="RESERVES" -->
-                       <TR VALIGN=TOP>
-                       <TD><!-- TMPL_VAR NAME="btitle" --></TD>
-                       <TD><!-- TMPL_VAR NAME="author" --></TD>
-                       <TD><!-- TMPL_VAR NAME="reservedate" --></TD>
-                       </TR>
+                       <tr valign="top">
+                       <td><a href="opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a></td>
+                       <td><!-- TMPL_IF NAME="author" --><!-- TMPL_VAR NAME="author" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
+                       <td><!-- TMPL_VAR NAME="reservedate" --></td>
+                       </tr>
                <!-- /TMPL_LOOP -->
        </table>
 <!-- /TMPL_IF -->