Index: openacs-4/packages/forums/www/forum-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/forum-view.adp,v
diff -u -r1.14.2.1 -r1.14.2.1.2.1
--- openacs-4/packages/forums/www/forum-view.adp	22 Nov 2002 18:38:32 -0000	1.14.2.1
+++ openacs-4/packages/forums/www/forum-view.adp	16 Aug 2003 23:20:13 -0000	1.14.2.1.2.1
@@ -6,64 +6,109 @@
 
   <table width="95%">
     <tr>
-      <td style="white-space: nowrap; font-size: x-small; line-height: 150%">
+      <td style="white-space: nowrap; line-height: 150%">
         <if @moderate_p@>
-        [
+        
           <if @admin_p@>
             <a href="admin/forum-edit?forum_id=@forum_id@">Administer</a> |
           </if>
           <a href="moderate/forum?forum_id=@forum_id@">Manage/Moderate</a>
-        ]       
+               
         </if>
 
         <br>
   
         @notification_chunk@
   
         <br>
+	<if @post_p@>	
+	  <strong><a href="message-post?forum_id=@forum_id@">Post a New Message</a></strong>
+	</if>	  
+      </td>
+      <td align="right">
+	 <if @mode@ ne "unanswered"><br /><a href="forum-view?forum_id=@forum_id@&mode=unanswered">View unanswered posts</a></if><if @user_id@ ne 0><if @mode@ ne "sincelastvisit"><br /><a href="forum-view?forum_id=@forum_id@&mode=sincelastvisit">New posts since your last visit</a></if></if></td>
+    </tr>
   
-        <if @post_p@>
-          [ <a href="message-post?forum_id=@forum_id@">Post a New Message</a> ]
+    </table>
+  
+    <br>
+ 
+    <!-- pagination context bar -->
+    <table cellpadding=4 cellspacing=0 border=0 width="95%">
+    <tr>
+      <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="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>
+      <multiple name=pages>
+        <if @page@ ne @pages.page@>
+          <a href="forum-view?forum_id=@forum_id@&page=@pages.page@">@pages.page@</a>
+        </if>
+        <else>
+          @page@
+        </else>
+      </multiple>
+        <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="Next Page" width="11" height="20" align="center"></a>
+            <br>
+        </if>
+        <else>&nbsp;</else>
+      </td>
+
       <td align="right">
-        <formtemplate id="search">
-          <formwidget id="forum_id">
-            Search:&nbsp;<formwidget id="search_text">
-          </formtemplate>
+
+
+        <if @info.next_group@ not nil>
+
+          <a href="forum-view?forum_id=@forum_id@&page=@info.next_group@">
+            <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>
-  
     </table>
+    <!-- end pagination -->
+ 
+    <table style="color: black; <if @background-color@ not nil>background-color: @table_border_color@;</if>" width="95%">
   
-    <br>
-  
-    <table style="color: black; background-color: @table_border_color@;" width="95%">
-  
       <tr>
+	<th align="left"></th>
         <th align="left" width="55%">Subject</th>
         <th align="left" width="20%">Author</th>
         <th align="center" width="5%">Replies</th>
         <th align="center" width="20%">Last Post</th>
       </tr>
+
+     <if @messages:rowcount@ gt 0>
   
-      <if @messages:rowcount@ gt 0>
         <multiple name="messages">
           <if @messages.rownum@ odd>
-            <tr style="color: black; background-color: @table_bgcolor@;" >
+            <tr style="color: black; <if @table_bgcolor@ not nil>background-color: @table_bgcolor@;</if>" >
           </if>
           <else>
-            <tr style="color: black; background-color: @table_other_bgcolor@;">
+            <tr style="color: black; <if @table_other_bgcolor@ not nil>background-color: @table_other_bgcolor@;</if>">
           </else>
-  
-          <td style="padding: 4px;">
+	<td>
             <if @messages.new_p@>
-              <strong>
+	<img src="/graphics/new.gif" width="30" height="12" alt="New">
             </if>
+	</td>  
+          <td style="padding: 4px;">
+
               <a href="message-view?message_id=@messages.message_id@">@messages.subject@</a> 
-            <if @messages.new_p@>
-              </strong>
-            </if>
+
             <if @moderate_p@ and @messages.state@ ne approved>
               <small>(@messages.state@)</small>
             </if>
@@ -82,5 +127,55 @@
       </else>
   
     </table>
+  
+    <br>
 
+    <!-- pagination context bar -->
+    <table cellpadding=4 cellspacing=0 border=0 width="95%">
+    <tr>
+      <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="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>
+      <multiple name=pages>
+        <if @page@ ne @pages.page@>
+          <a href="forum-view?forum_id=@forum_id@&page=@pages.page@">@pages.page@</a>
+        </if>
+        <else>
+          @page@
+        </else>
+      </multiple>
+        <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="Next Page" width="11" height="20" align="center"></a>
+            <br>
+        </if>
+        <else>&nbsp;</else>
+      </td>
+
+      <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>&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>
+    </table>
+    <!-- end pagination -->
+
 </center>
Index: openacs-4/packages/forums/www/forum-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/forum-view.tcl,v
diff -u -r1.8.2.3 -r1.8.2.3.2.1
--- openacs-4/packages/forums/www/forum-view.tcl	26 Jan 2003 13:32:13 -0000	1.8.2.3
+++ openacs-4/packages/forums/www/forum-view.tcl	16 Aug 2003 23:20:13 -0000	1.8.2.3.2.1
@@ -3,11 +3,14 @@
     one forum view
 
     @author Ben Adida (ben@openforce.net)
+    @author Paginator stuff added by Roberto Mello (rmello@fslc.usu.edu)
     @creation-date 2002-05-24
-    @cvs-id $Id$
+    @version $Id$
 
 } -query {
+    {page 1}
     forum_id:integer,notnull
+    {mode ""}
 }
 
 
@@ -50,34 +53,55 @@
 # Get forum data
 forum::get -forum_id $forum_id -array forum
 
-#it is confusing to provide a moderate link for non-moderated forums.
-if { $forum(posting_policy) != "moderated" } {
-    set moderate_p 0
-}
-
 # If disabled!
 if {$forum(enabled_p) != "t"} {
     ad_returnredirect "./"
     ad_script_abort
 }
 
-set query messages_select
-if {$moderate_p} {
-    set query messages_select_moderator
+#set query messages_select
+
+# sort by latest reply
+# lets make this the default
+#if {[string equal $mode latest]} {
+    set query messages_select_latest
+#}
+
+# just unanswered questions
+if {[string equal $mode unanswered]} {
+    set query messages_select_unanswered
 }
 
-db_multirow messages $query {} {
-    set subject [ad_quotehtml $subject]
-    set user_name [ad_quotehtml $user_name]
+# since last visit
+if {![string equal $user_id 0] && [string equal $mode sincelastvisit]} {
+    set query messages_select_sincelastvisit
+    set second_to_last_visit [db_string get_last_visit ""]
 }
 
+set forums_table forums_messages_approved
+if {$moderate_p} {
+#    set query messages_select_moderator
+    set forums_table forums_messages
+}
+set paginator_name paginated_messages$forum_id$mode
+
+# paginator stuff
+paginator create $query $paginator_name "" -pagesize 30 -groupsize 10 -contextual
+
+paginator get_data ${query}_display_data $paginator_name messages "" message_id $page
+
+paginator get_display_info $paginator_name info $page
+
+set group [paginator get_group $paginator_name $page]
+
+paginator get_context $paginator_name pages [paginator get_pages $paginator_name $group]
+paginator get_context $paginator_name groups [paginator get_groups $paginator_name $group 10]
+
 set notification_chunk [notification::display::request_widget \
     -type forums_forum_notif \
     -object_id $forum_id \
     -pretty_name $forum(name) \
     -url [ad_conn url]?forum_id=$forum_id \
 ]
-
+template::util::multirow_quote_html messages subject
 set context [list $forum(name)]
-
-ad_return_template