Index: openacs-4/packages/forums/www/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/Attic/master.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/forums/www/master.adp	3 Jun 2002 04:39:05 -0000	1.3
+++ openacs-4/packages/forums/www/master.adp	1 Aug 2002 14:53:20 -0000	1.4
@@ -1,5 +1,6 @@
 <master>
 <property name="title">@title@</property>
+<if @focus@ not nil><property name="focus">@focus@</property></if>
 
 <h2>@title@</h2>
 
Index: openacs-4/packages/forums/www/message-post.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-post.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/forums/www/message-post.adp	30 Jul 2002 22:04:59 -0000	1.3
+++ openacs-4/packages/forums/www/message-post.adp	1 Aug 2002 14:53:20 -0000	1.4
@@ -1,6 +1,7 @@
 <master src="master">
 <property name="title">Post to Forum: @forum.name@</property>
 <property name="context_bar">@context_bar@</property>
+<property name="focus">message.subject</property>
 
 <if @parent_id@ ne "">
   <table style="color: black; background-color: @table_border_color@;"  width="100%">
Index: openacs-4/packages/forums/www/admin/forum-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/admin/forum-edit.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/forums/www/admin/forum-edit.adp	1 Aug 2002 14:36:25 -0000	1.3
+++ openacs-4/packages/forums/www/admin/forum-edit.adp	1 Aug 2002 14:53:20 -0000	1.4
@@ -1,6 +1,7 @@
 <master src="../master">
 <property name="title">Edit Forum: @forum.name@</property>
 <property name="context_bar">@context_bar@</property>
+<property name="focus">forum.name</property>
 
 <if @forum.enabled_p@ eq t>
 This forum is <b>enabled</b>. You may <a href="forum-disable?forum_id=@forum.forum_id@">disable it</a>.
Index: openacs-4/packages/forums/www/admin/forum-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/admin/forum-edit.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/forums/www/admin/forum-edit.tcl	1 Aug 2002 14:36:25 -0000	1.4
+++ openacs-4/packages/forums/www/admin/forum-edit.tcl	1 Aug 2002 14:53:20 -0000	1.5
@@ -19,7 +19,7 @@
         -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}}
Index: openacs-4/packages/forums/www/admin/forum-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/admin/forum-new.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/forums/www/admin/forum-new.adp	29 May 2002 21:40:11 -0000	1.1
+++ openacs-4/packages/forums/www/admin/forum-new.adp	1 Aug 2002 14:53:20 -0000	1.2
@@ -1,5 +1,6 @@
 <master src="../master">
 <property name="title">Create New Forum</property>
-<property name="context_bar"></property>
+<property name="context_bar">@context_bar@</property>
+<property name="focus">forum.name</property>
 
 <formtemplate id="forum"></formtemplate>
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.4 -r1.5
--- openacs-4/packages/forums/www/admin/forum-new.tcl	5 Jun 2002 14:28:47 -0000	1.4
+++ openacs-4/packages/forums/www/admin/forum-new.tcl	1 Aug 2002 14:53:20 -0000	1.5
@@ -73,11 +73,15 @@
     ad_script_abort
 }
 
-# Pre-fetch the forum_id
-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
+set context_bar [list "Create New Forum"]
 
+if { [form is_request forum] } {
+    # Pre-fetch the forum_id
+    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