X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Foutput.php;h=96ab1140789bf9a55f0ce595b76e1ca12905dacb;hp=03319915b867b88b1a7b733075802215fdbb9db2;hb=af2046f113109cc6ceaafcbce96377978e12c5a5;hpb=6bb40ad539c14101b609018998d5045e88e2ace4;ds=sidebyside

diff --git a/include/output.php b/include/output.php
index 0331991..96ab114 100644
--- a/include/output.php
+++ b/include/output.php
@@ -53,48 +53,80 @@ function output_form_for_new_game($names)
 			 * after we selected them to make sure that each name
 			 * only shows up once
 			 */
+
+  /* delete players name, since he will be on position D anyway */
+  unset($copy_names[array_search($_SESSION["name"],$copy_names)]);
+  srand((float) microtime() * 10000000);
+
+
   echo '  <form action="index.php?action=new" method="post">';
   echo '    <h2> '._('Select players (Remember: you need to be one of the players)').' </h2>';
-  echo '   <div class="table">';
-  echo '     <img class="table" src="pics/table.png" alt="table" />';
 
-  /* ask player for names */
+  echo '   <div class="table">';
 
-  $i=0;
+  echo  "     <div class=\"table1\">\n";
+  $randkey = array_rand($copy_names);
+  $rand = $copy_names[$randkey];
+  /* delete this name from the list of possible names */
+  unset($copy_names[$randkey]);
+  echo "       <select name=\"PlayerB\" size=\"1\">  \n";
+  foreach($names as $name)
+    {
+      if($name==$rand)
+	echo "         <option selected=\"selected\">$name</option>\n";
+      else
+	echo "         <option>$name</option>\n";
+    }
+  echo "       </select>\n     </div>\n";
 
-  /* delete players name, since he will be on position D anyway */
-  unset($copy_names[array_search($_SESSION["name"],$copy_names)]);
+  echo '   <div class="middle">';
 
-  srand((float) microtime() * 10000000);
-  foreach( array("PlayerA","PlayerB","PlayerC","PlayerD") as $player)
+  $randkey = array_rand($copy_names);
+  $rand = $copy_names[$randkey];
+  /* delete this name from the list of possible names */
+  unset($copy_names[$randkey]);
+  echo  "     <div class=\"table0\">\n";
+  echo "       <select name=\"PlayerA\" size=\"1\">  \n";
+  foreach($names as $name)
     {
-      /* pick 3 names at random and put the players name on position D*/
-      if($i<3)
-	{
-	  $randkey = array_rand($copy_names);
-	  $rand = $copy_names[$randkey];
-	  /* delete this name from the list of possible names */
-	  unset($copy_names[$randkey]);
-	}
+      if($name==$rand)
+	echo "         <option selected=\"selected\">$name</option>\n";
       else
-	{
-	  $rand = $_SESSION["name"];
-	}
+	echo "         <option>$name</option>\n";
+    }
+  echo "       </select>\n     </div>\n";
 
-      echo  "     <div class=\"table".$i."\">\n";
-      $i++;
-      echo "       <select name=\"$player\" size=\"1\">  \n";
-      foreach($names as $name)
-	{
-	  if($name==$rand)
-	    {
-	      echo "         <option selected=\"selected\">$name</option>\n";
-	    }
-	  else
-	    echo "         <option>$name</option>\n";
-	}
-      echo "       </select>\n     </div>\n";
+  echo '     <img class="table" src="pics/table.png" alt="table" />';
+  $randkey = array_rand($copy_names);
+  $rand = $copy_names[$randkey];
+  /* delete this name from the list of possible names */
+  unset($copy_names[$randkey]);
+  echo  "     <div class=\"table2\">\n";
+  echo "       <select name=\"PlayerC\" size=\"1\">  \n";
+  foreach($names as $name)
+    {
+      if($name==$rand)
+	echo "         <option selected=\"selected\">$name</option>\n";
+      else
+	echo "         <option>$name</option>\n";
     }
+  echo "       </select>\n     </div>\n";
+
+  echo '   </div>';
+  $rand = $_SESSION["name"];
+  echo  "     <div class=\"table3\">\n";
+  $i++;
+  echo "       <select name=\"PlayerD\" size=\"1\">  \n";
+  foreach($names as $name)
+    {
+      if($name==$rand)
+	echo "         <option selected=\"selected\">$name</option>\n";
+      else
+	echo "         <option>$name</option>\n";
+    }
+  echo "       </select>\n     </div>\n";
+
+  /* ask player for names */
 
     echo '    </div>';
     echo '';
@@ -376,49 +408,16 @@ function output_header()
   <head>
      <title>e-Doko</title>
      <meta charset="utf-8" />
+     <meta name="viewport" content="width=device-width; initial-scale=1.0;" />
      <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=34" />
-     <link rel="stylesheet" media="screen and (max-width: 600px)" href="css/narrow.css?v=2" />
+     <link rel="stylesheet" href="css/standard.css?v=40" />
      <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();">
@@ -443,15 +442,13 @@ function output_footer()
     "  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".
+  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 alt=\"Green Web Hosting! This site hosted by DreamHost.\"".
     " src=\"pics/green1.gif\" height=\"32\" width=\"100\" /></a>\n".
     "  </p> \n";
-  echo "\n";
-  echo "</footer>\n";
-
+  echo "</footer>\n\n";
   echo "</body>\n";
   echo "</html>\n";
 
@@ -488,9 +485,9 @@ function output_status()
       echo " | <a href=\"".$WIKI."\">"._('wiki/bugs')."</a>\n";
       echo " | <a href=\"".$RSS."?uid=".$myid."&amp;token=".$token."\">"._('atom')."</a>\n";
       echo " |&nbsp;&nbsp;&nbsp; <a href=\"".$INDEX."?action=logout\">"._('logout')."</a>\n";
-      echo "</div>\n";
+      echo "</div>\n\n";
 
-      echo "<div class=\"lastlogin\"><span>"._('last login').": ".date("r",$unixtime)."</span></div>\n";
+      echo "<div class=\"lastlogin\"><span>"._('last login').": ".date("r",$unixtime)."</span></div>\n\n";
     }
   return;
 }
@@ -598,10 +595,10 @@ 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";
+    echo "  $note <hr />\n";
   if($userstatus!='gameover')
-    echo "<input name=\"note\" type=\"text\" size=\"15\" maxlength=\"100\" />\n";
-  echo "</div> \n";
+    echo "  <input name=\"note\" type=\"text\" size=\"15\" maxlength=\"100\" />\n";
+  echo "</div>\n\n";
 
   return;
 }