Index: openacs-4/packages/acs-templating/acs-templating.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/acs-templating.info,v
diff -u -r1.27.2.11 -r1.27.2.12
--- openacs-4/packages/acs-templating/acs-templating.info	1 Mar 2005 00:18:48 -0000	1.27.2.11
+++ openacs-4/packages/acs-templating/acs-templating.info	25 Apr 2005 12:16:26 -0000	1.27.2.12
@@ -7,7 +7,7 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="5.1.5" url="http://openacs.org/repository/download/apm/acs-templating-5.1.5.apm">
+    <version name="5.1.5d1" url="http://openacs.org/repository/download/apm/acs-templating-5.1.5d1.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Templating library.</summary>
         <release-date>2004-02-28</release-date>
@@ -25,7 +25,7 @@
 layout of a site can be more easily administered.
 </description>
 
-        <provides url="acs-templating" version="5.1.4"/>
+        <provides url="acs-templating" version="5.1.5d1"/>
         <requires url="acs-kernel" version="5.0.0"/>
 
         <callbacks>
@@ -45,7 +45,3 @@
 
     </version>
 </package>
-
-
-
-
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.6.2.6 -r1.6.2.7
--- openacs-4/packages/acs-templating/resources/lists/table.adp	21 Apr 2005 16:44:28 -0000	1.6.2.6
+++ openacs-4/packages/acs-templating/resources/lists/table.adp	25 Apr 2005 12:16:27 -0000	1.6.2.7
@@ -2,56 +2,57 @@
 
 <if @list_properties.page_size@ not nil>
   <noparse>
-    <if \@paginator.page_count@ gt 1>
+    <if \@paginator.page_count@ gt 1 or \@list_properties.page_size_variable_p@ eq 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 \@paginator.page_count@ gt 1>
+            <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>
-            <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 \@paginator.previous_page_url@ not nil>
+              &nbsp;<a href="\@paginator.previous_page_url@" title="\@paginator.previous_page_context@">&lt;</a>&nbsp;
             </if>
             <else>
-              <if \@paginator_pages.page@ lt 10>&nbsp;&nbsp;</if><b>\@paginator_pages.page@</b>
+              &nbsp;&lt;&nbsp;
             </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>
+            <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>
-              &gt;&gt;
+              &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>
 
-          <if @list_properties.page_size_variable_p@ eq 1>
+          <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@
+              \@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@
+                  <option value="\@page_sizes.value@"<if \@list_properties.page_size@ eq \@page_sizes.value@> selected</if>>\@page_sizes.name@
                 </multiple>
               </select>
             </form>
@@ -208,56 +209,57 @@
 
 <if @list_properties.page_size@ not nil>
   <noparse>
-    <if \@paginator.page_count@ gt 1>
+    <if \@paginator.page_count@ gt 1 or \@list_properties.page_size_variable_p@ eq 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 \@paginator.page_count@ gt 1>
+            <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>
-            <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 \@paginator.previous_page_url@ not nil>
+              &nbsp;<a href="\@paginator.previous_page_url@" title="\@paginator.previous_page_context@">&lt;</a>&nbsp;
             </if>
             <else>
-              <if \@paginator_pages.page@ lt 10>&nbsp;&nbsp;</if><b>\@paginator_pages.page@</b>
+              &nbsp;&lt;&nbsp;
             </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>
+            <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>
-              &gt;&gt;
+              &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>
 
-          <if @list_properties.page_size_variable_p@ eq 1>
+          <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@
+              \@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@
+                  <option value="\@page_sizes.value@"<if \@list_properties.page_size@ eq \@page_sizes.value@> selected</if>>\@page_sizes.name@
                 </multiple>
               </select>
             </form>
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.18.2.10 -r1.18.2.11
--- openacs-4/packages/acs-templating/tcl/list-procs.tcl	21 Apr 2005 16:44:28 -0000	1.18.2.10
+++ openacs-4/packages/acs-templating/tcl/list-procs.tcl	25 Apr 2005 12:16:27 -0000	1.18.2.11
@@ -1094,7 +1094,7 @@
     
     # 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}}
+	template::util::list_to_multirow page_sizes {{name 10 value 10} {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 } {