Index: openacs-4/packages/dotlrn/www/admin/class.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class.adp,v
diff -u -N
--- openacs-4/packages/dotlrn/www/admin/class.adp	6 Mar 2002 22:35:15 -0000	1.7
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-<a href="one-class?class_key=@class_key@">@pretty_name@</a>
-<!--
-<if @can_instantiate@ gt 0>
-[
-  <font size="-1">
-    <a href="class-instance-new?class_key=@class_key@&referer=@referer@">New Instance</a>
-  </font>
-]
-</if>
-<else>
-[
-  <font size="-1" color="#aaaaaa">
-    <i>New Instance</i>
-  </font>
-]
-</else>
-
-<if @instances:rowcount@ gt 0>
-<blockquote>
-<multiple name="instances">
-  <include src="class-instance" class_instance_id="@instances.class_instance_id@" referer="@referer@"><br>
-</multiple>
-</blockquote>
-</if>
--->
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 -N
--- openacs-4/packages/dotlrn/www/admin/class.tcl	6 Mar 2002 22:35:15 -0000	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-# dotlrn/www/admin/class.tcl
-
-ad_page_contract {
-    @author yon (yon@milliped.com)
-    @creation-date Dec 10, 2001
-    @version $Id: class.tcl,v 1.4 2002/03/06 22:35:15 yon Exp $
-} -query {
-    {term_id -1}
-} -properties {
-    class_key:onevalue
-    pretty_name:onevalue
-    instances:multirow
-    can_instantiate:onevalue
-}
-
-set query "select_class_instances"
-if {$term_id == -1} {
-    set query "select_all_class_instances"
-}
-
-db_multirow instances $query {}
-
-set can_instantiate [dotlrn_class::can_instantiate -class_key $class_key]
-
-ad_return_template
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 -N
--- openacs-4/packages/dotlrn/www/admin/class.xql	6 Mar 2002 22:35:15 -0000	1.5
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-
-<queryset>
-  <fullquery name="select_all_class_instances">
-    <querytext>
-      select class_instance_id
-      from dotlrn_class_instances
-      where class_key = :class_key
-      order by class_instance_id
-    </querytext>
-  </fullquery>
-
-  <fullquery name="select_class_instances">
-    <querytext>
-      select class_instance_id
-      from dotlrn_class_instances
-      where class_key = :class_key
-      and term_id = :term_id
-      order by class_instance_id
-    </querytext>
-  </fullquery>
-</queryset>
Index: openacs-4/packages/dotlrn/www/admin/club-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/club-oracle.xql,v
diff -u -N
--- openacs-4/packages/dotlrn/www/admin/club-oracle.xql	17 Dec 2001 23:02:56 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-
-<queryset>
-  <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
-
-  <fullquery name="select_club">
-    <querytext>
-      select dotlrn_communities.community_key,
-             dotlrn_communities.pretty_name,
-             dotlrn_communities.description,
-             dotlrn_community.url(:club_id)
-      from dotlrn_communities
-      where dotlrn_communities.community_id = :club_id
-    </querytext>
-  </fullquery>
-</queryset>
Index: openacs-4/packages/dotlrn/www/admin/club.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/club.adp,v
diff -u -N
--- openacs-4/packages/dotlrn/www/admin/club.adp	11 Feb 2002 22:44:17 -0000	1.5
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-<a href=@url@>@pretty_name@</a> - [ <a href=@url@one-community-admin><font size="-1">admin</font></a> ] @description@
Index: openacs-4/packages/dotlrn/www/admin/club.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/club.tcl,v
diff -u -N
--- openacs-4/packages/dotlrn/www/admin/club.tcl	23 Jan 2002 00:15:44 -0000	1.5
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-ad_page_contract {
-    displays dotLRN clubs admin page
-
-    @author yon (yon@openforce.net)
-    @creation-date 2001-12-03
-    @version $Id: club.tcl,v 1.5 2002/01/23 00:15:44 yon Exp $
-} -query {
-} -properties {
-    club_id:onevalue
-    pretty_name:onevalue
-    descrition:onevalue
-    url:onevalue
-}
-
-if {![exists_and_not_null url]} {
-    db_1row select_club {}
-}
-
-ad_return_template
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 -N -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/admin/clubs.adp	15 Jan 2002 20:47:02 -0000	1.6
+++ openacs-4/packages/dotlrn/www/admin/clubs.adp	7 Mar 2002 18:49:33 -0000	1.7
@@ -7,14 +7,20 @@
 <p></p>
 
 <if @clubs:rowcount@ gt 0>
+<table border="0" cellspacing="0" cellpadding="3" width="100%">
+  <tr>
+    <th align="left" width="15%"><%= [ad_parameter clubs_pretty_name] %> Name</th>
+    <th align="left" width="50%">Description</th>
+    <th align="left">Actions</th>
+  </tr>
 <multiple name="clubs">
-  <include src="club" club_id="@clubs.club_id@"
-                      pretty_name="@clubs.pretty_name@"
-                      description="@clubs.description@"
-                      community_key="@clubs.community_key@"
-                      url="@clubs.url@">
-  <p></p>
+  <tr>
+    <td><a href="@clubs.url@">@clubs.pretty_name@</a></td>
+    <td>@clubs.description@</td>
+    <td>[&nbsp<font size="-1"><a href="@clubs.url@one-community-admin">admin</a></font>&nbsp;]</td>
+  </tr>
 </multiple>
+</table>
 </if>
 
 <if @clubs:rowcount@ gt 10>
Index: openacs-4/packages/dotlrn/www/admin/department.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/department.adp,v
diff -u -N
--- openacs-4/packages/dotlrn/www/admin/department.adp	22 Jan 2002 00:13:09 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-<a href="one-department?department_key=@department_key@">@pretty_name@</a>
Index: openacs-4/packages/dotlrn/www/admin/department.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/department.tcl,v
diff -u -N
--- openacs-4/packages/dotlrn/www/admin/department.tcl	22 Jan 2002 00:13:09 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-# dotlrn/www/admin/department.tcl
-
-ad_page_contract {
-    @author yon (yon@openforce.net)
-    @creation-date 2002-01-20
-    @version $Id: department.tcl,v 1.1 2002/01/22 00:13:09 yon Exp $
-} -query {
-} -properties {
-    department_key:onevalue
-    pretty_name:onevalue
-}
-
-if {![exists_and_not_null pretty_name]} {
-    db_1row select_department {}
-}
-
-ad_return_template
Index: openacs-4/packages/dotlrn/www/admin/department.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/department.xql,v
diff -u -N
--- openacs-4/packages/dotlrn/www/admin/department.xql	22 Jan 2002 00:13:09 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-
-<queryset>
-  <fullquery name="select_department">
-    <querytext>
-      select department_key,
-             pretty_name
-      from dotlrn_departments_full
-      where department_key = :department_key
-    </querytext>
-  </fullquery>
-</queryset>
Index: openacs-4/packages/dotlrn/www/admin/one-class.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/one-class.adp,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/dotlrn/www/admin/one-class.adp	6 Mar 2002 22:35:15 -0000	1.8
+++ openacs-4/packages/dotlrn/www/admin/one-class.adp	7 Mar 2002 18:49:33 -0000	1.9
@@ -30,13 +30,15 @@
 <if @class_instances:rowcount@ gt 0>
 <table border="0" cellspacing="0" cellpadding="3" width="100%">
   <tr>
-    <th align="left" width="10%">Term</th>
-    <th align="left"><%= [ad_parameter classes_pretty_name] %> Instance Name</th>
+    <th align="left" width="15%">Term</th>
+    <th align="left" width="50%"><%= [ad_parameter classes_pretty_name] %> Instance Name</th>
+    <th align="left">Actions</th>
   </tr>
 <multiple name="class_instances">
   <tr>
     <td>@class_instances.term_name@&nbsp;@class_instances.term_year@</td>
-    <td><a href="@class_instances.url@one-community-admin">@class_instances.pretty_name@</a></td>
+    <td><a href="@class_instances.url@">@class_instances.pretty_name@</a></td>
+    <td>[&nbsp;<font size="-1"><a href="@class_instances.url@one-community-admin">admin</a></font>&nbsp;]</td>
   </tr>
 </multiple>
 </table>
Index: openacs-4/packages/dotlrn/www/admin/term.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/term.adp,v
diff -u -N
--- openacs-4/packages/dotlrn/www/admin/term.adp	17 Dec 2001 23:02:56 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-@term_name@ @term_year@ (@start_date@ - @end_date@)
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 -N
--- openacs-4/packages/dotlrn/www/admin/term.tcl	20 Jan 2002 19:43:46 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-# dotlrn/www/admin/term.tcl
-
-ad_page_contract {
-    @author yon (yon@openforce.net)
-    @creation-date 2001-12-03
-    @version $Id: term.tcl,v 1.2 2002/01/20 19:43:46 yon Exp $
-} -query {
-} -properties {
-    term_id:onevalue
-    term_name:onevalue
-    term_year:onevalue
-    start_date:onevalue
-    end_date:onevalue
-}
-
-if {![exists_and_not_null term_name]} {
-    db_1row select_term {}
-}
-
-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 -N
--- openacs-4/packages/dotlrn/www/admin/term.xql	17 Dec 2001 23:02:56 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-
-<queryset>
-  <fullquery name="select_term">
-    <querytext>
-      select dotlrn_terms.term_name,
-             dotlrn_terms.term_year,
-             dotlrn_terms.start_date,
-             dotlrn_terms.end_date
-      from dotlrn_terms
-      where dotlrn_terms.term_id = :term_id
-    </querytext>
-  </fullquery>
-</queryset>
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 -N -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/admin/terms.adp	15 Jan 2002 20:47:02 -0000	1.3
+++ openacs-4/packages/dotlrn/www/admin/terms.adp	7 Mar 2002 18:54:10 -0000	1.4
@@ -7,14 +7,20 @@
 <p></p>
 
 <if @terms:rowcount@ gt 0>
+<table border="0" cellspacing="0" cellpadding="3" width="100%">
+  <tr>
+    <th align="left" width="15%">Term</th>
+    <th align="left" width="15%">Start Date</th>
+    <th align="left" width="15%">End Date</th>
+  </tr>
 <multiple name="terms">
-  <include src="term" term_id="@terms.term_id@"
-                      term_name="@terms.term_name@"
-                      term_year="@terms.term_year@"
-                      start_date="@terms.start_date@"
-                      end_date="@terms.end_date@">
-  <p></p>
+  <tr>
+    <td><a href="term?term_id=@terms.term_id@">@terms.term_name@ @terms.term_year@</a></td>
+    <td>@terms.start_date@</td>
+    <td>@terms.end_date@</td>
+  </tr>
 </multiple>
+</table>
 </if>
 
 <if @terms:rowcount@ gt 10>