Index: openacs-4/packages/dotlrn/www/admin/terms.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/terms.adp,v
diff -u -r1.17 -r1.17.6.1
--- openacs-4/packages/dotlrn/www/admin/terms.adp	18 Nov 2002 17:58:53 -0000	1.17
+++ openacs-4/packages/dotlrn/www/admin/terms.adp	1 Oct 2004 17:37:37 -0000	1.17.6.1
@@ -24,72 +24,21 @@
 
 <center>
 
-  <table cellpadding="5" width="95%">
-    <tr>
-      <td align="left">
-        <nobr>
-          <small>[
-            <a href="term-new">#dotlrn.New_Term#</a>
-          ]</small>
-        </nobr>
-      </td>
-    </tr>
-  </table>
 
-  <br>
-
-  <table bgcolor="#cccccc" cellpadding="5" width="95%">
-    <tr>
-      <th align="left">#dotlrn.Term#</th>
-      <th align="center" width="15%">#dotlrn.Start_Date#</th>
-      <th align="center" width="15%">#dotlrn.End_Date#</th>
-      <th align="center" width="15%">#dotlrn.Classes#</th>
-    </tr>
-
 <if @terms:rowcount@ gt 0>
-
-<multiple name="terms">
-
-<if @terms.rownum@ odd>
-    <tr bgcolor="#eeeeee">
+  <listtemplate name="terms"></listtemplate>
 </if>
 <else>
-    <tr bgcolor="#d9e4f9">
-</else>
-      <td align="left"><a href="term?term_id=@terms.term_id@">@terms.term_name@ @terms.term_year@</a></td>
-      <td align="center">@terms.start_date_pretty@</td>
-      <td align="center">@terms.end_date_pretty@</td>
-      <td align="center">@terms.n_classes@</td>
-    </tr>
-
-</multiple>
-
-</if>
-<else>
+<table>
   <tr bgcolor="#eeeeee">
     <td align="left" colspan="4">
       <i>#dotlrn.No_Terms#</i>
     </td>
   </tr>
+</table>
 </else>
-  </table>
 
-<if @terms:rowcount@ gt 10>
-  <br>
-
-  <table cellpadding="5" width="95%">
-    <tr>
-      <td align="left">
-        <nobr>
-          <small>[
-            <a href="term-new">#dotlrn.New_Term#</a>
-          ]</small>
-        </nobr>
-      </td>
-    </tr>
-  </table>
-</if>
-
+<br>
 </center>
 
 
Index: openacs-4/packages/dotlrn/www/admin/terms.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/terms.tcl,v
diff -u -r1.6.6.1 -r1.6.6.2
--- openacs-4/packages/dotlrn/www/admin/terms.tcl	25 Aug 2004 15:50:58 -0000	1.6.6.1
+++ openacs-4/packages/dotlrn/www/admin/terms.tcl	1 Oct 2004 17:37:37 -0000	1.6.6.2
@@ -21,6 +21,8 @@
     @creation-date Dec 13, 2001
     @version $Id$
 } -query {
+    page:optional
+    {orderby "start_date_pretty,desc"}
 } -properties {
     context_bar:onevalue
     terms:multirow
@@ -31,6 +33,39 @@
 
 set context_bar "[_ dotlrn.Terms]"
 
+set actions [list "[_ dotlrn.New_Term]" "term-new"]
+
+template::list::create \
+    -name terms \
+    -multirow terms \
+    -actions $actions \
+    -key term_id \
+    -page_size 50 \
+    -page_query_name terms_pagination \
+    -elements {
+        term_name {
+            label "[_ dotlrn.Term]"
+	    orderby_asc {term_name asc}
+	    orderby_desc {term_name desc}
+            link_url_eval {[export_vars -base "term" { term_id }]}
+        }
+        start_date_pretty {
+            label "[_ dotlrn.Start_Date]"
+	    orderby_asc {start_date_ansi asc}
+	    orderby_desc {start_date_ansi desc}
+        }
+        end_date_pretty {
+            label "[_ dotlrn.End_Date]"
+	    orderby_asc {end_date_ansi asc}
+	    orderby_desc {end_date_ansi desc}
+        }
+        n_classes {
+            label "[_ dotlrn.Classes]"
+	    orderby_asc {n_classes asc}
+	    orderby_desc {n_classes desc}
+        }
+    }
+
 db_multirow -extend { start_date_pretty end_date_pretty } terms select_terms {} {
     set start_date_pretty [lc_time_fmt $start_date_ansi "%q"]
     set end_date_pretty [lc_time_fmt $end_date_ansi "%q"]