Minor changes to correct for validity (quoting attributes, encoding entities, etc.)

diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc
index a2b3ebd..4f15bd9 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc
@@ -44,10 +44,10 @@ a.members:hover {
        <a class="catalogue" href="javascript:Help()">Help</a>
 </div>
 <div id="submenu">
-       <span class="koha">options &gt;&gt;&nbsp;&nbsp;</b></span>
+       <span class="koha">options &gt;&gt;&nbsp;&nbsp;</span>
        <a href="/cgi-bin/koha/members/members-home.pl" class="submenu">Member home</a>
        <a href="/cgi-bin/koha/members/memberentry.pl?actionType=Add" class="submenu2">Add member</a>
-       <a href="/cgi-bin/koha/members/memberentry.pl?categorycode=I&actionType=Add" class="submenu">Add organisation</a>
+       <a href="/cgi-bin/koha/members/memberentry.pl?categorycode=I&amp;actionType=Add" class="submenu">Add organisation</a>
 </div>
 <!-- TMPL_IF NAME="loggedinusername" -->
     <p align="left">Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>]</p>

diff --git a/koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl
index df1164c..d507a30 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl
@@ -1,132 +1,115 @@
 <!-- TMPL_INCLUDE name="members-top.inc" -->
-<BLOCKQUOTE>
-
+<div id="mainbloc">
 <!-- TMPL_IF name="surname" -->
-       <h1>Edit Institution</h1><br>
+       <h1>Edit Institution</h1>
 <!-- TMPL_ELSE -->
-       <h1>Add new Institution</h1><br>
+       <h1>Add new Institution</h1>
 <!-- /TMPL_IF -->
-<form action=/cgi-bin/koha/members/newimember.pl method=post>
-  <input type=hidden name=joining value="">
-  <input type=hidden name=expiry value="">
-  <input type=hidden name=type value="borrowers">
-  <input type=hidden name=borrowernumber value="<!-- TMPL_VAR NAME=member -->">
-  <input type=hidden name=updtype value=I>
+<form action="/cgi-bin/koha/members/newimember.pl" method="post">
+  <input type="hidden" name="joining" value="">
+  <input type="hidden" name="expiry" value="">
+  <input type="hidden" name="type" value="borrowers">
+  <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="member" -->">
+  <input type="hidden" name="updtype" value="I">
 
-  <table border=0 cellspacing=0 cellpadding=5>
+  <table border="0" cellspacing="0" cellpadding="5">
 
-    <tr valign=top>
-      <td ><input type=reset value="Clear all Fields"></td>
+    <tr valign="top">
+      <td colspan="3"><input type="reset" value="Clear all Fields"></td>
     </tr>
 
-    <tr align=right>
-      <td COLSPAN=2 ALIGN=RIGHT><font size=3 face='arial,helvetica'>
-        <STRONG>Member# <!-- TMPL_VAR NAME="member" -->, Card number*</STRONG>
-      </TD>
-      <TD align=right><input type=text name=cardnumber_institution size=20 value=<!-- TMPL_VAR NAME=cardnumber_institution -->><br></td>
-    </TR>
-
-    <tr><td>&nbsp;</TD></TR>
+    <tr align="right">
+      <td colspan="2" align="right">
+        <strong>Member# <!-- TMPL_VAR NAME="member" -->, Card number*</strong>
+      </td>
+      <td align="right"><input type="text" name="cardnumber_institution" size="20" value="<!-- TMPL_VAR NAME=cardnumber_institution -->"></td>
+    </tr>
 
-    <tr valign=top bgcolor="99cc33" >
-      <td  COLSPAN=5 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+    <tr valign="top" bgcolor="#99cc33">
+      <td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
         <B>INSTITUTION DETAILS</b>
       </td>
-      <td  COLSPAN=2  ALIGN=RIGHT background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-      </td>
+      <td colspan="2" align="right" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">&nbsp;</td>
     </tr>
 
-    <tr valign=top bgcolor=white>
-      <td><FONT SIZE=2>Institution Name</FONT></td>
+    <tr>
+      <td colspan="3">Institution Name</td>
     </tr>
-    <tr valign=top bgcolor=white>
-      <td colspan=3><input type=text name=institution_name size=50 value="<!-- TMPL_VAR name="surname" -->"></td>
+    <tr>
+      <td colspan="3"><input type="text" name="institution_name" size="50" value="<!-- TMPL_VAR name="surname" -->"></td>
     </tr>
-    <tr><td>&nbsp;</TD></TR>
 
-    <tr valign=top bgcolor="99cc33" >
-      <td  COLSPAN=5 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+    <tr valign="top" bgcolor="99cc33" >
+      <td  colspan="3" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
          <B>INSTITUTION ADDRESS</b>
       </td>
     </tr>
 
-    <tr valign=top bgcolor=white>
-       <td ><FONT SIZE=2>Postal Address*</FONT></td>
-       <td><FONT SIZE=2>Zipcode / Town*</FONT></td>
-       <td><FONT SIZE=2>Area</FONT></td>
+    <tr>
+       <td >Postal Address*</td>
+       <td>Zipcode / Town*</td>
+       <td>Area</td>
     </tr>
-    <tr valign=top bgcolor=white>
-       <td><input type=text name=address size=40 value="<!-- TMPL_VAR name="streetaddress" -->"></td>
-       <td><input type=text name=zipcode size=20 value="<!-- TMPL_VAR name="zipcode" -->"> <br/><input type=text name=city size=20 value="<!-- TMPL_VAR name="city" -->"></td>
+    <tr>
+       <td><input type="text" name="address" size="40" value="<!-- TMPL_VAR name="streetaddress" -->"></td>
+       <td><input type="text" name="zipcode" size="20" value="<!-- TMPL_VAR name="zipcode" -->"> <br> <input type="text" name="city" size="20" value="<!-- TMPL_VAR name="city" -->"></td>
        <td>
        <!-- TMPL_VAR name="CGIbranch" -->
         </td>
     </tr>
-    <tr><td>&nbsp;</TD></TR>
 
-    <tr valign=top bgcolor="99cc33">
-      <td COLSPAN=5 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+    <tr valign="top" bgcolor="#99cc33">
+      <td colspan="3" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
          <B>CONTACT DETAILS</b>
       </td>
     </tr>
 
-    <tr valign=top bgcolor=white>
-       <td COLSPAN=3><FONT SIZE=2>Contact Name*</td>
+    <tr>
+       <td colspan="3">Contact Name*</td>
     </tr>
-    <tr valign=top bgcolor=white>
-       <td COLSPAN=3><input type=text name=contactname size=40 value="<!-- TMPL_VAR name="contactname" -->"></td>
+    <tr>
+       <td colspan="3"><input type="text" name="contactname" size="40" value="<!-- TMPL_VAR name="contactname" -->"></td>
     </tr>
 
 
-    <tr valign=top bgcolor=white>
-       <td><FONT SIZE=2>Phone (day)</td>
-       <td><FONT SIZE=2>Fax</td>
-       <td><FONT SIZE=2>Email</td>
+    <tr>
+       <td>Phone (day)</td>
+       <td>Fax</td>
+       <td>Email</td>
     </tr>
-    <tr valign=top bgcolor=white>
-       <td ><input type=text name=phoneday size=20 value="<!-- TMPL_VAR name="phoneday" -->"></td>
-       <td><input type=text name=faxnumber size=20 value="<!-- TMPL_VAR name="faxnumber" -->"></td>
-       <td ><input type=text name=emailaddress size=20 value="<!-- TMPL_VAR name="emailaddress" -->"></td>
+    <tr>
+       <td ><input type="text" name="phoneday" size="20" value="<!-- TMPL_VAR name="phoneday" -->"></td>
+       <td><input type="text" name="faxnumber" size="20" value="<!-- TMPL_VAR name="faxnumber" -->"></td>
+       <td ><input type="text" name="emailaddress" size="20" value="<!-- TMPL_VAR name="emailaddress" -->"></td>
     </tr>
 
-    <tr><td>&nbsp;</TD></TR>
-
-    <tr valign=top bgcolor=white>
-       <td><FONT SIZE=2>Notes</font></td>
+    <tr>
+       <td>Notes</td>
     </tr>
-    <tr valign=top bgcolor=white>
-       <td COLSPAN=4><textarea name=altnotes wrap=physical cols=70 rows=3><!-- TMPL_VAR name="altnotes" --></textarea></td>
+    <tr>
+       <td colspan="3"><textarea name="altnotes" cols="70" rows="3"><!-- TMPL_VAR name="altnotes" --></textarea></td>
     </tr>
 
-    <tr><td>&nbsp;</TD></TR>
-
-    <tr valign=top bgcolor="99cc33"  >
-       <td  COLSPAN=5  background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>LIBRARY USE</B></td>
+    <tr valign="top" bgcolor="#99cc33"  >
+       <td  colspan="3"  background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>LIBRARY USE</B></td>
     </tr>
 
-    <tr valign=top bgcolor=white>
-       <td ><FONT SIZE=2>Notes</font></td>
+    <tr>
+       <td colspan="3">Notes</td>
     </tr>
-    <tr valign=top >
-       <td  COLSPAN=5><textarea name=borrowernotes wrap=physical cols=70 rows=3><!-- TMPL_VAR name="borrowernotes" --></textarea></td>
+    <tr valign="top" >
+       <td colspan="3"><textarea name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR name="borrowernotes" --></textarea></td>
     </tr>
 
-    <tr><td>&nbsp;</TD></TR>
-
-    <tr valign=top bgcolor=white>
-       <td  COLSPAN=5 align=right >
-         <input type=submit class="button" value="Save Changes" ALT="Add New Member" border=0 >
+    <tr>
+       <td  colspan="3" align=right >
+         <input type="submit" class="button" value="Save Changes">
       </td>
     </tr>
-  </TABLE>
+  </table>
 </form>
-
-</BLOCKQUOTE>
-
-<br clear=all>
-<p> &nbsp; </p>
-
+</div>
 <!-- TMPL_VAR NAME=endmenumember -->
 
 </body>
-</HTML>
+</html>

diff --git a/koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl
index 8d139b8..308ba00 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl
@@ -3,15 +3,15 @@
 <div id="mainbloc">
                <div id="bloc25">
                <div id="bloctitle"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></div>
-               <form method=post>
-                       <input type=hidden name=member value=<!-- TMPL_VAR NAME=member -->>
+               <form method="post" action="/cgi-bin/koha/members/member-password.pl">
+                       <input type="hidden" name="member" value="<!-- TMPL_VAR NAME=member -->">
                        <!-- TMPL_IF NAME="warn" -->
-                               You have entered a UserID that already exists.  Please choose another one.<br/>
+                               You have entered a UserID that already exists.  Please choose another one.<br>
                        <!-- /TMPL_IF -->
-                       New UserID: <input name=newuserid size=20 value=<!-- TMPL_VAR NAME=userid -->> <br/>
-                       New Password: <input name=newpassword size=20 value=<!-- TMPL_VAR NAME=defaultnewpassword -->><br/>
-                       <input type=submit value="Confirm Password" class="button">
+                       New UserID: <input name="newuserid" size="20" value="<!-- TMPL_VAR NAME=userid -->"> <br>
+                       New Password: <input name="newpassword" size="20" value="<!-- TMPL_VAR NAME=defaultnewpassword -->"><br>
+                       <input type="submit" value="Confirm Password" class="button">
                </form>
 </div>
-
+</div>
 <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl
index 7d1bbae..fce35b8 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl
@@ -2,16 +2,16 @@
 <div id="mainbloc">
 <h1>Member Search</h1>
 
-<div id="bloc100">
-       <div id="bloctitle">Search on</div>
+<div class="bloc100">
+       <div class="bloctitle">Search on</div>
        <form action="/cgi-bin/koha/members/member.pl" method=post>
                <input type=text name="member" value="<!-- TMPL_VAR NAME=member -->">
                <input type="submit" class="button" value="OK">
        </form>
 </div>
 
-<div id="bloc100">
-       <div id="bloctitle">You Searched for <!-- TMPL_VAR NAME=member --></div>
+<div class="bloc100">
+       <div class="bloctitle">You Searched for <!-- TMPL_VAR NAME="member" --></div>
        <table>
                <tr>
                        <th>Card</th>
@@ -23,27 +23,28 @@
                        <th>Charges</th>
                        <th>Notes</th>
                </tr>
-               <!-- TMPL_LOOP NAME=resultsloop -->
+               <!-- TMPL_LOOP NAME="resultsloop" -->
                        <!-- TMPL_IF NAME="background" -->
-                               <TR bgcolor="#ffffcc">
+                               <tr bgcolor="#ffffcc">
                        <!-- TMPL_ELSE -->
-                               <TR bgcolor=white>
+                               <tr bgcolor="white">
                        <!-- /TMPL_IF -->
-                               <td><!-- TMPL_VAR NAME=cardnumber --></td>
-                               <td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME=borrowernumber -->"><!-- TMPL_VAR NAME=surname --></td>
-                               <td><!-- TMPL_VAR NAME=firstname --></a></td>
-                               <td><!-- TMPL_VAR NAME=categorycode --></td>
-                               <td><!-- TMPL_VAR NAME=streetaddress --> <!-- TMPL_VAR NAME=city --></td>
-                               <td><!-- TMPL_VAR NAME=odissue --></td>
-                               <td><!-- TMPL_VAR NAME=fines --></td>
-                               <td><!-- TMPL_VAR NAME=borrowernotes --></td>
+                               <td><!-- TMPL_VAR NAME="cardnumber" --></td>
+                               <td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" --></a></td>
+                               <td><!-- TMPL_VAR NAME="firstname" --></a></td>
+                               <td><!-- TMPL_VAR NAME="categorycode" --></td>
+                               <td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME="city" --></td>
+                               <td><!-- TMPL_VAR NAME="odissue" --></td>
+                               <td><!-- TMPL_VAR NAME="fines" --></td>
+                               <td><!-- TMPL_VAR NAME="borrowernotes" --></td>
                        </tr>
                <!-- /TMPL_LOOP -->
        </table>
-       <form action=/cgi-bin/koha/members/simpleredirect.pl method=post>
+       <form action="/cgi-bin/koha/members/simpleredirect.pl" method="post">
        <input type=submit class="button" value="Add member" title="Add member" alt="Add member">
-       <INPUT TYPE="radio" name="chooseform" value="adult" checked>Adult
-       <INPUT TYPE="radio" name="chooseform" value="organisation" >Organisation
+       <input type="radio" name="chooseform" value="adult" checked>Adult
+       <input type="radio" name="chooseform" value="organisation" >Organisation
        </form>
 </div>
+</div>
 <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
index e341cef..9031d64 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
@@ -12,49 +12,49 @@
        <!-- /TMPL_IF -->
 
        <!-- TMPL_IF Name="NOK" -->
-               <h1 >ERROR</H1>
+               <h1>ERROR</h1>
                <div id="problem">
                        <p>The following fields have a forbidden value. Correct them and press OK again :</p>
                        <!-- TMPL_IF name="ERROR_cardnumber" -->
-                               Card number<br/>
+                               Card number<br>
                        <!-- /TMPL_IF -->
                        <!-- TMPL_IF name="ERROR_invalid_cardnumber" -->
-                               Invalid cardnumber<br/>
+                               Invalid cardnumber<br>
                        <!-- /TMPL_IF -->
                        <!-- TMPL_IF name="ERROR_gender" -->
-                               Gender<br/>
+                               Gender<br>
                        <!-- /TMPL_IF -->
                        <!-- TMPL_IF name="ERROR_firstname" -->
-                               Given Names<br/>
+                               Given Names<br>
                        <!-- /TMPL_IF -->
                        <!-- TMPL_IF name="ERROR_surname" -->
-                               Surname<br/>
+                               Surname<br>
                        <!-- /TMPL_IF -->
                        <!-- TMPL_IF name="aERROR_ddress" -->
-                               Postal Street Address<br/>
+                               Postal Street Address<br>
                        <!-- /TMPL_IF -->
                        <!-- TMPL_IF name="ERROR_city" -->
-                               Postal city<br/>
+                               Postal city<br>
                        <!-- /TMPL_IF -->
                </div>
        <!-- /TMPL_IF -->
-       <form action=/cgi-bin/koha/members/memberentry.pl method=post>
-               <input type=hidden name=joining value="<!-- TMPL_VAR NAME=dateenrolled -->">
-               <input type=hidden name=expiry value="<!-- TMPL_VAR NAME=expiry -->">
-               <input type=hidden name=type value="borrowers">
-               <input type=hidden name=borrowernumber value="<!-- TMPL_VAR NAME=member -->">
-               <input type=hidden name=updtype value="<!-- TMPL_VAR NAME=updtype -->">
-               <!-- TMPL_IF NAME=addAction -->
+       <form action="/cgi-bin/koha/members/memberentry.pl" method="post">
+               <input type="hidden" name="joining" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
+               <input type="hidden" name="expiry" value="<!-- TMPL_VAR NAME="expiry" -->">
+               <input type="hidden" name="type" value="borrowers">
+               <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="member" -->">
+               <input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
+               <!-- TMPL_IF NAME="addAction" -->
                        <input type="hidden" name="op" value="add">
                <!-- TMPL_ELSE -->
                        <input type="hidden" name="op" value="modify">
                <!-- /TMPL_IF -->
                <table>
                        <tr>
-                               <td colspan=5>Member# <!-- TMPL_VAR NAME=member -->, Card number* <input type=text name=cardnumber size=10 value="<!-- TMPL_VAR NAME=cardnumber -->"></td>
+                               <td colspan="5">Member# <!-- TMPL_VAR NAME="member" -->, Card number* <input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME=cardnumber -->"></td>
                        </tr>
                        <tr>
-                               <th colspan=5>MEMBER PERSONAL DETAILS</th>
+                               <th colspan="5">MEMBER PERSONAL DETAILS</th>
                        </tr>
                        <tr>
                                <td><!-- TMPL_UNLESS name="institution" -->Salutation<!-- /TMPL_UNLESS --></td>
@@ -80,34 +80,34 @@
                                </td>
                                <td>
                                        <!-- TMPL_UNLESS name="institution" -->
-                                               <input type=text name=initials size=5 value="<!-- TMPL_VAR NAME=initials -->">
+                                               <input type="text" name="initials" size="5" value="<!-- TMPL_VAR NAME="initials" -->">
                                        <!-- /TMPL_UNLESS -->
                                </td>
                                <td>
                                <!-- TMPL_UNLESS name="institution" -->
-                                       <input type=text name=firstname size=20 value="<!-- TMPL_VAR NAME=firstname -->">
+                                       <input type="text" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" -->">
                                        <!-- /TMPL_UNLESS -->
                                </td>
-                               <td><input type=text name=surname size=20 value="<!-- TMPL_VAR NAME=surname -->"></td>
+                               <td><input type="text" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->"></td>
                                <td>
                                        <!-- TMPL_UNLESS name="institution" -->
-                                               <input type=text name=othernames size=20 value="<!-- TMPL_VAR NAME=othernames -->">
+                                               <input type="text" name="othernames" size="20" value="<!-- TMPL_VAR NAME="othernames" -->">
                                        <!-- /TMPL_UNLESS -->
                                </td>
                        </tr>
 
                        <tr>
-                               <td colspan=2>
+                               <td colspan="2">
                                <!-- TMPL_UNLESS name="institution" -->
-                                       <input type="radio" name="sex" value="F"<!-- TMPL_IF NAME=female --> checked<!-- /TMPL_IF -->>F
-                                       <input type="radio" name="sex" value="M"<!-- TMPL_UNLESS NAME=female --> checked<!-- /TMPL_UNLESS -->> M
+                                       <input type="radio" name="sex" value="F"<!-- TMPL_IF NAME="female" --> checked<!-- /TMPL_IF -->>F
+                                       <input type="radio" name="sex" value="M"<!-- TMPL_UNLESS NAME="female" --> checked<!-- /TMPL_UNLESS -->> M
                                <!-- /TMPL_UNLESS -->
 
                                </td>
-                               <td colspan=2>
+                               <td colspan="2">
                                        <!-- TMPL_UNLESS name="institution" -->
                                        Date of Birth (<!-- TMPL_VAR NAME=dateformat -->)
-                                       <input type=text name=dateofbirth size=10 value="<!-- TMPL_VAR NAME=dateofbirth -->">
+                                       <input type="text" name="dateofbirth" size="10" value="<!-- TMPL_VAR NAME=dateofbirth -->">
                                        <!-- /TMPL_UNLESS -->
                                </td>
                                <td>
@@ -115,48 +115,48 @@
                                </td>
                        </tr>
                        <!-- TMPL_IF NAME=ethcatpopup -->
-                               <tr valign=top bgcolor=white>
+                               <tr valign="top" bgcolor="white">
                                        <!-- TMPL_VAR NAME=ethcatpopup -->
-                                       <td colspan=2>Ethnicity</td>
-                                       <td colspan=2>Ethnicity Notes</td>
+                                       <td colspan="2">Ethnicity</td>
+                                       <td colspan="2">Ethnicity Notes</td>
                                </tr>
                        <!-- /TMPL_IF -->
                        <!-- TMPL_IF name="ethcatpopup" -->
-                               <tr valign=top bgcolor=white>
-                                       <td colspan=2>
+                               <tr valign="top" bgcolor="white">
+                                       <td colspan="2">
                                                <!-- TMPL_IF name="ethcatpopup" -->
-                                                       <select name="ethnicity" size=1>
-                                                               <!-- TMPL_LOOP NAME=ethnicityloop -->
-                                                               <option value=<!-- TMPL_VAR NAME=value --><!-- TMPL_VAR NAME=selected -->><!-- TMPL_VAR NAME=label -->
+                                                       <select name="ethnicity" size="1">
+                                                               <!-- TMPL_LOOP NAME="ethnicityloop" -->
+                                                               <option value=<!-- TMPL_VAR NAME="value" --><!-- TMPL_VAR NAME="selected" -->><!-- TMPL_VAR NAME="label" -->
                                                                <!-- /TMPL_LOOP -->
                                                        </select>
                                                <!-- /TMPL_IF -->
                                                </td>
-                                               <!-- TMPL_IF NAME=ethcatpopup --><!-- TMPL_VAR NAME=ethcatpopup -->
-                                               <td colspan=2><input type=text name=ethnicnotes size=40 ></td>
+                                               <!-- TMPL_IF NAME="ethcatpopup" --><!-- TMPL_VAR NAME="ethcatpopup" -->
+                                               <td colspan="2"><input type="text" name="ethnicnotes" size="40" ></td>
                                                <!-- TMPL_ELSE -->
-                                               <td colspan=2>&nbsp;</td>
+                                               <td colspan="2">&nbsp;</td>
                                                <!-- /TMPL_IF -->
                                </tr>
                        <!-- /tmpl_if -->
 
                        <tr>
-                               <th colspan=5>MEMBER ADDRESS</th>
+                               <th colspan="5">MEMBER ADDRESS</th>
                        </tr>
 
                        <tr>
-                               <td  colspan=2><b>Postal Address*</b></td>
+                               <td  colspan="2"><b>Postal Address*</b></td>
                                <td><b>Zipcode</b></td>
                                <td><b> Town*</b></td>
                                <td>Joining Branch</td>
                        </tr>
                        <tr>
-                               <td colspan=2><input type="text" name="address" size="40" value="<!-- TMPL_VAR NAME=address -->"></td>
+                               <td colspan="2"><input type="text" name="address" size="40" value="<!-- TMPL_VAR NAME="address" -->"></td>
                                <td>
-                                       <input type=text name="zipcode" size=10 maxlength=20 value="<!-- TMPL_VAR NAME="zipcode" -->">
+                                       <input type="text" name="zipcode" size="10" maxlength=20 value="<!-- TMPL_VAR NAME="zipcode" -->">
                                </td>
                                <td>
-                                       <input type=text name="city" size=20 value="<!-- TMPL_VAR NAME=city -->">
+                                       <input type="text" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->">
                                </td>
                                <td>
                                        <!-- TMPL_VAR name="CGIbranch" -->
@@ -165,63 +165,63 @@
 
 
                        <tr>
-                               <td colspan=2>Street Address if different</td>
-                               <td></td>
-                               <td></td>
+                               <td colspan="2">Street Address if different</td>
+                               <td>&nbsp;</td>
+                               <td>&nbsp;</td>
                        </tr>
                        <tr>
-                               <td colspan=2><input type=text name="streetaddress" size=40 value="<!-- TMPL_VAR NAME=streetaddress -->"></td>
+                               <td colspan="2"><input type="text" name="streetaddress" size="40" value="<!-- TMPL_VAR NAME="streetaddress" -->"></td>
                                <td>
-                                       <input type=text name="homezipcode" size=10 maxlength=20 value="<!-- TMPL_VAR NAME="homezipcode" -->">
+                                       <input type="text" name="homezipcode" size="10" maxlength="20" value="<!-- TMPL_VAR NAME="homezipcode" -->">
                                </td>
                                <td>
-                                       <input type=text name=streetcity size=20 value="<!-- TMPL_VAR NAME=streetcity -->"></td>
+                                       <input type="text" name="streetcity" size="20" value="<!-- TMPL_VAR NAME="streetcity" -->"></td>
                        </tr>
 
                        <tr>
-                               <td colspan=2 >Phone home</td>
+                               <td colspan="2" >Phone home</td>
                                <td>Fax</td>
                                <td>Email</td>
                                <td>Text Messaging</td>
                        </tr>
                        <tr>
-                               <td colspan=2><input type=text name=phone size=20 value="<!-- TMPL_VAR NAME=phone -->"></td>
-                               <td><input type=text name=faxnumber size=20 value="<!-- TMPL_VAR NAME=faxnumber -->"></td>
-                               <td><input type=text name=emailaddress size=20 value="<!-- TMPL_VAR NAME=emailaddress -->"></td>
-                               <td><input type=text name=textmessaging size=20 value="<!-- TMPL_VAR NAME=textmessaging -->"></td>
+                               <td colspan="2"><input type="text" name="phone" size="20" value="<!-- TMPL_VAR NAME="phone" -->"></td>
+                               <td><input type="text" name="faxnumber" size="20" value="<!-- TMPL_VAR NAME="faxnumber" -->"></td>
+                               <td><input type="text" name="emailaddress" size="20" value="<!-- TMPL_VAR NAME="emailaddress" -->"></td>
+                               <td><input type="text" name="textmessaging" size="20" value="<!-- TMPL_VAR NAME="textmessaging" -->"></td>
                        </tr>
 
 
                        <tr>
-                               <td colspan=2 >Phone daytime</td>
-                               <td></td>
-                               <td></td>
-                               <td></td>
+                               <td colspan="2" >Phone daytime</td>
+                               <td>&nbsp;</td>
+                               <td>&nbsp;</td>
+                               <td>&nbsp;</td>
                        </tr>
                        <tr>
-                               <td colspan=2><input type=text name="phoneday" size="20" value="<!-- TMPL_VAR NAME=phoneday -->"></td>
-                               <td></td>
-                               <td></td>
-                               <td></td>
+                               <td colspan="2"><input type="text" name="phoneday" size="20" value="<!-- TMPL_VAR NAME="phoneday" -->"></td>
+                               <td>&nbsp;</td>
+                               <td>&nbsp;</td>
+                               <td>&nbsp;</td>
                        </tr>
 
                        <!-- TMPL_UNLESS name="institution" -->
                        <tr>
-                               <th colspan=5>ALTERNATE CONTACT DETAILS</th>
+                               <th colspan="5">ALTERNATE CONTACT DETAILS</th>
                        </tr>
 
                        <tr>
-                               <td   colspan=3 ><b> Surname*</b></td>
+                               <td colspan="3"><b> Surname*</b></td>
                                <td>Phone</td>
                                        <td>Relationship</td>
                        </tr>
                        <tr>
-                               <td colspan=3 ><input type=text name=contactname size=40 value="<!-- TMPL_VAR NAME=contactname -->"></td>
-                               <td><input type=text name=altphone size=20 value="<!-- TMPL_VAR NAME=altphone -->"></td>
+                               <td colspan="3"><input type="text" name="contactname" size="40" value="<!-- TMPL_VAR NAME="contactname" -->"></td>
+                               <td><input type="text" name="altphone" size="20" value="<!-- TMPL_VAR NAME="altphone" -->"></td>
                                        <td>
-                                       <select name=altrelationship size=1>
-                                       <!-- TMPL_LOOP NAME=relshiploop -->
-                                               <OPTION <!-- TMPL_VAR NAME=selected -->><!-- TMPL_VAR NAME=relationship -->
+                                       <select name="altrelationship" size="1">
+                                       <!-- TMPL_LOOP NAME="relshiploop" -->
+                                               <option <!-- TMPL_VAR NAME="selected" -->><!-- TMPL_VAR NAME="relationship" --></option>
                                        <!-- /TMPL_LOOP -->
                                        </select>
                                        </td>
@@ -230,26 +230,26 @@
 
                        <tr>
                                <td> Notes</td>
-                               <td colspan=4><textarea name=altnotes wrap=physical cols=70 rows=3><!-- TMPL_VAR NAME=altnotes --></textarea></td>
+                               <td colspan="4"><textarea name="altnotes" cols="70" rows="3"><!-- TMPL_VAR NAME="altnotes" --></textarea></td>
                        </tr>
 
 
                        <tr>
-                               <th colspan=5 >LIBRARY USE</th>
+                               <th colspan="5" >LIBRARY USE</th>
                        </tr>
 
                        <tr>
                                <td> Notes</td>
-                               <td colspan=4><textarea name=borrowernotes wrap=physical cols=70 rows=3><!-- TMPL_VAR NAME=borrowernotes --></textarea></td>
+                               <td colspan="4"><textarea name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea></td>
                        </tr>
 
-                       <!-- TMPL_IF NAME=modify -->
+                       <!-- TMPL_IF NAME="modify" -->
                                <tr><td colspan=5>FLAGS</td></tr>
-                               <!-- TMPL_LOOP NAME=flagloop -->
+                               <!-- TMPL_LOOP NAME="flagloop" -->
                                <tr>
-                                       <td colspan=2><!-- TMPL_VAR NAME=html --></td>
-                                       <td colspan=3><input type=radio name="<!-- TMPL_VAR NAME=name -->" value="1" <!-- TMPL_VAR NAME=yes -->>Yes
-                                       <input type=radio name="<!-- TMPL_VAR NAME=name -->" value="0" <!-- TMPL_VAR NAME=no -->>No
+                                       <td colspan="2"><!-- TMPL_VAR NAME="html" --></td>
+                                       <td colspan="3"><input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="1" <!-- TMPL_VAR NAME="yes" -->>Yes
+                                       <input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="0" <!-- TMPL_VAR NAME="no" -->>No
                                        </td>
                                </tr>
                                <!-- /TMPL_LOOP -->
@@ -259,9 +259,9 @@
                        <tr>
                                <td></td>
                                <td>
-                                       <input type=hidden name=type value=<!-- TMPL_VAR NAME="type" -->>
-                                       <input type=reset value="Clear all Fields" class="button">
-                                       <input type="submit" value="save" class="button">
+                                       <input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->">
+                                       <input type="reset" value="Clear all Fields" class="button">
+                                       <input type="submit" value="Save" class="button">
                                </td>
                        </tr>
                </table>

diff --git a/koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl
index 2192930..d1e18de 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl
@@ -3,7 +3,7 @@
 <h1>Members</h1>
 
 <div id="bloc25">
-       <div id="bloctitle">Member Search</div>
+       <div class="bloctitle">Member Search</div>
        <FORM ACTION="/cgi-bin/koha/members/member.pl" method=post>
                <input type="text" size=50 name=member >
                <input type="submit" class="button" value="OK">
@@ -12,7 +12,7 @@
        </form>
 </div>
 <div id="bloc25">
-                       <div id="bloctitle">Browse Members</div>
+                       <div class="bloctitle">Browse Members</div>
                        <A HREF="/cgi-bin/koha/members/member.pl?member=a">A</a> ||
                        <A HREF="/cgi-bin/koha/members/member.pl?member=b">B</a> ||
                        <A HREF="/cgi-bin/koha/members/member.pl?member=c">C</a> ||

diff --git a/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
index 857857a..a4d13c1 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
@@ -1,9 +1,9 @@
 <!-- TMPL_INCLUDE NAME="members-top.inc" -->
 
 <div id="mainbloc">
-       <h1><!-- TMPL_VAR NAME=firstname --> <!-- TMPL_VAR NAME=surname --></h1>
-       <div id="bloc25">
-               <div id="bloctitle">MEMBERSHIP RECORD</div>
+       <h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
+       <div class="bloc25">
+               <div class="bloctitle">MEMBERSHIP RECORD</div>
                <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_IF name="IS_ADULT" -->(<!-- TMPL_VAR NAME="firstname" -->, <!-- TMPL_VAR NAME="initials" -->)<!-- /TMPL_IF -->
                <p>Card number: <!-- TMPL_VAR NAME="cardnumber" --><br>
                Postal Address: <!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR name="zipcode" --> <!-- TMPL_VAR NAME="city" --><br>
@@ -12,10 +12,10 @@
                Phone daytime: <!-- TMPL_VAR NAME="phoneday" --><br>
                Fax: <!-- TMPL_VAR NAME="faxnumber" --><br>
                E-mail: <a href="mailto:<!-- TMPL_VAR NAME="emailaddress" -->"><!-- TMPL_VAR NAME="emailaddress" --></a><br>
-               Text messaging: <!-- TMPL_VAR NAME="textmessaging" --><p>
+               Text messaging: <!-- TMPL_VAR NAME="textmessaging" --><br>
                Membership Number: <!-- TMPL_VAR NAME="borrowernumber" --><br>
                Membership Category: <!-- TMPL_VAR NAME="categorycode" --><br>
-               Fee:$30/year, Paid<br>
+               Fee: $30/year, Paid<br>
                Joined: <!-- TMPL_VAR NAME="dateenrolled" -->,  Expires: <!-- TMPL_VAR NAME="expiry" --><br>
                Joining branch: <!-- TMPL_VAR NAME="branchcode" -->
                </p>
@@ -38,13 +38,13 @@
                <p>
                <!-- TMPL_UNLESS name="I" -->
                        <!-- TMPL_IF NAME="isguarantee" -->
-                               Guarantees:<br><!-- TMPL_LOOP NAME="guaranteeloop" --><A HREF="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME=name --> - <!-- TMPL_VAR NAME="cardnumber" --></a><br><!-- /TMPL_LOOP -->
+                               Guarantees:<br><!-- TMPL_LOOP NAME="guaranteeloop" --><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME=name --> - <!-- TMPL_VAR NAME="cardnumber" --></a><br><!-- /TMPL_LOOP -->
                        <!-- TMPL_ELSE -->
                                Guarantor:
                                <!-- TMPL_IF NAME="guarantorborrowernumber" -->
-                                       <A HREF="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR NAME="guarantorborrowernumber" -->"><!-- TMPL_VAR NAME="guarantorcardnumber" --></a><br>
+                                       <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="guarantorborrowernumber" -->"><!-- TMPL_VAR NAME="guarantorcardnumber" --></a><br>
                                <!-- TMPL_ELSE -->
-                                       no guarantor<br>
+                                       No guarantor<br>
                                <!-- /TMPL_IF -->
                        <!-- /TMPL_IF -->
                <!-- /TMPL_UNLESS -->
@@ -53,48 +53,46 @@
                        General Notes: <!--<A HREF="popbox.html" onclick="messenger(200,250,'Form that lets you add to and delete notes.'); return false">-->
                        <!-- TMPL_VAR NAME="borrowernotes" --><!--</a>-->
                </p>
-               <p align=right>
-               </font>
+
                <!-- TMPL_IF name="IS_ADULT" -->
-                       <p align=right>
-                       <form action=/cgi-bin/koha/members/jmemberentry.pl method=post>
-                               <INPUT TYPE="submit" name="submit" VALUE="Add Child" class="button" alt="Add Child">
-                               <input type=hidden name=type value=Add>
-                               <input type=hidden name=bornum value="<!-- TMPL_VAR NAME=borrowernumber -->">
+                       
+                       <form action="/cgi-bin/koha/members/jmemberentry.pl" method="post">
+                               <p align="right"><input type="submit" name="submit" VALUE="Add Child" class="button" alt="Add Child">
+                               <input type="hidden" name="type" value="Add">
+                               <input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME=borrowernumber -->"></p>
                        </form>
-                       </P>
+                       
                <!-- /TMPL_IF -->
                <br>
                <!-- TMPL_IF name="I" -->
-                       <form action=/cgi-bin/koha/members/imemberentry.pl method=post>
+                       <form action="/cgi-bin/koha/members/imemberentry.pl" method="post">
                                <input type=hidden name=bornum value="<!-- TMPL_VAR NAME="bornum" -->">
                                <INPUT TYPE=submit class="button" value="Modify">
                        </form>
                <!-- TMPL_ELSE -->
-                       <form action=/cgi-bin/koha/members/memberentry.pl method=post>
-                               <input type=hidden name=bornum value="<!-- TMPL_VAR NAME="bornum" -->">
-                               <INPUT TYPE=submit class="button" name="modify" value="Modify">
+                       <form action="/cgi-bin/koha/members/memberentry.pl" method="post">
+                               <input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
+                               <INPUT TYPE="submit" class="button" name="modify" value="Modify">
                        </form>
                <!-- /TMPL_IF -->
                <form action="javascript:confirm_deletion()">
-                       <input type=hidden name=member value="<!-- TMPL_VAR NAME="bornum" -->">
-                       <INPUT TYPE=submit class="button" value="Delete">
+                       <input type="hidden" name="member" value="<!-- TMPL_VAR NAME="bornum" -->">
+                       <INPUT TYPE="submit" class="button" value="Delete">
                </form>
-               <form action=/cgi-bin/koha/members/member-password.pl method=post>
-                       <input type=hidden name=member value=<!-- TMPL_VAR NAME=bornum -->>
-                       <input type=submit class="button" value="Change Password">
+               <form action="/cgi-bin/koha/members/member-password.pl" method="post">
+                       <input type="hidden" name="member" value="<!-- TMPL_VAR NAME=bornum -->">
+                       <input type="submit" class="button" value="Change Password">
                </form>
-               <form action=/cgi-bin/koha/members/member-flags.pl method=post>
-                       <input type=hidden name=member value=<!-- TMPL_VAR NAME=bornum -->>
-                       <input type=submit class="button" value="Modify User Flags">
+               <form action="/cgi-bin/koha/members/member-flags.pl" method="post">
+                       <input type="hidden" name="member" value="<!-- TMPL_VAR NAME=bornum -->">
+                       <input type="submit" class="button" value="Modify User Flags">
                </form>
        </div>
 
-       <div id="bloc25">
-               <div id="bloctitle">FINES & CHARGES</div>
+       <div class="bloc25">
+               <div class="bloctitle">FINES &amp; CHARGES</div>
                <!-- TMPL_IF name="totaldue" -->
                        Total due <!-- TMPL_VAR name="totaldue"-->
-                       </tr>
                <TMPL_ELSE>
                        No debts
                </TMPL_IF>
@@ -107,10 +105,10 @@
                        </a>
                </p>
        </div>
-       <div id="bloc25">
-               <div id="bloctitle">ITEMS CURRENTLY ON ISSUE</div>
+       <div class="bloc25">
+               <div class="bloctitle">ITEMS CURRENTLY ON ISSUE</div>
                <!-- TMPL_IF name="issueloop" -->
-                       <form action="renewscript.pl" method=post>
+                       <form action="renewscript.pl" method="post">
                        <input type="hidden" name="bornum" value="<!-- TMPL_VAR name="bornum" -->">
 
                        <table>
@@ -124,9 +122,9 @@
 
                        <!-- TMPL_LOOP NAME=issueloop -->
                        <tr>
-                               <td><!-- TMPL_IF NAME=red --><font color=red><!-- /TMPL_IF -->
-                               <!-- TMPL_VAR NAME="title" -->
-                               <a href="/cgi-bin/koha/moredetail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&bib=<!-- TMPL_VAR NAME="biblionumber" -->&bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->">
+                               <td><!-- TMPL_IF NAME=red --><font color="red"><!-- /TMPL_IF -->
+                               <!-- TMPL_VAR NAME="title" --><!-- TMPL_IF NAME=red --></font><!-- /TMPL_IF -->
+                               <a href="/cgi-bin/koha/moredetail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->">
                                        <!-- TMPL_VAR NAME="barcode" -->
                                </a>
                                </td>
@@ -137,34 +135,34 @@
                                <!-- TMPL_IF NAME=norenew -->
                                        <a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">On Request - no renewals</a>
                                <!-- TMPL_ELSE -->
-                                       <input type=radio name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value=y>Y
-                                       <input type=radio name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value=n>N
+                                       <input type="radio" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="y">Y
+                                       <input type="radio" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="n">N
                                <!-- /TMPL_IF -->
-                               <!-- TMPL_IF NAME=red --></font><!-- /TMPL_IF -->
+                               
                                </td>
                        </tr>
                        <!-- /TMPL_LOOP -->
                        </table>
-                       <input type=submit class="button" value="Renew Items">
+                       <input type="submit" class="button" value="Renew Items">
                </form>
                <!-- TMPL_ELSE -->
                        None
                <!-- /TMPL_IF -->
        </div>
-       <div id="bloc25">
-               <div id="bloctitle">ITEMS REQUESTED</div>
+       <div class="bloc25">
+               <div class="bloctitle">ITEMS REQUESTED</div>
                        <!-- TMPL_IF NAME=reserveloop -->
-                               <table>
+                       <form action="/cgi-bin/koha/modrequest.pl" method="post">       <table>
                                        <tr>
                                                <th>Title</th>
                                                <th>Requested</th>
                                                <th>Remove</th>
                                        </tr>
-                                       <form action=/cgi-bin/koha/modrequest.pl method=post>
-                                               <input type=hidden name=from value=borrower>
+                                       
+                                               
                                                <!-- TMPL_LOOP NAME=reserveloop -->
                                                <tr>
-                                                       <td>
+                                                       <td><input type="hidden" name="from" value="borrower">
                                                                <a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a>
                                                                <!-- TMPL_IF NAME=volumeddesc -->
                                                                        <!-- TMPL_VAR NAME="volumeddesc" -->
@@ -174,34 +172,32 @@
                                                        <td><!-- TMPL_VAR NAME="reservedate2" --></td>
                                                        <td>
                                                                <select name="rank-request">
-                                                               <option value=n>No
-                                                               <option value=del>Yes
-                                                               </select>
+                                                               <option value="n">No
+                                                               <option value="del">Yes
+                                                               </select><input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="biblionumber" -->">
+                                                       <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="bornum" -->">
                                                        </td>
-                                                       <input type=hidden name=biblio value="<!-- TMPL_VAR NAME="biblionumber" -->">
-                                                       <input type=hidden name=borrowernumber value="<!-- TMPL_VAR NAME="bornum" -->">
+                                                       
                                                </tr>
                                                <!-- /TMPL_LOOP -->
                                                <tr>
-                                                       <td colspan=5 align=right>
+                                                       <td colspan="5" align="right">
                                                        <!-- TMPL_IF name="reserveloop" -->
-                                                               <INPUT TYPE="image" name="submit" VALUE="update" height=42 WIDTH=187 BORDER=0 src="<!-- TMPL_VAR name="themelang" -->/images/cancel-requests.gif">
+                                                               <input type="submit" name="submit" value="Update" class="button">
                                                        <!-- /TMPL_IF -->
                                                        </td>
                                                </tr>
-                                       </form>
-                               </table>
+                                       
+                               </table></form>
                        <!-- TMPL_ELSE -->
                                None
                        <!-- /TMPL_IF -->
        </div>
-       <div id="bloc25">
-               <a class=button href="/cgi-bin/koha/readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
-                       Reading Record
-               </a>
-       </div>
+
+<p>            <a class="button" href="/cgi-bin/koha/readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Reading Record</a></p>
+
 </div>
-<script>
+<script language="JavaScript" type="text/javascript">
 function confirm_deletion() {
        var is_confirmed = confirm('do you confirm deletetion ?');
        if (is_confirmed) {

diff --git a/koha-tmpl/intranet-tmpl/default/en/members/pay.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/pay.tmpl
index 47b3af0..38627db 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/members/pay.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/pay.tmpl
@@ -1,48 +1,44 @@
 <!-- TMPL_INCLUDE NAME="members-top.inc" -->
+<div id="mainbloc">
+<h1>Pay Fines for <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --></h1>
 
-<h1>Pay Fines for <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --></h1><P>
-<center>
-<p>
-       <form action=/cgi-bin/koha/pay.pl method=post>
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
-<TR VALIGN=TOP>
-       <td  bgcolor="#99cc33" background="/images/background-mem.gif" colspan=4><B>FINES & CHARGES</B></TD>
-       <td  bgcolor="#99cc33" background="/images/background-mem.gif" colspan=4><B>AMOUNT OWING</B></TD>
-</TR>
-       <input type="hidden" name="bornum" value="<!-- TMPL_VAR name="bornum" -->">
+       <form action="/cgi-bin/koha/pay.pl" method="post">
+<table cellspacing="0" cellpadding="5" border="1">
+<tr valign="top">
+       <td  bgcolor="#99cc33" background="/images/background-mem.gif" colspan="4"><B>FINES &amp; CHARGES</b></td>
+       <td bgcolor="#99cc33" background="/images/background-mem.gif" colspan="4"><B>AMOUNT OWING</b></td>
+</tr>
+       
 <!-- TMPL_LOOP name="loop_pay" -->
-<tr VALIGN=TOP  >
-       <TD><input type=radio name="payfine<!-- TMPL_VAR name="i" -->" value="no" checked>Unpaid
-       <input type=radio name="payfine<!-- TMPL_VAR name="i" -->" value="yes">Pay
-       <input type=radio name="payfine<!-- TMPL_VAR name="i" -->" value="wo">Writeoff
-       <input type=hidden name="itemnumber<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="itemnumber" -->">
-       <input type=hidden name="accounttype<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="accounttype" -->">
-       <input type=hidden name="amount<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="amount'}" -->">
-       <input type=hidden name="out<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="amountoutstanding" -->">
-       <input type=hidden name="bornum<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="bornum" -->">
-       <input type=hidden name="accountno<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="accountno" -->">
+<tr valign="top">
+       <td><input type="hidden" name="bornum" value="<!-- TMPL_VAR name="bornum" -->"><input type="radio" name="payfine<!-- TMPL_VAR name="i" -->" value="no" checked="checked">Unpaid
+       <input type="radio" name="payfine<!-- TMPL_VAR name="i" -->" value="yes">Pay
+       <input type="radio" name="payfine<!-- TMPL_VAR name="i" -->" value="wo">Writeoff
+       <input type="hidden" name="itemnumber<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="itemnumber" -->">
+       <input type="hidden" name="accounttype<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="accounttype" -->">
+       <input type="hidden" name="amount<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="amount'}" -->">
+       <input type="hidden" name="out<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="amountoutstanding" -->">
+       <input type="hidden" name="bornum<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="bornum" -->">
+       <input type="hidden" name="accountno<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="accountno" -->">
        </td>
-       <TD><!-- TMPL_VAR name="description" --> <!-- TMPL_VAR name="title" --></td>
-       <TD><!-- TMPL_VAR name="accounttype" --></td>
+       <td><!-- TMPL_VAR name="description" --> <!-- TMPL_VAR name="title" --></td>
+       <td><!-- TMPL_VAR name="accounttype" --></td>
        <td><!-- TMPL_VAR name="amount" --></td>
-       <TD><!-- TMPL_VAR name="amountoutstanding" --></td>
+       <td><!-- TMPL_VAR name="amountoutstanding" --></td>
 </tr>
 <!-- /TMPL_LOOP -->
-<tr VALIGN=TOP  >
-       <TD colspan=4 align=right><b>Total Due</b></td>
-       <TD><b><!-- TMPL_VAR name="total" --></b></td>
+<tr valign="top">
+       <td colspan="4" align="right"><b>Total Due</b></td>
+       <td><b><!-- TMPL_VAR name="total" --></b></td>
        </tr>
-       <tr VALIGN=TOP  >
-       <TD colspan=5 align=right>
-       <INPUT TYPE="submit" name="submit"  VALUE="pay" class="button"></td>
+       <tr valign="top">
+       <td colspan="5" align="right">
+       <input type="submit" name="submit"  value="Pay" class="button"></td>
 </tr>
 </table>
 </form>
-<br clear=all>
-<p> &nbsp; </p>
-
-<br>
-<a href="moremember.pl?bornum=<!-- TMPL_VAR name="bornum" -->">Return</a> to Member Record
 
+<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR name="bornum" -->">Return</a> to Member Record
+</div>
 <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
 

diff --git a/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl
index 4191a87..85b4f4b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl
@@ -1,49 +1,48 @@
 <!-- TMPL_INCLUDE NAME="members-top.inc" -->
 
-<h1><!-- TMPL_VAR NAME=firstname --> <!-- TMPL_VAR NAME=surname --></h1>
-<br>Member Number: <!-- TMPL_VAR NAME=bornum -->
-<br>Card number: <!-- TMPL_VAR NAME=cardnumber -->
-<P>
+<h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
+<p>Member Number: <!-- TMPL_VAR NAME="bornum" --></p>
+<p>Card number: <!-- TMPL_VAR NAME="cardnumber" --></p>
+
 <!-- TMPL_IF NAME=showfulllink -->
-<a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&limit=full">Full output</a>
-<br/>
+<p><a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&amp;limit=full">Full output</a></p>
 <!-- /TMPL_IF -->
-<br/>
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
-<TR VALIGN=TOP>
-       <TD background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-               <a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&order=title&limit=<!-- TMPL_VAR name="limit" -->"><b>TITLE</b></a>
-       </TD>
-       <TD background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-               <a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&order=author&limit=<!-- TMPL_VAR name="limit" -->"><b>AUTHOR</b></a>
-       </TD>
-       <TD background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-               <a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&limit=<!-- TMPL_VAR name="limit" -->"><b>DATE DUE</b></a>
-       </TD>
-       <TD background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-               <a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&order=returndate&limit=<!-- TMPL_VAR name="limit" -->"><b>RETURNED</b></a>
-       </TD>
-       <TD background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+
+<table cellspacing="0"  cellpadding="5" border="1">
+<tr valign="top">
+       <td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+               <a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&order=title&amp;limit=<!-- TMPL_VAR name="limit" -->"><b>TITLE</b></a>
+       </td>
+       <td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+               <a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&order=author&amp;limit=<!-- TMPL_VAR name="limit" -->"><b>AUTHOR</b></a>
+       </td>
+       <td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+               <a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&amp;limit=<!-- TMPL_VAR name="limit" -->"><b>DATE DUE</b></a>
+       </td>
+       <td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+               <a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&amp;order=returndate&amp;limit=<!-- TMPL_VAR name="limit" -->"><b>RETURNED</b></a>
+       </td>
+       <td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
                <b>Volume</b>
-       </TD>
-</TR>
+       </td>
+</tr>
 <!-- TMPL_LOOP name="loop_reading" -->
-<TR VALIGN=TOP>
-       <TD  bgcolor="white">
+<tr valign="top">
+       <td bgcolor="white"><!-- TMPL_VAR NAME="biblionumber" -->
                <!-- TMPL_VAR name="title" -->&nbsp;
-       </TD>
-       <TD  bgcolor="white">
+       </td>
+       <td bgcolor="white">
                <!-- TMPL_VAR name="author" -->&nbsp;
-       </TD>
-       <TD  bgcolor="white">
+       </td>
+       <td bgcolor="white">
                <!-- TMPL_VAR name="date_due" -->&nbsp;
-       </TD>
-       <TD  bgcolor="white">
+       </td>
+       <td bgcolor="white">
                <!-- TMPL_VAR name="returndate" -->&nbsp;
-       </TD>
-       <TD  bgcolor="white">
+       </td>
+       <td bgcolor="white">
                <!-- TMPL_VAR name="volumeddesc" -->&nbsp;
-       </TD>
+       </td>
 <!-- /TMPL_LOOP -->
 </TABLE>