Index: openacs-4/packages/dotlrn/www/admin/term.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/term.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn/www/admin/term.tcl	7 Mar 2002 20:38:40 -0000	1.5
+++ openacs-4/packages/dotlrn/www/admin/term.tcl	7 Mar 2002 20:58:40 -0000	1.6
@@ -44,8 +44,6 @@
     select dotlrn_terms.term_name || ' ' || dotlrn_terms.term_year,
            dotlrn_terms.term_id
     from dotlrn_terms
-    where dotlrn_terms.end_date > (sysdate - 360)
-    and dotlrn_terms.start_date < (sysdate + 360)
     order by dotlrn_terms.start_date,
              dotlrn_terms.end_date
 }]
@@ -70,21 +68,31 @@
 if {[form is_valid term_form]} {
     form get_values term_form term_id department_key
 
-    ad_returnredirect "term?[export_vars {term_id department_key}]"
+    if {$term_id != -1} {
+        ad_returnredirect "term?[export_vars {term_id department_key}]"
+    }
 }
 
 if {![exists_and_not_null referer]} {
     set referer "terms"
 }
 
 set query "select_classes"
+if {$term_id == -1} {
+    set query "select_all_classes"
+}
 if {![empty_string_p $department_key]} {
-    set query "select_classes_by_department"
+    append query "_by_department"
 }
 
 db_multirow classes $query {}
 
-set title "One Term"
-set context_bar {{terms Terms} One}
+if {![db_0or1row select_term_info {}]} {
+    set title "All Terms"
+    set context_bar {{terms Terms} {All Terms}}
+} else {
+    set title "$term_name $term_year ($start_date - $end_date)"
+    set context_bar {{terms Terms} One}
+}
 
 ad_return_template
Index: openacs-4/packages/dotlrn/www/admin/term.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/term.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/admin/term.xql	7 Mar 2002 20:24:41 -0000	1.3
+++ openacs-4/packages/dotlrn/www/admin/term.xql	7 Mar 2002 20:58:40 -0000	1.4
@@ -1,10 +1,23 @@
 <?xml version="1.0"?>
 
 <queryset>
+
+    <fullquery name="select_term_info">
+        <querytext>
+            select term_name,
+                   term_year,
+                   to_char(start_date, 'Mon DD YYYY') as start_date,
+                   to_char(end_date, 'Mon DD YYYY') as end_date
+            from dotlrn_terms
+            where term_id = :term_id
+        </querytext>
+    </fullquery>
+
     <fullquery name="select_classes">
         <querytext>
             select dotlrn_class_instances_full.*
             from dotlrn_class_instances_full
+            where dotlrn_class_instances_full.term_id = :term_id
             order by dotlrn_class_instances_full.department_name,
                      dotlrn_class_instances_full.department_key,
                      dotlrn_class_instances_full.class_name,
@@ -18,6 +31,34 @@
         <querytext>
             select dotlrn_class_instances_full.*
             from dotlrn_class_instances_full
+            where dotlrn_class_instances_full.term_id = :term_id
+            and dotlrn_class_instances_full.department_key = :department_key
+            order by dotlrn_class_instances_full.department_name,
+                     dotlrn_class_instances_full.department_key,
+                     dotlrn_class_instances_full.class_name,
+                     dotlrn_class_instances_full.class_key,
+                     dotlrn_class_instances_full.pretty_name,
+                     dotlrn_class_instances_full.community_key
+        </querytext>
+    </fullquery>
+
+    <fullquery name="select_all_classes">
+        <querytext>
+            select dotlrn_class_instances_full.*
+            from dotlrn_class_instances_full
+            order by dotlrn_class_instances_full.department_name,
+                     dotlrn_class_instances_full.department_key,
+                     dotlrn_class_instances_full.class_name,
+                     dotlrn_class_instances_full.class_key,
+                     dotlrn_class_instances_full.pretty_name,
+                     dotlrn_class_instances_full.community_key
+        </querytext>
+    </fullquery>
+
+    <fullquery name="select_all_classes_by_department">
+        <querytext>
+            select dotlrn_class_instances_full.*
+            from dotlrn_class_instances_full
             where dotlrn_class_instances_full.department_key = :department_key
             order by dotlrn_class_instances_full.department_name,
                      dotlrn_class_instances_full.department_key,
@@ -27,4 +68,5 @@
                      dotlrn_class_instances_full.community_key
         </querytext>
     </fullquery>
+
 </queryset>
Index: openacs-4/packages/dotlrn/www/admin/terms.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/terms.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/admin/terms.xql	17 Dec 2001 23:02:56 -0000	1.1
+++ openacs-4/packages/dotlrn/www/admin/terms.xql	7 Mar 2002 20:58:40 -0000	1.2
@@ -6,8 +6,8 @@
       select term_id,
              term_name,
              term_year,
-             start_date,
-             end_date
+             to_char(start_date, 'Mon DD YYYY') as start_date,
+             to_char(end_date, 'Mon DD YYYY') as end_date
       from dotlrn_terms
       order by start_date
     </querytext>