Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-classes-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-classes-create.sql,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-classes-create.sql	17 Dec 2001 23:02:55 -0000	1.12
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-classes-create.sql	11 Jan 2002 06:33:26 -0000	1.13
@@ -58,7 +58,9 @@
                                 constraint dotlrn_class_instances_pk
                                 primary key,
     class_key                   constraint dotlrn_ci_class_key_fk
-                                references dotlrn_classes (class_key),
+                                references dotlrn_classes (class_key)
+                                constraint dotlrn_ci_class_key_nn
+                                not null,
     term_id                     constraint dotlrn_ci_term_id_fk
                                 references dotlrn_terms (term_id)
                                 constraint dotlrn_ci_term_id_nn
@@ -89,6 +91,19 @@
     where  dotlrn_communities.community_id = dotlrn_class_instances.class_instance_id
     and dotlrn_class_instances.term_id = dotlrn_terms.term_id;
 
+create or replace view dotlrn_class_instances_current
+as
+    select *
+    from dotlrn_class_instances_full
+    where active_end_date >= sysdate
+    and active_start_date <= sysdate;
+
+create or replace view dotlrn_class_instances_not_old
+as
+    select *
+    from dotlrn_class_instances_full
+    where active_end_date >= sysdate;
+
 create or replace package dotlrn_class
 is
     function new (
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-init.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/dotlrn-init.sql,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-init.sql	17 Dec 2001 23:02:55 -0000	1.9
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-init.sql	11 Jan 2002 06:33:26 -0000	1.10
@@ -18,27 +18,27 @@
     foo := dotlrn_community_type.new (
         community_type => 'dotlrn_community',
         parent_type => NULL,
-        pretty_name => 'dotLRN Community',
-        pretty_plural => 'dotLRN Communities',
-        description => 'dotLRN Communities - the base community type'
+        pretty_name => 'Community',
+        pretty_plural => 'Communities',
+        description => 'Communities - the base community type'
     );
 
     -- create the dotlrn_class community type
     foo := dotlrn_community_type.new (
         community_type => 'dotlrn_class_instance',
         parent_type => 'dotlrn_community',
-        pretty_name => 'dotLRN Class',
-        pretty_plural => 'dotLRN Classes',
-        description => 'dotLRN Classes - e.g. 6.001'
+        pretty_name => 'Class',
+        pretty_plural => 'Classes',
+        description => 'Classes - e.g. 6.001'
     );
 
     -- create the dotlrn_club community type
     foo := dotlrn_community_type.new (
         community_type => 'dotlrn_club',
         parent_type => 'dotlrn_community',
-        pretty_name => 'dotLRN Club',
-        pretty_plural => 'dotLRN Clubs',
-        description => 'dotLRN Clubs - e.g. Alumni'
+        pretty_name => 'Club',
+        pretty_plural => 'Clubs',
+        description => 'Clubs - e.g. Alumni'
     );
 
     -- create roles
Index: openacs-4/packages/dotlrn/www/one-community-admin.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-admin.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/one-community-admin.tcl	10 Jan 2002 19:30:18 -0000	1.7
+++ openacs-4/packages/dotlrn/www/one-community-admin.tcl	11 Jan 2002 06:33:26 -0000	1.8
@@ -7,6 +7,7 @@
     @version $Id$
 } -query {
 } -properties {
+    users:multirow
 }
 
 set community_id [dotlrn_community::get_community_id]
Index: openacs-4/packages/dotlrn/www/admin/class-instance-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class-instance-new.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/admin/class-instance-new.adp	10 Dec 2001 22:48:57 -0000	1.3
+++ openacs-4/packages/dotlrn/www/admin/class-instance-new.adp	11 Jan 2002 06:33:26 -0000	1.4
@@ -1,5 +1,5 @@
 <master src="master">
-<property name="title">dotLRN New Class Instance for @class_name@</property>
+<property name="title">New Class Instance of @class_name@</property>
 <property name="context_bar">@context_bar@</property>
 
 <formtemplate id="add_class_instance"></formtemplate>
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/class-instance-oracle.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/dotlrn/www/admin/class-instance.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/class-instance.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn/www/admin/class-instance.xql	11 Jan 2002 06:33:26 -0000	1.1
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+
+<queryset>
+  <fullquery name="select_class_instance">
+    <querytext>
+      select dotlrn_class_instances.pretty_name,
+             dotlrn_class_instances.url
+      from dotlrn_class_instances_full dotlrn_class_instances
+      where dotlrn_class_instances.class_instance_id = :class_instance_id
+    </querytext>
+  </fullquery>
+</queryset>
Index: openacs-4/packages/dotlrn/www/admin/class-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class-new.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/admin/class-new.adp	10 Dec 2001 22:48:57 -0000	1.3
+++ openacs-4/packages/dotlrn/www/admin/class-new.adp	11 Jan 2002 06:33:26 -0000	1.4
@@ -1,5 +1,5 @@
 <master src="master">
-<property name="title">dotLRN New Class</property>
+<property name="title">New Class</property>
 <property name="context_bar">@context_bar@</property>
 
 <formtemplate id="add_class"></formtemplate>
Index: openacs-4/packages/dotlrn/www/admin/class.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/admin/class.tcl	17 Dec 2001 23:02:56 -0000	1.2
+++ openacs-4/packages/dotlrn/www/admin/class.tcl	11 Jan 2002 06:33:26 -0000	1.3
@@ -5,14 +5,15 @@
     @creation-date Dec 10, 2001
     @version $Id$
 } -query {
+    {filter "select_current_class_instances"}
 } -properties {
     class_key:onevalue
     pretty_name:onevalue
     instances:multirow
     can_instantiate:onevalue
 }
 
-db_multirow instances select_class_instances {}
+db_multirow instances $filter {}
 
 set can_instantiate [db_string can_instantiate_class {}]
 
Index: openacs-4/packages/dotlrn/www/admin/class.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/admin/class.xql	17 Dec 2001 23:02:56 -0000	1.2
+++ openacs-4/packages/dotlrn/www/admin/class.xql	11 Jan 2002 06:33:26 -0000	1.3
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <queryset>
-  <fullquery name="select_class_instances">
+  <fullquery name="select_all_class_instances">
     <querytext>
       select class_instance_id
       from dotlrn_class_instances
@@ -10,6 +10,24 @@
     </querytext>
   </fullquery>
 
+  <fullquery name="select_current_class_instances">
+    <querytext>
+      select class_instance_id
+      from dotlrn_class_instances_current
+      where class_key = :class_key
+      order by class_instance_id
+    </querytext>
+  </fullquery>
+
+  <fullquery name="select_current_and_future_class_instances">
+    <querytext>
+      select class_instance_id
+      from dotlrn_class_instances_not_old
+      where class_key = :class_key
+      order by class_instance_id
+    </querytext>
+  </fullquery>
+
   <fullquery name="can_instantiate_class">
     <querytext>
       select count(*)
Index: openacs-4/packages/dotlrn/www/admin/classes.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/classes.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn/www/admin/classes.adp	17 Dec 2001 23:02:56 -0000	1.5
+++ openacs-4/packages/dotlrn/www/admin/classes.adp	11 Jan 2002 06:33:26 -0000	1.6
@@ -1,5 +1,5 @@
 <master src="master">
-<property name="title">dotLRN Classes</property>
+<property name="title">Classes</property>
 <property name="context_bar">@context_bar@</property>
 
 [ <a href="class-new">new class</a> ]
@@ -8,6 +8,10 @@
 <include src="need-term-note">
 </p>
 
+@filter_bar@
+
+<p></p>
+
 <if @classes:rowcount@ gt 0>
 <multiple name="classes">
 <include src="class" class_key="@classes.class_key@" pretty_name="@classes.pretty_name@">
Index: openacs-4/packages/dotlrn/www/admin/classes.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/classes.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/admin/classes.tcl	10 Dec 2001 22:48:57 -0000	1.3
+++ openacs-4/packages/dotlrn/www/admin/classes.tcl	11 Jan 2002 06:33:26 -0000	1.4
@@ -7,11 +7,23 @@
     @version $Id$
 } -query {
 } -properties {
+    filter_bar:onevalue
     classes:multirow
 }
 
 set context_bar "Classes"
 
+set filter select_current_class_instances
+set filter_bar [ad_dimensional {
+    {filter "Term:" select_current_class_instances
+        {
+            {select_current_class_instances current {}}
+            {select_current_and_future_class_instances "+future" {}}
+            {select_all_class_instances "+past" {}}
+        }
+    }
+}]
+
 db_multirow classes select_classes {}
 
 ad_return_template
Index: openacs-4/packages/dotlrn/www/admin/club-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/club-new.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/admin/club-new.adp	10 Dec 2001 22:48:57 -0000	1.2
+++ openacs-4/packages/dotlrn/www/admin/club-new.adp	11 Jan 2002 06:33:26 -0000	1.3
@@ -1,5 +1,5 @@
 <master src="master">
-<property name="title">dotLRN New Club</property>
+<property name="title">New Club</property>
 <property name="context_bar">@context_bar@</property>
 
 <formtemplate id="add_club"></formtemplate>
Index: openacs-4/packages/dotlrn/www/admin/clubs.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/clubs.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/admin/clubs.adp	17 Dec 2001 23:02:56 -0000	1.4
+++ openacs-4/packages/dotlrn/www/admin/clubs.adp	11 Jan 2002 06:33:26 -0000	1.5
@@ -1,5 +1,5 @@
 <master src="master">
-<property name="title">dotLRN Clubs</property>
+<property name="title">Clubs</property>
 <property name="context_bar">@context_bar@</property>
 
 [ <a href="club-new">new club</a> ]
Index: openacs-4/packages/dotlrn/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/index.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/admin/index.adp	17 Dec 2001 23:07:56 -0000	1.7
+++ openacs-4/packages/dotlrn/www/admin/index.adp	11 Jan 2002 06:33:26 -0000	1.8
@@ -9,8 +9,8 @@
 <property name="context_bar">@context_bar@</property>
 
 <ul>
-  <li><a href="users">dotLRN Users</a></li>
-  <li><a href="terms">dotLRN Terms</a></li>
-  <li><a href="classes">dotLRN Classes</a></li>
-  <li><a href="clubs">dotLRN Clubs</a></li>
+  <li><a href="users">Users</a></li>
+  <li><a href="terms">Terms</a></li>
+  <li><a href="classes">Classes</a></li>
+  <li><a href="clubs">Clubs</a></li>
 </ul>
Index: openacs-4/packages/dotlrn/www/admin/term-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/term-new.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/admin/term-new.adp	17 Dec 2001 23:02:56 -0000	1.1
+++ openacs-4/packages/dotlrn/www/admin/term-new.adp	11 Jan 2002 06:33:26 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="master">
-<property name="title">dotLRN New Term</property>
+<property name="title">New Term</property>
 <property name="context_bar">@context_bar@</property>
 
 <formtemplate id="add_term"></formtemplate>
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.1 -r1.2
--- openacs-4/packages/dotlrn/www/admin/terms.adp	17 Dec 2001 23:02:56 -0000	1.1
+++ openacs-4/packages/dotlrn/www/admin/terms.adp	11 Jan 2002 06:33:26 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="master">
-<property name="title">dotLRN Terms</property>
+<property name="title">Terms</property>
 <property name="context_bar">@context_bar@</property>
 
 [ <a href="term-new">new term</a> ]
Index: openacs-4/packages/dotlrn/www/admin/user-edit-verify.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-edit-verify.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/admin/user-edit-verify.adp	11 Dec 2001 16:14:13 -0000	1.2
+++ openacs-4/packages/dotlrn/www/admin/user-edit-verify.adp	11 Jan 2002 06:33:26 -0000	1.3
@@ -1,5 +1,5 @@
 <master src="master">
-<property name="title">dotLRN Admin: Edit a User</property>
+<property name="title">Edit a User</property>
 <property name="context_bar">@context_bar@</property>
 
 You're editing <strong>@first_names@ @last_name@</strong>. 
Index: openacs-4/packages/dotlrn/www/admin/user-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-edit.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/admin/user-edit.adp	10 Jan 2002 19:30:18 -0000	1.3
+++ openacs-4/packages/dotlrn/www/admin/user-edit.adp	11 Jan 2002 06:33:26 -0000	1.4
@@ -1,5 +1,5 @@
 <master src="master">
-<property name="title">dotLRN Admin: Edit a User</property>
+<property name="title">Edit a User</property>
 <property name="context_bar">@context_bar@</property>
 
 You're editing <strong>@first_names@ @last_name@</strong>. 
Index: openacs-4/packages/dotlrn/www/admin/user-new-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-new-2.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/admin/user-new-2.adp	10 Jan 2002 21:19:32 -0000	1.7
+++ openacs-4/packages/dotlrn/www/admin/user-new-2.adp	11 Jan 2002 06:33:26 -0000	1.8
@@ -1,5 +1,5 @@
 <master src="master">
-<property name="title">dotLRN Admin: Add a User</property>
+<property name="title">Add a User</property>
 <property name="context_bar">@context_bar@</property>
 
 You've chosen to add <strong>@first_names@ @last_name@</strong>. 
Index: openacs-4/packages/dotlrn/www/admin/user-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-new.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/admin/user-new.adp	10 Jan 2002 21:19:32 -0000	1.4
+++ openacs-4/packages/dotlrn/www/admin/user-new.adp	11 Jan 2002 06:33:26 -0000	1.5
@@ -1,5 +1,5 @@
 <master src="master">
-<property name="title">dotLRN Admin: Add a User</property>
+<property name="title">Add a User</property>
 <property name="context_bar">@context_bar@</property>
 
 The results of your search are:
Index: openacs-4/packages/dotlrn/www/admin/users.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/admin/users.adp	17 Dec 2001 23:02:56 -0000	1.7
+++ openacs-4/packages/dotlrn/www/admin/users.adp	11 Jan 2002 06:33:26 -0000	1.8
@@ -1,8 +1,8 @@
 <master src="master">
-<property name="title">dotLRN Admin</property>
+<property name="title">Users</property>
 <property name="context_bar">@context_bar@</property>
 
-<h3>dotLRN users</h3>
+<h3>Users</h3>
 <table border=0 cellpadding=2 cellspacing=0 width=650>
 <tr bgcolor=black>
 <td>
@@ -40,5 +40,3 @@
 <form method=get action=user-new>
 Add a new dotLRN user: <input type=text name=search_text> <input type=submit value=search>
 </form>
-
-