Index: openacs-4/packages/forums/www/master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/Attic/master.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/forums/www/master.tcl	29 May 2002 21:40:11 -0000	1.1
+++ openacs-4/packages/forums/www/master.tcl	1 Jun 2002 19:33:42 -0000	1.2
@@ -2,5 +2,5 @@
 if {[info exists context_bar]} {
     set context_bar [eval ad_context_bar $context_bar]
 } else {
-    set context_bar ""
+    set context_bar "FOO"
 }
Index: openacs-4/packages/forums/www/message-post.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-post.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/forums/www/message-post.tcl	30 May 2002 06:25:52 -0000	1.2
+++ openacs-4/packages/forums/www/message-post.tcl	1 Jun 2002 19:33:42 -0000	1.3
@@ -13,6 +13,7 @@
 
 # Either forum_id or parent_id has to be non-null
 if {[empty_string_p $forum_id] && [empty_string_p $parent_id]} {
+    ns_log Notice "BMA: both are null!"
     # error!
     return -code error
 }
@@ -42,7 +43,7 @@
         -label "Confirm?" -datatype text -widget hidden
 
 element create message subscribe_p \
-        -label "Subscribe?" -datatype text -widget hidden
+        -label "Subscribe?" -datatype text -widget hidden -optional
 
 if {[form is_valid message]} {
     template::form get_values message message_id forum_id parent_id subject content html_p confirm_p subscribe_p
@@ -79,7 +80,7 @@
 
     set message_view_url "[ad_conn package_url]message-view?message_id=$message_id"
 
-    if {$subscribe_p && [empty_string_p $parent_id]} {
+    if {![empty_string_p $subscribe_p] && $subscribe_p && [empty_string_p $parent_id]} {
         set notification_url [notification::display::subscribe_url -type forums_message_notif -object_id $message_id -url $message_view_url -user_id [ad_conn user_id]]
 
         # redirect to notification stuff
Index: openacs-4/packages/forums/www/message-view-flat.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/Attic/message-view-flat.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/forums/www/message-view-flat.adp	1 Jun 2002 19:33:42 -0000	1.1
@@ -0,0 +1,44 @@
+<master src="master">
+<property name="title">Forum @forum.name@: @message.subject@</property>
+<property name="context_bar">@context_bar@</property>
+
+<p>
+@notification_chunk@
+</p>
+
+<h3>Message</h3>
+<blockquote>
+<if @message.parent_id@ not nil>
+<i>response to <a href="message-view?message_id=@message.root_message_id@">@message.root_subject@</a></i><p>
+</if>
+
+<b>@message.subject@</b>
+
+<p>
+
+@message.content@
+
+<p>
+-- <a href="user-history?user_id=@message.user_id@">@message.user_name@</a> on <%= [util_AnsiDatetoPrettyDate $message(posting_date)] %><p>
+
+<if @post_p@ eq 1><a href="message-post?parent_id=@message_id@">Respond!</a></if>
+&nbsp; | &nbsp;
+<a href="message-email?message_id=@message_id@">Email</a>
+
+<if @moderate_p@ eq 1>
+<p>
+<b>Administration:</b> [@message.state@] [ <a href="moderate/message-delete?message_id=@message_id@">delete</a><if @message.state@ ne approved> | <a href="moderate/message-approve?message_id=@message_id@">approve</a></if><if @message.state@ ne rejected> | <a href="moderate/message-reject?message_id=@message_id@">reject</a></if> | <a href="moderate/message-edit?message_id=@message_id@">edit</a>]
+</if>
+</blockquote>
+
+<h3>Responses</h3>
+
+<multiple name="responses">
+<blockquote>
+<if @moderate_p@ eq 1 and @responses.state@ ne approved><b><i>(@responses.state@)</i></b><br></if>
+<b>@responses.subject@</b><p>
+@responses.content@<p>
+-- <a href="user-history?user_id=@responses.user_id@">@responses.user_name@</a> on <%= [util_AnsiDatetoPrettyDate $responses(posting_date)] %><p><hr width=40%><p>
+</blockquote>
+</multiple>
+</ul>
Index: openacs-4/packages/forums/www/message-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-view.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/forums/www/message-view.tcl	29 May 2002 21:40:10 -0000	1.1
+++ openacs-4/packages/forums/www/message-view.tcl	1 Jun 2002 19:33:42 -0000	1.2
@@ -52,7 +52,11 @@
 
 set context_bar [list [list "./forum-view?forum_id=$message(forum_id)" "$message(forum_name)"] {One Message}]
 
-ad_return_template
+if {$forum(presentation_type) == "flat"} {
+    ad_return_template message-view-flat
+} else {
+    ad_return_template
+}