Index: openacs-4/contrib/obsolete-packages/bboard/www/message-threaded.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/message-threaded.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/bboard/www/message-threaded.adp	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/contrib/obsolete-packages/bboard/www/message-threaded.adp	29 Jun 2001 20:37:18 -0000	1.2
@@ -2,31 +2,32 @@
 <property name="context_bar">@context_bar@</property>
 <property name="title">@forum_name@: @title@</property>
 
+<table width="100%"><tr><td>
+<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><p>
+
 <table width="100%">
- <multiple name=replies>
-  <tr><td><img src="spacer.gif" width="<%= [expr 25*@replies.thread_depth@]%>" 
+ <multiple name=messages>
+  <tr><td><img src="spacer.gif" width="<%= [expr 25*@messages.thread_depth@]%>" 
                align="left">
-  <a name="@replies.message_id@">
-  <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@" link_p="t"
- 	   write_p="@replies.write_p@" delete_p="@replies.delete_p@"
-           reply_p="@message_create_p@" forum_id="@forum_id@"
-	   user_id="@replies.user_id@">
+  <a name="@messages.message_id@">
+  <include src="simple-message" title="@messages.title@" author="@messages.full_name@"
+           mime_type="@messages.mime_type@" content="@messages.content@"
+	   date="@messages.pretty_date@" id="@messages.message_id@" link_p="t"
+ 	   write_p="@messages.write_p@"
+           reply_p="t" forum_id="@forum_id@"
+	   admin_p="@admin_p@" user_id="@messages.user_id@">
   </tr></td>
  </multiple>
-
 </table>
-<br>
-<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>