Index: openacs-4/contrib/obsolete-packages/bboard/www/forum-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/forum-view.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/bboard/www/forum-view.adp	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/contrib/obsolete-packages/bboard/www/forum-view.adp	29 Jun 2001 20:37:18 -0000	1.2
@@ -3,53 +3,44 @@
 <property name="title">@title@</property>
 
 <table width="100%" cellspacing="0" cellpadding="0"><tr><td>
-[ 
  <if @category_id@ not nil>
-  <a href="message-new?forum_id=@forum_id@&category_id=@category_id@">Post a message</a>
+  [ <b><a href="message-new?forum_id=@forum_id@&category_id=@category_id@">Post a message</a></b> ]
  </if>
  <else>
-  <a href="message-new?forum_id=@forum_id@">Post a message</a>
+  [<b><a href="message-new?forum_id=@forum_id@">Post a message</a></b>]
  </else>
 
-<if @category_create_p@ ne 0 or @subscribe_p@ not nil and @subscribe_p@ eq 1>
- |
 </if>
+</td>
 
-<if @category_create_p@ ne 0>
- <a href="category-new?forum_id=@forum_id@">Create a category</a>
- <if @subscribe_p@ not nil and @subscribe_p@ eq 1>
- |
- </if>
-</if>
-
-<if @subscribe_p@ not nil and @subscribe_p@ eq 1>
+<td align="right">
  <if @subscribed_p@ eq 0>
   <if @category_id@ not nil>
-   <a href="category-subscribe?category_id=@category_id@">Subscribe to Category</a>
+   [<a href="category-subscribe?category_id=@category_id@">Subscribe to Category</a>]
   </if>
   <else>
-   <a href="forum-subscribe?forum_id=@forum_id@">Subscribe to Forum</a>
+   [<a href="forum-subscribe?forum_id=@forum_id@">Subscribe to Forum</a>]
   </else>
  </if>
  <else>
   <if @category_id@ not nil>
-   <a href="category-unsubscribe?category_id=@category_id@">Unsubscribe from Category</a>
+   You're subscribed to this category [<a href="category-unsubscribe?category_id=@category_id@">Unsubscribe</a>]
   </if>
   <else>
-   <a href="forum-unsubscribe?forum_id=@forum_id@">Unsubscribe from Forum</a>
+   You're subscribed to this forum [<a href="forum-unsubscribe?forum_id=@forum_id@">Unsubscribe</a>]
   </else>
  </else>
-</if>
- ]</td>
-<td align="right">
+</td>
+</tr></table><p>
+
+<table width="100%" cellspacing="0" cellpadding="0"><tr><td>
+<h3>Messages</h3><td>
+
  <if @last_n_days@ not nil and @last_n_days@ ne 0>
-  Last @last_n_days@ days.  <a href="forum?forum_id=@forum_id@&last_n_days=0">Show All Messages</a>.
+ <td align="right"> Last @last_n_days@ days.  <a href="forum?forum_id=@forum_id@&last_n_days=0">Show All Messages</a>.</td>
  </if>
-</td>
 </tr></table>
 
-<h3>Messages</h3>
-
 <if @moderator_p@ ne 0>
  <if @unapproved:rowcount@ gt 0>
   <h4>Not Yet Approved</h4>
@@ -66,7 +57,7 @@
  </if>
 </if>
 
-<include src="message-list" &=messages forum_id="@forum_id@" last_updated_p="t" />
+<include src="message-list" &=messages forum_id="@forum_id@" last_updated_p="t" top_p="t"/>
 
 <if @moderator_p@ ne 0>
  <if @rejected:rowcount@ gt 0>
@@ -81,16 +72,16 @@
  </if>
 </if>
 
+<if @categories:rowcount@ ne 0 or @category_create_p@ ne 0>
+ <h3>By Category</h3>
+</if>
 <if @categories:rowcount@ ne 0>
- <h3>Categories</h3>
  <ul>
   <multiple name=categories>
    <li><a href="forum-by-category?forum_id=@forum_id@&category_id=@categories.category_id@">@categories.short_name@</a>
     (@categories.message_count@)
-    <if @categories.write_p@ eq "t">
+    <if @admin_p@ eq "t">
      [<a href="category-edit?category_id=@categories.category_id@">edit</a>]
-    </if>
-    <if @categories.delete_p@ eq "t">
      [<a href="category-delete?category_id=@categories.category_id@">delete</a>]
     </if>
    </li>
@@ -99,10 +90,21 @@
  </ul>
 </if>
 
+<if @category_create_p@ ne 0>
+ [<a href="category-new?forum_id=@forum_id@">Create a category</a>]
+</if> <p>
+
 <h3>Search</h3>
 <form method="get" action="search">
  <input type="hidden" name="forum_id" value="@forum_id@">
  <input type="text" name="query"> 
  <input type="submit" value="Go!">
 </form>
 
+<p>
+
+<if @admin_p@ eq "t">
+ <h3>Admin</h3>
+ [<a href="forum-move?forum_id=@forum_id@">Move messages to other forum</a>]
+ [<a href="/permissions/one?object_id=@forum_id@">Set Permissions</a>]
+</if>
\ No newline at end of file