X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Foutput.php;h=33f7b199d4b9e0c9e18b3f1a99a49fabdeb2b0fe;hp=231f8f691cc2a39cfa821bcde88b847956c37bda;hb=de3f7290a0d3fb90e48c89cf508b38d77db1ccff;hpb=5edd63b115fe7712c6e220fc6a0b78dbace4f3cd

diff --git a/include/output.php b/include/output.php
index 231f8f6..33f7b19 100644
--- a/include/output.php
+++ b/include/output.php
@@ -12,7 +12,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 "Do you want to continue playing?(This will start a new game, with $playerD as dealer.)\n";
   echo "  <input type=\"hidden\" name=\"PlayerA\" value=\"$playerA\" />\n";
   echo "  <input type=\"hidden\" name=\"PlayerB\" value=\"$playerB\" />\n";
   echo "  <input type=\"hidden\" name=\"PlayerC\" value=\"$playerC\" />\n";
@@ -80,37 +80,38 @@ function output_form_for_new_game($names)
 ?>
     </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: </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>
-        <li> <input type="radio" name="schweinchen" value="secondaftercall" />
-             second one become highest only in case re/contra was announced
-        </li>
-      </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>
+     <h2 class="rules">Rules</h2>
+     <h3>Gameplay-related</h3>
+     <h4>Ten of hearts:</h4>
+     <p>
+       <select name="dullen">
+         <option value="none"> just normal non-trump  </option>
+         <option value="firstwins"> first ten of hearts wins the trick </option>
+         <option value="secondwins" selected="selected"> second ten of hearts wins the trick </option>
+       </select>
+     </p>
+     <h4>Schweinchen (both foxes), only in normal games or silent solos:</h4>
+     <p>
+       <select name="schweinchen">
+         <option value="none" selected="selected"> none </option>
+	 <option value="both"> both become highest trump (automatic call at beginning of the game)   </option>
+	 <option value="second"> first one normal, second one becomes highest (call during the game) </option>
+	 <option value="secondaftercall">  second one become highest only in case re/contra was announced
+	 </option>
+       </select>
+     </p>
+     <h4>Call Re/Contra, etc.:</h4>
+     <p>
+       <select name="callrule">
+	 <option value="1st-own-card" selected="selected">  Can call re/contra on the first <strong>own</strong> card played, 90 on the second, etc.</option>
+	 <option value="5th-card">  Can call re/contra until 5th card is played, 90 until 9th card is played, etc.</option>
+	 <option value="9-cards" > Can call re/contra until 5th card is played, 90 if player still has 9 cards, etc.</option>
+       </select>
+     </p>
+     <h3>Scoring-related</h3>
+     <h4>(not yet implemented)</h4>
+     <p><input type="submit" value="start game"></p>
+     </form>
 <?php
 }
 
@@ -300,7 +301,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/standard019.css" />
+     <link rel="stylesheet" type="text/css" href="css/standard021.css" />
      <script type="text/javascript" src="include/game.js"> </script>
      <script type="text/javascript" src="include/jquery.js"> </script>
      <script type="text/javascript" src="include/jquery.tablesorter.js"></script>
@@ -386,10 +387,35 @@ function output_status()
 
 function output_select_timezone($name,$timezone="")
 {
-  $Tzone = array ( "Europe/London"     => "London",
-		   "Europe/Berlin"     => "Berlin",
-		   "America/Vancouver" => "Berkeley",
-		   "Pacific/Auckland"  => "Wellington" );
+  $Tzone = array ("Pacific/Apia"         => "Apia",                /*UTC-11*/
+                  "Pacific/Honolulu"     => "Honolulu",            /*UTC-10*/
+                  "America/Anchorage"    => "Anchorage",           /*UTC-9*/
+                  "America/Vancouver"    => "Berkeley",            /*UTC-8*/
+                  "America/Phoenix"      => "Phoenix",             /*UTC-7*/
+                  "America/Chicago"      => "Chicago",             /*UTC-6*/
+                  "America/New_York"     => "New York",            /*UTC-5*/
+                  "America/Santiago"     => "Santiago",            /*UTC-4*/
+                  "America/Buenos_Aires" => "Buenos Aires",        /*UTC-3*/
+                  "Atlantic/South_Georgia" => "Fernando de Noronha", /*UTC-2*/
+                  "Atlantic/Azores"       => "Azores",             /*UTC-1"*/
+                  "Europe/London"         => "London",             /*UTC*/
+                  "Europe/Berlin"         => "Berlin",             /*UTC+1*/
+                  "Africa/Cairo"          => "Cairo",              /*UTC+2*/
+                  "Europe/Moscow"         => "Moscow",             /*UTC+3*/
+                  "Asia/Tehran"           => "Tehran",             /*UTC+3:30*/
+                  "Asia/Dubai"            => "Dubai",              /*UTC+4*/
+                  "Asia/Karachi"          => "Karachi",            /*UTC+5*/
+                  "Asia/Calcutta"         => "Delhi",              /*UTC+5:30*/
+                  "Asia/Kathmandu"        => "Kathmandu",          /*UTC+5:45*/
+                  "Asia/Dhaka"            => "Dhaka",              /*UTC+6*/
+                  "Asia/Rangoon"          => "Yangon",             /*UTC+6:30*/
+                  "Asia/Bangkok"          => "Bangkok",            /*UTC+7*/
+                  "Asia/Hong_Kong"        => "Beijing",            /*UTC+8*/
+                  "Asia/Tokyo"            => "Tokyo",              /*UTC+9*/
+                  "Australia/Darwin"      => "Darwin",             /*UTC+9:30*/
+                  "Australia/Sydney"      => "Sydney",             /*UTC+10*/
+                  "Asia/Magadan"          => "Magadan",            /*UTC+11*/
+                  "Pacific/Auckland"      => "Wellington" );       /*UTC+12*/
 
   echo "  <select id=\"$name\" name=\"$name\" size=\"1\">\n";
 
@@ -522,7 +548,7 @@ function output_exchanged_cards()
    * go through all positions, check that position has cards that need to be shown and
    * show those cards
    */
-  $show = 1;
+  $show=1;
   for($mypos=1;$mypos<5;$mypos++)
     {
       $usersick = DB_get_sickness_by_pos_and_gameid($mypos,$gameid);
@@ -530,22 +556,45 @@ function output_exchanged_cards()
 	 $mypos==$povertypos1 || $mypos==$partnerpos1 ||
 	 $mypos==$povertypos2 || $mypos==$partnerpos2 )
 	{
+	  /* figure out if we gave trump back */
+	  $trump_back1=0;
+	  if($povertypos2)
+	    foreach($povertycards1 as $card)
+	      {
+		if(is_trump($card))
+		  {
+		    $trump_back1=1;
+		    break;
+		  }
+	      }
+	  $trump_back2=0;
+	  if($povertypos2)
+	    foreach($povertycards2 as $card)
+	      {
+		if(is_trump($card))
+		  {
+		    $trump_back2=1;
+		    break;
+		  }
+	      }
+
+	  /* output vorbehalt  */
 	  echo "      <div class=\"vorbehalt".($mypos-1)."\"> Vorbehalt <br />\n";
 	  if($show)
 	    echo "       $usersick <br />\n";
+
+	  /* output cards */
 	  if($mypos==$partnerpos1)
 	    {
-	      $trump_back=0;
 	      foreach($partnercards1 as $card)
 		{
-		  if(is_trump($card)) $trump_back=1;
 		  echo '        ';
 		  if($povertyhash1 == $me || $partnerhash1 == $me || $mystatus=='gameover')
 		    display_card($card,$PREF['cardset']);
 		  else
 		    display_card(0,$PREF['cardset']);
 		}
-	      if($trump_back) echo "Trump back";
+	      if($trump_back1) echo "        Trump back";
 	    }
 	  else if($mypos==$povertypos1)
 	    {
@@ -557,6 +606,7 @@ function output_exchanged_cards()
 		  else
 		    display_card(0,$PREF['cardset']);
 	      }
+	      if($trump_back1) echo "        Trump back";
 	    }
 	  else if($mypos==$povertypos2)
 	    {
@@ -568,10 +618,10 @@ function output_exchanged_cards()
 		  else
 		    display_card(0,$PREF['cardset']);
 		}
+	      if($trump_back2) echo "        Trump back";
 	    }
 	  else if($mypos==$partnerpos2)
 	    {
-	      $trump_back=0;
 	      foreach($partnercards2 as $card)
 		{
 		  if(is_trump($card)) $trump_back=1;
@@ -581,15 +631,14 @@ function output_exchanged_cards()
 		  else
 		    display_card(0,$PREF['cardset']);
 		}
-	      if($trump_back) echo "Trump back";
+	      if($trump_back2) echo "        Trump back";
 	    }
 	  echo  "      </div>\n";
-
-	  if($mygametype == $usersick)
-	    $show = 0;
 	}
+      if($mygametype == $usersick)
+	$show = 0;
     }
 }
 
 
-?>
\ No newline at end of file
+?>