LAYOUT: moved score table and rules to the top

[e-DoKo.git] / include / output.php

diff --git a/include/output.php b/include/output.php
index 6d7deb7e69f3e08c5d87ac04d92a74e121324a1e..86db0a0a9e5599e5030e38b3c37822177af43a24 100644 (file)
--- a/include/output.php
+++ b/include/output.php
@@ -1,5 +1,5 @@
 <?php
 <?php

-/* make sure that we are not called from outside the scripts, 
+/* make sure that we are not called from outside the scripts,

  * use a variable defined in config.php to check this
  */
 if(!isset($HOST))
  * use a variable defined in config.php to check this
  */
 if(!isset($HOST))


@@ -7,31 +7,6 @@ if(!isset($HOST))
 
 /* functions which only ouput html  */
 
 
 /* functions which only ouput html  */
 

-function output_user_settings()
-{
-  global $PREF;
-
-  echo "<div class=\"useroptions\">\n";
-  echo "<h4> Settings </h4>\n";
-  echo "<a href=\"index.php?passwd=ask\">Change password</a><br />";
-
-  echo "<h5> Card set </h5>\n";
-  if( $PREF["cardset"] == "english" )
-    echo "<a href=\"index.php?setpref=germancards\">Change to German cards</a><br />";
-  else
-    echo "<a href=\"index.php?setpref=englishcards\">Change to English cards</a> <br />";
-
-  echo "<h5> Email </h5>\n";
-  if( $PREF["email"] == "emailaddict" )
-    echo "<a href=\"index.php?setpref=emailnonaddict\">Change to non-addicted mode (emails for each move)</a><br />";
-  else
-    echo "<a href=\"index.php?setpref=emailaddict\">Change to addicted mode (minimal amount of emails)</a> <br />";
-
-  echo "</div>\n";
-
-  return;
-}
-

 function output_ask_for_new_game($playerA,$playerB,$playerC,$playerD,$oldgameid)
 {
   global $RULES;
 function output_ask_for_new_game($playerA,$playerB,$playerC,$playerD,$oldgameid)
 {
   global $RULES;


@@ -54,13 +29,11 @@ function output_ask_for_new_game($playerA,$playerB,$playerC,$playerD,$oldgameid)
 function output_form_for_new_game($names)
 {
 ?>
 function output_form_for_new_game($names)
 {
 ?>

-    <h2> Players </h2>
-    <p>Please select four players (or use the randomly pre-selected names)</p>
-    <p>Remember: you need to be one of the players ;) </p>
-       <form action="index.php?action=new" method="post">
+  <form action="index.php?action=new" method="post">
+    <h2> Select players (Remember: you need to be one of the players) </h2>

 
    <div class="table">
 
    <div class="table">

-     <img src="pics/table.png" alt="table" />
+     <img class="table" src="pics/table.png" alt="table" />

 <?php
     /* ask for player names */
     $i=0;
 <?php
     /* ask for player names */
     $i=0;


@@ -69,59 +42,102 @@ function output_form_for_new_game($names)
       srand((float) microtime() * 10000000);
       $randkey = array_rand($names);
       $rand = $names[$randkey];
       srand((float) microtime() * 10000000);
       $randkey = array_rand($names);
       $rand = $names[$randkey];

-      echo  "<div class=\"table".$i."\">\n";
+      echo  "     <div class=\"table".$i."\">\n";

       $i++;
       $i++;

-      echo "    Name:  \n  <select name=\"$player\" size=\"1\" />  \n";
+      echo "       <select name=\"$player\" size=\"1\">  \n";

       foreach($names as $name)
        {
          if($name==$rand)
            {
       foreach($names as $name)
        {
          if($name==$rand)
            {

-             echo "     <option selected=\"selected\">$name</option>\n";
+             echo "         <option selected=\"selected\">$name</option>\n";

            }
          else
            }
          else

-           echo "     <option>$name</option>\n";
+           echo "         <option>$name</option>\n";

        }
        }

-      echo "  </select>\n</div>\n";
+      echo "       </select>\n     </div>\n";

     }
 ?>
     </div>
     }
 ?>
     </div>

+

    <h2 class="rules"> Rules </h2>
       <p> Some areas are grayed out which means that the rule is not implemented yet and therefore cannot be selected </p>
    <h2 class="rules"> Rules </h2>
       <p> Some areas are grayed out which means that the rule is not implemented yet and therefore cannot be selected </p>

-      <p> Ten of hearts:
-         <ul>
-         <li> <input type="radio" name="dullen" value="none" /> just normal non-trump  </li>
-         <li> <input type="radio" name="dullen" value="firstwins" /> first ten of hearts wins the trick </li>
-         <li> <input type="radio" name="dullen" value="secondwins" checked="checked" /> second ten of hearts wins the trick </li>
-         </ul>
-      </p>
-      <p> Schweinchen (both foxes), only in normal games or silent solos:
-        <ul>
+      <p> Ten of hearts: </p>
+      <ul>
+        <li> <input type="radio" name="dullen" value="none" /> just normal non-trump  </li>
+        <li> <input type="radio" name="dullen" value="firstwins" /> first ten of hearts wins the trick </li>
+        <li> <input type="radio" name="dullen" value="secondwins" checked="checked" /> second ten of hearts wins the trick </li>
+      </ul>
+      <p> Schweinchen (both foxes), only in normal games or silent solos: </p>
+      <ul>

         <li> <input type="radio" name="schweinchen" value="none" checked="checked" /> none </li>
         <li> <input type="radio" name="schweinchen" value="both" />
               both become highest trump (automatic call at beginning of the game)
         </li>
         <li> <input type="radio" name="schweinchen" value="second" />
         <li> <input type="radio" name="schweinchen" value="none" checked="checked" /> none </li>
         <li> <input type="radio" name="schweinchen" value="both" />
               both become highest trump (automatic call at beginning of the game)
         </li>
         <li> <input type="radio" name="schweinchen" value="second" />

-              first one normal, second one becomes highest (call during the game) </li>
+             first one normal, second one becomes highest (call during the game) </li>

         <li> <input type="radio" name="schweinchen" value="secondaftercall"  disabled="disabled" />
         <li> <input type="radio" name="schweinchen" value="secondaftercall"  disabled="disabled" />

-      second one become highest only in case re/contra was announced (not working yet)
+             second one become highest only in case re/contra was announced (not working yet)

         </li>
         </li>

-        </ul>
-      </p>
-      <p> Call Re/Contra, etc.:
-        <ul>
-           <li><input type="radio" name="callrule" value="1st-own-card" checked="checked" />
-                Can call re/contra on the first <strong>own</strong> card played, 90 on the second, etc.</li>
-           <li><input type="radio" name="callrule" value="5th-card" />
-                Can call re/contra until 5th card is played, 90 until 9th card is played, etc.</li>
-           <li><input type="radio" name="callrule" value="9-cards"  />
-                Can call re/contra until 5th card is played, 90 if player still has 9 cards, etc.</li>
-        </ul>
-      </p>
+      </ul>
+      <p> Call Re/Contra, etc.: </p>
+      <ul>
+         <li><input type="radio" name="callrule" value="1st-own-card" checked="checked" />
+              Can call re/contra on the first <strong>own</strong> card played, 90 on the second, etc.</li>
+         <li><input type="radio" name="callrule" value="5th-card" />
+              Can call re/contra until 5th card is played, 90 until 9th card is played, etc.</li>
+         <li><input type="radio" name="callrule" value="9-cards"  />
+              Can call re/contra until 5th card is played, 90 if player still has 9 cards, etc.</li>
+      </ul>

    <input type="submit" value="start game" />
  </form>
 <?php
 }
 
    <input type="submit" value="start game" />
  </form>
 <?php
 }
 

+function output_table($data,$caption="",$class="")
+{
+  if($class!="")
+    $HTML  = "\n<table class=\"$class\">\n";
+  else
+    $HTML  = "\n<table>\n";
+
+  $i=0;
+
+  if($caption!="")
+    $HTML .= "  <caption> $caption </caption>\n";
+
+  foreach($data as $record)
+    {
+      if(!$i)
+       $HTML .= "  <thead>\n  <tr>\n";
+      else
+       {
+         if($i==1) $HTML .= "  <tbody>\n";
+         if($i % 2)
+           $HTML .= "  <tr class=\"odd\">   ";
+         else
+           $HTML .= "  <tr class=\"even\">  ";
+       }
+      foreach($record as $point)
+       {
+         if($i)
+           $HTML .= "    <td>$point</td> ";
+         else
+           $HTML .= "    <th>$point</th> ";
+       }
+
+      if(!$i)
+       $HTML .= "  </tr>\n  </thead>\n";
+      else
+       {
+         $HTML .= "  </tr>\n";
+       }
+      $i++;
+    }
+  $HTML .= "  </tbody>\n</table>\n";
+
+  return $HTML;
+}
+

 function display_card($card,$dir="english")
 {
   /* cards are only availabl for the odd values, e.g. 1.png, 3.png, ...
 function display_card($card,$dir="english")
 {
   /* cards are only availabl for the odd values, e.g. 1.png, 3.png, ...


@@ -226,7 +242,6 @@ function output_form_calls($me)
       " <input type=\"radio\" name=\"call\" value=\"no\" /> <br />";
 }
 
       " <input type=\"radio\" name=\"call\" value=\"no\" /> <br />";
 }
 

-

 function output_check_want_to_play($me)
 {
    ?>
 function output_check_want_to_play($me)
 {
    ?>


@@ -243,64 +258,6 @@ function output_check_want_to_play($me)
   return;
 }
 
   return;
 }
 

-function output_home_page($pre,$game,$done,$avgtime)
-{
-  global $WIKI;
-  
-  echo"<p> If you want to play a game of Doppelkopf, you found the right place ;)".
-    " For more information please visit our <a href=\"$WIKI\">wiki</a>. </p>";
-  
-  if($pre == 0)
-    echo "<p> At the moment there are no games that are being started ";
-  else if($pre==1)
-    echo "<p> At the moment there is one games that is being started ";
-  else
-    echo "<p> At the moment there are $pre games that are being started ";
-  
-  echo "and ";
-  
-  if($game==0)
-    echo "zero games that are ongoing. ";
-  else if($game==1)
-    echo "one game that is ongoing. ";
-  else
-    echo "$game games that are ongoing. ";
-  
-  echo "<br />\n";
-  
-  if($done==0)
-    echo "No game has been completed on this server. </p>";
-  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: $avgtime days</p>";
-?>
-
-    <p> Please <a href="index.php?action=register">register</a>, in case you have not done that yet  <br />
-        or login with you email-address or name and password here:
-    </p>
-        <form action="index.php?action=login" method="post">
-          <fieldset>
-            <legend>Login</legend>
-             <table>
-              <tr>
-                 <td><label for="email">Email:</label></td>
-                 <td><input type="text" id="email" name="email" size="20" maxlength="30" /> </td>
-              </tr><tr>
-                 <td><label for="password">Password:</label></td>
-                 <td><input type="password" id="password" name="password" size="20" maxlength="30" /></td>
-              </tr><tr>
-                <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>
-          </fieldset>
-        </form>
-
-<?php
- return;
-}
-

 function output_header()
 {
    global $REV;
 function output_header()
 {
    global $REV;


@@ -313,8 +270,9 @@ 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/standard001.css" />
+     <link rel="stylesheet" type="text/css" href="css/standard006.css" />

      <script type="text/javascript">
      <script type="text/javascript">

+       var current=0;

        function hl(num) {
          if(document.getElementById){
           var i;
        function hl(num) {
          if(document.getElementById){
           var i;


@@ -323,20 +281,32 @@ function output_header()
               document.getElementById("trick"+i).style.display = 'none';
           }
           document.getElementById("trick"+num).style.display = 'block';
               document.getElementById("trick"+i).style.display = 'none';
           }
           document.getElementById("trick"+num).style.display = 'block';

+          current=num;

         }
        }
        function high_last(){
         if(document.getElementById){
           var i;
         }
        }
        function high_last(){
         if(document.getElementById){
           var i;

-          for(i=13;i>0;i--) {
+          for(i=13;i>=0;i--) {

             if(document.getElementById("trick"+i))
               {
                 hl(i);
             if(document.getElementById("trick"+i))
               {
                 hl(i);

+                current=i;

                 break;
               }
           }
         }
        }
                 break;
               }
           }
         }
        }

+       function hl_next()
+        {
+          if(document.getElementById("trick"+(current+1)))
+            hl(current+1);
+        }
+       function hl_prev()
+        {
+          if(document.getElementById("trick"+(current-1)))
+            hl(current-1);
+        }

      </script>
   </head>
 <body onload="high_last();">
      </script>
   </head>
 <body onload="high_last();">


@@ -376,15 +346,20 @@ function output_footer()
 
 function output_status()
 {
 
 function output_status()
 {

-  global $defaulttimezone;
+  global $defaulttimezone,$INDEX,$WIKI;

    if(isset($_SESSION["name"]))
      {
        $name = $_SESSION["name"];
 
        /* logout info */
    if(isset($_SESSION["name"]))
      {
        $name = $_SESSION["name"];
 
        /* logout info */

-       echo "\n<div class=\"status\">";
-       echo $name;
-       echo " <a href=\"index.php?action=logout\">logout</a>";
+       echo "\n<div class=\"status\">\n";
+       echo $name,"\n";
+       echo " | <a href=\"".$INDEX."\"> mypage </a>\n";
+       echo " | <a href=\"".$INDEX."?action=prefs\">settings</a>\n";
+       echo " | <a href=\"".$INDEX."?action=new\">new game</a>\n";
+       echo " | <a href=\"".$INDEX."?action=stats\">statistics</a>\n";
+       echo " | <a href=\"".$WIKI."\">wiki</a>\n";
+       echo " |&nbsp;&nbsp;&nbsp; <a href=\"".$INDEX."?action=logout\">logout</a>\n";

        echo "</div>\n";
 
        /* last logon time */
        echo "</div>\n";
 
        /* last logon time */


@@ -401,6 +376,26 @@ function output_status()
   return;
 }
 
   return;
 }
 

+function output_select_timezone($name,$timezone="")
+{
+  $Tzone = array ( "Europe/London"     => "London",
+                  "Europe/Berlin"     => "Berlin",
+                  "America/Vancouver" => "Berkeley",
+                  "Pacific/Auckland"  => "Wellington" );
+
+  echo "  <select id=\"$name\" name=\"$name\" size=\"1\">\n";
+
+  foreach($Tzone as $zone=>$city)
+    {
+      if($timezone==$zone)
+       echo "   <option value=\"$zone\" selected=\"selected\">$city</option>\n";
+      else
+       echo "   <option value=\"$zone\">$city</option>\n";
+    }
+  echo "  </select>\n";
+
+  return;
+}

 
 function output_password_recovery($email,$password)
 {
 
 function output_password_recovery($email,$password)
 {