CLEANUP: make html output a bit nicer

added some newlines and spaces

diff --git a/functions.php b/functions.php
index 73d04f62113cc5df5a4af2a7b713b78ebcb0f18b..3726cf115f00888f37fbdc6aafe98d72a368c066 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -692,11 +692,11 @@ function display_table ()
       $zone   = return_timezone($offset);
       date_default_timezone_set($zone);
       
       $zone   = return_timezone($offset);
       date_default_timezone_set($zone);
       

-      echo " <div class=\"table".($pos-1)."\">\n";
+      echo "  <div class=\"table".($pos-1)."\">\n";

       if(!$debug)
       if(!$debug)

-       echo " $name \n";
+       echo "   $name \n";

       else
       else

-       echo "<a href=\"".$host."?me=".$hash."\">$name</a>\n";
+       echo "   <a href=\"".$host."?me=".$hash."\">$name</a>\n";

 
       /* add hints for poverty, wedding, solo, etc */
       if($GT=="poverty" && $party=="re")
 
       /* add hints for poverty, wedding, solo, etc */
       if($GT=="poverty" && $party=="re")


@@ -706,12 +706,12 @@ function display_table ()
            $cards    = DB_get_all_hand($userhash);
            $trumpNR  = count_trump($cards);
            if($trumpNR)
            $cards    = DB_get_all_hand($userhash);
            $trumpNR  = count_trump($cards);
            if($trumpNR)

-             echo "<img src=\"pics/button/poverty_trump_button.png\" class=\"button\" alt=\"poverty < trump back\" />";
+             echo "   <img src=\"pics/button/poverty_trump_button.png\" class=\"button\" alt=\"poverty < trump back\" />";

            else
            else

-             echo "<img src=\"pics/button/poverty_notrump_button.png\" class=\"button\" alt=\"poverty <\" />";
+             echo "   <img src=\"pics/button/poverty_notrump_button.png\" class=\"button\" alt=\"poverty <\" />";

          }
        else
          }
        else

-         echo "<img src=\"pics/button/poverty_partner_button.png\" class=\"button\" alt=\"poverty >\" />";
+         echo "   <img src=\"pics/button/poverty_partner_button.png\" class=\"button\" alt=\"poverty >\" />";

       
       if($GT=="dpoverty")
        if($party=="re")
       
       if($GT=="dpoverty")
        if($party=="re")


@@ -721,12 +721,12 @@ function display_table ()
              $cards    = DB_get_all_hand($userhash);
              $trumpNR  = count_trump($cards);
              if($trumpNR)
              $cards    = DB_get_all_hand($userhash);
              $trumpNR  = count_trump($cards);
              if($trumpNR)

-               echo "<img src=\"pics/button/poverty_trump_button.png\" class=\"button\" alt=\"poverty < trump back\" />";
+               echo "   <img src=\"pics/button/poverty_trump_button.png\" class=\"button\" alt=\"poverty < trump back\" />";

              else
              else

-               echo "<img src=\"pics/button/poverty_notrump_button.png\" class=\"button\" alt=\"poverty <\" />";
+               echo "   <img src=\"pics/button/poverty_notrump_button.png\" class=\"button\" alt=\"poverty <\" />";

            }
          else
            }
          else

-           echo "<img src=\"pics/button/poverty_partner_button.png\" class=\"button\" alt=\"poverty >\" />";
+           echo "   <img src=\"pics/button/poverty_partner_button.png\" class=\"button\" alt=\"poverty >\" />";

        else
          if($sickness=="poverty")
            {
        else
          if($sickness=="poverty")
            {


@@ -734,65 +734,65 @@ function display_table ()
              $cards    = DB_get_all_hand($userhash);
              $trumpNR  = count_trump($cards);
              if($trumpNR)
              $cards    = DB_get_all_hand($userhash);
              $trumpNR  = count_trump($cards);
              if($trumpNR)

-               echo "<img src=\"pics/button/poverty2_trump_button.png\" class=\"button\" alt=\"poverty2 < trump back\" />";
+               echo "   <img src=\"pics/button/poverty2_trump_button.png\" class=\"button\" alt=\"poverty2 < trump back\" />";

              else
              else

-               echo "<img src=\"pics/button/poverty2_notrump_button.png\" class=\"button\" alt=\"poverty2 <\" />";
+               echo "   <img src=\"pics/button/poverty2_notrump_button.png\" class=\"button\" alt=\"poverty2 <\" />";

            }
          else
            }
          else

-           echo "<img src=\"pics/button/poverty2_partner_button.png\" class=\"button\" alt=\"poverty2 >\" />";
+           echo "   <img src=\"pics/button/poverty2_partner_button.png\" class=\"button\" alt=\"poverty2 >\" />";

       
       if($GT=="wedding" && $party=="re")
        if($sickness=="wedding")
       
       if($GT=="wedding" && $party=="re")
        if($sickness=="wedding")

-         echo "<img src=\"pics/button/wedding_button.png\" class=\"button\" alt=\"wedding\" />";
+         echo "   <img src=\"pics/button/wedding_button.png\" class=\"button\" alt=\"wedding\" />";

        else
        else

-         echo "<img src=\"pics/button/wedding_partner_button.png\" class=\"button\" alt=\"wedding partner\" />";
+         echo "   <img src=\"pics/button/wedding_partner_button.png\" class=\"button\" alt=\"wedding partner\" />";

       
       if(ereg("solo",$GT) && $party=="re")
        {
          if(ereg("queen",$GT))
       
       if(ereg("solo",$GT) && $party=="re")
        {
          if(ereg("queen",$GT))

-           echo "<img src=\"pics/button/queensolo_button.png\" class=\"button\" alt=\"$GT\" />";
+           echo "   <img src=\"pics/button/queensolo_button.png\" class=\"button\" alt=\"$GT\" />";

          else if(ereg("jack",$GT))
          else if(ereg("jack",$GT))

-           echo "<img src=\"pics/button/jacksolo_button.png\" class=\"button\" alt=\"$GT\" />";
+           echo "   <img src=\"pics/button/jacksolo_button.png\" class=\"button\" alt=\"$GT\" />";

          else if(ereg("club",$GT))
          else if(ereg("club",$GT))

-           echo "<img src=\"pics/button/clubsolo_button.png\" class=\"button\" alt=\"$GT\" />";
+           echo "   <img src=\"pics/button/clubsolo_button.png\" class=\"button\" alt=\"$GT\" />";

          else if(ereg("spade",$GT))
          else if(ereg("spade",$GT))

-           echo "<img src=\"pics/button/spadesolo_button.png\" class=\"button\" alt=\"$GT\" />";
+           echo "   <img src=\"pics/button/spadesolo_button.png\" class=\"button\" alt=\"$GT\" />";

          else if(ereg("heart",$GT))
          else if(ereg("heart",$GT))

-           echo "<img src=\"pics/button/heartsolo_button.png\" class=\"button\" alt=\"$GT\" />";
+           echo "   <img src=\"pics/button/heartsolo_button.png\" class=\"button\" alt=\"$GT\" />";

          else if(ereg("trumpless",$GT))
          else if(ereg("trumpless",$GT))

-           echo "<img src=\"pics/button/notrumpsolo_button.png\" class=\"button\" alt=\"$GT\" />";
+           echo "   <img src=\"pics/button/notrumpsolo_button.png\" class=\"button\" alt=\"$GT\" />";

          else if(ereg("trump",$GT))
          else if(ereg("trump",$GT))

-           echo "<img src=\"pics/button/trumpsolo_button.png\" class=\"button\" alt=\"$GT\" />";
+           echo "   <img src=\"pics/button/trumpsolo_button.png\" class=\"button\" alt=\"$GT\" />";

        }
       
       /* add point calls */
       if($call!=NULL)
        {
          if($party=="re")
        }
       
       /* add point calls */
       if($call!=NULL)
        {
          if($party=="re")

-           echo "<img src=\"pics/button/re_button.png\" class=\"button\" alt=\"re\" />";
+           echo "  <img src=\"pics/button/re_button.png\" class=\"button\" alt=\"re\" />";

          else
          else

-           echo "<img src=\"pics/button/contra_button.png\" class=\"button\" alt=\"contra\" />";
+           echo "  <img src=\"pics/button/contra_button.png\" class=\"button\" alt=\"contra\" />";

          switch($call)
            {
            case "0":
          switch($call)
            {
            case "0":

-             echo "<img src=\"pics/button/0_button.png\" class=\"button\" alt=\"0\" />";
+             echo "   <img src=\"pics/button/0_button.png\" class=\"button\" alt=\"0\" />";

              break;
            case "30":
              break;
            case "30":

-             echo "<img src=\"pics/button/30_button.png\" class=\"button\" alt=\"30\" />";
+             echo "   <img src=\"pics/button/30_button.png\" class=\"button\" alt=\"30\" />";

              break;
            case "60":
              break;
            case "60":

-             echo "<img src=\"pics/button/60_button.png\" class=\"button\" alt=\"60\" />";
+             echo "   <img src=\"pics/button/60_button.png\" class=\"button\" alt=\"60\" />";

              break;
            case "90":
              break;
            case "90":

-             echo "<img src=\"pics/button/90_button.png\" class=\"button\" alt=\"90\" />";
+             echo "   <img src=\"pics/button/90_button.png\" class=\"button\" alt=\"90\" />";

              break;
            }
        }
       
              break;
            }
        }
       

-      echo "<br />\n";
-      echo " <span title=\"".date("Y-m-d H:i:s")."\">local time</span>";
-      echo " <span title=\"".date("Y-m-d H:i:s",$lastlogin)."\">last login</span>";
-      echo " </div>\n";
+      echo "    <br />\n";
+      echo "    <span title=\"".date("Y-m-d H:i:s")."\">local time</span>\n";
+      echo "    <span title=\"".date("Y-m-d H:i:s",$lastlogin)."\">last login</span>\n";
+      echo "   </div>\n";

       
     }
   echo  "</div>\n"; /* end output table */
       
     }
   echo  "</div>\n"; /* end output table */


@@ -821,7 +821,7 @@ function display_user_menu()
       echo "<a href=\"".$host."?me=".$r[0]."\">game ".DB_format_gameid($r[1])." </a><br />\n";
     }
   
       echo "<a href=\"".$host."?me=".$r[0]."\">game ".DB_format_gameid($r[1])." </a><br />\n";
     }
   

-  echo "<hr /> <a href=\"".$host."?new\">start a new game</a>";
+  echo "<hr /> <a href=\"".$host."?new\">start a new game</a>\n";

               
 
   echo
               
 
   echo

diff --git a/index.php b/index.php
index 7d2d4abeb3fbe39c89c1197eb813b028a362e305..538bc81938f9eebcc76b0d203d0b30d7d4527892 100644 (file)
--- a/index.php
+++ b/index.php
@@ -349,9 +349,9 @@ else if(myisset("me"))
        foreach($hashes as $hash)
          {
            if($hash == $me)
        foreach($hashes as $hash)
          {
            if($hash == $me)

-             echo "$i ";
+             echo "$i \n";

            else 
            else 

-             echo "<a href=\"".$host."?me=".$hash."\">$i</a> ";
+             echo "<a href=\"".$host."?me=".$hash."\">$i</a> \n";

            $i++;
          }
        echo "</div>\n";
            $i++;
          }
        echo "</div>\n";

diff --git a/output.php b/output.php
index 88bc9f21a1d2b6bbd6050e2260d8a44e9d9379a6..5c5e0aa8388b12443810384b587aa8b2d6e08bc7 100644 (file)
--- a/output.php
+++ b/output.php
@@ -335,18 +335,18 @@ function output_footer()
 {
   global $REV,$PREF;
 
 {
   global $REV,$PREF;
 

-  echo "</div>";
+  echo "</div>\n\n";

   echo "<div class=\"footer\">\n";
   echo "<div class=\"footer\">\n";

-  echo "<p class=\"left\"> copyright 2006-2007 Arun Persaud <br />\n".
-    "Verwendung der [deutschen] Kartenbilder mit Genehmigung <br />der Spielkartenfabrik Altenburg GmbH,(c) ASS Altenburger <br />".
-    "- ASS Altenburger Spielkarten - Spielkartenfabrik Altenburg GmbH <br />".
-    "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\">".
-    "via git </a> <br />or download the source via <br />'git clone http://nubati.net/git/e-DoKo.git' <br />".
-    "<a href=\"http://www.dreamhost.com/green.cgi\">".
-    "<img  border=\"0\" alt=\"Green Web Hosting! This site hosted by DreamHost.\"".
-    "src=\"https://secure.newdream.net/green1.gif\" height=\"32\" width=\"100\" /></a>".
-    "</p> \n";
+  echo "  <p class=\"left\"> copyright 2006-2007 Arun Persaud <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  border=\"0\" alt=\"Green Web Hosting! This site hosted by DreamHost.\"".
+    "src=\"https://secure.newdream.net/green1.gif\" height=\"32\" width=\"100\" /></a>\n".
+    "  </p> \n";

   echo "\n";
   echo "</div>\n";
 
   echo "\n";
   echo "</div>\n";