Tidied up for XHTML and accessibility compliance

diff --git a/login/change_password_form.html b/login/change_password_form.html
index d577a5191700789be77d019df95941d014cadd55..a42d29f9eabd71dcbeb5fb52880cd15ff1f8e879 100644 (file)
--- a/login/change_password_form.html
+++ b/login/change_password_form.html
@@ -17,10 +17,10 @@
 <table cellpadding="10">\r
 \r
 <tr valign="top">\r
-    <td><p><?php print_string("username") ?>:</p></td>\r
+    <td><?php print_string("username") ?>:</td>\r
     <td>\r
     <?php if (isadmin()) { ?>\r
-        <input type="text" name="username" size="25" value="<?php p($frm->username) ?>" />\r
+        <input type="text" name="username" size="25" value="<?php p($frm->username) ?>" alt="<?php print_string("username") ?>" />\r
     <?php } else { ?>\r
         <input type="hidden" name="username" value="<?php p($frm->username)?>" />  <?php p($frm->username)?>\r
     <?php } ?>\r
@@ -30,22 +30,22 @@
 \r
 <?php if (!isadmin()) { ?>\r
     <tr valign="top">\r
-        <td><p><?php print_string("password") ?>:</p></td>\r
-        <td><input type="password" name="password" size="25" value="<?php p($frm->password) ?>" />\r
+        <td><?php print_string("password") ?>:</td>\r
+        <td><input type="password" name="password" size="25" value="<?php p($frm->password) ?>" alt="<?php print_string("password") ?>" />\r
         <?php if (!empty($err->password)) { formerr($err->password); } ?>\r
         </td>\r
     </tr>\r
 <?php } ?>\r
 \r
 <tr valign="top">\r
-    <td><p><?php print_string("newpassword") ?>:</p></td>\r
-    <td><input type="password" name="newpassword1" size="25" value="<?php p($frm->newpassword1) ?>" />\r
+    <td><?php print_string("newpassword") ?>:</td>\r
+    <td><input type="password" name="newpassword1" size="25" value="<?php p($frm->newpassword1) ?>" alt="<?php print_string("newpassword") ?>" />\r
     <?php if (!empty($err->newpassword1)) { formerr($err->newpassword1); } ?>\r
     </td>\r
 </tr>\r
 <tr valign="top">\r
-    <td><p><?php print_string("newpassword") ?> (<?php print_string("again") ?>):</p></td>\r
-    <td><input type="password" name="newpassword2" size="25" value="<?php p($frm->newpassword2) ?>" />\r
+    <td><?php print_string("newpassword") ?> (<?php print_string("again") ?>):</td>\r
+    <td><input type="password" name="newpassword2" size="25" value="<?php p($frm->newpassword2) ?>" alt="<?php print_string("newpassword") ?> (<?php print_string("again") ?>)" />\r
     <?php if (!empty($err->newpassword2)) { formerr($err->newpassword2); } ?>\r
     </td>\r
 </tr>\r

diff --git a/login/forgot_password_form.html b/login/forgot_password_form.html
index 2450dd26e30061ae84e746a58764d37005680fde..bf26ae526d3cee7b7cd402baec50430c35aa179b 100644 (file)
--- a/login/forgot_password_form.html
+++ b/login/forgot_password_form.html
@@ -10,14 +10,14 @@
     <table>\r
     <tr>\r
         <td class="label"><?php print_string("email") ?>:</td>\r
-        <td><input type="text" name="email" size="25" value="<?php p($frm->email) ?>" />\r
+        <td><input type="text" name="email" size="25" value="<?php p($frm->email) ?>" alt="<?php print_string("email") ?>" />\r
               <?php if (!empty($err->email)) {formerr($err->email);} ?>\r
         </td>\r
     </tr>\r
     <tr>\r
         <td></td>\r
         <td><input type="submit" value="<?php print_string("ok") ?>" />\r
-            <input type="button" value="<?php print_string("cancel") ?>" onClick="javascript: history.go(-1)" />\r
+            <input type="button" value="<?php print_string("cancel") ?>" onclick="javascript: history.go(-1)" />\r
         </td>\r
     </tr>\r
     </table>\r

diff --git a/login/index_form.html b/login/index_form.html
index d53ea748b913a8ef875df532553097a271e12d53..e300e56c185dc4227ea07fe9c02d56fc7feb3803 100644 (file)
--- a/login/index_form.html
+++ b/login/index_form.html
@@ -22,18 +22,18 @@
             <table align="center" style="font-size: small">\r
               <tr> \r
                 <td align="right">\r
-                  <p><?php print_string("username") ?>:</p>\r
+                  <?php print_string("username") ?>:\r
                 </td>\r
                 <td>\r
-                  <input type="text" name="username" size="15" value="<?php p($frm->username) ?>" /> \r
+                  <input type="text" name="username" size="15" value="<?php p($frm->username) ?>" alt="<?php print_string("username") ?>" /> \r
                 </td>\r
               </tr>\r
               <tr> \r
                 <td align="right">\r
-                  <p><?php print_string("password") ?>:</p>\r
+                  <?php print_string("password") ?>:\r
                 </td>\r
                 <td>\r
-                  <input type="password" name="password" size="15" value="<?php p($frm->password) ?>" /> \r
+                  <input type="password" name="password" size="15" value="<?php p($frm->password) ?>" alt="<?php print_string("password") ?>" />\r
                 </td>\r
               </tr>\r
             </table>\r
@@ -48,13 +48,11 @@
 <?php if ($CFG->guestloginbutton) {  ?>\r
       <hr width="80%" />\r
       <p><?php print_string("someallowguest") ?>:</p>\r
-      <p>\r
         <form action="index.php" method="post" name="guestlogin">\r
           <input type="hidden" name="username" value="guest" />\r
           <input type="hidden" name="password" value="guest" />\r
           <input type="submit" value="<?php print_string("loginguest") ?>" />\r
         </form>\r
-      </p>\r
 <?php } ?>\r
 \r
 <?php if ($CFG->changepassword or is_internal_auth() ) {\r
@@ -68,11 +66,9 @@
 ?>\r
       <hr width="80%" />\r
       <p><?php print_string("forgotten") ?></p> \r
-      <p>\r
         <form action="<?php p($changepassword) ?>" method="get" name="changepassword">\r
           <input type="submit" value="<?php p($changebuttonname) ?>" />\r
         </form>\r
-      </p>\r
 <?php } ?>\r
 \r
     </td>\r
@@ -81,7 +77,7 @@
     <td width="50%" valign="top" bgcolor="<?php p($THEME->cellcontent2) ?>" class="generalbox">\r
 <?php     switch ($CFG->auth) {\r
               case "email":\r
-                 echo "<p>".get_string("loginsteps", "", "signup.php")."</p>";\r
+                 print_string("loginsteps", "", "signup.php");\r
 ?>\r
                  <div align="center">\r
                    <form action="signup.php" method="get" name="signup">\r
@@ -90,7 +86,7 @@
                  </div>\r
 <?php            break;\r
                case "none":\r
-                 echo "<p>".get_string("loginstepsnone")."</p>";\r
+                 print_string("loginstepsnone");\r
                  break;\r
                default:\r
                  echo format_text($CFG->auth_instructions);\r

diff --git a/login/signup_form.html b/login/signup_form.html
index 2859ddf5943dce2704dee9739404ea9ec312b6f2..4526f7390504f13ec4d156badea3e943f6da3420 100644 (file)
--- a/login/signup_form.html
+++ b/login/signup_form.html
@@ -62,15 +62,16 @@
 
 <tr valign="top">
 
-       <td colspan="2"><p><b><?php print_string("createuserandpass") ?>:</b></p></td>
+       <td colspan="2"><b><?php print_string("createuserandpass") ?>:</b></td>
 
 </tr>
 
+
 <tr valign="top">
 
-       <td align="right"><p><?php print_string("username") ?>:</p></td>
+       <td align="right"><?php print_string("username") ?>:</td>
 
-       <td><input type="text" name="username" size="12" value="<?php p($user->username) ?>" />
+       <td><input type="text" name="username" size="12" value="<?php p($user->username) ?>" alt="<?php print_string("username") ?>" />
 
        <?php if (!empty($err->username)) { formerr($err->username); } ?>
 
@@ -80,9 +81,9 @@
 
 <tr valign="top">
 
-       <td align="right"><p><?php print_string("password") ?>:</p></td>
+       <td align="right"><?php print_string("password") ?>:</td>
 
-       <td><input type="password" name="password" size="12" value="<?php p($user->password) ?>" />
+       <td><input type="password" name="password" size="12" value="<?php p($user->password) ?>" alt="<?php print_string("password") ?>" />
 
        <?php if (!empty($err->password)) { formerr($err->password); } ?>
 
@@ -104,9 +105,9 @@
 
 <tr valign="top">
 
-       <td align="right"><p><?php print_string("email") ?>:</p></td>
+       <td align="right"><?php print_string("email") ?>:</td>
 
-       <td><input type="text" name="email" size="25" value="<?php p($user->email) ?>" />
+       <td><input type="text" name="email" size="25" value="<?php p($user->email) ?>" alt="<?php print_string("email") ?>" />
 
        <?php if (!empty($err->email)) { formerr($err->email); } ?>
 
@@ -116,9 +117,9 @@
 
 <tr valign="top">
 
-       <td align="right"><p><?php print_string("emailagain") ?>:</p></td>
+       <td align="right"><?php print_string("emailagain") ?>:</td>
 
-       <td><input type="text" name="email2" size="25" value="<?php p($user->email2) ?>" />
+       <td><input type="text" name="email2" size="25" value="<?php p($user->email2) ?>" alt="<?php print_string("emailagain") ?>" />
 
        <?php if (!empty($err->email2)) { formerr($err->email2); } ?>
 
@@ -128,9 +129,9 @@
 
 <tr valign="top">
 
-       <td align="right"><p><?php print_string("firstname") ?>:</p></td>
+       <td align="right"><?php print_string("firstname") ?>:</td>
 
-       <td><input type="text" name="firstname" size="25" value="<?php p($user->firstname) ?>" />
+       <td><input type="text" name="firstname" size="25" value="<?php p($user->firstname) ?>" alt="<?php print_string("firstname") ?>" />
 
        <?php if (!empty($err->firstname)) { formerr($err->firstname);} ?>
 
@@ -140,9 +141,9 @@
 
 <tr valign="top">
 
-       <td align="right"><p><?php print_string("lastname") ?>:</p></td>
+       <td align="right"><?php print_string("lastname") ?>:</td>
 
-       <td><input type="text" name="lastname" size="25" value="<?php p($user->lastname) ?>" />
+       <td><input type="text" name="lastname" size="25" value="<?php p($user->lastname) ?>" alt="<?php print_string("lastname") ?>" />
 
        <?php if (!empty($err->lastname)) { formerr($err->lastname);} ?>
 
@@ -152,9 +153,9 @@
 
 <tr valign="top">
 
-       <td align="right"><p><?php print_string("city") ?>:</p></td>
+       <td align="right"><?php print_string("city") ?>:</td>
 
-       <td><input type="text" name="city" size="25" value="<?php p($user->city) ?>" />
+       <td><input type="text" name="city" size="25" value="<?php p($user->city) ?>" alt="<?php print_string("city") ?>" />
 
        <?php if (!empty($err->city)) { formerr($err->city);} ?>
 
@@ -164,7 +165,7 @@
 
 <tr valign="top">
 
-       <td align="right"><p><?php print_string("country") ?>:</p></td>
+       <td align="right"><?php print_string("country") ?>:</td>
 
        <td><?php choose_from_menu (get_list_of_countries(), "country", $user->country, get_string("selectacountry"), "", "") ?>