Index: openacs-4/packages/dotlrn/dotlrn.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/dotlrn.info,v diff -u -r1.61 -r1.62 --- openacs-4/packages/dotlrn/dotlrn.info 7 Mar 2002 19:02:38 -0000 1.61 +++ openacs-4/packages/dotlrn/dotlrn.info 7 Mar 2002 20:24:41 -0000 1.62 @@ -117,9 +117,6 @@ <file type="query_file" db_type="oracle" path="www/admin/class-instance-new-oracle.xql"/> <file type="content_page" path="www/admin/class-instance-new.adp"/> <file type="content_page" path="www/admin/class-instance-new.tcl"/> - <file type="content_page" path="www/admin/class-instance.adp"/> - <file type="content_page" path="www/admin/class-instance.tcl"/> - <file type="query_file" path="www/admin/class-instance.xql"/> <file type="content_page" path="www/admin/class-new.adp"/> <file type="content_page" path="www/admin/class-new.tcl"/> <file type="content_page" path="www/admin/class.adp"/> @@ -155,6 +152,9 @@ <file type="content_page" path="www/admin/site-wide-admin-toggle.tcl"/> <file type="content_page" path="www/admin/term-new.adp"/> <file type="content_page" path="www/admin/term-new.tcl"/> + <file type="content_page" path="www/admin/term.adp"/> + <file type="content_page" path="www/admin/term.tcl"/> + <file type="query_file" path="www/admin/term.xql"/> <file type="content_page" path="www/admin/terms.adp"/> <file type="content_page" path="www/admin/terms.tcl"/> <file type="query_file" path="www/admin/terms.xql"/> 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.15 -r1.16 --- openacs-4/packages/dotlrn/sql/oracle/dotlrn-classes-create.sql 6 Mar 2002 22:35:15 -0000 1.15 +++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-classes-create.sql 7 Mar 2002 20:24:41 -0000 1.16 @@ -113,12 +113,21 @@ dotlrn_communities.portal_id, dotlrn_communities.portal_template_id, dotlrn_communities.package_id, - dotlrn_community.url(dotlrn_communities.community_id) as url + dotlrn_community.url(dotlrn_communities.community_id) as url, + dotlrn_classes_full.pretty_name as class_name, + dotlrn_classes_full.url as class_url, + dotlrn_classes_full.department_key, + dotlrn_departments_full.pretty_name as department_name, + dotlrn_departments_full.url as department_url from dotlrn_communities, dotlrn_class_instances, - dotlrn_terms - where dotlrn_communities.community_id = dotlrn_class_instances.class_instance_id - and dotlrn_class_instances.term_id = dotlrn_terms.term_id; + dotlrn_terms, + dotlrn_classes_full, + dotlrn_departments_full + where dotlrn_communities.community_id = dotlrn_class_instances.class_instance_id + and dotlrn_class_instances.term_id = dotlrn_terms.term_id + and dotlrn_communities.community_type = dotlrn_classes_full.class_key + and dotlrn_classes_full.department_key = dotlrn_departments_full.department_key; create or replace view dotlrn_class_instances_current as Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/class-instance.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/class-instance.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/class-instance.xql'. Fisheye: No comparison available. Pass `N' to diff? 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 -r1.9 -r1.10 --- openacs-4/packages/dotlrn/www/admin/class.adp 7 Mar 2002 19:02:38 -0000 1.9 +++ openacs-4/packages/dotlrn/www/admin/class.adp 7 Mar 2002 20:24:41 -0000 1.10 @@ -15,7 +15,7 @@ </else> </p> -<table bgcolor="#ececec" border="0" cellspacing="0" cellpadding="3" width="100%"> +<table bgcolor="#ececec"> <tr> <th align="left" width="50%"> <formtemplate id="term_form"> @@ -28,15 +28,15 @@ <p></p> <if @class_instances:rowcount@ gt 0> -<table border="0" cellspacing="0" cellpadding="3" width="100%"> +<table> <tr> <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@ @class_instances.term_year@</td> + <td><a href="term?term_id=@class_instances.term_id@">@class_instances.term_name@ @class_instances.term_year@</a></td> <td><a href="@class_instances.url@">@class_instances.pretty_name@</a></td> <td>[ <font size="-1"><a href="@class_instances.url@one-community-admin">admin</a></font> ]</td> </tr> Index: openacs-4/packages/dotlrn/www/admin/classes-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/classes-chunk.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn/www/admin/classes-chunk.adp 7 Mar 2002 19:02:38 -0000 1.3 +++ openacs-4/packages/dotlrn/www/admin/classes-chunk.adp 7 Mar 2002 20:24:41 -0000 1.4 @@ -4,7 +4,7 @@ <p></p> -<table bgcolor="#ececec" border="0" cellspacing="0" cellpadding="3" width="100%"> +<table bgcolor="#ececec"> <tr> <th align="left" width="50%"> <formtemplate id="department_form"> @@ -17,7 +17,7 @@ <p></p> <if @classes:rowcount@ gt 0> -<table border="0" cellspacing="0" cellpadding="3" width="100%"> +<table> <tr> <th align="left" width="30%"><%= [ad_parameter departments_pretty_name] %></th> <th align="left" width="10%"><%= [ad_parameter classes_pretty_name] %> Key</th> 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.7 -r1.8 --- openacs-4/packages/dotlrn/www/admin/clubs.adp 7 Mar 2002 18:49:33 -0000 1.7 +++ openacs-4/packages/dotlrn/www/admin/clubs.adp 7 Mar 2002 20:24:41 -0000 1.8 @@ -7,7 +7,7 @@ <p></p> <if @clubs:rowcount@ gt 0> -<table border="0" cellspacing="0" cellpadding="3" width="100%"> +<table> <tr> <th align="left" width="15%"><%= [ad_parameter clubs_pretty_name] %> Name</th> <th align="left" width="50%">Description</th> Index: openacs-4/packages/dotlrn/www/admin/departments.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/departments.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn/www/admin/departments.adp 7 Mar 2002 19:02:38 -0000 1.3 +++ openacs-4/packages/dotlrn/www/admin/departments.adp 7 Mar 2002 20:24:41 -0000 1.4 @@ -7,7 +7,7 @@ <p></p> <if @departments:rowcount@ gt 0> -<table border="0" cellspacing="0" cellpadding="0" width="100%"> +<table> <tr> <th align="left" width="30%"><%= [ad_parameter departments_pretty_name] %> Key</th> <th align="left"><%= [ad_parameter departments_pretty_name] %> Name</th> Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/term.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/term.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/term.xql'. Fisheye: No comparison available. Pass `N' to diff? 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.4 -r1.5 --- openacs-4/packages/dotlrn/www/admin/terms.adp 7 Mar 2002 18:54:10 -0000 1.4 +++ openacs-4/packages/dotlrn/www/admin/terms.adp 7 Mar 2002 20:24:41 -0000 1.5 @@ -7,7 +7,7 @@ <p></p> <if @terms:rowcount@ gt 0> -<table border="0" cellspacing="0" cellpadding="3" width="100%"> +<table> <tr> <th align="left" width="15%">Term</th> <th align="left" width="15%">Start Date</th> Index: openacs-4/packages/dotlrn/www/admin/users-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk.adp,v diff -u -r1.7 -r1.8 --- openacs-4/packages/dotlrn/www/admin/users-chunk.adp 6 Mar 2002 00:17:31 -0000 1.7 +++ openacs-4/packages/dotlrn/www/admin/users-chunk.adp 7 Mar 2002 20:24:41 -0000 1.8 @@ -1,7 +1,7 @@ -<table border="0" cellpadding="2" cellspacing="0" width="95%"> +<table width="95%"> <tr bgcolor="black"> <td> - <table border="0" cellpadding="2" cellspacing="0" width="100%"> + <table> <tr bgcolor="#aaaaaa"> <th align="left" width="50%">User</th> <th align="left">Access</th>