Added category options and descriptions.

4 files changed, 35 insertions, 9 deletions

diff --git a/htdocs/categories.php b/htdocs/categories.php
index e4c1f37..a3e8ba2 100644
--- a/htdocs/categories.php
+++ b/htdocs/categories.php
@@ -36,10 +36,13 @@ function listCategories() {
     echo "<h2>Categories</h2>";
 
     $cats = Category::getCategories();
-    foreach ($cats as $short => $name) {
+    echo "<dl>";
+    foreach ($cats as $short => $cat) {
         $url = $GLOBALS['CONFIG']['urlroot'] . "/categories/$short";
-        echo "<p><a href=\"$url\">$name</a></p>";
+        echo "<dt><a href=\"$url\">". $cat->getName() ."</a></dt>";
+        echo "<dd>". $cat->getDescription() ."</dd>";
     }
+    echo "</dl>";
 }
 
 function displayEvents($category) {
diff --git a/htdocs/css/main.css b/htdocs/css/main.css
index be823b3..3e306ce 100644
--- a/htdocs/css/main.css
+++ b/htdocs/css/main.css
@@ -22,7 +22,7 @@ body {
     margin: 0 1.5em 0 1.5em;
 }
 
-.bigbutton {
+.bigbutton, .bigbutton:visited {
     background: url('../images/bigbutton.png') repeat-x center top;
     color: white;
     padding: 0.3em 1em 0.3em 1em;
@@ -30,7 +30,7 @@ body {
     border-radius: 5px;
 }
 
-.smallbutton {
+.smallbutton, .smallbutton:visited {
     background: url('../images/smallbutton.png') repeat-x center top;
     color: white;
     padding: 0.3em 1em 0.3em 1em;
@@ -86,6 +86,19 @@ body {
 
 }
 
+dt {
+    margin-top: 1.5em;
+    margin-bottom: 0.25em;
+    text-transform: uppercase;
+    font-weight: bold;
+    font-size: larger;
+}
+
+a, a:visited {
+    text-decoration: none;
+    color: blue;
+}
+
 .post {
     margin-bottom: 2em;
 }
diff --git a/htdocs/new-post.php b/htdocs/new-post.php
index 8573bce..961cdda 100644
--- a/htdocs/new-post.php
+++ b/htdocs/new-post.php
@@ -81,11 +81,16 @@ function handle_category() {
     echo "<p>Start by choosing a category from the list below</p>";
 
     // List Categories
-    foreach (Category::getCategories() as $short => $name) {
-        echo "<p><a href=\"". $GLOBALS['CONFIG']['urlroot']
-            . "/new-post.php?stage=tos&category=$short\">$name</a></p>";
+    $cats = Category::getCategories();
+    echo "<dl>";
+    foreach ($cats as $short => $cat) {
+        $url = $GLOBALS['CONFIG']['urlroot']
+            . "/new-post.php?stage=tos&category=$short";
+
+        echo "<dt><a href=\"$url\">". $cat->getName() ."</a></dt>";
+        echo "<dd>". $cat->getDescription() ."</dd>";
     }
-    
+    echo "</dl>";
 }
 
 function finish_category() {
diff --git a/htdocs/src/Category.inc.php b/htdocs/src/Category.inc.php
index edc0303..fdcd210 100644
--- a/htdocs/src/Category.inc.php
+++ b/htdocs/src/Category.inc.php
@@ -27,7 +27,8 @@ class Category {
        
         $result = array();
         foreach ($rows as $row) {
-            $result[$row['shortname']] = $row['name'];
+            $cat = new Category($row);
+            $result[$row['shortname']] = $cat;
         }
 
         return $result;
@@ -80,6 +81,10 @@ class Category {
     public function getShortname() {
         return htmlspecialchars($this->info['shortname']);
     }
+
+    public function getDescription() {
+        return htmlspecialchars($this->info['description']);
+    }
 }
 
 ?>