Index: openacs-4/packages/dotlrn/www/control-panel.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/control-panel.adp,v
diff -u -r1.13 -r1.13.6.1
--- openacs-4/packages/dotlrn/www/control-panel.adp	3 Oct 2003 20:21:33 -0000	1.13
+++ openacs-4/packages/dotlrn/www/control-panel.adp	2 Aug 2004 10:14:04 -0000	1.13.6.1
@@ -39,7 +39,7 @@
 	<tr><td>
 <h3>#dotlrn.General_Site_Help#</h3> 
 <ul>
-  <li><a href="@dotlrn_url@/help">#dotlrn.help#</a></li>
+  <li><a href="/global/HELP/indice.htm">#dotlrn.help#</a></li>
   <li>#dotlrn.Ask_a_question# <a href="mailto:@system_owner@">@system_owner@</a>
 </ul>
 <h3>#dotlrn.Personal_Options#</h3>
Index: openacs-4/packages/dotlrn/www/spam-recipients.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam-recipients.tcl,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/dotlrn/www/spam-recipients.tcl	22 Jul 2004 05:58:37 -0000	1.1.2.2
+++ openacs-4/packages/dotlrn/www/spam-recipients.tcl	2 Aug 2004 10:14:04 -0000	1.1.2.3
@@ -23,7 +23,7 @@
 ]
 if {!$site_wide_admin_p} {
     set admin_p [dotlrn::user_can_admin_community_p -user_id $my_user_id -community_id $community_id]
-    set read_private_data_p [dotlrn::user_can_read_private_data_p -user_id $my_user_id]
+    set read_private_data_p [dotlrn::user_can_read_private_data_p -user_id $my_user_id -object_id $community_id]
 } else {
     set admin_p 1
     set read_private_data_p 1
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.19 -r1.19.6.1
--- openacs-4/packages/dotlrn/www/admin/departments.adp	11 Dec 2002 13:53:51 -0000	1.19
+++ openacs-4/packages/dotlrn/www/admin/departments.adp	2 Aug 2004 10:14:04 -0000	1.19.6.1
@@ -55,7 +55,7 @@
         </else>
         
         <td align="left">
-          <a href="department?department_key=@departments.department_key@">@departments.pretty_name@</a>
+          <a href="department?department_key=@departments.department_key@">@departments.description@ (@departments.pretty_name@)</a>
         </td>
         
         <td align="center" style="white-space: nowrap; font-size: x-small;">
Index: openacs-4/packages/dotlrn/www/admin/departments.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/departments.xql,v
diff -u -r1.6 -r1.6.10.1
--- openacs-4/packages/dotlrn/www/admin/departments.xql	14 Aug 2002 19:18:50 -0000	1.6
+++ openacs-4/packages/dotlrn/www/admin/departments.xql	2 Aug 2004 10:14:04 -0000	1.6.10.1
@@ -6,6 +6,7 @@
         <querytext>
             select department_key,
                    pretty_name,
+                   description,
                    (select count(*)
                     from dotlrn_classes
                     where department_key = dotlrn_departments_full.department_key) as n_classes
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.22 -r1.22.6.1
--- openacs-4/packages/dotlrn/www/admin/term.adp	13 Dec 2002 16:06:33 -0000	1.22
+++ openacs-4/packages/dotlrn/www/admin/term.adp	2 Aug 2004 10:14:04 -0000	1.22.6.1
@@ -102,7 +102,7 @@
 <if @term_id@ eq -1>
       <td align="left">@classes.term_name@ @classes.term_year@</td>
 </if>
-      <td align="left"><a href="@classes.url@">@classes.pretty_name@</a></td>
+      <td align="left"><a href="@classes.url@">@classes.description@</a></td>
       <td align="center">@classes.n_members@</td>
       <td align="center">
         <nobr>
Index: openacs-4/packages/dotlrn/www/admin/user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user.adp,v
diff -u -r1.25.2.2.4.2 -r1.25.2.2.4.3
--- openacs-4/packages/dotlrn/www/admin/user.adp	19 Jul 2004 18:39:39 -0000	1.25.2.2.4.2
+++ openacs-4/packages/dotlrn/www/admin/user.adp	2 Aug 2004 10:14:04 -0000	1.25.2.2.4.3
@@ -29,25 +29,19 @@
   <li>
     #dotlrn.Person_name#
     @first_names@ @last_name@
-  <if @oacs_site_wide_admin_p@ true> 
     [<small> <a href="/user/basic-info-update?@export_edit_vars@">#dotlrn.Edit#</a> </small>]
-  </if>
   </li>
 
   <li>
     #dotlrn.Email#
     <a href="mailto:@email@">@email@</a>
-  <if @oacs_site_wide_admin_p@ true>
     [<small> <a href="/user/basic-info-update?@export_edit_vars@">#dotlrn.Edit#</a> </small>]
-  </if> 
   </li>
 
   <li>
     #dotlrn.Screen_name#
-    @screen_name@
-  <if @oacs_site_wide_admin_p@ true>
+    @screen_name;noquote@
     [<small> <a href="/user/basic-info-update?@export_edit_vars@">#dotlrn.Edit#</a> </small>]
-  </if>
   </li>
 
   <li>
@@ -76,9 +70,7 @@
   <li>
     #dotlrn.Member_state#
     @member_state@
-  <if @oacs_site_wide_admin_p@ true> 
     @change_state_links;noquote@
-  </if>
   </li>
 
 </ul>
@@ -125,7 +117,7 @@
     <ul>
 <multiple name="member_classes">
       <li>
-        <a href="@member_classes.url@">@member_classes.pretty_name@</a>
+        <a href="@member_classes.url@">@member_classes.description@</a>
         @member_classes.term_name@ @member_classes.term_year@
         (@member_classes.role_pretty_name@)
       </li>
@@ -141,7 +133,7 @@
     <ul>
 <multiple name="member_clubs">
       <li>
-        <a href="@member_clubs.url@">@member_clubs.pretty_name@</a>
+        <a href="@member_clubs.url@">@member_clubs.description@</a>
         (@member_clubs.role_pretty_name@)
       </li>
 </multiple>
@@ -156,7 +148,7 @@
     <ul>
 <multiple name="member_subgroups">
       <li>
-        <a href="@member_subgroups.url@">@member_subgroups.pretty_name@</a>
+        <a href="@member_subgroups.url@">@member_subgroups.description@</a>
         (@member_subgroups.role_pretty_name@)
       </li>
 </multiple>
@@ -189,8 +181,16 @@
   <if @portrait_p@>
     <li><a href="/user/portrait/index.tcl?@export_edit_vars@">#dotlrn.lt_Manage_this_users_por#</a></li>
   </if>
-
- <if @oacs_site_wide_admin_p@ true>
+  <li>    
+  <if @dotlrn_user_p@>
+    <if @site_wide_admin_p@>
+      #dotlrn.lt_This_user_is_a_site-w# 
+      (<a href="site-wide-admin-toggle?user_id=@user_id@&value=revoke&referer=@return_url@">#dotlrn.revoke#</a>)
+    </if>
+    <else>
+      <a href="site-wide-admin-toggle?user_id=@user_id@&value=grant&referer=@return_url@">
+      #dotlrn.lt_Make_this_user_a_site#</a>
+    </else>
+  </if>
   <li><a href="/acs-admin/users/become?user_id=@user_id@">#dotlrn.Become_this_user#</a></li>
- </if> 
 </ul>