Index: openacs-4/packages/forums/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/forums/www/index.adp	3 Jun 2002 15:47:48 -0000	1.3
+++ openacs-4/packages/forums/www/index.adp	5 Jun 2002 14:28:47 -0000	1.4
@@ -37,11 +37,11 @@
   </else>
 
       <td>
-        <a href="forum-view?forum_id=@forums.forum_id@">@forums.name@</a><br>
-        <i>@forums.charter@</i>
+        <a href="forum-view?forum_id=@forums.forum_id@">@forums.name@</a>
+        <if @forums.charter@ not nil><br><i>@forums.charter@</i></if>
       </td>
       <td>@forums.n_threads@</td>
-      <td>@forums.last_modified@</td>
+      <td><if @forums.n_threads@ gt 0>@forums.last_modified@</if></td>
 
     </tr>
 
Index: openacs-4/packages/forums/www/admin/forum-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/admin/forum-new.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/forums/www/admin/forum-new.tcl	3 Jun 2002 04:39:05 -0000	1.3
+++ openacs-4/packages/forums/www/admin/forum-new.tcl	5 Jun 2002 14:28:47 -0000	1.4
@@ -6,42 +6,61 @@
     @creation-date 2002-05-25
     @version $Id$
 
-} {
+} -query {
     {name ""}
 }
 
-# scoping
 set package_id [ad_conn package_id]
 
 form create forum
 
 element create forum forum_id \
-        -label "Forum ID" -datatype integer -widget hidden
+    -label "Forum ID" \
+    -datatype integer \
+    -widget hidden
 
 element create forum name \
-        -label "Name" -datatype text -widget text -html {size 60}
+    -label Name \
+    -datatype text \
+    -widget text \
+    -html {size 60}
 
 element create forum charter \
-        -label "Charter" -datatype text -widget textarea -html {cols 60 rows 10 wrap soft}
+    -label Charter \
+    -datatype text \
+    -widget textarea \
+    -html {cols 60 rows 10 wrap soft} \
+    -optional
 
 element create forum presentation_type \
-        -label "Presentation" -datatype text -widget select -options {{Flat flat} {Threaded threaded}}
+    -label Presentation \
+    -datatype text \
+    -widget select \
+    -options {{Flat flat} {Threaded threaded}}
 
 element create forum posting_policy \
-        -label "Posting Policy" -datatype text -widget select -options {{open open} {moderated moderated} {closed closed}}
+    -label "Posting Policy" \
+    -datatype text \
+    -widget select \
+    -options {{open open} {moderated moderated} {closed closed}}
 
 element create forum new_threads_p \
-        -label "Users Can Create New Threads" -datatype integer -widget radio -options {{yes 1} {no 0}}
+    -label "Users Can Create New Threads" \
+    -datatype integer \
+    -widget radio \
+    -options {{yes 1} {no 0}}
 
 if {[form is_valid forum]} {
-    template::form get_values forum forum_id name charter presentation_type posting_policy new_threads_p
+    template::form get_values forum \
+        forum_id name charter presentation_type posting_policy new_threads_p
 
     set forum_id [forum::new -forum_id $forum_id \
-            -name $name \
-            -charter $charter \
-            -presentation_type $presentation_type \
-            -posting_policy $posting_policy \
-            -package_id $package_id]
+        -name $name \
+        -charter $charter \
+        -presentation_type $presentation_type \
+        -posting_policy $posting_policy \
+        -package_id $package_id \
+    ]
 
     # Users can create new threads?
     if {$new_threads_p} {
@@ -58,6 +77,7 @@
 set forum_id [db_nextval acs_object_id_seq]
 element set_properties forum forum_id -value $forum_id
 element set_properties forum name -value $name
+element set_properties forum presentation_type -value threaded
 element set_properties forum new_threads_p -value 1
 
 ad_return_template