From: moodler <moodler>
Date: Tue, 21 Sep 2004 09:21:26 +0000 (+0000)
Subject: Tidied up for XHTML and accessibility compliance
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=4f55eaf29d8556d4fe753ad5cca16022aa7be13c;p=moodle.git

Tidied up for XHTML and accessibility compliance
---

diff --git a/login/change_password_form.html b/login/change_password_form.html
index d577a51917..a42d29f9ea 100644
--- a/login/change_password_form.html
+++ b/login/change_password_form.html
@@ -17,10 +17,10 @@
 <table cellpadding="10">
 
 <tr valign="top">
-    <td><p><?php print_string("username") ?>:</p></td>
+    <td><?php print_string("username") ?>:</td>
     <td>
     <?php if (isadmin()) { ?>
-        <input type="text" name="username" size="25" value="<?php p($frm->username) ?>" />
+        <input type="text" name="username" size="25" value="<?php p($frm->username) ?>" alt="<?php print_string("username") ?>" />
     <?php } else { ?>
         <input type="hidden" name="username" value="<?php p($frm->username)?>" />  <?php p($frm->username)?>
     <?php } ?>
@@ -30,22 +30,22 @@
 
 <?php if (!isadmin()) { ?>
     <tr valign="top">
-        <td><p><?php print_string("password") ?>:</p></td>
-        <td><input type="password" name="password" size="25" value="<?php p($frm->password) ?>" />
+        <td><?php print_string("password") ?>:</td>
+        <td><input type="password" name="password" size="25" value="<?php p($frm->password) ?>" alt="<?php print_string("password") ?>" />
         <?php if (!empty($err->password)) { formerr($err->password); } ?>
         </td>
     </tr>
 <?php } ?>
 
 <tr valign="top">
-    <td><p><?php print_string("newpassword") ?>:</p></td>
-    <td><input type="password" name="newpassword1" size="25" value="<?php p($frm->newpassword1) ?>" />
+    <td><?php print_string("newpassword") ?>:</td>
+    <td><input type="password" name="newpassword1" size="25" value="<?php p($frm->newpassword1) ?>" alt="<?php print_string("newpassword") ?>" />
     <?php if (!empty($err->newpassword1)) { formerr($err->newpassword1); } ?>
     </td>
 </tr>
 <tr valign="top">
-    <td><p><?php print_string("newpassword") ?> (<?php print_string("again") ?>):</p></td>
-    <td><input type="password" name="newpassword2" size="25" value="<?php p($frm->newpassword2) ?>" />
+    <td><?php print_string("newpassword") ?> (<?php print_string("again") ?>):</td>
+    <td><input type="password" name="newpassword2" size="25" value="<?php p($frm->newpassword2) ?>" alt="<?php print_string("newpassword") ?> (<?php print_string("again") ?>)" />
     <?php if (!empty($err->newpassword2)) { formerr($err->newpassword2); } ?>
     </td>
 </tr>
diff --git a/login/forgot_password_form.html b/login/forgot_password_form.html
index 2450dd26e3..bf26ae526d 100644
--- a/login/forgot_password_form.html
+++ b/login/forgot_password_form.html
@@ -10,14 +10,14 @@
     <table>
     <tr>
         <td class="label"><?php print_string("email") ?>:</td>
-        <td><input type="text" name="email" size="25" value="<?php p($frm->email) ?>" />
+        <td><input type="text" name="email" size="25" value="<?php p($frm->email) ?>" alt="<?php print_string("email") ?>" />
               <?php if (!empty($err->email)) {formerr($err->email);} ?>
         </td>
     </tr>
     <tr>
         <td></td>
         <td><input type="submit" value="<?php print_string("ok") ?>" />
-            <input type="button" value="<?php print_string("cancel") ?>" onClick="javascript: history.go(-1)" />
+            <input type="button" value="<?php print_string("cancel") ?>" onclick="javascript: history.go(-1)" />
         </td>
     </tr>
     </table>
diff --git a/login/index_form.html b/login/index_form.html
index d53ea748b9..e300e56c18 100644
--- a/login/index_form.html
+++ b/login/index_form.html
@@ -22,18 +22,18 @@
             <table align="center" style="font-size: small">
               <tr> 
                 <td align="right">
-                  <p><?php print_string("username") ?>:</p>
+                  <?php print_string("username") ?>:
                 </td>
                 <td>
-                  <input type="text" name="username" size="15" value="<?php p($frm->username) ?>" /> 
+                  <input type="text" name="username" size="15" value="<?php p($frm->username) ?>" alt="<?php print_string("username") ?>" /> 
                 </td>
               </tr>
               <tr> 
                 <td align="right">
-                  <p><?php print_string("password") ?>:</p>
+                  <?php print_string("password") ?>:
                 </td>
                 <td>
-                  <input type="password" name="password" size="15" value="<?php p($frm->password) ?>" /> 
+                  <input type="password" name="password" size="15" value="<?php p($frm->password) ?>" alt="<?php print_string("password") ?>" />
                 </td>
               </tr>
             </table>
@@ -48,13 +48,11 @@
 <?php if ($CFG->guestloginbutton) {  ?>
       <hr width="80%" />
       <p><?php print_string("someallowguest") ?>:</p>
-      <p>
         <form action="index.php" method="post" name="guestlogin">
           <input type="hidden" name="username" value="guest" />
           <input type="hidden" name="password" value="guest" />
           <input type="submit" value="<?php print_string("loginguest") ?>" />
         </form>
-      </p>
 <?php } ?>
 
 <?php if ($CFG->changepassword or is_internal_auth() ) {
@@ -68,11 +66,9 @@
 ?>
       <hr width="80%" />
       <p><?php print_string("forgotten") ?></p> 
-      <p>
         <form action="<?php p($changepassword) ?>" method="get" name="changepassword">
           <input type="submit" value="<?php p($changebuttonname) ?>" />
         </form>
-      </p>
 <?php } ?>
 
     </td>
@@ -81,7 +77,7 @@
     <td width="50%" valign="top" bgcolor="<?php p($THEME->cellcontent2) ?>" class="generalbox">
 <?php     switch ($CFG->auth) {
               case "email":
-                 echo "<p>".get_string("loginsteps", "", "signup.php")."</p>";
+                 print_string("loginsteps", "", "signup.php");
 ?>
                  <div align="center">
                    <form action="signup.php" method="get" name="signup">
@@ -90,7 +86,7 @@
                  </div>
 <?php            break;
                case "none":
-                 echo "<p>".get_string("loginstepsnone")."</p>";
+                 print_string("loginstepsnone");
                  break;
                default:
                  echo format_text($CFG->auth_instructions);
diff --git a/login/signup_form.html b/login/signup_form.html
index 2859ddf594..4526f73905 100644
--- 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"), "", "") ?>