Index: openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml,v
diff -u -r1.33.2.6.4.2 -r1.33.2.6.4.3
--- openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml	21 Jun 2004 19:55:38 -0000	1.33.2.6.4.2
+++ openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml	22 Jun 2004 20:02:40 -0000	1.33.2.6.4.3
@@ -117,6 +117,7 @@
   <msg key="course_assistant_role_pretty_plural">Course Assistants</msg>
   <msg key="Create_A_New_User">Create A New User</msg>
   <msg key="Create_a_Web_Log">Create a Web Log</msg>
+  <msg key="Created">Created</msg>
   <msg key="CSV_File_Format">CSV File Format</msg>
   <msg key="Customize_Layout">Customize Layout</msg>
   <msg key="Deactivate_">Deactivate ...</msg>
@@ -249,7 +250,7 @@
   <msg key="lt_An_error_occured_whil">An error occured while trying to add a user to a community.  This error has been logged.</msg>
   <msg key="lt_An_error_occured_whil_1">An error occured while trying to remove a user to a community.  This error has been logged.</msg>
   <msg key="lt_approve_and_add_to_do">approve and add to dotLRN</msg>
-  <msg key="lt_Are_you_sure_you_want">Are you sure you want to delete the empty department</msg>
+  <msg key="lt_Are_you_sure_you_want">Are you sure you want to archive group &lt;strong&gt;%pretty_name%&lt;/strong&gt; and all its subgroups (if any)?</msg>
   <msg key="lt_Be_sure_that_the_pers">Be sure that the person does not already have an account under another email address. Duplicate accounts cause problems for everyone. To add a person with an existing account use &lt;a href=members&gt;Manage Membership&lt;/a&gt;.</msg>
   <msg key="lt_Class_Key_a_short_nam">Class Key (a short name, no spaces)</msg>
   <msg key="lt_Communitys_Web_Addres">Community's Web Address</msg>
@@ -333,7 +334,7 @@
 Message: %body%</msg>
   <msg key="lt_The_following_members">The following members of</msg>
   <msg key="lt_The_following_variabl">The following variables can be used to insert user/community specific data:</msg>
-  <msg key="lt_The_groups_data_will_">The group's data will not be modified, but the group will only be accessible to system administrators.</msg>
+  <msg key="lt_The_groups_data_will_">The group's data will not be modified, but members will no longer have links to the group or its content from their home portal.</msg>
   <msg key="lt_The_results_of_your_s">The results of your search are:</msg>
   <msg key="lt_The_system_was_unable">The system was unable to send email. Please notify the user personally. This problem is probably caused by a misconfiguration of your email system. Here is the error:</msg>
   <msg key="lt_There_was_a_bug_in_th">There was a bug in this page</msg>
@@ -435,6 +436,8 @@
   <msg key="not_a_user">Not a User</msg>
   <msg key="Not_Allowed">Not Allowed</msg>
   <msg key="Note">Note:</msg>
+  <msg key="Note_if_you_make">Note: if you make any changes using this form, the user will lose their portal customizations.</msg>
+  <msg key="Note_the_term_column">Note: the &quot;Term&quot; column applies to classes and subgroups of classes.  For subgroups of classes, the &quot;Term&quot; column holds the term of the subgroup's parent class.  No term is displayed for sub-subgroups and deeper descendants.</msg>
   <msg key="Nuke">Nuke</msg>
   <msg key="Nuke_">Nuke ...</msg>
   <msg key="Nuke_Users">Nuke Users</msg>
@@ -444,6 +447,7 @@
   <msg key="Or">Or</msg>
   <msg key="or_by_RGB_number">or by RGB number</msg>
   <msg key="or_return_to">or, return to</msg>
+  <msg key="Parent">Parent</msg>
   <msg key="Pending">Pending</msg>
   <msg key="Pending_Approval">Pending Approval</msg>
   <msg key="Person_name">Name</msg>
Index: openacs-4/packages/dotlrn/www/admin/archived-communities-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/archived-communities-oracle.xql,v
diff -u -r1.1 -r1.1.10.1
--- openacs-4/packages/dotlrn/www/admin/archived-communities-oracle.xql	15 Jul 2002 18:32:24 -0000	1.1
+++ openacs-4/packages/dotlrn/www/admin/archived-communities-oracle.xql	22 Jun 2004 20:02:40 -0000	1.1.10.1
@@ -3,15 +3,54 @@
 <queryset>
     <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
+    <!-- AEG: This query has gotten pretty nasty.  Basically we need
+         to provide the site-wide admin more information about
+         communities than just the name.  Time information is key,
+         so we try to associate classes with a term.  If the
+         community is not a class, we look to see if the parent
+         is a class.  We don't do the full recursion for
+         sub-subgroups etc.  We could push that into some expensive
+         plsql if the current version turns out to be too hackish.
+         Or maybe creation date is all we need, and we can throw
+         the rest out?
+    -->
     <fullquery name="select_archived_comms">
         <querytext>
-            select pretty_name, 
-                   description,
-                   dotlrn_community.url(community_id) as url
-            from dotlrn_communities_all
-            where archived_p = 't'
-            order by pretty_name,
-                     description
+            select child.pretty_name, 
+                   child.description,
+                   dotlrn_community.url(child.community_id) as url,
+                   parent.community_id as parent_community_id,
+                   parent.pretty_name as parent_pretty_name,
+                   case when parent.community_id is null then null
+                     else dotlrn_community.url(parent.community_id) end
+                     as parent_url,
+                   class.term_name,
+                   class.term_year,
+                   parent_class.term_name as parent_term_name,
+                   parent_class.term_year as parent_term_year,
+                   to_char(o.creation_date, 'Mon YYYY') as creation_date,
+                   to_char(o.last_modified, 'Mon YYYY') as last_modified
+            from dotlrn_communities_all child,
+                 dotlrn_communities_all parent,
+                 (select i.class_instance_id,
+                         t.term_name,
+                         t.term_year
+                  from dotlrn_class_instances i,
+                       dotlrn_terms t
+                  where t.term_id = i.term_id) class,
+                 (select i.class_instance_id,
+                         t.term_name,
+                         t.term_year
+                  from dotlrn_class_instances i,
+                       dotlrn_terms t
+                  where t.term_id = i.term_id) parent_class,
+                  acs_objects o
+            where child.archived_p = 't'
+              and child.parent_community_id = parent.community_id(+)
+              and child.community_id = class.class_instance_id(+)
+              and child.parent_community_id = parent_class.class_instance_id(+)
+              and o.object_id = child.community_id
+            order by child.pretty_name
         </querytext>
     </fullquery>
 
Index: openacs-4/packages/dotlrn/www/admin/archived-communities-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/archived-communities-postgresql.xql,v
diff -u -r1.1 -r1.1.10.1
--- openacs-4/packages/dotlrn/www/admin/archived-communities-postgresql.xql	15 Jul 2002 18:32:24 -0000	1.1
+++ openacs-4/packages/dotlrn/www/admin/archived-communities-postgresql.xql	22 Jun 2004 20:02:40 -0000	1.1.10.1
@@ -1,17 +1,55 @@
 <?xml version="1.0"?>
 
 <queryset>
-    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
+    <!-- AEG: This query has gotten pretty nasty.  Basically we need
+         to provide the site-wide admin more information about
+         communities than just the name.  Time information is key,
+         so we try to associate classes with a term.  If the
+         community is not a class, we look to see if the parent
+         is a class.  We don't do the full recursion for
+         sub-subgroups etc.  We could push that into some expensive
+         plsql if the current version turns out to be too hackish.
+         Or maybe creation date is all we need, and we can throw
+         the rest out?
+    -->
     <fullquery name="select_archived_comms">
         <querytext>
-            select pretty_name, 
-                   description,
-                   dotlrn_community__url(community_id) as url
-            from dotlrn_communities_all
-            where archived_p = 't'
-            order by pretty_name,
-                     description
+            select child.pretty_name, 
+                   child.description,
+                   dotlrn_community__url(child.community_id) as url,
+                   parent.community_id as parent_community_id,
+                   parent.pretty_name as parent_pretty_name,
+                   case when parent.community_id is null then null
+                     else dotlrn_community__url(parent.community_id) end
+                     as parent_url,
+                   class.term_name,
+                   class.term_year,
+                   parent_class.term_name as parent_term_name,
+                   parent_class.term_year as parent_term_year,
+                   to_char(o.creation_date, 'Mon YYYY') as creation_date,
+                   to_char(o.last_modified, 'Mon YYYY') as last_modified
+            from dotlrn_communities_all child left outer join
+                 dotlrn_communities_all parent using (community_id),
+                 dotlrn_communities_all child left outer join
+                 (select i.class_instance_id,
+                         t.term_name,
+                         t.term_year
+                  from dotlrn_class_instances i,
+                       dotlrn_terms t
+                  where t.term_id = i.term_id) class using (class_instance_id),
+                 dotlrn_communities_all child left outer join
+                 (select i.class_instance_id,
+                         t.term_name,
+                         t.term_year
+                  from dotlrn_class_instances i,
+                       dotlrn_terms t
+                  where t.term_id = i.term_id) parent_class using (class_instance_id),
+                  acs_objects o
+            where child.archived_p = 't'
+              and o.object_id = child.community_id
+            order by child.pretty_name
         </querytext>
     </fullquery>
 
Index: openacs-4/packages/dotlrn/www/admin/archived-communities.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/archived-communities.adp,v
diff -u -r1.4 -r1.4.6.1
--- openacs-4/packages/dotlrn/www/admin/archived-communities.adp	11 Dec 2002 13:53:51 -0000	1.4
+++ openacs-4/packages/dotlrn/www/admin/archived-communities.adp	22 Jun 2004 20:02:40 -0000	1.4.6.1
@@ -23,17 +23,33 @@
 <property name="context_bar">@context_bar@</property>
 
 <if @archived_comms:rowcount@ gt 0>
+<p><small><font color="red">#dotlrn.Note_the_term_column</font></small></p>
 <table width="100%">
   <tr>
-    <th align="left" width="15%">#dotlrn.Name#</th>
-    <th align="left" width="50%">#dotlrn.Description#</th>
-    <th align="left">#dotlrn.Actions#</th>
+    <th align="left" width="25%">#dotlrn.Parent#</th>
+    <th align="left" width="50%">#dotlrn.Name#</th>
+    <th align="left">#dotlrn.Term#</th>
+    <th align="left">#dotlrn.Created#</th>
   </tr>
 <multiple name="archived_comms">
-  <tr>
-    <td><a href="@archived_comms.url@">@archived_comms.pretty_name@</a></td>
-    <td><pre>@archived_comms.description@</pre></td>
-    <td></td>
+<if @archived_comms.rownum@ odd>
+  <tr class="odd">
+</if><else>
+  <tr class="even">
+</else>
+    <td>
+      <if @archived_comms.parent_community_id@ not eq ""><a href="@archived_comm
+s.parent_url@">@archived_comms.parent_pretty_name@</a></if>
+    </td>
+    <td>
+      <a href="@archived_comms.url@">@archived_comms.pretty_name@</a></td>
+    <td>
+        @archived_comms.term_name@ @archived_comms.term_year@
+        <% # look for a parent term if no child term is found %>
+        <if @archived_comms.term_name@ eq "">@archived_comms.parent_term_name@ @
+archived_comms.parent_term_year@</if>
+    </td>
+    <td><em>@archived_comms.creation_date@</em></td>
   </tr>
 </multiple>
 </table>
Index: openacs-4/packages/dotlrn/www/admin/archived-communities.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/archived-communities.tcl,v
diff -u -r1.4 -r1.4.6.1
--- openacs-4/packages/dotlrn/www/admin/archived-communities.tcl	11 Dec 2002 13:53:51 -0000	1.4
+++ openacs-4/packages/dotlrn/www/admin/archived-communities.tcl	22 Jun 2004 20:02:40 -0000	1.4.6.1
@@ -31,8 +31,6 @@
 set title "[_ dotlrn.archived_groups]"
 set context_bar [list $title]
 
-db_multirow archived_comms select_archived_comms {} {
-    set description [ad_quotehtml $description]
-}
+db_multirow archived_comms select_archived_comms {}
 
 ad_return_template
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.11 -r1.11.6.1
--- openacs-4/packages/dotlrn/www/admin/user-edit.adp	23 Oct 2002 12:38:40 -0000	1.11
+++ openacs-4/packages/dotlrn/www/admin/user-edit.adp	22 Jun 2004 20:02:41 -0000	1.11.6.1
@@ -23,6 +23,8 @@
 <property name="context_bar">@context_bar@</property>
 
 #dotlrn.Youre_editing# <strong>@first_names@ @last_name@</strong>.
+<p>
+<font color=red>#dotlrn.Note_if_you_make#</font>
 
 <p></p>