X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Foutput.php;h=279d4a43c05831ae2c9206276361caa597ff875c;hp=6e5f15f9465e975baf41e24927126d410753491e;hb=e2db7fab7569c20afa4f7915edb70842ae1aed8e;hpb=ef0fd1178c4f9e5bea92dac7d02a12ce0d523547

diff --git a/include/output.php b/include/output.php
index 6e5f15f..279d4a4 100644
--- a/include/output.php
+++ b/include/output.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Arun Persaud <arun@nubati.net>
+/* Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Arun Persaud <arun@nubati.net>
  *
  *   This file is part of e-DoKo.
  *
@@ -274,8 +274,8 @@ function output_check_for_sickness($me,$mycards)
   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 />';
 
@@ -446,7 +446,7 @@ function output_footer()
 
   echo "</div>\n\n";
   echo "<footer>\n";
-  echo "  <p class=\"left\"> copyright 2006-2013 <a href=\"$INDEX?action=about\">Arun Persaud, et al.</a> <br />\n";
+  echo "  <p class=\"left\"> copyright 2006-2014 <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".
@@ -489,25 +489,34 @@ function output_navbar()
       $token = get_user_token($myid);
 
       /* logout info */
-      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";
+      echo "\n<nav class=\"navbar navbar-default navbar-fixed-top\" role=\"navigation\">\n";
+      echo "  <div class=\"container-fluid\">\n";
+      echo "    <div class=\"navbar-header\">";
+      echo "         <a href=\"".$INDEX."\">\n";
+      echo "           <img class=\"grav navbar-right\" title=\""._('last login').": ".date("r",$unixtime)."\" ";
+      echo             "src=\"http://www.gravatar.com/avatar/".md5(strtolower(trim($email)))."?d=identicon\" /></a>\n";
+      echo '         <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-elements">
+                         <span class="sr-only">Toggle navigation</span>
+                         <span class="icon-bar"></span>
+                         <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                     </button>';
+      echo "      <a class=\"navbar-brand\" href=\"".$INDEX."\">E-DoKo</a>\n";
+      echo "    </div>";
+      echo '    <div class="collapse navbar-collapse" id="navbar-collapse-elements">';
+      echo "      <ul class=\"nav navbar-nav\">";
+      echo "         <li> <a href=\"".$INDEX."\"><span class=\"glyphicon glyphicon-home\"></span>"._('Home')."</a></li>\n";
+      echo "         <li> <a href=\"".$INDEX."?action=prefs\"><span class=\"glyphicon glyphicon-cog\"></span>".
+	_('settings')."</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\"><span class=\"glyphicon glyphicon-off\"></span>"._('logout')."</a></li>\n";
+      echo "      </ul>\n";
+      echo "    </div>\n";
+      echo "  </div>\n";
+      echo "</nav>\n";
     }
   return;
 }