projects / e-DoKo.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
TRANSLATION: marked more strings for translation
[e-DoKo.git] / include / output.php
diff --git a/include/output.php b/include/output.php
index fa61c87caa69d315ad9423e48854b9242f2a2c4c..d38c899c2b96d7b4b2920a6e8dc46610489d6e9f 100644 (file)
--- a/include/output.php
+++ b/include/output.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 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.
  *
@@ -130,7 +130,6 @@ function output_form_for_new_game($names)
   echo '   </div>';
   $rand = $_SESSION["name"];
   echo  "     <div class=\"table3\">\n";
-  $i++;
   echo "       <select name=\"PlayerD\" size=\"1\">  \n";
   foreach($names as $name)
     {
@@ -425,10 +424,14 @@ function output_header()
      <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" 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"); ?>" />
-     <link rel="stylesheet" href="<?php echo autoversion("css/dateinput.css"); ?>"/>
      <script src="js/less.min.js" type="text/javascript"></script>
+!-->
   </head>
 <body onload="high_last();">
 <?php
@@ -443,16 +446,15 @@ function output_footer()
 
   echo "</div>\n\n";
   echo "<footer>\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\"><p>\n".
+    "  <img class=\"right\" alt=\"Green Web Hosting! This site hosted by DreamHost.\"".
+    " src=\"pics/green1.gif\" height=\"32\" width=\"100\" /></a>\n";
   echo "  <p class=\"left\"> copyright 2006-2012 <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 alt=\"Green Web Hosting! This site hosted by DreamHost.\"".
-    " src=\"pics/green1.gif\" height=\"32\" width=\"100\" /></a>\n".
-    "  </p> \n";
   echo "</footer>\n\n";
 
   echo '<script src="'.autoversion('js/jquery.min.js').             '"></script>';
@@ -474,7 +476,8 @@ function output_navbar()
 
   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);
@@ -489,28 +492,23 @@ function output_navbar()
       $token = get_user_token($myid);
 
       /* logout info */
-      echo "\n<div class=\"navbar navbar-fixed-top\">\n";
-      echo "  <div class=\"navbar-inner\">\n";
-      echo "    <span class=\"brand\" href=\"#\">E-DoKo</span>\n";
-      echo "    <ul class=\"nav\">";
-      echo "       <li><a href=\"#\">$name</a> </li>\n";
-      echo "       <li class=\"divider-vertical\"></li>\n";
-      echo " <li> <a href=\"".$INDEX."\">"._('mypage')."</a></li>\n";
-      echo "       <li class=\"divider-vertical\"></li>\n";
-      echo " <li> <a href=\"".$INDEX."?action=prefs\">"._('settings')."</a></li>\n";
-      echo "       <li class=\"divider-vertical\"></li>\n";
-      echo " <li> <a href=\"".$INDEX."?action=new\">"._('new game')."</a></li>\n";
-      echo "       <li class=\"divider-vertical\"></li>\n";
-      echo " <li> <a href=\"".$INDEX."?action=stats\">"._('statistics')."</a></li>\n";
-      echo "       <li class=\"divider-vertical\"></li>\n";
-      echo " <li> <a href=\"".$WIKI."\">"._('wiki/bugs')."</a></li>\n";
-      echo "       <li class=\"divider-vertical\"></li>\n";
-      echo " <li> <a href=\"".$RSS."?uid=".$myid."&amp;token=".$token."\">"._('atom')."</a></li>\n";
-      echo "       <li class=\"divider-vertical\"></li>\n";
-      echo " <li> <a href=\"".$INDEX."?action=logout\">"._('logout')."</a></li>\n";
-      echo "    </ul>\n";
-      echo "  </div>\n";
-      echo "</div>\n\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\n";
     }
Email/Web based Dopppelkopf server