X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Foutput.php;h=bbdc99f1e0d09b7f3b809e37a0f3a9559adceea1;hp=79bc19edf1d12c01242d42298f91431262b3d7c6;hb=a76008b94138f041b5a8f2426a55d59142152d02;hpb=5451fd5cd006d6b6345f84812b51af9f121fded9

diff --git a/include/output.php b/include/output.php
index 79bc19e..bbdc99f 100644
--- a/include/output.php
+++ b/include/output.php
@@ -202,12 +202,15 @@ function display_card($card,$dir="english")
   return;
 }
 
-function display_link_card($card,$dir="english",$type="card")
+function display_link_card($card,$dir="english",$type="card", $selected=0)
 {
+  if($selected)
+    $selected = 'checked="checked"';
+
   if( $card/2 - (int)($card/2) == 0.5)
-    echo "<div class=\"cardinput\"><input type=\"radio\" name=\"".$type."\" value=\"".$card."\" /><img src=\"cards/".$dir."/".$card.".png\" alt=\"".DB_get_card_name($card)."\" /></div>\n";
+    echo "<label class=\"cardinput\"><input type=\"radio\" name=\"".$type."\" value=\"".$card."\" $selected /><img src=\"cards/".$dir."/".$card.".png\" alt=\"".DB_get_card_name($card)."\" /></label>\n";
   else
-    echo "<div class=\"cardinput\" ><input type=\"radio\" name=\"".$type."\" value=\"".$card."\" /><img src=\"cards/".$dir."/".($card-1).".png\" alt=\"".DB_get_card_name($card-1)."\" /></div>\n";
+    echo "<label class=\"cardinput\"><input type=\"radio\" name=\"".$type."\" value=\"".$card."\" $selected /><img src=\"cards/".$dir."/".($card-1).".png\" alt=\"".DB_get_card_name($card-1)."\" /></label>\n";
   return;
 }
 
@@ -219,14 +222,14 @@ function output_check_for_sickness($me,$mycards)
   echo '';
   echo '    '._('Do you want to play solo?').'';
   echo '    <select name="solo" size="1">';
-  echo '      <option selected="selected">'._('No').'</option>';
-  echo '      <option>'._('trumpless').'</option>';
-  echo '      <option>'._('trump').'</option>';
-  echo '      <option>'._('queen').'</option>';
-  echo '      <option>'._('jack').'</option>';
-  echo '      <option>'._('club').'</option>';
-  echo '      <option>'._('spade').'</option>';
-  echo '      <option>'._('heart').'</option>';
+  echo '      <option value="No" selected="selected">'.'No'.'</option>';
+  echo '      <option value="trumpless">'._('trumpless').'</option>';
+  echo '      <option value="trump">'._('trump').'</option>';
+  echo '      <option value="queen">'._('queen').'</option>';
+  echo '      <option value="jack">'._('jack').'</option>';
+  echo '      <option value="club">'._('club').'</option>';
+  echo '      <option valvue="spade">'._('spade').'</option>';
+  echo '      <option value="hear">'._('heart').'</option>';
   echo '    </select>';
   echo '    <br />';
 
@@ -293,60 +296,60 @@ function output_check_for_sickness($me,$mycards)
 
 function output_form_calls($me,$myparty)
 {
-  $highstart = "<span class=\"highcall\">";
-  $highend   = "</span>";
+  $highstart = '  <span class="highcall">';
+  $highend   = '</span>';
 
   $tmp = can_call(120,$me);
   if( $tmp )
     {
       if($tmp==2) echo $highstart;
       if($myparty=='re')
-	echo "re (120):";
+	echo '  re (120):';
       else if ($myparty=='contra')
-	echo "contra (120):";
+	echo '  contra (120):';
       else
-	echo " re/contra (120):";
-      echo " <input type=\"radio\" name=\"call\" value=\"120\" />";
+	echo '  re/contra (120):';
+      echo ' <input type="radio" name="call" value="120" />';
       if($tmp==2) echo $highend;
-      echo "<br />\n";
+      echo "\n";
     }
-  $tmp =  can_call(90,$me);
+  $tmp = can_call(90,$me);
   if( $tmp )
     {
       if($tmp==2) echo $highstart;
-      echo " 90:".
-	" <input type=\"radio\" name=\"call\" value=\"90\" />";
+      echo '  90:'.
+	' <input type="radio" name="call" value="90" />';
       if($tmp==2) echo $highend;
-      echo "<br />\n";
+      echo "\n";
     }
   $tmp = can_call(60,$me);
   if( $tmp )
     {
       if($tmp==2) echo $highstart;
-      echo " 60:".
-	" <input type=\"radio\" name=\"call\" value=\"60\" />";
+      echo '  60:'.
+	' <input type="radio" name="call" value="60" />';
       if($tmp==2) echo $highend;
-      echo "<br />\n";
+      echo "\n";
     }
   $tmp = can_call(30,$me);
   if( $tmp )
     {
       if($tmp==2) echo $highstart;
-      echo " 30:".
-	" <input type=\"radio\" name=\"call\" value=\"30\" />";
+      echo '  30:'.
+	' <input type="radio" name="call" value="30" />';
       if($tmp==2) echo $highend;
-      echo "<br />\n";
+      echo "\n";
     }
   $tmp = can_call(0,$me);
   if( $tmp )
     {
       if($tmp==2) echo $highstart;
-      echo " 0:".
-	" <input type=\"radio\" name=\"call\" value=\"0\" />";
+      echo '  0:'.
+	' <input type="radio" name="call" value="0" />';
       if($tmp==2) echo $highend;
-      echo "<br />\n".
-	" no call:".
-	" <input type=\"radio\" name=\"call\" value=\"no\" /> <br />";
+      echo "\n".
+	'  no call:'.
+	' <input type="radio" name="call" value="no" />'."\n";
     }
 }
 
@@ -368,31 +371,62 @@ function output_header()
 {
    global $REV;
 ?>
-<!DOCTYPE html PUBLIC
-    "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN"
-    "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<!DOCTYPE html>
+<html lang="en">
   <head>
      <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/standard023.css" />
-     <script type="text/javascript" src="include/game.js"> </script>
+     <meta charset="utf-8" />
+     <link rel="shortcut icon" href="pics/edoko-favicon.png" />
+     <link rel="stylesheet" href="css/normalize.css?v=1" />
+     <link rel="stylesheet" href="css/standard.css?v=32" />
+     <link rel="stylesheet" media="screen and (max-width: 600px)" href="css/narrow.css?v=1" />
+     <link rel="stylesheet" href="css/dateinput.css?v=1"/>
      <script type="text/javascript" src="include/jquery.js"> </script>
      <script type="text/javascript" src="include/jquery.tablesorter.js"></script>
+     <script type="text/javascript" src="include/jquery.tools.min.js"></script>
+     <script type="text/javascript" src="include/game.js"> </script>
      <script type="text/javascript">
         $(document).ready(function()
 	   {
               $("#ScoreTable").tablesorter({ widgets: ['zebra']});
+
+	      $(".gameshidesession").click( function () {
+		  $(this).parent().children(".gamessession").hide(300);
+		  $(this).parent().children(".gamesshowsession").show();
+		  $(this).hide();
+		});
+
+	      $(".gamesshowsession").click( function () {
+		  $(this).parent().children(".gamessession").show(300);
+		  $(this).parent().children(".gameshidesession").show();
+		  $(this).hide();
+		});
+
+	      $(".gameshowall").click( function () {
+		  $(".gamessession").show(300);
+		  $(".gamesshowsession").hide();
+		  $(".gameshidesession").show();
+		});
+	      $(".gamehideall").click( function () {
+		  $(".gamessession").hide(300);
+		  $(".gamesshowsession").show();
+		  $(".gameshidesession").hide();
+		});
+
+	      $("ul.loginregister").click(function () {
+		  $(".dologin").slideToggle();
+		  $(".doregister").slideToggle();
+		});
+
            });
      </script>
   </head>
 <body onload="high_last();">
-<div class="header">
+<header>
 <?php
   echo '<h1> '._('Welcome to E-Doko').' </h1>';
 ?>
-</div>
+</header>
 <?php
 
   echo "<div class=\"main\">";
@@ -401,22 +435,22 @@ function output_header()
 
 function output_footer()
 {
-  global $REV,$PREF;
+  global $REV, $PREF, $INDEX;
 
   echo "</div>\n\n";
-  echo "<div class=\"footer\">\n";
-  echo "  <p class=\"left\"> copyright 2006,2007,2008,2009,2010 Arun Persaud, Lance Thornton(graphics),  Jeff Zerger(database support) <br />\n".
+  echo "<footer>\n";
+  echo "  <p class=\"left\"> copyright 2006,2007,2008,2009,2010 <a href=\"$INDEX?action=about\">Arun Persaud, et al.</a> <br />\n".
     "  Verwendung der [deutschen] Kartenbilder mit Genehmigung <br />der Spielkartenfabrik Altenburg GmbH,(c) ASS Altenburger <br />\n".
     "  - ASS Altenburger Spielkarten - Spielkartenfabrik Altenburg GmbH <br />\n".
     "  a Carta Mundi Company Email: info@spielkarten.com Internet: www.spielkarten.com</p>\n";
  echo " <p class=\"right\"> See the latest changes <a href=\"http://nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=summary\">\n".
     "  via git </a> <br />or download the source via <br />\n'git clone http://nubati.net/git/e-DoKo.git' <br />\n".
     "  <a href=\"http://www.dreamhost.com/green.cgi\">\n".
-    "  <img  border=\"0\" alt=\"Green Web Hosting! This site hosted by DreamHost.\"".
-    "src=\"https://secure.newdream.net/green1.gif\" height=\"32\" width=\"100\" /></a>\n".
+    "  <img alt=\"Green Web Hosting! This site hosted by DreamHost.\"".
+    " src=\"pics/green1.gif\" height=\"32\" width=\"100\" /></a>\n".
     "  </p> \n";
   echo "\n";
-  echo "</div>\n";
+  echo "</footer>\n";
 
   echo "</body>\n";
   echo "</html>\n";
@@ -458,12 +492,6 @@ function output_status()
 
       echo "<div class=\"lastlogin\"><span>"._('last login').": ".date("r",$unixtime)."</span></div>\n";
     }
-  else
-    {
-      echo "\n<div class=\"status\">\n";
-      echo "<a href=\"".$INDEX."\">"._('login')."</a>\n";
-      echo "</div>\n";
-    }
   return;
 }
 
@@ -546,13 +574,13 @@ function output_password_recovery($email,$password)
        <legend>Password recovery</legend>
         <table>
          <tr>
-            <td><label for="email">Old password:</label></td>
+            <td><label for="password0">Old password:</label></td>
             <td><input type="password" id="password0" name="password0" size="20" maxlength="30" /> </td>
          </tr><tr>
-            <td><label for="password">New password:</label></td>
+            <td><label for="password1">New password:</label></td>
             <td><input type="password" id="password1" name="password1" size="20" maxlength="30" /></td>
          </tr><tr>
-            <td><label for="password">Retype:</label></td>
+            <td><label for="password2">Retype:</label></td>
             <td><input type="password" id="password2" name="password2" size="20" maxlength="30" /></td>
          </tr><tr>
            <td></td>
@@ -696,7 +724,7 @@ function output_exchanged_cards()
 		  else
 		    display_card(0,$PREF['cardset']);
 		}
-	      if($trump_back1) echo "        Trump back";
+	      if($trump_back1) echo '        '._('Trump back');
 	    }
 	  else if($mypos==$povertypos1)
 	    {
@@ -708,7 +736,7 @@ function output_exchanged_cards()
 		  else
 		    display_card(0,$PREF['cardset']);
 	      }
-	      if($trump_back1) echo "        Trump back";
+	      if($trump_back1) echo '        '._('Trump back');
 	    }
 	  else if($mypos==$povertypos2)
 	    {
@@ -720,7 +748,7 @@ function output_exchanged_cards()
 		  else
 		    display_card(0,$PREF['cardset']);
 		}
-	      if($trump_back2) echo "        Trump back";
+	      if($trump_back2) echo '        '._('Trump back');
 	    }
 	  else if($mypos==$partnerpos2)
 	    {
@@ -733,7 +761,7 @@ function output_exchanged_cards()
 		  else
 		    display_card(0,$PREF['cardset']);
 		}
-	      if($trump_back2) echo "        Trump back";
+	      if($trump_back2) echo '        '._('Trump back');
 	    }
 	  echo  "      </div>\n";
 	}