CLEANUP: cleaned up CSS a bit

the bug where you couldn't click on the prev/next button shouldn't show up that often now, since that area is now a bit bigger, but the bug is still there...

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

diff --git a/css/standard015.css b/css/standard016.css
similarity index 93%
rename from css/standard015.css
rename to css/standard016.css
index 2dfadd0d570df4ddcf6ec51de0ae7978e970e8da..0e49111e2b7d660c720877248453fe900f6b1b3a 100644 (file)
--- a/css/standard015.css
+++ b/css/standard016.css
@@ -48,6 +48,9 @@ body { background-color: #ddd; }
 }
 
 .footer {
+  float: left;
+  clear: both;
+  width: 100%;
   background-color: #fff;
   margin:0;
   margin-left: 3em;
@@ -67,6 +70,53 @@ body { background-color: #ddd; }
   font-size: smaller;
 }
 
+/* sessions */
+.session {
+  width: 100%;
+  border-bottom: 1px solid #000;
+  text-align: center;
+}
+.session div.sessionrules {
+  width: 19em;
+  float: left;
+  text-align: left;
+}
+.session div.sessionrules div{
+  display:none;
+  background-color: #fff;
+  border: 1px solid #000;
+  position:absolute;
+  z-index: 30;
+  padding:0.5em;
+}
+.session div.sessionrules:hover div{ display:block; }
+.session div.sessionscore {
+  width: 19em;
+  float: right;
+  text-align: right;
+}
+.session div.sessionscore div{
+  position:absolute;
+  width:12em;
+  right:3em;
+  display:none;
+  background-color: #fff;
+  border: 1px solid #000;
+  z-index: 30;
+}
+.session div.sessionscore:hover div{ display:block;}
+.session img.rulesicon{ height: 1em; }
+
+.session .scoretable{
+  height:20em;
+  overflow: auto;
+}
+.session table.score {
+  margin:0.5em;
+  width:10em;
+  border-collapse:collapse;
+}
+
 /* all kind of message that should appear in the middle of the page/table */
 .joingame,.sickness,.poverty,.total,.message {
  position: absolute;
@@ -124,7 +174,7 @@ div.table {
   left:0;
   padding:0;
 /*  border: 3px solid blue; */
-  top: 8.2em;
+  top: 9.2em;
   text-align:center;
 }
 
@@ -183,8 +233,8 @@ ul.tricks {
 ul.tricks a { text-decoration:none; color:#000;}
 ul.tricks li {
   /*background-color:blue;*/
-  margin:0.1em;
-  padding:0.2em 0.5em;
+  padding:0.1em;
+  margin:0.2em 0.5em;
   display:inline;
 }
 ul.tricks li.old {  background-color:#fff; }
@@ -195,17 +245,14 @@ ul.tricks li div.trick {
   position:absolute;
   width:100%;
   height:35em;
-  top:1.2em;
+  top:2.2em;
   left: 0;
   margin:0;
   padding:0;
 /*  border: 2px solid red;*/
   display:block;
 }
-ul.tricks li div.trick {
-  display:none;
-}
-
+ul.tricks li div.trick { display:none;}
 ul.tricks li div.trick img.arrow {
   position:absolute;
   margin:0;
@@ -388,55 +435,6 @@ ul.tricks li div div span.comment span{
   padding:0;
 }
 
-
-/* sessions */
-.session {
-  border-bottom:1px solid #000;
-  text-align:center;
-}
-div.session div.sessionrules {
-  width:19em;
-  float:left ;
-  text-align: left;
-}
-div.session div.sessionscore {
-  width:19em;
-  float:right ;
-  text-align: right;
-}
-div.session div.sessionrules div{
-  display:none;
-  background-color: #fff;
-  border: 1px solid #000;
-  position:absolute;
-  z-index: 30;
-  padding:0.5em;
-}
-div.session div.sessionrules:hover div{
-  display:block;
-}
-div.session div.sessionscore div{
-  position:absolute;
-  width:12em;
-  right:3em;
-  display:none;
-  background-color: #fff;
-  border: 1px solid #000;
-  z-index: 30;
-}
-div.session div.sessionscore:hover div{ display:block;}
-div.session img.rulesicon{ height: 1em; }
-
-.scoretable{
-  height:20em;
-  overflow: auto;
-}
-table.score {
-  margin:0.5em;
-  width:10em;
-  border-collapse:collapse;
-}
-
 .gameinfo {
   position:absolute;
   top:27em;
@@ -500,16 +498,6 @@ table.score {
   margin-bottom:0.1em;
 }
 
-.submitbutton {
-  padding: 0.2em;
-  padding-bottom: 0.3em;
-  border:0;
-  background-color: #efe;
-}
-
-.submitbutton:hover{ background-color:#afa;}
-
-
 .cardinput {
   display:inline;
   position:relative;

diff --git a/include/functions.php b/include/functions.php
index db7ccadb059a747f422dd7481f74151b341ae41f..5c23958ea8b4315afc5e33a69b5837732deb55a9 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -1052,22 +1052,22 @@ function format_score_table_html($score,$userid)
   if(sizeof($score)==0)
     return "";
 
-  $output = "<div class=\"scoretable\">\n<table class=\"score\">\n <thead><tr>\n";
+  $output = "<div class=\"scoretable\">\n<table class=\"score\">\n <thead>\n  <tr>\n";
 
   /* output header */
-  $output.= "  <th> No </th>";
+  $output.= "   <th> No </th>";
   foreach($score[0]['players'] as $id=>$points)
     {
       $name = DB_get_name('userid',$id); /*TODO*/
       $output.= "<th> ".substr($name,0,2)." </th>";
     }
-  $output.="<th>P</th>\n </tr>\n</thead>\n<tbody>\n";
+  $output.="<th>P</th>\n  </tr>\n </thead>\n <tbody>\n";
 
   $i=0;
   foreach($score as $game)
     {
       $i++;
-      $output.=" <tr>";
+      $output.="  <tr>";
       $userhash = DB_get_hash_from_gameid_and_userid($game['gameid'],$userid);
       /* create link to old games only if you are logged in and its your game*/
       if(isset($_SESSION['id']) && $_SESSION['id']==$userid)
@@ -1085,7 +1085,7 @@ function format_score_table_html($score,$userid)
       $output.="</td></tr>\n";
     }
 
-  $output.="</tbody>\n</table></div>\n";
+  $output.=" </tbody>\n</table>\n</div>\n";
 
   return $output;
 }

diff --git a/include/game.php b/include/game.php
index b2df36918e6624e94f8739a14e32764eac5d98d5..fb807c74ed4533da18ccdc4da77e2f8c159e9e14 100644 (file)
--- a/include/game.php
+++ b/include/game.php
@@ -139,41 +139,41 @@ if($session)
     switch($RULES['dullen'])
       {
       case 'none':
-       echo "<img class=\"rulesicon\" alt=\"not ten of hearts\" src=\"pics/button/no-ten-of-hearts.png\"/>\n"; break;
+       echo "  <img class=\"rulesicon\" alt=\"not ten of hearts\" src=\"pics/button/no-ten-of-hearts.png\"/>\n"; break;
       case 'firstwins':
-       echo "<img class=\"rulesicon\" alt=\"ten of hearts\" src=\"pics/button/ten-of-hearts.png\"/>\n"; break;
+       echo "  <img class=\"rulesicon\" alt=\"ten of hearts\" src=\"pics/button/ten-of-hearts.png\"/>\n"; break;
       case 'secondwins':
-       echo "<img class=\"rulesicon\" alt=\"second ten of hearts\" src=\"pics/button/second-ten-of-hearts.png\"/>\n"; break;
+       echo "  <img class=\"rulesicon\" alt=\"second ten of hearts\" src=\"pics/button/second-ten-of-hearts.png\"/>\n"; break;
       }
     switch($RULES['schweinchen'])
       {
       case 'none':
-       echo "<img class=\"rulesicon\" alt=\"no schweinchen\" ".
+       echo "  <img class=\"rulesicon\" alt=\"no schweinchen\" ".
          "src=\"pics/button/no-schweinchen.png\"/>\n"; break;
       case 'both':
-       echo "<img class=\"rulesicon\" alt=\"two schweinchen \" ".
+       echo "  <img class=\"rulesicon\" alt=\"two schweinchen \" ".
          "src=\"pics/button/two-schweinchen.png\"/>\n"; break;
       case 'second':
-       echo "<img class=\"rulesicon\" alt=\"second schweinchen\" ".
+       echo "  <img class=\"rulesicon\" alt=\"second schweinchen\" ".
          "src=\"pics/button/second-schweinchen.png\"/>\n"; break;
       case 'secondaftercall':
-       echo "<img class=\"rulesicon\" alt=\"second schweinchen after call\" ".
+       echo "  <img class=\"rulesicon\" alt=\"second schweinchen after call\" ".
          "src=\"pics/button/second-schweinchen-after-call.png\"/>\n"; break;
       }
     switch($RULES['call'])
       {
       case '1st-own-card':
-       echo "<img class=\"rulesicon\" alt=\"1st-own-card\" src=\"pics/button/1st-own-card.png\"/>\n"; break;
+       echo "  <img class=\"rulesicon\" alt=\"1st-own-card\" src=\"pics/button/1st-own-card.png\"/>\n"; break;
       case '5th-card':
-       echo "<img class=\"rulesicon\" alt=\"5th-card\" src=\"pics/button/5th-card.png\"/>\n"; break;
+       echo "  <img class=\"rulesicon\" alt=\"5th-card\" src=\"pics/button/5th-card.png\"/>\n"; break;
       case '9-cards':
-       echo "<img class=\"rulesicon\" alt=\"9-cards\" src=\"pics/button/9-cards.png\"/>\n"; break;
+       echo "  <img class=\"rulesicon\" alt=\"9-cards\" src=\"pics/button/9-cards.png\"/>\n"; break;
       }
-    echo " <div>\n";
+    echo "  <div>\n";
     echo "       10ofhearts : {$RULES['dullen']}      <br />\n";
     echo "       schweinchen: {$RULES['schweinchen']} <br />\n";
     echo "       call:        {$RULES['call']}        <br />\n";
-    echo "    </div>\n  </div>\n";
+    echo "  </div>\n  </div>\n";
     echo "  <div class=\"sessionscore\">Score \n";
     $score   = generate_score_table($session);
     echo format_score_table_html($score,$myid);
@@ -192,7 +192,7 @@ if($session)
       echo "This is game number $j of <a href=\"{$INDEX}?action=game&amp;me=$lasthash\">$i</a> in session $session.";
     else
       echo "This is game number $j of $i in session $session.";
-    echo "</div>\n";
+    echo "\n</div>\n";
   }
 
 /* display the table and the names */

diff --git a/include/output.php b/include/output.php
index 86061e22bc444fb36ce172eaab696ae0e2ef38e0..8d9336f46ffb78537f5b5ebd11c2685fba98c0ce 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/standard015.css" />
+     <link rel="stylesheet" type="text/css" href="css/standard016.css" />
      <script type="text/javascript" src="include/game.js"> </script>
   </head>
 <body onload="high_last();">

diff --git a/include/preferences.php b/include/preferences.php
index 77ad8671d6ff383cc59ff6790ac92ae8efa9128b..67e2eecb409e3e7d7e6b1a51f9c5a778a1f7a0de 100644 (file)
--- a/include/preferences.php
+++ b/include/preferences.php
@@ -206,7 +206,7 @@ echo "    <tr><td>Password(new):         </td><td>",
 echo "    <tr><td>Password(new, retype): </td><td>",
   "<input type=\"password\" id=\"password2\" name=\"password2\" size=\"20\" maxlength=\"30\" />",
   " </td></tr>\n";
-echo "    <tr><td><input type=\"submit\" class=\"submitbutton\" name=\"passwd\" value=\"set\" /></td>",
+echo "    <tr><td><input type=\"submit\"  name=\"passwd\" value=\"set\" /></td>",
   "<td></td></tr>\n";
 echo "    </table>\n";
 echo "  </form>\n";