changeset 1334:73dd95d63e7a

Upstream sync.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 09 Sep 2012 01:15:52 +0300
parents 11dbebfca64c
children 5c397c0b78f7
files www/index.php www/info.php www/wizards.txt
diffstat 3 files changed, 9 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/www/index.php	Sat Sep 01 07:12:32 2012 +0300
+++ b/www/index.php	Sun Sep 09 01:15:52 2012 +0300
@@ -158,6 +158,7 @@
 <?
 static $conpics = array(
   
+  "Kepucon'12" => "kepucon2012",
   "Kepucon'11" => "kepucon2011",
   "Kepucon'10" => "kepucon2010",
   "Kepucon'08" => "kepucon2008",
--- a/www/info.php	Sat Sep 01 07:12:32 2012 +0300
+++ b/www/info.php	Sun Sep 09 01:15:52 2012 +0300
@@ -63,12 +63,14 @@
 
 /* Print table of wizards
  */
-foreach ($locTable as $location) {
-  foreach ($location["coders"] as $wiz) {
+foreach ($locTable as $location)
+{
+  foreach ($location["coders"] as $wiz)
+  {
     $name = $wiz["name"];
     if (!isset($wizTable[$name]))
-      $wizTable[$name] = array("name" => $name);
-      $wizTable[$name]["areas"]++;
+      $wizTable[$name] = array("name" => $name, "areas" => 0);
+    $wizTable[$name]["areas"]++;
   }
 }
 
@@ -102,7 +104,7 @@
         printf("  <td width=\"%d%%\" style=\"background: %s;\"><a href=\"loc.php?a=%s\">%s</a> <span style=\"color: #f80;\">",
           (100 / $maxRow), (count($wizard) > 2 || isset($wizard["desc"])) ? "#474" : "#744", $wizard["name"], $wizard["name"]);
 
-        if (isset($wizard["areas"]))
+        if ($wizard["areas"] > 0)
           echo " (".$wizard["areas"].")";
 
         echo "</span></td>\n";
--- a/www/wizards.txt	Sat Sep 01 07:12:32 2012 +0300
+++ b/www/wizards.txt	Sun Sep 09 01:15:52 2012 +0300
@@ -1,6 +1,6 @@
 # Information about coders/wizards. Format of this file:
 # name;[http://homepageURL|bat];[http://pictureURL];freeform description$
-Ggr;bat;img/ggr.jpg;
+Ggr;http://tnsp.org/~ccr/;img/ggr.jpg;
 	[b]Editor's note: As I would feel silly writing about myself in third
 	person, this entry will be, as an exception, written in
 	first person.[/b]