Index: openacs-4/packages/openacs-bootstrap5-theme/resources/lists/table-2third.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap5-theme/resources/lists/table-2third.adp,v
diff -u -r1.1.2.4 -r1.1.2.5
--- openacs-4/packages/openacs-bootstrap5-theme/resources/lists/table-2third.adp	22 Oct 2022 17:48:48 -0000	1.1.2.4
+++ openacs-4/packages/openacs-bootstrap5-theme/resources/lists/table-2third.adp	25 Oct 2022 12:18:40 -0000	1.1.2.5
@@ -8,40 +8,40 @@
           <if \@paginator.page_count@ gt 1>
             <if \@paginator.group_count@ gt 1 and \@paginator.groupsize@ gt 1>
               <if \@paginator.previous_group_url@ not nil>
-                <li><a href="\@paginator.previous_group_url@" title="\@paginator.previous_group_context@">&laquo;</a></li>
+                <li class="page-item"><a class="page-link" href="\@paginator.previous_group_url@" title="\@paginator.previous_group_context@">&laquo;</a></li>
               </if>
               <else>
-               <li class="disabled"><a href="#" aria-label="Previous"><span aria-hidden="true">&laquo;</span></a></li>
+               <li class="page-item disabled"><a class="page-link" href="#" aria-label="Previous"><span aria-hidden="true">&laquo;</span></a></li>
               </else>
             </if>
             <if \@paginator.previous_page_url@ not nil>
-              <li><a aria-label="Previous" href="\@paginator.previous_page_url@" title="\@paginator.previous_page_context@"><span aria-hidden="true">&lsaquo;</span></a></li>
+              <li class="page-item"><a class="page-link" aria-label="Previous" href="\@paginator.previous_page_url@" title="\@paginator.previous_page_context@"><span aria-hidden="true">&lsaquo;</span></a></li>
             </if>
             <else>
-               <li class="disabled"><a href="#" aria-label="Previous"><span aria-hidden="true">&lsaquo;</span></a></li>
+               <li class="page-item disabled"><a class="page-link" href="#" aria-label="Previous"><span aria-hidden="true">&lsaquo;</span></a></li>
             </else>
     
             <multiple name="paginator_pages">
               <if \@paginator.current_page@ ne \@paginator_pages.page@>
-                <li><a href="\@paginator_pages.url@" title="\@paginator_pages.context@">\@paginator_pages.page@</a></li>
+                <li class="page-item"><a class="page-link" href="\@paginator_pages.url@" title="\@paginator_pages.context@">\@paginator_pages.page@</a></li>
               </if>
               <else>
-                <li class="active"><a href="#">\@paginator_pages.page@ <span class="visually-hidden">(current)</span></a></li>
+                <li class="page-item active"><a class="page-link" href="#">\@paginator_pages.page@ <span class="visually-hidden">(current)</span></a></li>
               </else>
             </multiple>
 
             <if \@paginator.next_page_url@ not nil>
-              <li><a aria-label="Next" href="\@paginator.next_page_url@" title="\@paginator.next_page_context@"><span aria-hidden="true">&rsaquo;</span></a></li>
+              <li class="page-item"><a class="page-link" aria-label="Next" href="\@paginator.next_page_url@" title="\@paginator.next_page_context@"><span aria-hidden="true">&rsaquo;</span></a></li>
             </if>
             <else>
-               <li class="disabled"><a href="#" aria-label="Next"><span aria-hidden="true">&rsaquo;</span></a></li>
+               <li class="page-item disabled"><a class="page-link" href="#" aria-label="Next"><span aria-hidden="true">&rsaquo;</span></a></li>
             </else>
             <if \@paginator.group_count@ gt 1 and \@paginator.groupsize@ gt 1>
               <if \@paginator.next_group_url@ not nil>
-                <li><a href="\@paginator.next_group_url@" title="\@paginator.next_group_context@">&raquo;</a></li>
+                <li class="page-item"><a class="page-link" href="\@paginator.next_group_url@" title="\@paginator.next_group_context@">&raquo;</a></li>
               </if>
               <else>
-               <li class="disabled"><a href="#" aria-label="Next"><span aria-hidden="true">&raquo;</span></a></li>
+               <li class="page-item disabled"><a class="page-link" href="#" aria-label="Next"><span aria-hidden="true">&raquo;</span></a></li>
               </else>
             </if>
           </if>
@@ -257,40 +257,40 @@
           <if \@paginator.page_count@ gt 1>
             <if \@paginator.group_count@ gt 1 and \@paginator.groupsize@ gt 1>
               <if \@paginator.previous_group_url@ not nil>
-                <li><a href="\@paginator.previous_group_url@" title="\@paginator.previous_group_context@">&laquo;</a></li>
+                <li class="page-item"><a class="page-link" href="\@paginator.previous_group_url@" title="\@paginator.previous_group_context@">&laquo;</a></li>
               </if>
               <else>
-               <li class="disabled"><a href="#" aria-label="Previous"><span aria-hidden="true">&laquo;</span></a></li>
+               <li class="page-item disabled"><a class="page-link" href="#" aria-label="Previous"><span aria-hidden="true">&laquo;</span></a></li>
               </else>
             </if>
             <if \@paginator.previous_page_url@ not nil>
-              <li><a aria-label="Previous" href="\@paginator.previous_page_url@" title="\@paginator.previous_page_context@"><span aria-hidden="true">&lsaquo;</span></a></li>
+              <li class="page-item"><a class="page-link" aria-label="Previous" href="\@paginator.previous_page_url@" title="\@paginator.previous_page_context@"><span aria-hidden="true">&lsaquo;</span></a></li>
             </if>
             <else>
-               <li class="disabled"><a href="#" aria-label="Previous"><span aria-hidden="true">&lsaquo;</span></a></li>
+               <li class="page-item disabled"><a class="page-link" href="#" aria-label="Previous"><span aria-hidden="true">&lsaquo;</span></a></li>
             </else>
 
             <multiple name="paginator_pages">
               <if \@paginator.current_page@ ne \@paginator_pages.page@>
-                <li><a href="\@paginator_pages.url@" title="\@paginator_pages.context@">\@paginator_pages.page@</a></li>
+                <li class="page-item"><a class="page-link" href="\@paginator_pages.url@" title="\@paginator_pages.context@">\@paginator_pages.page@</a></li>
               </if>
               <else>
-                <li class="active"><a href="#">\@paginator_pages.page@ <span class="visually-hidden">(current)</span></a></li>
+                <li class="page-item active"><a class="page-link" href="#">\@paginator_pages.page@ <span class="visually-hidden">(current)</span></a></li>
               </else>
             </multiple>
 
             <if \@paginator.next_page_url@ not nil>
-              <li><a aria-label="Next" href="\@paginator.next_page_url@" title="\@paginator.next_page_context@"><span aria-hidden="true">&rsaquo;</span></a></li>
+              <li class="page-item"><a class="page-link" aria-label="Next" href="\@paginator.next_page_url@" title="\@paginator.next_page_context@"><span aria-hidden="true">&rsaquo;</span></a></li>
             </if>
             <else>
-               <li class="disabled"><a href="#" aria-label="Next"><span aria-hidden="true">&rsaquo;</span></a></li>
+               <li class="page-item disabled"><a class="page-link" href="#" aria-label="Next"><span aria-hidden="true">&rsaquo;</span></a></li>
             </else>
             <if \@paginator.group_count@ gt 1 and \@paginator.groupsize@ gt 1>
               <if \@paginator.next_group_url@ not nil>
-                <li><a href="\@paginator.next_group_url@" title="\@paginator.next_group_context@">&raquo;</a></li>
+                <li class="page-item"><a class="page-link" href="\@paginator.next_group_url@" title="\@paginator.next_group_context@">&raquo;</a></li>
               </if>
               <else>
-               <li class="disabled"><a href="#" aria-label="Next"><span aria-hidden="true">&raquo;</span></a></li>
+               <li class="page-item disabled"><a class="page-link" href="#" aria-label="Next"><span aria-hidden="true">&raquo;</span></a></li>
               </else>
             </if>
           </if>
Index: openacs-4/packages/openacs-bootstrap5-theme/resources/lists/table.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap5-theme/resources/lists/table.adp,v
diff -u -r1.1.2.4 -r1.1.2.5
--- openacs-4/packages/openacs-bootstrap5-theme/resources/lists/table.adp	22 Oct 2022 17:48:48 -0000	1.1.2.4
+++ openacs-4/packages/openacs-bootstrap5-theme/resources/lists/table.adp	25 Oct 2022 12:18:41 -0000	1.1.2.5
@@ -8,40 +8,40 @@
           <if \@paginator.page_count@ gt 1>
             <if \@paginator.group_count@ gt 1 and \@paginator.groupsize@ gt 1>
               <if \@paginator.previous_group_url@ not nil>
-                <li><a href="\@paginator.previous_group_url@" title="\@paginator.previous_group_context@">&laquo;</a></li>
+                <li class="page-item"><a class="page-link" href="\@paginator.previous_group_url@" title="\@paginator.previous_group_context@">&laquo;</a></li>
               </if>
               <else>
-               <li class="disabled"><a href="#" aria-label="Previous"><span aria-hidden="true">&laquo;</span></a></li>
+               <li class="page-item disabled"><a class="page-link" href="#" aria-label="Previous"><span aria-hidden="true">&laquo;</span></a></li>
               </else>
             </if>
             <if \@paginator.previous_page_url@ not nil>
-              <li><a aria-label="Previous" href="\@paginator.previous_page_url@" title="\@paginator.previous_page_context@"><span aria-hidden="true">&lsaquo;</span></a></li>
+              <li class="page-item"><a class="page-link" aria-label="Previous" href="\@paginator.previous_page_url@" title="\@paginator.previous_page_context@"><span aria-hidden="true">&lsaquo;</span></a></li>
             </if>
             <else>
-               <li class="disabled"><a href="#" aria-label="Previous"><span aria-hidden="true">&lsaquo;</span></a></li>
+               <li class="page-item disabled"><a class="page-link" href="#" aria-label="Previous"><span aria-hidden="true">&lsaquo;</span></a></li>
             </else>
     
             <multiple name="paginator_pages">
               <if \@paginator.current_page@ ne \@paginator_pages.page@>
-                <li><a href="\@paginator_pages.url@" title="\@paginator_pages.context@">\@paginator_pages.page@</a></li>
+                <li class="page-item"><a class="page-link" href="\@paginator_pages.url@" title="\@paginator_pages.context@">\@paginator_pages.page@</a></li>
               </if>
               <else>
-                <li class="active"><a href="#">\@paginator_pages.page@ <span class="visually-hidden">(current)</span></a></li>
+                <li class="page-item active"><a class="page-link" href="#">\@paginator_pages.page@ <span class="visually-hidden">(current)</span></a></li>
               </else>
             </multiple>
 
             <if \@paginator.next_page_url@ not nil>
-              <li><a aria-label="Next" href="\@paginator.next_page_url@" title="\@paginator.next_page_context@"><span aria-hidden="true">&rsaquo;</span></a></li>
+              <li class="page-item"><a class="page-link" aria-label="Next" href="\@paginator.next_page_url@" title="\@paginator.next_page_context@"><span aria-hidden="true">&rsaquo;</span></a></li>
             </if>
             <else>
-               <li class="disabled"><a href="#" aria-label="Next"><span aria-hidden="true">&rsaquo;</span></a></li>
+               <li class="page-item disabled"><a class="page-link" href="#" aria-label="Next"><span aria-hidden="true">&rsaquo;</span></a></li>
             </else>
             <if \@paginator.group_count@ gt 1 and \@paginator.groupsize@ gt 1>
               <if \@paginator.next_group_url@ not nil>
-                <li><a href="\@paginator.next_group_url@" title="\@paginator.next_group_context@">&raquo;</a></li>
+                <li class="page-item"><a class="page-link" href="\@paginator.next_group_url@" title="\@paginator.next_group_context@">&raquo;</a></li>
               </if>
               <else>
-               <li class="disabled"><a href="#" aria-label="Next"><span aria-hidden="true">&raquo;</span></a></li>
+               <li class="page-item disabled"><a class="page-link" href="#" aria-label="Next"><span aria-hidden="true">&raquo;</span></a></li>
               </else>
             </if>
           </if>
@@ -255,40 +255,40 @@
           <if \@paginator.page_count@ gt 1>
             <if \@paginator.group_count@ gt 1 and \@paginator.groupsize@ gt 1>
               <if \@paginator.previous_group_url@ not nil>
-                <li><a href="\@paginator.previous_group_url@" title="\@paginator.previous_group_context@">&laquo;</a></li>
+                <li class="page-item"><a class="page-link" href="\@paginator.previous_group_url@" title="\@paginator.previous_group_context@">&laquo;</a></li>
               </if>
               <else>
-               <li class="disabled"><a href="#" aria-label="Previous"><span aria-hidden="true">&laquo;</span></a></li>
+               <li class="page-item disabled"><a class="page-link" href="#" aria-label="Previous"><span aria-hidden="true">&laquo;</span></a></li>
               </else>
             </if>
             <if \@paginator.previous_page_url@ not nil>
-              <li><a aria-label="Previous" href="\@paginator.previous_page_url@" title="\@paginator.previous_page_context@"><span aria-hidden="true">&lsaquo;</span></a></li>
+              <li class="page-item"><a class="page-link" aria-label="Previous" href="\@paginator.previous_page_url@" title="\@paginator.previous_page_context@"><span aria-hidden="true">&lsaquo;</span></a></li>
             </if>
             <else>
-               <li class="disabled"><a href="#" aria-label="Previous"><span aria-hidden="true">&lsaquo;</span></a></li>
+               <li class="page-item disabled"><a class="page-link" href="#" aria-label="Previous"><span aria-hidden="true">&lsaquo;</span></a></li>
             </else>
 
             <multiple name="paginator_pages">
               <if \@paginator.current_page@ ne \@paginator_pages.page@>
-                <li><a href="\@paginator_pages.url@" title="\@paginator_pages.context@">\@paginator_pages.page@</a></li>
+                <li class="page-item"><a class="page-link" href="\@paginator_pages.url@" title="\@paginator_pages.context@">\@paginator_pages.page@</a></li>
               </if>
               <else>
-                <li class="active"><a href="#">\@paginator_pages.page@ <span class="visually-hidden">(current)</span></a></li>
+                <li class="page-item active"><a class="page-link" href="#">\@paginator_pages.page@ <span class="visually-hidden">(current)</span></a></li>
               </else>
             </multiple>
 
             <if \@paginator.next_page_url@ not nil>
-              <li><a aria-label="Next" href="\@paginator.next_page_url@" title="\@paginator.next_page_context@"><span aria-hidden="true">&rsaquo;</span></a></li>
+              <li class="page-item"><a class="page-link" aria-label="Next" href="\@paginator.next_page_url@" title="\@paginator.next_page_context@"><span aria-hidden="true">&rsaquo;</span></a></li>
             </if>
             <else>
-               <li class="disabled"><a href="#" aria-label="Next"><span aria-hidden="true">&rsaquo;</span></a></li>
+               <li class="page-item disabled"><a class="page-link" href="#" aria-label="Next"><span aria-hidden="true">&rsaquo;</span></a></li>
             </else>
             <if \@paginator.group_count@ gt 1 and \@paginator.groupsize@ gt 1>
               <if \@paginator.next_group_url@ not nil>
-                <li><a href="\@paginator.next_group_url@" title="\@paginator.next_group_context@">&raquo;</a></li>
+                <li class="page-item"><a class="page-link" href="\@paginator.next_group_url@" title="\@paginator.next_group_context@">&raquo;</a></li>
               </if>
               <else>
-               <li class="disabled"><a href="#" aria-label="Next"><span aria-hidden="true">&raquo;</span></a></li>
+               <li class="page-item disabled"><a class="page-link" href="#" aria-label="Next"><span aria-hidden="true">&raquo;</span></a></li>
               </else>
             </if>
           </if>