Index: openacs-4/contrib/obsolete-packages/bboard/www/message.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/message.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/bboard/www/message.adp	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/contrib/obsolete-packages/bboard/www/message.adp	29 Jun 2001 20:37:18 -0000	1.2
@@ -2,12 +2,29 @@
 <property name="context_bar">@context_bar@</property>
 <property name="title">@forum_name@: @message.title@</property>
 
+<table width="100%"><tr><td>
+<if @admin_p@ not nil and @admin_p@ ne "f">
+  [<a href="message-delete?forum_id=@forum_id@&message_id=@message_id@&replies=t">Delete Thread</a>]
+</if>
+
+<if @moderate_p@ not nil and @moderate_p@ ne "f">
+  [<a href="message-move?forum_id=@forum_id@&message_id=@message_id@">Move Thread</a>]
+</if></td>
+<td align="right"> <if @subscribed_p@ eq 0>
+  [<a href="message-subscribe?forum_id=@forum_id@&message_id=@message_id@">Subscribe to replies</a>]
+ </if>
+ <else>
+  You're subscribed to replies [<a href="message-unsubscribe?forum_id=@forum_id@&message_id=@message_id@">Unsubscribe</a>]
+ </else>
+</td></tr></table>
+
+
 <h3>Message:</h3>
 <blockquote>
 <include src="simple-message" title="@message.title@" author="@message.full_name@"
          mime_type="@message.mime_type@" content="@message.content@"
          date="@message.pretty_date@" id="@message.message_id@"
-	 write_p="@message.write_p@" delete_p="@message.delete_p@"
+	 write_p="@message.write_p@" admin_p="@admin_p@"
          forum_id="@forum_id@" user_id="@message.user_id@">
 </blockquote>
 <if @replies:rowcount@ gt 0>
@@ -18,7 +35,7 @@
   <include src="simple-message" title="@replies.title@" author="@replies.full_name@"
            mime_type="@replies.mime_type@" content="@replies.content@"
 	   date="@replies.pretty_date@" id="@replies.message_id@" 
- 	   write_p="@replies.write_p@" delete_p="@replies.delete_p@"
+ 	   write_p="@replies.write_p@" admin_p="@admin_p@"
            forum_id="@forum_id@" user_id=@replies.user_id@>
   </blockquote>
   <if @replies:rowcount@ ne @replies.rownum@>
@@ -27,20 +44,9 @@
  </multiple>
 </if>
 
-[
-<a href="message-new?forum_id=@forum_id@&reply_to=@message_id@">Post a reply</a>
-<if @subscribe_p@ eq 1>
- |
- <if @subscribed_p@ eq 0>
-  <a href="message-subscribe?forum_id=@forum_id@&message_id=@message_id@">Subscribe to replies</a>
- </if>
- <else>
-  <a href="message-unsubscribe?forum_id=@forum_id@&message_id=@message_id@">Unsubscribe from replies</a>
- </else>
-</if>
+ <center><form action="message-new">
+  <input type="hidden" name="forum_id" value="@forum_id@">
+  <input type="hidden" name="reply_to" value="@message_id@">
+  <input type="submit" value="Post a reply">
+ </form></center>
 
-<if @message.delete_p@ not nil and @message.delete_p@ ne "f">
-  | <a href="message-delete?forum_id=@forum_id@&message_id=@message_id@&replies=t">Delete Thread</a>
-</if>
-
-]
\ No newline at end of file