Index: openacs-4/packages/acs-templating/resources/lists/table.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/lists/table.adp,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/acs-templating/resources/lists/table.adp	23 Mar 2005 22:21:23 -0000	1.16
+++ openacs-4/packages/acs-templating/resources/lists/table.adp	21 Apr 2005 17:13:19 -0000	1.17
@@ -1,20 +1,10 @@
 <table class="@list_properties.class@" cellpadding="3" cellspacing="1"@list_properties.table_attributes;noquote@>
 
-<if @list_properties.bulk_actions@ not nil>
-  <if @list_properties.bulk_action_method@ not nil>
-  <form name="@list_properties.name@" method="@list_properties.bulk_action_method@">  
-  </if>
-  <else>
-  <form name="@list_properties.name@" method="GET">
-  </else>
-  @list_properties.bulk_action_export_chunk;noquote@
-</if>
-
 <if @list_properties.page_size@ not nil>
   <noparse>
     <if \@paginator.page_count@ gt 1>
       <tr width="100%" class="list-paginator">
-        <td colspan="@elements:rowcount@" align="center">
+        <td colspan="@elements:rowcount@"><table width="100%"><tr width="100%"><td align="center">
           <if \@paginator.group_count@ gt 1 and \@paginator.groupsize@ gt 1>
             <if \@paginator.previous_group_url@ not nil>
               <a href="\@paginator.previous_group_url@" title="\@paginator.previous_group_context@">&lt;&lt;</a>
@@ -54,12 +44,35 @@
               &gt;&gt;
             </else>
           </if>
-        </td>
+
+          <if @list_properties.page_size_variable_p@ eq 1>
+            </td><td align="right" width="5%">
+            <form name="\@list_properties.name@_resize" method="GET">
+              @list_properties.page_size_export_chunk;noquote@
+              <select name="page_size" onChange="acs_ListBulkActionClick('\@list_properties.name@_resize', '\@list_properties.url@'); return false;">
+                <multiple name="page_sizes">
+                  <option value="\@page_sizes.value@"<if @list_properties.page_size@ eq \@page_sizes.value@> selected</if>>\@page_sizes.name@
+                </multiple>
+              </select>
+            </form>
+          </if>
+
+        </td></tr></table></td>
       </tr>
     </if>
   </noparse>
 </if>
 
+<if @list_properties.bulk_actions@ not nil>
+  <if @list_properties.bulk_action_method@ not nil>
+  <form name="@list_properties.name@" method="@list_properties.bulk_action_method@">  
+  </if>
+  <else>
+  <form name="@list_properties.name@" method="GET">
+  </else>
+  @list_properties.bulk_action_export_chunk;noquote@
+</if>
+
 <if @actions:rowcount@ gt 0>
   <tr class="list-button-bar">
     <td colspan="@elements:rowcount@" class="list-button-bar">
@@ -193,6 +206,69 @@
   </noparse>
 
 
+<if @list_properties.page_size@ not nil>
+  <noparse>
+    <if \@paginator.page_count@ gt 1>
+      <tr width="100%" class="list-paginator">
+        <td colspan="@elements:rowcount@"><table width="100%"><tr width="100%"><td align="center">
+          <if \@paginator.group_count@ gt 1 and \@paginator.groupsize@ gt 1>
+            <if \@paginator.previous_group_url@ not nil>
+              <a href="\@paginator.previous_group_url@" title="\@paginator.previous_group_context@">&lt;&lt;</a>
+            </if>
+            <else>
+              &lt;&lt;
+            </else>
+          </if>
+          <if \@paginator.previous_page_url@ not nil>
+            &nbsp;<a href="\@paginator.previous_page_url@" title="\@paginator.previous_page_context@">&lt;</a>&nbsp;
+          </if>
+          <else>
+            &nbsp;&lt;&nbsp;
+          </else>
+
+          <multiple name="paginator_pages">
+            <if \@paginator.current_page@ ne \@paginator_pages.page@>
+              <if \@paginator_pages.page@ lt 10>&nbsp;&nbsp;</if><a 
+              href="\@paginator_pages.url@" title="\@paginator_pages.context@">\@paginator_pages.page@</a>
+            </if>
+            <else>
+              <if \@paginator_pages.page@ lt 10>&nbsp;&nbsp;</if><b>\@paginator_pages.page@</b>
+            </else>
+          </multiple>
+
+          <if \@paginator.next_page_url@ not nil>
+            &nbsp;<a href="\@paginator.next_page_url@" title="\@paginator.next_page_context@">&gt;</a>&nbsp;
+          </if>
+          <else>
+            &nbsp;&gt;&nbsp;
+          </else>
+          <if \@paginator.group_count@ gt 1 and \@paginator.groupsize@ gt 1>
+            <if \@paginator.next_group_url@ not nil>
+              <a href="\@paginator.next_group_url@" title="\@paginator.next_group_context@">&gt;&gt;</a>
+            </if>
+            <else>
+              &gt;&gt;
+            </else>
+          </if>
+
+          <if @list_properties.page_size_variable_p@ eq 1>
+            </td><td align="right" width="5%">
+            <form name="\@list_properties.name@_resize" method="GET">
+              @list_properties.page_size_export_chunk;noquote@
+              <select name="page_size" onChange="acs_ListBulkActionClick('\@list_properties.name@_resize', '\@list_properties.url@'); return false;">
+                <multiple name="page_sizes">
+                  <option value="\@page_sizes.value@"<if @list_properties.page_size@ eq \@page_sizes.value@> selected</if>>\@page_sizes.name@
+                </multiple>
+              </select>
+            </form>
+          </if>
+
+        </td></tr></table></td>
+      </tr>
+    </if>
+  </noparse>
+</if>
+
 <noparse><if \@@list_properties.multirow@:rowcount@ gt 0></noparse>
   <if @bulk_actions:rowcount@ gt 0>
     <tr class="list-button-bar">
Index: openacs-4/packages/acs-templating/tcl/list-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/list-procs.tcl,v
diff -u -r1.24 -r1.25
--- openacs-4/packages/acs-templating/tcl/list-procs.tcl	27 Feb 2005 22:45:40 -0000	1.24
+++ openacs-4/packages/acs-templating/tcl/list-procs.tcl	21 Apr 2005 17:13:20 -0000	1.25
@@ -40,6 +40,7 @@
     {-class ""}
     {-html ""}
     {-page_size ""}
+    {-page_size_variable_p 0}
     {-page_groupsize 10}
     {-page_query ""}
     {-page_query_name ""}
@@ -177,6 +178,8 @@
 
     @param  page_size      The number of rows to display on each page. If specified, the list will be paginated.
 
+    @param  page_size_variable_p Displays a selectbox to let the user change the number of rows to display on each page. If specified, the list will be paginated.
+
     @param  page_groupsize The page group size for the paginator. See template::paginator::create for more details.
                            
 
@@ -241,6 +244,7 @@
         multirow {}
         style {}
         page_size {}
+        page_size_variable_p {}
         page_groupsize {}
         page_query {}
         page_query_name {}
@@ -276,6 +280,8 @@
         ulevel {}
         output {}
         bulk_action_export_chunk {}
+	page_size_export_chunk {}
+	url {}
     }
 
     # Set default for no_data
@@ -417,7 +423,15 @@
     }
 
     # Pagination
-    if { ![empty_string_p $list_properties(page_size)] && $list_properties(page_size) != 0 } {
+    if { $list_properties(page_size_variable_p) == 1 } {
+	# Create a filter for the variable page size
+        template::list::filter::create \
+            -list_name $name \
+            -filter_name "page_size" \
+            -spec [list label "Page Size" default_value 20 hide_p t]
+    }
+
+    if { (![empty_string_p $list_properties(page_size)] && $list_properties(page_size) != 0) || $list_properties(page_size_variable_p) == 1 } {
         # Check that we have either page_query or page_query_name
         if { [empty_string_p $list_properties(page_query)] && [empty_string_p $list_properties(page_query_name)] } {
             error "When specifying a non-zero page_size, you must also provide either page_query or page_query_name"
@@ -492,6 +506,12 @@
     }
 
     # Create the paginator 
+    if { $list_properties(page_size_variable_p) == 1 } {
+	set list_properties(page_size) $list_properties(filter,page_size)
+	set list_properties(url) [ad_conn url]
+        set list_properties(page_size_export_chunk) [uplevel $list_properties(ulevel) [list export_vars -form -exclude {page_size page} $list_properties(filters_export)]]
+    }
+
     if { ![empty_string_p $list_properties(page_size)] && $list_properties(page_size) != 0 } {
 
         if { [string equal $list_properties(page_query) ""] } {
@@ -1078,6 +1098,10 @@
     set __list_code [template::adp_compile -string $__adp_output]
     
     # Paginator
+    if { $list_properties(page_size_variable_p) == 1 } {
+	template::util::list_to_multirow page_sizes {{name 20 value 20} {name 50 value 50} {name 100 value 100}}
+    }
+
     if { ![empty_string_p $list_properties(page_size)] && $list_properties(page_size) != 0 } {
         
         set current_page $list_properties(filter,page)