X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Foutput.php;h=81f01c5dc3fe95f72ad07dee1036c2c5cd60899a;hp=3eb813013d5e7d9f33e290235a65f30a89a3a438;hb=12a7da9216b33c12ecc7939be1f6e8a48a273b00;hpb=e8b56a58ef9b5dabf77273f540d1ec678e604615

diff --git a/include/output.php b/include/output.php
index 3eb8130..81f01c5 100644
--- a/include/output.php
+++ b/include/output.php
@@ -42,69 +42,69 @@ function output_form_for_new_game($names)
       srand((float) microtime() * 10000000);
       $randkey = array_rand($names);
       $rand = $names[$randkey];
-      echo  "<div class=\"table".$i."\">\n";
+      echo  "     <div class=\"table".$i."\">\n";
       $i++;
-      echo "    <select name=\"$player\" size=\"1\" />  \n";
+      echo "       <select name=\"$player\" size=\"1\">  \n";
       foreach($names as $name)
 	{
 	  if($name==$rand)
 	    {
-	      echo "     <option selected=\"selected\">$name</option>\n";
+	      echo "         <option selected=\"selected\">$name</option>\n";
 	    }
 	  else
-	    echo "     <option>$name</option>\n";
+	    echo "         <option>$name</option>\n";
 	}
-      echo "  </select>\n</div>\n";
+      echo "       </select>\n     </div>\n";
     }
 ?>
     </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>
-      <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" />
-              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" />
-      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>
-        </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
 }
 
-function output_table($data,$class="")
+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)
@@ -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/standard004.css" />
+     <link rel="stylesheet" type="text/css" href="css/standard008.css" />
      <script type="text/javascript">
        var current=0;
        function hl(num) {
@@ -372,7 +372,13 @@ function output_status()
        date_default_timezone_set($zone);
 
        echo "<div class=\"lastlogin\">last login: ".date("r",$unixtime)."</div>\n";
-     };
+     }
+   else
+     {
+       echo "\n<div class=\"status\">\n";
+       echo "<a href=\"".$INDEX."\">login</a>\n";
+       echo "</div>\n";
+     }
   return;
 }
 
@@ -397,8 +403,6 @@ function output_select_timezone($name,$timezone="")
   return;
 }
 
-
-
 function output_password_recovery($email,$password)
 {
 ?>
@@ -430,4 +434,18 @@ function output_password_recovery($email,$password)
 
 <?php
 }
+
+function output_user_notes($userid,$gameid,$userstatus)
+{
+  echo "<div class=\"notes\"> Personal notes: <br />\n";
+  $notes = DB_get_notes_by_userid_and_gameid($userid,$gameid);
+  foreach($notes as $note)
+    echo "$note <hr />\n";
+  if($userstatus!='gameover')
+    echo "<input name=\"note\" type=\"text\" size=\"15\" maxlength=\"100\" />\n";
+  echo "</div> \n";
+
+  return;
+}
+    
 ?>
\ No newline at end of file