From: Arun Persaud <arun@nubati.net>
Date: Mon, 28 Apr 2008 00:43:11 +0000 (-0700)
Subject: BUGFIX: couldn't restart a finished game; force reload of CSS
X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=commitdiff_plain;h=5aa7d5dd2d0b487188fef191c6e5ef38f13e38f7

BUGFIX: couldn't restart a finished game; force reload of CSS

problem was that everything on the page was in a form which is now
submitted to the game page, but for new games, we need to call the newgame.php
page. moved the button out of the side and into its own div structure now to fix it.

also renamed the css file to force a reload

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

diff --git a/css/standard.css b/css/standard001.css
similarity index 99%
rename from css/standard.css
rename to css/standard001.css
index 2862248..b694fe9 100644
--- a/css/standard.css
+++ b/css/standard001.css
@@ -36,6 +36,7 @@
 
 .joingame,.sickness,.poverty,.total,.message {
  position: absolute;
+ background-color: #fff;
  width: 20%;
  top:22em;
  left:40%;
diff --git a/include/game.php b/include/game.php
index 51d4320..b2c4fb0 100644
--- a/include/game.php
+++ b/include/game.php
@@ -1727,12 +1727,19 @@ switch($mystatus)
 	echo "<hr />";
       }
 
-    echo "<input type=\"submit\" value=\"submit\" />\n";
+    echo "<input type=\"submit\" value=\"submit\" />\n<hr />\n";
 
+    $session = DB_get_session_by_gameid($gameid);
+    $score   = generate_score_table($session);
+
+    echo $score;
+
+    echo "</div>\n";
+
+    echo "</form>\n";
 
     if($mystatus=='gameover' && DB_get_game_status_by_gameid($gameid)=='gameover' )
       {
-	echo "<hr />\n";
 
 	$session = DB_get_session_by_gameid($gameid);
 	$result  = mysql_query("SELECT id,create_date FROM Game".
@@ -1756,15 +1763,7 @@ switch($mystatus)
 	  }
       }
 
-    $session = DB_get_session_by_gameid($gameid);
-    $score = generate_score_table($session);
-
-    //  if(size_of($score)>30)
-      echo $score;
 
-    echo "</div>\n";
-
-    echo "</form>\n";
     output_footer();
     DB_close();
     exit();
diff --git a/include/output.php b/include/output.php
index 4f4a5b6..6d7deb7 100644
--- a/include/output.php
+++ b/include/output.php
@@ -36,6 +36,7 @@ function output_ask_for_new_game($playerA,$playerB,$playerC,$playerD,$oldgameid)
 {
   global $RULES;
 
+  echo "<div class=\"message\">\n<form action=\"index.php?action=new\" method=\"post\">\n";
   echo "Do you want to continue playing?(This will start a new game, with the next person as dealer.)\n";
   echo "  <input type=\"hidden\" name=\"PlayerA\" value=\"$playerA\" />\n";
   echo "  <input type=\"hidden\" name=\"PlayerB\" value=\"$playerB\" />\n";
@@ -46,7 +47,7 @@ function output_ask_for_new_game($playerA,$playerB,$playerC,$playerD,$oldgameid)
   echo "  <input type=\"hidden\" name=\"callrule\" value=\"".$RULES["call"]."\" />\n";
   echo "  <input type=\"hidden\" name=\"followup\" value=\"$oldgameid\" />\n";
   echo "  <input type=\"submit\" value=\"keep playing\" />\n";
-
+  echo "</form>\n</div>";
   return;
 }
 
@@ -312,7 +313,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/standard.css" />
+     <link rel="stylesheet" type="text/css" href="css/standard001.css" />
      <script type="text/javascript">
        function hl(num) {
          if(document.getElementById){