Index: openacs.org-dev/packages/forums/www/forum-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/forum-view.adp,v
diff -u -r1.7 -r1.8
--- openacs.org-dev/packages/forums/www/forum-view.adp	21 Oct 2002 18:43:10 -0000	1.7
+++ openacs.org-dev/packages/forums/www/forum-view.adp	28 Oct 2002 20:45:29 -0000	1.8
@@ -40,18 +40,17 @@
     <!-- pagination context bar -->
     <table cellpadding=4 cellspacing=0 border=0 width="95%">
     <tr>
-      <td align=left width="10%">
-<if @info.previous_group@ not nil>
-          <a href="forum-view?forum_id=@forum_id@&page=@info.previous_group@">
-            <b>Previous 10</b>
-          </a>
+      <td align="left">
+        <if @info.previous_group@ not nil>
+	<a href="forum-view?forum_id=@forum_id@&page=@info.previous_group@"><img src="/templates/images/nav_previous_group.jpg" border="0" align="center"></a>
+&nbsp;<b><a href="forum-view?forum_id=@forum_id@&page=@info.previous_group@">Previous 10</a></b>
         </if>
       </td>
     
       <td align=center>
         <if @info.previous_page@ gt 0>
           <a href="forum-view?forum_id=@forum_id@&page=@info.previous_page@">
-                        <img src="/templates/images/nav_previous.jpg" border="0" alt="<" width="11" height="20" align="center"></a> <a href="forum-view?forum_id=@forum_id@&page=@info.previous_page@"><b>Previous</b></a>
+                        <img src="/templates/images/nav_previous.jpg" border="0" alt="Previous Page" width="11" height="20" align="center"></a> <a href="forum-view?forum_id=@forum_id@&page=@info.previous_page@"><b>Previous</b></a>
           &nbsp;
         </if>
         <else>&nbsp;</else>
@@ -66,20 +65,19 @@
         <if @page@ lt @info.page_count@>
           &nbsp; <a href="forum-view?forum_id=@forum_id@&page=@info.next_page@">
             <b>Next</b></a> <a href="forum-view?forum_id=@forum_id@&page=@info.next_page@">
-            <img src="/templates/images/nav_next.jpg" border="0" alt=">" width="11" height="20" align="center"></a>
+            <img src="/templates/images/nav_next.jpg" border="0" alt="Next Page" width="11" height="20" align="center"></a>
             <br>
         </if>
         <else>&nbsp;</else>
       </td>
 
-      <td align=right width=10%">
+      <td align="right">
 
 
         <if @info.next_group@ not nil>
-          &nbsp;&nbsp;
+
           <a href="forum-view?forum_id=@forum_id@&page=@info.next_group@">
-            <b>Next 10</b>
-          </a>
+            <b>Next 10</b></a>&nbsp;<a href="forum-view?forum_id=@forum_id@&page=@info.next_group@"><img src="/templates/images/nav_next_group.jpg" border="0" align="center"></a>
         </if>
       </td>
     </tr>
@@ -137,24 +135,18 @@
     <!-- pagination context bar -->
     <table cellpadding=4 cellspacing=0 border=0 width="95%">
     <tr>
-      <td align=left width="10%">
-        <if @info.previous_page@ gt 0>
-          <a href="forum-view?forum_id=@forum_id@&page=@info.previous_page@">
-            <img src="/templates/images/nav_previous.jpg" border="0" alt="<" width="16" height="26"></a>
-          <br>
-        </if>
-        <else>&nbsp;</else>
+      <td align="left">
+
         <if @info.previous_group@ not nil>
-          <a href="forum-view?forum_id=@forum_id@&page=@info.previous_group@">
-             Previous 10
-          </a>
+	<a href="forum-view?forum_id=@forum_id@&page=@info.previous_group@"><img src="/templates/images/nav_previous_group.jpg" border="0" align="center"></a>
+&nbsp;<b><a href="forum-view?forum_id=@forum_id@&page=@info.previous_group@">Previous 10</a></b>
         </if>
       </td>
     
       <td align=center>
         <if @info.previous_page@ gt 0>
           <a href="forum-view?forum_id=@forum_id@&page=@info.previous_page@">
-            <b>Previous</b></a>
+                        <img src="/templates/images/nav_previous.jpg" border="0" alt="Previous Page" width="11" height="20" align="center"></a> <a href="forum-view?forum_id=@forum_id@&page=@info.previous_page@"><b>Previous</b></a>
           &nbsp;
         </if>
         <else>&nbsp;</else>
@@ -168,25 +160,20 @@
       </multiple>
         <if @page@ lt @info.page_count@>
           &nbsp; <a href="forum-view?forum_id=@forum_id@&page=@info.next_page@">
-            <b>Next</b>
-          </a>
+            <b>Next</b></a> <a href="forum-view?forum_id=@forum_id@&page=@info.next_page@">
+            <img src="/templates/images/nav_next.jpg" border="0" alt="Next Page" width="11" height="20" align="center"></a>
+            <br>
         </if>
         <else>&nbsp;</else>
       </td>
 
-      <td align=right width=10%">
-        <if @page@ lt @info.page_count@>
-          <a href="forum-view?forum_id=@forum_id@&page=@info.next_page@">
-            <img src="/templates/images/nav_next.jpg" border="0" alt=">" width="17" height="26"></a>
-            <br>
-        </if>
-        <else>&nbsp;</else>
+      <td align="right">
 
+
         <if @info.next_group@ not nil>
           &nbsp;&nbsp;
           <a href="forum-view?forum_id=@forum_id@&page=@info.next_group@">
-            Next 10
-          </a>
+            <b>Next 10</b></a>&nbsp;<a href="forum-view?forum_id=@forum_id@&page=@info.next_group@"><img src="/templates/images/nav_next_group.jpg" border="0" align="center"></a>
         </if>
       </td>
     </tr>
Index: openacs.org-dev/packages/forums/www/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/index-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs.org-dev/packages/forums/www/index-postgresql.xql	9 Jul 2002 17:35:09 -0000	1.1
+++ openacs.org-dev/packages/forums/www/index-postgresql.xql	28 Oct 2002 20:45:29 -0000	1.2
@@ -21,7 +21,7 @@
                  or 't' = acs_permission__permission_p(:user_id, forums_forums_enabled.forum_id, 'forum_read')
                 )
             and forums_forums_enabled.forum_id = acs_objects.object_id
-            order by forums_forums_enabled.name
+            order by forums_forums_enabled.forum_id
         </querytext>
     </fullquery>
 
Index: openacs.org-dev/packages/forums/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/index.adp,v
diff -u -r1.1 -r1.2
--- openacs.org-dev/packages/forums/www/index.adp	9 Jul 2002 17:35:09 -0000	1.1
+++ openacs.org-dev/packages/forums/www/index.adp	28 Oct 2002 20:45:29 -0000	1.2
@@ -1,70 +1,78 @@
-<master src="master">
+<master>
 <property name="title">Forums</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <center>
-
-  <table cellpadding="5" width="95%">
-
+  <table width="95%">
     <tr>
-      <td>
-<if @admin_p@>
-        <nobr><small>[ <a href="admin/forum-new">New Forum</a> ]</small></nobr>
-</if>
-<else>&nbsp;</else>
+      <td style="font-size: x-small; white-space: nowrap; align=right;">
+        <if @admin_p@>
+          [ <a href="admin/forum-new">New Forum</a> | <a href="admin/">Administration</a> ]
+        </if>
+        <else>
+          &nbsp;
+        </else>
       </td>
-      <td>&nbsp;</td>
       <td align="right">
-<formtemplate id="search">
-        <formwidget id="forum_id">
-        Search:&nbsp;<formwidget id="search_text">
-</formtemplate>
+        <formtemplate id="search">
+          <formwidget id="forum_id">
+            Search Forums:&nbsp;
+          <formwidget id="search_text">
+        </formtemplate>
       </td>
     </tr>
 
   </table>
 
   <br>
 
-  <table bgcolor="#cccccc" cellpadding="5" width="95%">
+  <table width="95%" style="color: black; background-color: @table_border_color@;">
 
     <tr>
       <th align="left" width="70%">Forum Name</th>
       <th align="center" width="10%">Threads</th>
       <th align="center" width="20%">Last Post</th>
     </tr>
 
-<if @forums:rowcount@ gt 0>
-<multiple name="forums">
+    <if @forums:rowcount@ gt 0>
+      <multiple name="forums">
+        <if @forums.rownum@ odd>
+          <tr style="color: black; background-color: @table_bgcolor@;">
+        </if>
+        <else>
+          <tr style="color: black; background-color: @table_other_bgcolor@;">
+        </else>
 
-  <if @forums.rownum@ odd>
-    <tr bgcolor="#eeeeee">
-  </if>
-  <else>
-    <tr bgcolor="#d9e4f9">
-  </else>
-
-      <td>
-        <if @forums.new_p@ and @forums.n_threads@ gt 0><b></if>
-        <a href="forum-view?forum_id=@forums.forum_id@">@forums.name@</a>
-        <if @forums.new_p@ and @forums.n_threads@ gt 0></b></if>
-        <if @forums.charter@ not nil><br><i>@forums.charter@</i></if>
-      </td>
-      <td align="center">@forums.n_threads@</td>
-      <td align="center"><if @forums.n_threads@ gt 0>@forums.last_modified@</if></td>
-
-    </tr>
-
-</multiple>
-</if>
-<else>
-    <tr bgcolor="#eeeeee">
-      <td colspan="3">
-        <i>No Forums</i>
-      </td>
-    </tr>
-</else>
-
+        <td>
+          <if @forums.new_p@ and @forums.n_threads@ gt 0>
+            <strong>
+          </if>
+          <a href="forum-view?forum_id=@forums.forum_id@">@forums.name@</a>
+          <if @forums.new_p@ and @forums.n_threads@ gt 0>
+            </strong>
+          </if>
+          <if @forums.charter@ not nil>
+            <em>@forums.charter@</em>
+          </if>
+        </td>
+        <td align="center">
+          @forums.n_threads@
+        </td>
+        <td align="center">
+          <if @forums.n_threads@ gt 0>
+            @forums.last_modified@
+          </if>
+        </td>
+          </tr>
+      </multiple>
+    </if>
+    <else>
+      <tr style="color: black; background-color: @table_bgcolor@">
+        <td colspan="3">
+          <em>No Forums</em>
+        </td>
+      </tr>
+    </else>
   </table>
 
 </center>
Index: openacs.org-dev/packages/forums/www/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/master.adp,v
diff -u -r1.1 -r1.2
--- openacs.org-dev/packages/forums/www/master.adp	9 Jul 2002 17:35:09 -0000	1.1
+++ openacs.org-dev/packages/forums/www/master.adp	28 Oct 2002 20:45:29 -0000	1.2
@@ -1,10 +1,6 @@
 <master>
 <property name="title">@title@</property>
+<if @focus@ not nil><property name="focus">@focus@</property></if>
 
 <h2>@title@</h2>
-
-@context_bar@
-
-<hr noshade>
-
 <slave>
Index: openacs.org-dev/packages/forums/www/message-view-flat.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/message-view-flat.adp,v
diff -u -r1.2 -r1.3
--- openacs.org-dev/packages/forums/www/message-view-flat.adp	21 Oct 2002 18:43:10 -0000	1.2
+++ openacs.org-dev/packages/forums/www/message-view-flat.adp	28 Oct 2002 20:45:29 -0000	1.3
@@ -24,12 +24,10 @@
 
 <if @responses:rowcount@ gt 0>
 
-
-
 <multiple name="responses">
 
   <include src="message-chunk" bgcolor="#eeeeee" moderate_p=@moderate_p@ &message="responses" root_subject=@message.root_subject@>
 
 </multiple>
-
+</if>
 <p><strong><a href="message-post?parent_id=@message.message_id@">Post a reply</a></strong></p>
Index: openacs.org-dev/packages/forums/www/message-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/message-view.adp,v
diff -u -r1.4 -r1.5
--- openacs.org-dev/packages/forums/www/message-view.adp	21 Oct 2002 18:43:10 -0000	1.4
+++ openacs.org-dev/packages/forums/www/message-view.adp	28 Oct 2002 20:45:29 -0000	1.5
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Forum @forum.name@: @message.subject@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <br>
 
@@ -32,7 +32,6 @@
            moderate_p=@moderate_p@ 
            &message="message">
 
-
 <if @responses:rowcount@ gt 0>
 
 
Index: openacs.org-dev/packages/forums/www/message-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/message-view.tcl,v
diff -u -r1.3 -r1.4
--- openacs.org-dev/packages/forums/www/message-view.tcl	5 Sep 2002 17:27:48 -0000	1.3
+++ openacs.org-dev/packages/forums/www/message-view.tcl	28 Oct 2002 20:45:29 -0000	1.4
@@ -89,7 +89,7 @@
 }
 
 db_multirow responses $query {}
-
+ns_log notice "DAVEB:FORUMS: $query"
 # If this is a top-level thread, we allow subscriptions here
 if {[empty_string_p $message(parent_id)]} {
     set notification_chunk [notification::display::request_widget \
@@ -102,11 +102,11 @@
     set notification_chunk ""
 }
 
-set context_bar [list [list "./forum-view?forum_id=$message(forum_id)" "$message(forum_name)"]]
+set context [list [list "./forum-view?forum_id=$message(forum_id)" "$message(forum_name)"]]
 if {![empty_string_p $message(parent_id)]} {
     lappend context_bar [list "./message-view?message_id=$message(root_message_id)" "Entire Thread"]
 }
-lappend context_bar {One Message}
+lappend context {One Message}
 
 if {[string equal $forum(presentation_type) flat]} {
     ad_return_template "message-view-flat"
Index: openacs.org-dev/packages/forums/www/admin/forum-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/admin/forum-edit.tcl,v
diff -u -r1.2 -r1.3
--- openacs.org-dev/packages/forums/www/admin/forum-edit.tcl	5 Sep 2002 17:27:49 -0000	1.2
+++ openacs.org-dev/packages/forums/www/admin/forum-edit.tcl	28 Oct 2002 20:46:48 -0000	1.3
@@ -61,7 +61,7 @@
     ad_script_abort
 }
 
-set context_bar [list "Edit forum"]
+set context [list "Edit forum"]
     
 if { [form is_request forum] } {
     element set_properties forum forum_id -value $forum_id