Some tidying up of the HTML on the login page to make it a little

more respectable (and fix some display bugs)

diff --git a/login/index_form.html b/login/index_form.html
index d9189d0dcf22f92e48dce6b65f1c715e31470e04..d06e5a96f104d4fb681561769a97ea423e0b2d05 100644 (file)
--- a/login/index_form.html
+++ b/login/index_form.html
@@ -1,109 +1,110 @@
-<table width="90%" border="0" cellspacing="10" cellpadding="5" align="center">\r
+<table width="90%" border="0" cellspacing="10" cellpadding="5" align="center" style="font-size: small">\r
   <tr>\r
-    <?php if ($show_instructions) { ?>\r
-        <td width="50%" bgcolor="<?php p($THEME->cellheading2) ?>" class="headingblock">\r
-          <p align="center"><b><font size="3"><?php  print_string("returningtosite") ?></font></b></p>\r
-        </td>\r
-        <td width="50%" bgcolor="<?php p($THEME->cellheading2) ?>" class="headingblock">\r
-          <p align="center"><b><font size="3"><?php  print_string("firsttime") ?></font></b></p>\r
-        </td>\r
-    <?php } ?>\r
+<?php if ($show_instructions) { ?>\r
+    <td width="50%" bgcolor="<?php p($THEME->cellheading2) ?>" class="headingblock">\r
+      <p align="center"><b><font size="3"><?php  print_string("returningtosite") ?></font></b></p>\r
+    </td>\r
+    <td width="50%" bgcolor="<?php p($THEME->cellheading2) ?>" class="headingblock">\r
+      <p align="center"><b><font size="3"><?php  print_string("firsttime") ?></font></b></p>\r
+    </td>\r
+<?php } ?>\r
   </tr>\r
   <tr>\r
-    <td width="50%" valign="top" bgcolor="<?php p($THEME->cellcontent2) ?>" class="generalbox"> <font size="2"> \r
-        <p align="center"><?php print_string("loginusing") ?>:<br />\r
-          (<?php print_string("cookiesenabled"); helpbutton("cookies", get_string("cookiesenabled"))?>)<br />\r
-         <?php formerr($errormsg) ?>\r
-      </p></font>\r
-      <form action="index.php" method="post" name="form" id="form">\r
-        <table border="0" align="center">\r
+    <td width="50%" align="center" valign="top" bgcolor="<?php p($THEME->cellcontent2) ?>" class="generalbox">\r
+      <p><?php print_string("loginusing") ?>:<br />\r
+        (<?php print_string("cookiesenabled");?>) \r
+         <?php helpbutton("cookies", get_string("cookiesenabled"))?><br /><?php formerr($errormsg) ?>\r
+      </p>\r
+      <form action="index.php" method="post" name="login" id="login">\r
+        <table border="0" align="center" style="font-size: small">\r
         <tr>\r
-            <td width="80%"><font size="2">\r
-              <table align="center">\r
-                <tr> \r
-                  <td align="right"><p><font size="2"><?php print_string("username") ?>:</font></p></td>\r
-                  <td><input type="text" name="username" size="15" value="<?php p($frm->username) ?>" /> \r
-                  </td>\r
-                </tr>\r
-                <tr> \r
-                  <td height="24" align="right"><p><font size="2"><?php print_string("password") ?>:</font></p></td>\r
-                  <td><input type="password" name="password" size="15" value="<?php p($frm->password) ?>" /> \r
-                  </td>\r
-                </tr>\r
-              </table>\r
-              </font></td>\r
-            <td width="20%"><font size="2">\r
-                <input type="submit" name="Submit" value="<?php print_string("login") ?>" />\r
-              </font></td>\r
+          <td width="80%">\r
+            <table align="center" style="font-size: small">\r
+              <tr> \r
+                <td align="right">\r
+                  <p><?php print_string("username") ?>:</p>\r
+                </td>\r
+                <td>\r
+                  <input type="text" name="username" size="15" value="<?php p($frm->username) ?>" /> \r
+                </td>\r
+              </tr>\r
+              <tr> \r
+                <td align="right">\r
+                  <p><?php print_string("password") ?>:</p>\r
+                </td>\r
+                <td>\r
+                  <input type="password" name="password" size="15" value="<?php p($frm->password) ?>" /> \r
+                </td>\r
+              </tr>\r
+            </table>\r
+          </td>\r
+          <td width="20%">\r
+            <input type="submit" value="<?php print_string("login") ?>" />\r
+          </td>\r
         </tr>\r
-      </table>\r
-         </form>\r
-      <font size="2"> \r
-      <blockquote>\r
-    <?php if ($CFG->guestloginbutton) {  ?>\r
-          <hr />\r
-            <p align="center"><?php print_string("someallowguest") ?>:</p>\r
-            <center>\r
-            <form action="index.php" method="post" name="form2" id="form2">\r
-              <input type="hidden" name="username" value="guest" />\r
-              <input type="hidden" name="password" value="guest" />\r
-              <input type="submit" name="Submit"   value="<?php print_string("loginguest") ?>" />\r
-            </form>\r
-            </center>\r
-    <?php } ?>\r
-    <?php if ($CFG->changepassword or $CFG->auth == "email" or $CFG->auth == "none" or $CFG->auth == "manual") {\r
-          if ($CFG->auth == "email" or $CFG->auth == "none" or $CFG->auth == "manual") {\r
+        </table>\r
+      </form>\r
+\r
+<?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
+          if (is_internal_auth()) {\r
               $changepassword = "forgot_password.php";\r
               $changebuttonname = get_string("senddetails");\r
           } else {\r
               $changepassword = $CFG->changepassword;\r
               $changebuttonname = get_string("passwordrecovery");\r
           }\r
-    \r
-    ?>\r
-          <hr />\r
-            <p align="center"><?php print_string("forgotten") ?></p> \r
-            <center>\r
-            <form action="<?php p($changepassword) ?>" method="get" name="form3" id="form3">\r
-              <input type="submit" value="<?php p($changebuttonname) ?>" />\r
-            </form>\r
-            </center>\r
-    <?php } ?>\r
-        </blockquote>\r
-      </font> </td>\r
-    <?php if ($show_instructions) { ?>\r
-        <td width="50%" valign="top" bgcolor="<?php p($THEME->cellcontent2) ?>" class="generalbox">\r
-          <font size="2">\r
-          <?php switch ($CFG->auth) {\r
-               case "email":             ?>\r
-                 <p><?php print_string("loginsteps", "", "signup.php") ?></p>\r
-                 </font>\r
-                 <center>\r
-                 <form action="signup.php" method="get" name="form4" id="form4">\r
-                 \r
-            <input type="submit" value="<?php print_string("startsignup") ?>" />\r
-                 </form>\r
-                 </center>\r
-          <?php     break;\r
+?>\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
+\r
+<?php if ($show_instructions) { ?>\r
+    <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
+?>\r
+                 <div align="center">\r
+                   <form action="signup.php" method="get" name="signup">\r
+                   <input type="submit" value="<?php print_string("startsignup") ?>" />\r
+                   </form>\r
+                 </div>\r
+<?php            break;\r
                case "none":\r
-                 echo "<P>".get_string("loginstepsnone")."</P>";\r
+                 echo "<p>".get_string("loginstepsnone")."</p>";\r
                  break;\r
                default:\r
-                 echo "<BLOCKQUOTE>";\r
                  echo format_text($CFG->auth_instructions);\r
-                 echo "</blockquote>";\r
                  require_once("../auth/$CFG->auth/lib.php");\r
-                 if (isset($CFG->auth_user_create) and $CFG->auth_user_create==1 and function_exists('auth_user_create') ){?>\r
-                                   <form action="signup.php" method="get" name="form4" id="form4">\r
-                    \r
-          <input type="submit" value="<?php print_string("startsignup") ?>" />\r
+                 if (!empty($CFG->auth_user_create) and function_exists('auth_user_create') ){\r
+?>\r
+                 <div align="center">\r
+                                   <form action="signup.php" method="get" name="signup">\r
+                    <input type="submit" value="<?php print_string("startsignup") ?>" />\r
                     </form>\r
-                    </td></tr>\r
-                 <?php\r
-                                }\r
-             }\r
-          ?>\r
-    \r
-          \r
-    <?php  } ?>\r
+                 </div>\r
+<?php            }\r
+          }\r
+?>\r
+    </td></tr>\r
+<?php } ?>\r
 </table>\r