fixed html and some alignement in login/register screen

3 files changed, 38 insertions, 55 deletions

diff --git a/css/standard.css b/css/standard.css
index 3cfe0eb..bff7d8a 100644
--- a/css/standard.css
+++ b/css/standard.css
@@ -666,6 +666,8 @@ ul.loginregister li:last-child { border-right: 2px solid #000;}
 ul.loginregister li:hover {background-color: #aaa; }
 
 .doregister {display: none;}
+.dologin label,.doregister label {float:left; width: 6em; }
+
 
 .login fieldset{
   width: 24em;
@@ -765,6 +767,3 @@ div img.button {
 .about .translation {
     background-color: #fce94f;
 }
-
-
-
diff --git a/include/output.php b/include/output.php
index 8479d4b..df1d69a 100644
--- a/include/output.php
+++ b/include/output.php
@@ -377,7 +377,7 @@ function output_header()
      <title>e-Doko</title>
      <meta charset="utf-8" />
      <link rel="shortcut icon" href="pics/edoko-favicon.png" />
-     <link rel="stylesheet" href="css/standard.css?v=30" />
+     <link rel="stylesheet" href="css/standard.css?v=31" />
      <link rel="stylesheet" media="screen and (max-width: 600px)" href="css/narrow.css?v=1" />
      <link rel="stylesheet" href="css/dateinput.css?v=1"/>
      <script type="text/javascript" src="include/jquery.js"> </script>
diff --git a/include/welcome.php b/include/welcome.php
index 475d47f..c9e8028 100644
--- a/include/welcome.php
+++ b/include/welcome.php
@@ -51,22 +51,18 @@ $avgage	= $avgage[0];
 
 echo "\n\n<div class=\"login\">\n";
 
-echo "<p> Play Doppelkopf online.</p>".
-"<p> For more information please visit our <a href=\"$WIKI\">wiki</a>. </p>";
+echo "  <p> Play Doppelkopf online.</p>\n".
+"  <p> For more information please visit our <a href=\"$WIKI\">wiki</a>. </p>\n";
 ?>
   <ul class="loginregister">
   <li> Login </li>
   <li> Register </li>
   </ul>
+
   <form class="dologin" action="index.php?action=login" method="post">
   <fieldset>
     <label for="email">Email:</label>
     <input type="email" id="email" name="email" size="20" maxlength="30" autofocus /> <br />
-    <script>
-    if (!("autofocus" in document.createElement("input"))) {
-      document.getElementById("email").focus();
-    }
-    </script>
     <label for="password">Password:</label>
     <input type="password" id="password" name="password" size="20" maxlength="30" /> <br />
     <input type="submit" class="submitbutton" name="login" value="login" />
@@ -82,6 +78,7 @@ echo "<p> Play Doppelkopf online.</p>".
 <?php }?>
   </fieldset>
   </form>
+
 <?php
      /* check for openid information */
      $openid_url = '';
@@ -94,61 +91,49 @@ echo "<p> Play Doppelkopf online.</p>".
      if(myisset('openidemail'))
        $email      = $_REQUEST['openidemail'];
 
-     echo '<div class="doregister">'; echo "\n";
-     echo '        <form action="index.php?action=register" method="post">'; echo "\n";
-     echo '          <fieldset>'; echo "\n";
-     echo '             <table>'; echo "\n";
-     echo '              <tr>'; echo "\n";
-     echo '               <td><label for="Rfullname">Full name:</label></td>'; echo "\n";
-     echo "	       <td><input type=\"text\" id=\"Rfullname\" name=\"Rfullname\" size=\"20\" maxlength=\"30\" value=\"$name\" /> </td>"; echo "\n";
-     echo '              </tr><tr>'; echo "\n";
-     echo '               <td><label for="Remail">Email:</label></td>'; echo "\n";
-     echo "	       <td><input type=\"text\" id=\"Remail\" name=\"Remail\" size=\"20\" maxlength=\"30\" value=\"$email\" /></td>"; echo "\n";
-     echo '              </tr><tr>'; echo "\n";
+     echo '  <form class="doregister" action="index.php?action=register" method="post">'; echo "\n";
+     echo '  <fieldset>'; echo "\n";
+     echo '     <label for="Rfullname">Full name:</label>'; echo "\n";
+     echo "     <input type=\"text\" id=\"Rfullname\" name=\"Rfullname\" size=\"20\" maxlength=\"30\" value=\"$name\" /> <br />\n";
+     echo '     <label for="Remail">Email:</label>'; echo "\n";
+     echo "     <input type=\"text\" id=\"Remail\" name=\"Remail\" size=\"20\" maxlength=\"30\" value=\"$email\" />  <br />\n";
      if($openid_url=='')
        {
-	 echo '	       <td><label for="Rpassword">Password:</label></td>'; echo "\n";
-	 echo '               <td><input type="password" id="Rpassword" name="Rpassword" size="20" maxlength="30" /></td>'; echo "\n";
-	 echo '              </tr><tr>'; echo "\n";
+	 echo '     <label for="Rpassword">Password:</label>'; echo "\n";
+	 echo '     <input type="password" id="Rpassword" name="Rpassword" size="20" maxlength="30" />'; echo "<br />\n";
        }
      else
        {
-	 echo '	       <td><label for="Ropenid">OpenId:</label></td>'; echo "\n";
-	 echo '               <td><input type="text" id="Ropenid" name="Ropenid" size="20" maxlength="50" value="'.htmlentities($openid_url).'" /></td>'; echo "\n";
-	 echo '              </tr><tr>'; echo "\n";
+	 echo '    <label for="Ropenid">OpenId:</label>'; echo "\n";
+	 echo '    <input type="text" id="Ropenid" name="Ropenid" size="20" maxlength="50" value="'.htmlentities($openid_url).'" /> <br />'; echo "\n";
        }
-     echo '	       <td><label for="Rtimezone">Timezone:</label></td>'; echo "\n";
-     echo '               <td>';echo "\n";
-
+     echo '     <label for="Rtimezone">Timezone:</label>'; echo "\n";
      output_select_timezone("Rtimezone");
+
+     /* random number to select robotproof question */
+     $rand_number = mt_rand(0,3); /* to get numbers between 0 and 4  */
+     $Robotproof = "Robotproof".$rand_number;
 ?>
-	       </td>
-              </tr><tr>
+    <p style="float: left">Please answer this anti-spam question:</p>
+    <label for="Robotproof">  <?php echo output_robotproof($rand_number); ?></label>
 <?php
-              /* random number to select robotproof question */
-	      $rand_number = mt_rand(0,3); /* to get numbers between 0 and 4  */
-              $Robotproof = "Robotproof".$rand_number;
+	 echo "    <input type=\"text\" id=\"Robotproof\" name=\"$Robotproof\" size=\"20\" maxlength=\"30\" /> <br />\n";
 ?>
-		<td><label for="Robotproof">Please answer this question: <?php echo output_robotproof($rand_number); ?></label></td>
+    <input type="submit" value="register" />
+
 <?php
-	 echo "<td><input type=\"text\" id=\"Robotproof\" name=\"$Robotproof\" size=\"20\" maxlength=\"30\" /></td>\n";
-?>
-              </tr><tr>
-               <td colspan="2"> <input type="submit" value="register" /></td>
-              </tr>
-             </table>
-<?php		     if($openid_url=='')
-       echo "<p><br /><strong> IMPORTANT: passwords are going over the net as clear text, so pick an easy password. ".
-	 "No need to pick anything complicated here ;)</strong></p>";
-
-     echo "<p> <strong>N.B. Your email address will be exposed to other players whom you play games with. ";
-     echo "</strong></p>";
+       if($openid_url=='')
+	 echo "  <p><strong> IMPORTANT: passwords are going over the net as clear text, so pick an easy password. ".
+	   "No need to pick anything complicated here ;)</strong></p>\n";
+
+     echo "  <p><strong>N.B. Your email address will be exposed to other players whom you play games with.";
+     echo "</strong></p>\n";
 ?>
-          </fieldset>
-        </form>
-      </div>
+  </fieldset>
+  </form>
+
 <?php
-echo "<h4>Some statistics:</h4>";
+echo "<h4>Some statistics:</h4>\n";
 
 if($pre == 0)
   echo "<p> At the moment there are no games that are being started ";
@@ -173,8 +158,7 @@ if($done==0)
  else if($done==1)
    echo "One game has been completed on this server. </p>";
  else
-   echo "$done games have been completed on this server. Average time of a game: $avgage days</p>";
-
+   echo "$done games have been completed on this server. Average time of a game: $avgage days</p>\n";
 ?>
 
 </div>