Index: openacs-4/packages/dotlrn/www/manage-memberships.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/manage-memberships.adp,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/dotlrn/www/manage-memberships.adp	30 May 2002 02:57:34 -0000	1.13
+++ openacs-4/packages/dotlrn/www/manage-memberships.adp	4 Jun 2002 00:03:44 -0000	1.14
@@ -43,7 +43,7 @@
 
     <h4><a name="current_classes"><%= [parameter::get -parameter class_instances_pretty_plural] %></a></h4>
 
-    <table bgcolor="#ececec" width="100%">
+    <table bgcolor="#eeeeee" width="100%">
 <formtemplate id="member_form">
         <th align="left" width="50%">
           <%= [parameter::get -parameter departments_pretty_name] %>:&nbsp;<formwidget id="member_department_key">
@@ -66,7 +66,7 @@
 <multiple name="member_classes">
 
     <if @member_classes.rownum@ odd>
-      <tr bgcolor="#ececec">
+      <tr bgcolor="#eeeeee">
     </if>
     <else>
       <tr bgcolor="#ffffff">
@@ -103,7 +103,7 @@
 <multiple name="member_clubs">
 
     <if @member_clubs.rownum@ odd>
-      <tr bgcolor="#ececec">
+      <tr bgcolor="#eeeeee">
     </if>
     <else>
       <tr bgcolor="#ffffff">
@@ -135,7 +135,7 @@
 
     <h4><a name="join_classes"><%= [parameter::get -parameter class_instances_pretty_plural] %></a></h4>
 
-    <table bgcolor="#ececec" width="100%">
+    <table bgcolor="#eeeeee" width="100%">
 <formtemplate id="non_member_form">
         <th align="left" width="50%">
           <%= [parameter::get -parameter departments_pretty_name] %>:&nbsp;<formwidget id="non_member_department_key">
@@ -158,7 +158,7 @@
 <multiple name="non_member_classes">
 
     <if @non_member_classes.rownum@ odd>
-      <tr bgcolor="#ececec">
+      <tr bgcolor="#eeeeee">
     </if>
     <else>
       <tr bgcolor="#ffffff">
@@ -196,7 +196,7 @@
 <multiple name="non_member_clubs">
 
     <if @non_member_clubs.rownum@ odd>
-      <tr bgcolor="#ececec">
+      <tr bgcolor="#eeeeee">
     </if>
     <else>
       <tr bgcolor="#ffffff">
Index: openacs-4/packages/dotlrn/www/spam-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam-2.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/spam-2.adp	19 May 2002 15:13:41 -0000	1.3
+++ openacs-4/packages/dotlrn/www/spam-2.adp	4 Jun 2002 00:03:44 -0000	1.4
@@ -28,7 +28,7 @@
   Are you sure you want to send the following @spam_name@ Message?
 </p>
 
-<table bgcolor="#ececec" width="95%" cellpadding="3" cellspacing="3">
+<table bgcolor="#eeeeee" width="95%" cellpadding="3" cellspacing="3">
   <tr>
     <td width="10%">Subject</td>
     <td><pre>@subject@</pre></td>
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.21 -r1.22
--- openacs-4/packages/dotlrn/www/admin/class.adp	23 May 2002 23:30:38 -0000	1.21
+++ openacs-4/packages/dotlrn/www/admin/class.adp	4 Jun 2002 00:03:44 -0000	1.22
@@ -55,7 +55,7 @@
 </else>
 </p>
 
-<table bgcolor="#ececec" width="100%">
+<table bgcolor="#eeeeee" width="100%">
   <tr>
     <th align="left" width="50%">
 <formtemplate id="term_form">
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.11 -r1.12
--- openacs-4/packages/dotlrn/www/admin/classes-chunk.adp	21 May 2002 17:30:02 -0000	1.11
+++ openacs-4/packages/dotlrn/www/admin/classes-chunk.adp	4 Jun 2002 00:03:44 -0000	1.12
@@ -26,7 +26,7 @@
 
 <p></p>
 
-<table bgcolor="#ececec" width="100%">
+<table bgcolor="#eeeeee" width="100%">
   <tr>
     <th align="left" width="50%">
 <formtemplate id="department_form">
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 -r1.13 -r1.14
--- openacs-4/packages/dotlrn/www/admin/term.adp	22 May 2002 18:41:23 -0000	1.13
+++ openacs-4/packages/dotlrn/www/admin/term.adp	4 Jun 2002 00:03:44 -0000	1.14
@@ -56,7 +56,7 @@
 <br>
 </if>
 
-<table bgcolor="#ececec" width="100%">
+<table bgcolor="#eeeeee" width="100%">
   <tr>
     <th align="left" width="50%">
 <formtemplate id="department_form">
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.12 -r1.13
--- openacs-4/packages/dotlrn/www/admin/users-chunk.adp	28 May 2002 22:04:44 -0000	1.12
+++ openacs-4/packages/dotlrn/www/admin/users-chunk.adp	4 Jun 2002 00:03:44 -0000	1.13
@@ -32,7 +32,7 @@
 <multiple name="users">
 
 <if @users.rownum@ odd>
-        <tr bgcolor="#ececec">
+        <tr bgcolor="#eeeeee">
 </if>
 <else>
         <tr bgcolor="#ffffff">
Index: openacs-4/packages/dotlrn-faq/tcl/dotlrn-faq-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-faq/tcl/dotlrn-faq-procs.tcl,v
diff -u -r1.34 -r1.35
--- openacs-4/packages/dotlrn-faq/tcl/dotlrn-faq-procs.tcl	29 May 2002 23:00:25 -0000	1.34
+++ openacs-4/packages/dotlrn-faq/tcl/dotlrn-faq-procs.tcl	4 Jun 2002 00:03:44 -0000	1.35
@@ -64,14 +64,6 @@
     } {
         Add the faq applet to a specifc community
     } {
-        
-    }
-
-    ad_proc -public add_applet_to_community {
-        community_id
-    } {
-        Add the faq applet to a specifc community
-    } {
         set portal_id [dotlrn_community::get_portal_id \
                            -community_id $community_id
         ]
@@ -152,7 +144,7 @@
         set args [ns_set create]
         ns_set put $args package_id $package_id
         ns_set put $args param_action "append"
-        
+
         # don't use the cached version
         dotlrn_faq::add_portlet_helper \
             [dotlrn::get_portal_id_not_cached -user_id $user_id] \
@@ -182,9 +174,9 @@
     ad_proc -public add_portlet {
         portal_id
     } {
-        A helper proc to add the underlying portlet to the given portal. 
+        A helper proc to add the underlying portlet to the given portal.
 
-        @portal_id 
+        @portal_id
     } {
         set args [ns_set create]
         ns_set put $args package_id 0
@@ -199,10 +191,10 @@
     } {
         This does the call to add the portlet to the given portal.
         Params for the portlet are set by the calllers.
-        
+
         @param portal_id
         @param args An ns_set
-    } { 
+    } {
         faq_portlet::add_self_to_page \
             -portal_id $portal_id \
             -package_id [ns_set get $args "package_id"] \
@@ -213,11 +205,11 @@
         portal_id
         args
     } {
-        A helper proc to remove the underlying portlet from the given portal. 
-        
+        A helper proc to remove the underlying portlet from the given portal.
+
         @param portal_id
         @param args An ns_set
-    } { 
+    } {
         faq_portlet::remove_self_from_page \
             -portal_id $portal_id \
             -package_id [ns_set get $args "package_id"]
@@ -239,4 +231,5 @@
         db_exec_plsql call_faq_clone {}
         return $new_package_id
     }
+
 }
Index: openacs-4/packages/dotlrn-fs/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-fs/www/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn-fs/www/index.adp	18 May 2002 20:28:00 -0000	1.2
+++ openacs-4/packages/dotlrn-fs/www/index.adp	4 Jun 2002 00:03:44 -0000	1.3
@@ -30,7 +30,7 @@
       </tr>
 <multiple name="folders">
 <if @folders.rownum@ odd>
-      <tr bgcolor="#ececec">
+      <tr bgcolor="#eeeeee">
 </if>
 <else>
       <tr bgcolor="#ffffff">
Index: openacs-4/packages/faq-portlet/www/faq-portlet-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/www/Attic/faq-portlet-oracle.xql,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/faq-portlet/www/faq-portlet-oracle.xql	12 Apr 2002 08:11:38 -0000	1.8
+++ openacs-4/packages/faq-portlet/www/faq-portlet-oracle.xql	4 Jun 2002 00:03:44 -0000	1.9
@@ -6,9 +6,7 @@
     <fullquery name="select_faqs">
         <querytext>
             select acs_objects.context_id as package_id,
-                   (select apm_packages.instance_name
-                    from apm_packages
-                    where apm_packages.package_id = apm_package.parent_id(acs_objects.context_id)) as parent_name,
+                   acs_object.name(acs_objects.context_id) as parent_name,
                    (select site_node.url(site_nodes.node_id)
                     from site_nodes
                     where site_nodes.object_id = acs_objects.context_id) as url,
Index: openacs-4/packages/faq-portlet/www/faq-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/www/faq-portlet.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/faq-portlet/www/faq-portlet.adp	2 Jun 2002 14:23:36 -0000	1.10
+++ openacs-4/packages/faq-portlet/www/faq-portlet.adp	4 Jun 2002 00:03:44 -0000	1.11
@@ -50,7 +50,7 @@
     </if>
     <else>
       <if @faqs.rownum@ odd>
-        <tr bgcolor="#ececec">
+        <tr bgcolor="#eeeeee">
       </if>
       <else>
         <tr bgcolor="#ffffff">
Index: openacs-4/packages/forums-portlet/www/forums-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-portlet/www/forums-portlet.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/forums-portlet/www/forums-portlet.tcl	2 Jun 2002 19:43:13 -0000	1.2
+++ openacs-4/packages/forums-portlet/www/forums-portlet.tcl	4 Jun 2002 00:03:44 -0000	1.3
@@ -23,9 +23,7 @@
 
 db_multirow forums select_forums "
     select forums_forums.package_id,
-           (select apm_packages.instance_name
-            from apm_packages
-            where apm_packages.package_id = apm_package.parent_id(forums_forums.forum_id)) as parent_name,
+           acs_object.name(apm_package.parent_id(forums_forums.package_id)) as parent_name,
            (select site_node.url(site_nodes.node_id)
             from site_nodes
             where site_nodes.object_id = forums_forums.package_id) as url,
Index: openacs-4/packages/news-portlet/www/news-portlet-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/www/Attic/news-portlet-oracle.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/news-portlet/www/news-portlet-oracle.xql	12 May 2002 18:15:04 -0000	1.3
+++ openacs-4/packages/news-portlet/www/news-portlet-oracle.xql	4 Jun 2002 00:03:44 -0000	1.4
@@ -6,9 +6,7 @@
     <fullquery name="select_news_items">
         <querytext>
             select news_items_approved.package_id,
-                   (select ap1.instance_name
-                    from apm_packages ap1
-                    where ap1.package_id = apm_package.parent_id(news_items_approved.package_id)) as parent_name,
+                   acs_object.name(news_items_approved.package_id) as parent_name,
                    (select site_node.url(site_nodes.node_id)
                     from site_nodes
                     where site_nodes.object_id = news_items_approved.package_id) as url,