X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Foutput.php;h=0b456276c988a8446462d9d354fe2fc8d992f06d;hp=81f01c5dc3fe95f72ad07dee1036c2c5cd60899a;hb=522e61d6c5c04dac9c3254ddd2fd7ebb82a1a104;hpb=cd4cbd4a1cce2c35a6a78b1b957c17389001b4b1 diff --git a/include/output.php b/include/output.php index 81f01c5..0b45627 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 "
\n
\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 " \n"; echo " \n"; echo " \n"; @@ -28,6 +28,10 @@ function output_ask_for_new_game($playerA,$playerB,$playerC,$playerD,$oldgameid) function output_form_for_new_game($names) { + $copy_names = $names; /* local copy, so that we can delete names from it + * after we selected them to make sure that each name + * only shows up once + */ ?>

Select players (Remember: you need to be one of the players)

@@ -35,13 +39,30 @@ function output_form_for_new_game($names)
table \n"; $i++; echo " first one normal, second one becomes highest (call during the game) -
  • - 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
  • Call Re/Contra, etc.:

    @@ -93,12 +114,17 @@ function output_form_for_new_game($names) \n"; - else - $HTML = "\n\n"; + $HTML.= " class=\"$class\""; + if($id!="") + $HTML.= " id=\"$id\""; + + $HTML.=">\n"; $i=0; @@ -112,10 +138,7 @@ function output_table($data,$caption="",$class="") else { if($i==1) $HTML .= " \n"; - if($i % 2) - $HTML .= " "; - else - $HTML .= " "; + $HTML .= " "; } foreach($record as $point) { @@ -143,7 +166,7 @@ function display_card($card,$dir="english") /* cards are only availabl for the odd values, e.g. 1.png, 3.png, ... * convert even cards to the matching odd value */ - if( $card/2 - (int)($card/2) == 0.5) + if( $card/2 - (int)($card/2) == 0.5 || $card == 0) echo "\"".DB_get_card_name($card)."\"\n"; else echo "\"".DB_get_card_name($card-1)."\"\n"; @@ -221,11 +244,18 @@ function output_check_for_sickness($me,$mycards) return; } -function output_form_calls($me) +function output_form_calls($me,$myparty) { if( can_call(120,$me) ) - echo " re/contra (120):". - "
    "; + { + if($myparty=='re') + echo "re (120):"; + else if ($myparty=='contra') + echo "contra (120):"; + else + echo " re/contra (120):"; + echo "
    "; + } if( can_call(90,$me) ) echo " 90:". "
    "; @@ -270,48 +300,20 @@ function output_header() e-Doko - + + + +
    -

    Welcome to E-Doko (beta)

    +

    Welcome to E-Doko

    \n\n"; echo "
    \n"; - echo "

    copyright 2006-2008 Arun Persaud, Lance Thornton
    \n". + echo "

    copyright 2006-2009 Arun Persaud, Lance Thornton(graphics), Jeff Zerger(database support)
    \n". " Verwendung der [deutschen] Kartenbilder mit Genehmigung
    der Spielkartenfabrik Altenburg GmbH,(c) ASS Altenburger
    \n". " - ASS Altenburger Spielkarten - Spielkartenfabrik Altenburg GmbH
    \n". " a Carta Mundi Company Email: info@spielkarten.com Internet: www.spielkarten.com

    \n"; - echo "

    See the latest changes \n". + echo "

    See the latest changes \n". " via git
    or download the source via
    \n'git clone http://nubati.net/git/e-DoKo.git'
    \n". " \n". " \"Greenlast login: ".date("r",$unixtime)."

    \n"; + echo "
    last login: ".date("r",$unixtime)."
    \n"; } else { @@ -384,10 +386,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 "