LAYOUT: removed some overlapping areas

the total points and the game points for re/contra now only show up
on the "score" trick. This way they don't overlap with graphics when
looking at older tricks.

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

diff --git a/css/standard011.css b/css/standard012.css
similarity index 94%
rename from css/standard011.css
rename to css/standard012.css
index 90abd691f011ff49d39d953ec800124122d117c8..e7fd8a4157bdd02eaba4c5b04e5b9cc43a1850f5 100644 (file)
--- a/css/standard011.css
+++ b/css/standard012.css
@@ -38,7 +38,7 @@ body { background-color: #ddd; }
   top:0;
   left:3em;
 }
   top:0;
   left:3em;
 }

-.lastlogin span {   
+.lastlogin span {

   font-size:smaller;
 }
 
   font-size:smaller;
 }
 


@@ -83,20 +83,24 @@ body { background-color: #ddd; }
  z-index:22
 }
 
  z-index:22
 }
 

-
+.total {
+    top:11em;
+    width: 14%;
+    left: 43%;
+}

 /* scoring */
 .total .re {
  position: absolute;
 /* scoring */
 .total .re {
  position: absolute;

- left: -4em;
+ left: -12em;

  top:8em;
  top:8em;

- background-color: #fff;
+ background-color: #eee;

  z-index:15;
 }
 .total .contra {
  position: absolute;
  z-index:15;
 }
 .total .contra {
  position: absolute;

- right: -4em;
+ right: -14em;

  top:8em;
  top:8em;

- background-color: #fff;
+ background-color: #eee;

  z-index:15;
 }
 
  z-index:15;
 }
 


@@ -397,12 +401,12 @@ ul.tricks li div div span.comment span{
   border-bottom:1px solid #000;
   text-align:center;
 }
   border-bottom:1px solid #000;
   text-align:center;
 }

-div.session div.sessionrules { 
+div.session div.sessionrules {

   width:19em;
   float:left ;
   text-align: left;
 }
   width:19em;
   float:left ;
   text-align: left;
 }

-div.session div.sessionscore { 
+div.session div.sessionscore {

   width:19em;
   float:right ;
   text-align: right;
   width:19em;
   float:right ;
   text-align: right;


@@ -555,21 +559,21 @@ div span img.button {
   font-size:larger;
 }
 
   font-size:larger;
 }
 

-caption { 
+caption {

   text-align: center;
   margin: 0.5em;
   padding: 0.5em;
   padding-bottom: 0em;
   margin-bottom: 0;
  }
   text-align: center;
   margin: 0.5em;
   padding: 0.5em;
   padding-bottom: 0em;
   margin-bottom: 0;
  }

-table.stats { margin: 0.5em 1em; 
+table.stats { margin: 0.5em 1em;

   border: solid 0.2em #aeaeae;
   -moz-border-radius: 0.5em ;
   float: left;
 }
 table.stats tr.odd  { background-color:#aeaeae; }
 table.stats tr.even { background-color:#eaeaea; }
   border: solid 0.2em #aeaeae;
   -moz-border-radius: 0.5em ;
   float: left;
 }
 table.stats tr.odd  { background-color:#aeaeae; }
 table.stats tr.even { background-color:#eaeaea; }

-table.stats td, table.stats th { 
+table.stats td, table.stats th {

   margin-left:  0.2em;
   margin-right: 0.2em;
   padding-left:  0.2em;
   margin-left:  0.2em;
   margin-right: 0.2em;
   padding-left:  0.2em;


@@ -582,43 +586,43 @@ table.stats th { border-bottom: solid 0.2em #000 }
 
 
 /* the login window */
 
 
 /* the login window */

-.login { 
+.login {

   text-align:center;
   padding-top: 1em;
 }
 
   text-align:center;
   padding-top: 1em;
 }
 

-.login p, { 
+.login p, {

   padding: 0.1em 0.1em 0.15em;
 }
   padding: 0.1em 0.1em 0.15em;
 }

-.login h4 { 
+.login h4 {

   padding: 0.3em 0.3em 0.45em;
 }
 
   padding: 0.3em 0.3em 0.45em;
 }
 

-.login form{ 
-  width: 20em; 
+.login form{
+  width: 20em;

   margin: 0.5em auto;
   padding: 0.5em 0.5em  1.5em;
   text-align: center;
 }
 
   margin: 0.5em auto;
   padding: 0.5em 0.5em  1.5em;
   text-align: center;
 }
 

-.login legend, .login label, .login input{ 
+.login legend, .login label, .login input{

   padding: 0.5em 0.5em 0.75em;
 }
 
   padding: 0.5em 0.5em 0.75em;
 }
 

-.login fieldset { 
-  border: 2px solid #000; 
+.login fieldset {
+  border: 2px solid #000;

   padding: 0.5em 0.5em 0.75em;
   padding: 0.5em 0.5em 0.75em;

-  background-color: #eee; 
+  background-color: #eee;

 }
 
 .login .submitbutton {
 }
 
 .login .submitbutton {

-  background-color: #fff; 
+  background-color: #fff;

 }
 
 .login .submitbutton:hover {
 }
 
 .login .submitbutton:hover {

-  background-color: #aaa; 
+  background-color: #aaa;

 }
 
 }
 

-.login tr.center td{ 
+.login tr.center td{

   text-align: center;
 }
   text-align: center;
 }

diff --git a/include/game.php b/include/game.php
index b509de36f63021dcaab08ff8813cb4e0c5e7673b..4c7710d96932baeae22ac897a123e960f5ec4cc3 100644 (file)
--- a/include/game.php
+++ b/include/game.php
@@ -1808,6 +1808,42 @@ switch($mystatus)
            "        <div class=\"score\">".$r[2]."<br /> ".$r[1]."</div>\n".
            "      </div>\n";
 
            "        <div class=\"score\">".$r[2]."<br /> ".$r[1]."</div>\n".
            "      </div>\n";
 

+       /* display totals */
+       $result = DB_query("SELECT Hand.party, IFNULL(SUM(Card.points),0) FROM Hand".
+                          " LEFT JOIN Trick ON Trick.winner=Hand.position AND Trick.game_id=Hand.game_id".
+                          " LEFT JOIN User ON User.id=Hand.user_id".
+                          " LEFT JOIN Play ON Trick.id=Play.trick_id".
+                          " LEFT JOIN Hand_Card ON Hand_Card.id=Play.hand_card_id".
+                          " LEFT JOIN Card ON Card.id=Hand_Card.card_id".
+                          " WHERE Hand.game_id='$gameid'".
+                          " GROUP BY Hand.party" );
+       echo "<div class=\"total\">\n  Totals:<br />\n";
+       while( $r = DB_fetch_array($result))
+         echo "  ".$r[0]." ".$r[1]."<br />\n";
+
+       $queryresult = DB_query("SELECT timediff(mod_date,create_date) ".
+                               " FROM Game WHERE id='$gameid'");
+       $r = DB_fetch_array($queryresult);
+       echo "  <p>This game took ".$r[0]." hours.</p>\n";
+
+       echo "  <div class=\"re\">\n   Points Re: <br />\n";
+       $queryresult = DB_query("SELECT score FROM Score ".
+                               "  WHERE game_id=$gameid AND party='re'".
+                               " ");
+       while($r = DB_fetch_array($queryresult) )
+         echo "   ".$r[0]."<br />\n";
+       echo "  </div>\n";
+
+       echo "  <div class=\"contra\">\n   Points Contra: <br />\n";
+       $queryresult = DB_query("SELECT score FROM Score ".
+                               "  WHERE game_id=$gameid AND party='contra'".
+                               " ");
+       while($r = DB_fetch_array($queryresult) )
+         echo "   ".$r[0]."<br />\n";
+       echo "  </div>\n";
+
+       echo "</div>\n";
+

        echo "    </div>\n  </li>\n";  /* end div trick, end li trick */
       }
 
        echo "    </div>\n  </li>\n";  /* end div trick, end li trick */
       }
 


@@ -1883,45 +1919,6 @@ switch($mystatus)
     if(DB_get_game_status_by_gameid($gameid)=='play')
       {
        echo "The game is over for you.. other people still need to play though";
     if(DB_get_game_status_by_gameid($gameid)=='play')
       {
        echo "The game is over for you.. other people still need to play though";

-      }
-    else
-      {
-       $result = DB_query("SELECT Hand.party, IFNULL(SUM(Card.points),0) FROM Hand".
-                          " LEFT JOIN Trick ON Trick.winner=Hand.position AND Trick.game_id=Hand.game_id".
-                          " LEFT JOIN User ON User.id=Hand.user_id".
-                          " LEFT JOIN Play ON Trick.id=Play.trick_id".
-                          " LEFT JOIN Hand_Card ON Hand_Card.id=Play.hand_card_id".
-                          " LEFT JOIN Card ON Card.id=Hand_Card.card_id".
-                          " WHERE Hand.game_id='$gameid'".
-                          " GROUP BY Hand.party" );
-       echo "<div class=\"total\"> Totals:<br />\n";
-       while( $r = DB_fetch_array($result))
-         echo "  ".$r[0]." ".$r[1]."<br />\n";
-
-       $queryresult = DB_query("SELECT timediff(mod_date,create_date) ".
-                               " FROM Game WHERE id='$gameid'");
-       $r = DB_fetch_array($queryresult);
-       echo "<p>This game took ".$r[0]." hours.</p>";
-
-       echo "<div class=\"re\">\n Points Re: <br />\n";
-       $queryresult = DB_query("SELECT score FROM Score ".
-                               "  WHERE game_id=$gameid AND party='re'".
-                               " ");
-       while($r = DB_fetch_array($queryresult) )
-         echo "   ".$r[0]."<br />\n";
-       echo "</div>\n";
-
-       echo "<div class=\"contra\">\n Points Contra: <br />\n";
-       $queryresult = DB_query("SELECT score FROM Score ".
-                               "  WHERE game_id=$gameid AND party='contra'".
-                               " ");
-       while($r = DB_fetch_array($queryresult) )
-         echo "   ".$r[0]."<br />\n";
-       echo "</div>\n";
-
-       echo "</div>\n";
-
-

       }
     break;
   default:
       }
     break;
   default:

diff --git a/include/output.php b/include/output.php
index db9e2f12a64062e8ffe611547500026ef71eefdb..f2fe52414dcb695c7135f1d68b7d92b838d89c15 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" />
      <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/standard011.css" />
+     <link rel="stylesheet" type="text/css" href="css/standard012.css" />

      <script type="text/javascript">
        var current=0;
        function hl(num) {
      <script type="text/javascript">
        var current=0;
        function hl(num) {