X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Foutput.php;h=6a61b085aecfae99b5c1f4c1fecccb80eb070f47;hp=df1d69a7ff179c16cbe62852d310b0ad1c374785;hb=c42caf707e7b0b9e4e22a2d15b034b39101172e1;hpb=cc95c662be086f71697755fe6939ff4840fe25b1

diff --git a/include/output.php b/include/output.php
index df1d69a..6a61b08 100644
--- a/include/output.php
+++ b/include/output.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright 2006, 2007, 2008, 2009, 2010 Arun Persaud <arun@nubati.net>
+/* Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Arun Persaud <arun@nubati.net>
  *
  *   This file is part of e-DoKo.
  *
@@ -26,6 +26,21 @@ if(!isset($HOST))
 
 /* functions which only ouput html  */
 
+function autoversion($file)
+{
+  /* changes the file name of e.g. css/style.css to css/style.<md5>.css/js
+   * this way the browser can cache the file and will reload it if the file changed
+   * needs to have .htaccess set up correctly to link back to css/style.css */
+
+  /* only use it for file that have an absolut path */
+  if(!file_exists(dirname($_SERVER['SCRIPT_FILENAME']). '/' . $file))
+    return $file;
+
+  $md5 = md5_file(dirname($_SERVER['SCRIPT_FILENAME']). '/' . $file);
+  return preg_replace('{\\.([^./]+)$}', ".$md5.\$1", $file);
+}
+
+
 function output_ask_for_new_game($playerA,$playerB,$playerC,$playerD,$oldgameid)
 {
   global $RULES;
@@ -53,48 +68,79 @@ 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=\"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";
 
-  $i=0;
+  echo '   <div class="middle">';
 
-  /* delete players name, since he will be on position D anyway */
-  unset($copy_names[array_search($_SESSION["name"],$copy_names)]);
+  $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)
+    {
+      if($name==$rand)
+	echo "         <option selected=\"selected\">$name</option>\n";
+      else
+	echo "         <option>$name</option>\n";
+    }
+  echo "       </select>\n     </div>\n";
 
-  srand((float) microtime() * 10000000);
-  foreach( array("PlayerA","PlayerB","PlayerC","PlayerD") as $player)
+  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)
     {
-      /* 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 '   </div>';
+  $rand = $_SESSION["name"];
+  echo  "     <div class=\"table3\">\n";
+  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 '';
@@ -222,72 +268,72 @@ function output_check_for_sickness($me,$mycards)
   echo '';
   echo '    '._('Do you want to play solo?').'';
   echo '    <select name="solo" size="1">';
-  echo '      <option value="No" selected="selected">'.'No'.'</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 '      <option value="spade">'._('spade').'</option>';
+  echo '      <option value="heart">'._('heart').'</option>';
   echo '    </select>';
   echo '    <br />';
 
-  echo _('Wedding?');
   if(check_wedding($mycards))
      {
+       echo _('Do you want to call Wedding?');
        echo ' '._('yes')."<input type=\"radio\" name=\"wedding\" value=\"yes\" checked=\"checked\" />";
        echo ' '._('no')." <input type=\"radio\" name=\"wedding\" value=\"no\" /> <br />\n";
      }
    else
      {
-       echo ' '._('no')." <input type=\"hidden\" name=\"wedding\" value=\"no\" /> <br />\n";
+       echo "  <input type=\"hidden\" name=\"wedding\" value=\"no\" />\n";
      };
 
-  echo _('Do you have poverty?');
   if(count_trump($mycards)<4)
     {
+      echo _('Do you want to call poverty?');
       echo ' '._('yes')."<input type=\"radio\" name=\"poverty\" value=\"yes\" checked=\"checked\" />";
       echo ' '._('no')." <input type=\"radio\" name=\"poverty\" value=\"no\" /> <br />\n";
     }
   else
     {
-      echo ' '._('no')." <input type=\"hidden\" name=\"poverty\" value=\"no\" /> <br />\n";
+      echo "  <input type=\"hidden\" name=\"poverty\" value=\"no\" />\n";
     };
 
-  echo _('Do you have too many nines?');
   if(count_nines($mycards)>4)
      {
+       echo _('Do you want to call too many nines?');
        echo ' '._('yes')."<input type=\"radio\" name=\"nines\" value=\"yes\" checked=\"checked\" />";
        echo ' '._('no')." <input type=\"radio\" name=\"nines\" value=\"no\" /> <br />\n";
      }
    else
      {
-       echo ' '._('no')." <input type=\"hidden\" name=\"nines\" value=\"no\" /> <br />\n";
+       echo "  <input type=\"hidden\" name=\"nines\" value=\"no\" />\n";
      };
 
   if($RULES['lowtrump']=='cancel' || $RULES['lowtrump']=='poverty')
     {
-      if($RULES['lowtrump']=='cancel')
-	echo _('Do you have low trump (cancel game)?');
-      else
-	echo _('Do you have low trump (poverty)?');
-
       if(check_low_trump($mycards))
 	{
+          if($RULES['lowtrump']=='cancel')
+            echo _('Do you want to call low trump (cancel game)?');
+          else
+	    echo _('Do you want to call low trump (poverty)?');
+
 	  echo ' '._('yes')."<input type=\"radio\" name=\"lowtrump\" value=\"yes\" checked=\"checked\" />";
 	  echo ' '._('no')." <input type=\"radio\" name=\"lowtrump\" value=\"no\" /> <br />\n";
 	}
       else
 	{
-	  echo ' '._('no')." <input type=\"hidden\" name=\"lowtrump\" value=\"no\" /> <br />\n";
+	  echo "  <input type=\"hidden\" name=\"lowtrump\" value=\"no\" />\n";
 	};
     }
   else
-    echo "<input type=\"hidden\" name=\"lowtrump\" value=\"no\" />";
+    echo "  <input type=\"hidden\" name=\"lowtrump\" value=\"no\" />";
 
    echo "<input type=\"hidden\" name=\"me\" value=\"$me\" />\n";
-   echo "<input type=\"submit\" value=\""._('count me in')."\" />\n";
+   echo "<br /><input type=\"submit\" value=\""._('count me in')."\" />\n";
 
    echo "</div>\n";
 
@@ -357,7 +403,7 @@ function output_check_want_to_play($me)
 {
   echo ' <div class="joingame">';
   echo '   '._('Do you want to play a game of DoKo?').' <br />';
-  echo '   '._('yes').'<input type="radio" name="in" value="yes" />';
+  echo '   '._('yes').'<input type="radio" name="in" value="yes" checked="checked" />';
   echo '   '._('no').'<input type="radio" name="in" value="no" /> <br />';
   echo "<input type=\"hidden\" name=\"me\" value=\"$me\" />\n";
   echo "\n";
@@ -376,56 +422,18 @@ function output_header()
   <head>
      <title>e-Doko</title>
      <meta charset="utf-8" />
-     <link rel="shortcut icon" href="pics/edoko-favicon.png" />
-     <link rel="stylesheet" href="css/standard.css?v=31" />
-     <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>
+     <meta name="viewport" content="width=device-width; initial-scale=1.0;" />
+     <link id="favicon" rel="shortcut icon" href="pics/edoko-favicon.png" />
+     <link rel="stylesheet" media="all" href="<?php echo autoversion("css/bootstrap.css"); ?>" />
+     <link rel="stylesheet" href="<?php echo autoversion("css/standard.css"); ?>" />
+     <link rel="stylesheet" href="<?php echo autoversion("css/dateinput.css"); ?>"/>
+<!--
+     <link rel="stylesheet/less" media="all" href="<?php echo autoversion("css/bootstrap.less"); ?>" />
+     <link rel="stylesheet/less" href="<?php echo autoversion("css/standard.less"); ?>" />
+     <script src="js/less.min.js" type="text/javascript"></script>
+!-->
   </head>
 <body onload="high_last();">
-<header>
-<?php
-  echo '<h1> '._('Welcome to E-Doko').' </h1>';
-?>
-</header>
 <?php
 
   echo "<div class=\"main\">";
@@ -438,18 +446,20 @@ function output_footer()
 
   echo "</div>\n\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".
+  echo "  <p class=\"left\"> copyright 2006-2013 <a href=\"$INDEX?action=about\">Arun Persaud, et al.</a> <br />\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";
+    " src=\"pics/green1.gif\" height=\"32\" width=\"100\" /></a><p>\n";
+  echo "</footer>\n\n";
+
+  echo '<script src="'.autoversion('js/jquery.min.js').             '"></script>';
+  echo '<script src="'.autoversion('js/jquery.tablesorter.min.js'). '"></script>';
+  echo '<script src="'.autoversion('js/jquery.tools.min.js').       '"></script>';
+  echo '<script src="'.autoversion('js/bootstrap.min.js').          '"></script>';
+  echo '<script src="'.autoversion('js/layout.js').                 '"></script>';
+  echo '<script src="'.autoversion('js/game.js').                   '"></script>';
 
   echo "</body>\n";
   echo "</html>\n";
@@ -457,13 +467,14 @@ function output_footer()
   return;
 }
 
-function output_status()
+function output_navbar()
 {
   global $defaulttimezone, $INDEX, $WIKI, $RSS;
 
   if(isset($_SESSION['name']))
     {
-      $name = $_SESSION['name'];
+      $name  = $_SESSION['name'];
+      $email = DB_get_email('name',$name);
 
       /* last logon time */
       $myid  = DB_get_userid('name',$name);
@@ -478,18 +489,25 @@ function output_status()
       $token = get_user_token($myid);
 
       /* logout info */
-      echo "\n<div class=\"status\">\n";
-      echo $name,"\n";
-      echo " | <a href=\"".$INDEX."\">"._('mypage')."</a>\n";
-      echo " | <a href=\"".$INDEX."?action=prefs\">"._('settings')."</a>\n";
-      echo " | <a href=\"".$INDEX."?action=new\">"._('new game')."</a>\n";
-      echo " | <a href=\"".$INDEX."?action=stats\">"._('statistics')."</a>\n";
-      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 "\n<div class=\"navigation\">\n";
+      echo "  <span class=\"brand\" href=\"#\">E-DoKo</span>\n";
+      echo "  <ul class=\"nav\">";
+      echo "     <li>\n";
+      echo "         <img title=\"$name\" ";
+      echo             "src=\"http://www.gravatar.com/avatar/".md5(strtolower(trim($email)))."?d=identicon\" />\n";
+      echo "     </li>\n";
+      echo "     <li> <a href=\"".$INDEX."\"><i class=\"icon-home\"></i><span class=\"navhide\">"._('Home')."</span></a></li>\n";
+      echo "     <li> <a href=\"".$INDEX."?action=prefs\"><i class=\"icon-cog\"></i><span class=\"navhide\">".
+	_('settings')."</span></a></li>\n";
+      echo "     <li> <a href=\"".$INDEX."?action=new\">"._('new game')."</a></li>\n";
+      echo "     <li> <a href=\"".$INDEX."?action=stats\">"._('statistics')."</a></li>\n";
+      echo "     <li> <a href=\"".$WIKI."\">"._('wiki/bugs')."</a></li>\n";
+      echo "     <li> <a href=\"".$RSS."?uid=".$myid."&amp;token=".$token."\">"._('atom')."</a></li>\n";
+      echo "     <li> <a href=\"".$INDEX."?action=logout\"><i class=\"icon-off\"></i><span class=\"navhide\">"._('logout')."</span></a></li>\n";
+      echo "  </ul>\n";
       echo "</div>\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;
 }
@@ -597,10 +615,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;
 }
@@ -622,7 +640,7 @@ function output_robotproof($i)
     }
 }
 
-function output_exchanged_cards()
+function output_exchanged_cards($gametype)
 {
   /* in a poverty game this function will output the exchanged cards
    * players in the team will see the cards, the other team will see
@@ -630,7 +648,7 @@ function output_exchanged_cards()
    */
 
   /* need some information about the game */
-  global $gameid,$mygametype, $PREF,$me,$mystatus, $RULES;
+  global $gameid,$PREF,$me,$mystatus, $RULES;
 
   /* some variables to track where the people with poverty are sitting */
   $partnerpos1 = 0;
@@ -641,7 +659,7 @@ function output_exchanged_cards()
   /* only need to do it in a poverty game, this might not be needed, but
    * just to make sure everything is ok
    */
-  if($mygametype == 'poverty' || $mygametype=='dpoverty')
+  if($gametype == 'poverty' || $gametype=='dpoverty')
     {
       /* find out who has poverty */
       for($mypos=1;$mypos<5;$mypos++)
@@ -680,6 +698,19 @@ function output_exchanged_cards()
   $show=1;
   for($mypos=1;$mypos<5;$mypos++)
     {
+      /* output comments */
+      if($mypos==2)
+	{
+	  /* display all comments on the top right (card1)*/
+	  $comments = DB_get_pre_comment($gameid);
+	  /* display card */
+	  echo "      <div class=\"card1\">\n";
+	  /* display comments */
+	  foreach( $comments as $comment )
+	    echo "        <span class=\"comment\">".$comment[1].": ".$comment[0]."</span>\n";
+	  echo "      </div>\n"; /* end div card */
+	}
+
       $usersick = DB_get_sickness_by_pos_and_gameid($mypos,$gameid);
       if($usersick!=NULL ||
 	 $mypos==$povertypos1 || $mypos==$partnerpos1 ||
@@ -764,7 +795,7 @@ function output_exchanged_cards()
 	    }
 	  echo  "      </div>\n";
 	}
-      if($mygametype == $usersick)
+      if($gametype == $usersick)
 	$show = 0;
     }
 }