projects / e-DoKo.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
CLEANUP: moves javascript from header into game.js
[e-DoKo.git] / include / output.php
diff --git a/include/output.php b/include/output.php
index 91030abd2dce3e5153e57e110aa9adef2385debd..c6d78e32bfa53931d0c5fdb3bbc7437b841cd897 100644 (file)
--- a/include/output.php
+++ b/include/output.php
@@ -208,9 +208,9 @@ function display_link_card($card,$dir="english",$type="card", $selected=0)
     $selected = 'checked="checked"';
 
   if( $card/2 - (int)($card/2) == 0.5)
-    echo "<div class=\"cardinput\"><input type=\"radio\" name=\"".$type."\" value=\"".$card."\" $selected /><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."\" $selected /><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;
 }
 
@@ -371,62 +371,29 @@ 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/standard.css?v=29" />
-     <link rel="stylesheet" type="text/css" href="css/dateinput.css?v=1"/>
+     <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=35" />
+     <link rel="stylesheet" media="screen and (max-width: 600px)" href="css/narrow.css?v=2" />
+     <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\">";
@@ -438,8 +405,8 @@ function output_footer()
   global $REV, $PREF, $INDEX;
 
   echo "</div>\n\n";
-  echo "<div class=\"footer\">\n";
-  echo "  <p class=\"left\"> copyright 2006,2007,2008,2009,2010 <a href=\"$INDEX?action=about\">Arun Persaud, et al.</a> <br />\n".
+  echo "<footer>\n";
+  echo "  <p class=\"left\"> copyright 2006-2011 <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";
@@ -447,11 +414,9 @@ function output_footer()
     "  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=\"https://secure.newdream.net/green1.gif\" height=\"32\" width=\"100\" /></a>\n".
+    " src=\"pics/green1.gif\" height=\"32\" width=\"100\" /></a>\n".
     "  </p> \n";
-  echo "\n";
-  echo "</div>\n";
-
+  echo "</footer>\n\n";
   echo "</body>\n";
   echo "</html>\n";
 
@@ -488,9 +453,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;
 }
@@ -574,13 +539,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>
@@ -598,10 +563,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;
 }
Email/Web based Dopppelkopf server