LAYOUT: fixed the login screen

some html + css code cleanup

Signed-off-by: Arun Persaud <arun@nubati.net>

diff --git a/css/standard014.css b/css/standard015.css
similarity index 91%
rename from css/standard014.css
rename to css/standard015.css
index 913a18da8c39c849295edab0f879373ee9bf7844..2dfadd0d570df4ddcf6ec51de0ae7978e970e8da 100644 (file)
--- a/css/standard014.css
+++ b/css/standard015.css
@@ -38,9 +38,7 @@ body { background-color: #ddd; }
   top:0;
   left:3em;
 }
-.lastlogin span {
-  font-size:smaller;
-}
+.lastlogin span { font-size:smaller;}
 
 .main {
   background-color: #fff;
@@ -59,10 +57,8 @@ body { background-color: #ddd; }
   clear:both;
   height: 8em;
 }
-.footer .right { float:right;   font-size:smaller;
-}
-.footer .left  { float:left;  font-size:smaller;
- }
+.footer .right { float:right;   font-size:smaller;}
+.footer .left  { float:left;  font-size:smaller; }
 
 .status {
   position:absolute;
@@ -105,9 +101,7 @@ body { background-color: #ddd; }
 }
 
 /* output possible rules for  a new game  */
-.rules {
-  margin-top:24em;
-}
+.rules { margin-top:24em;}
 
 /* playing cards*/
 .card {
@@ -375,9 +369,7 @@ ul.tricks li div div span.comment span{
   text-align:center;
 }
 
-.mycards img {
-  height:6em;
-}
+.mycards img { height:6em;}
 
 .exchange {
   clear:both;
@@ -387,9 +379,7 @@ ul.tricks li div div span.comment span{
   background-color:yellow;
 }
 
-.exchange img {
-  height:6em;
-}
+.exchange img { height:6em;}
 
 .line{
   clear:both;
@@ -434,12 +424,8 @@ div.session div.sessionscore div{
   border: 1px solid #000;
   z-index: 30;
 }
-div.session div.sessionscore:hover div{
-  display:block;
-}
-div.session img.rulesicon {
- height: 1em;
-}
+div.session div.sessionscore:hover div{ display:block;}
+div.session img.rulesicon{ height: 1em; }
 
 .scoretable{
   height:20em;
@@ -521,9 +507,7 @@ table.score {
   background-color: #efe;
 }
 
-.submitbutton:hover {
-  background-color:#afa;
-}
+.submitbutton:hover{ background-color:#afa;}
 
 
 .cardinput {
@@ -532,17 +516,11 @@ table.score {
   border: 1px solid #000;
 }
 
-.cardinput img {
-  width: 4em;
-}
+.cardinput img { width: 4em;}
 
-.cardinput:hover{
-  background-color:red;
-}
+.cardinput:hover{ background-color:red;}
 
-div span img.button {
-  width: 2em;
-}
+div span img.button { width: 2em;}
 
 .gamestatuspre {
   padding: 0 0.3em;
@@ -557,13 +535,9 @@ div span img.button {
   background-color: #15de26;
 }
 
-.multi a{
-  color: #fff;
-}
+.multi a{ color: #fff;}
 
-.bigger {
-  font-size:larger;
-}
+.bigger{ font-size:larger;}
 
 caption {
   text-align: center;
@@ -604,31 +578,32 @@ table.stats th { border-bottom: solid 0.2em #000 }
   padding: 0.3em 0.3em 0.45em;
 }
 
+/* the login form */
 .login form{
-  width: 20em;
+  width: 24em;
   margin: 0.5em auto;
   padding: 0.5em 0.5em  1.5em;
   text-align: center;
 }
 
-.login legend, .login label, .login input{
-  padding: 0.5em 0.5em 0.75em;
-}
-
 .login fieldset {
   border: 2px solid #000;
   padding: 0.5em 0.5em 0.75em;
   background-color: #eee;
 }
 
-.login .submitbutton {
-  background-color: #fff;
-}
+.login label, .login input{ margin: 0.5em 0.5em 0.75em;}
 
-.login .submitbutton:hover {
-  background-color: #aaa;
+.login label{
+  float:left;
+  width:7em;
+  text-align: left;
 }
 
-.login tr.center td{
-  text-align: center;
+.login input #email, .login input #password{
+  width:9em;
+  float:right;
 }
+
+.login .submitbutton { background-color: #fff;}
+.login .submitbutton:hover { background-color: #aaa;}

diff --git a/include/output.php b/include/output.php
index 17bd9e26fdb8c5502649ac0cce5d527edc83bd2d..86061e22bc444fb36ce172eaab696ae0e2ef38e0 100644 (file)
--- a/include/output.php
+++ b/include/output.php
@@ -270,7 +270,7 @@ function output_header()
      <title>e-Doko</title>
      <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type" />
      <link rel="shortcut icon" type="image/x-icon" href="pics/edoko-favicon.png" />
-     <link rel="stylesheet" type="text/css" href="css/standard014.css" />
+     <link rel="stylesheet" type="text/css" href="css/standard015.css" />
      <script type="text/javascript" src="include/game.js"> </script>
   </head>
 <body onload="high_last();">

diff --git a/include/welcome.php b/include/welcome.php
index d760c26c388be44ec9fd15d11f43451fc2cc7dfd..5dd267c2741832aa2122cffbf49049080c231c97 100644 (file)
--- a/include/welcome.php
+++ b/include/welcome.php
@@ -30,7 +30,7 @@ $game = $game[0];
 $done  = $done[0];
 $avgage        = $avgage[0];
 
-echo "<div class=\"login\">\n";
+echo "\n\n<div class=\"login\">\n";
 
 echo "<p> If you want to play a game of Doppelkopf, you found the right place ;)</p>".
 "<p> For more information please visit our <a href=\"$WIKI\">wiki</a>. </p>".
@@ -71,21 +71,12 @@ if($done==0)
 
   <form action="index.php?action=login" method="post">
   <fieldset>
-  <table>
-  <tr>
-    <td><label for="email">Email:</label></td>
-    <td><input type="text" class="submitbutton" id="email" name="email" size="20" maxlength="30" /> </td>
-  </tr>
-  <tr>
-    <td><label for="password">Password:</label></td>
-    <td><input type="password" class="submitbutton" id="password" name="password" size="20" maxlength="30" /></td>
-  </tr>
-  <tr class="center">
-    <td> <input type="submit" class="submitbutton" name="login" value="login" /></td>
-    <td> <input type="submit" class="submitbutton" name="forgot" value="Forgot your password?" /></td>
-  </tr>
-  </table>
+    <label for="email">Email:</label>
+    <input type="text" id="email" name="email" size="20" maxlength="30" /> <br />
+    <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" />
+    <input type="submit" class="submitbutton" name="forgot" value="Forgot your password?" />
   </fieldset>
   </form>
-
-</div>
\ No newline at end of file
+</div>