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.3 -r1.25.2.2.4.4
--- openacs-4/packages/dotlrn/www/admin/user.adp	2 Aug 2004 10:14:04 -0000	1.25.2.2.4.3
+++ openacs-4/packages/dotlrn/www/admin/user.adp	2 Aug 2004 10:47:02 -0000	1.25.2.2.4.4
@@ -29,19 +29,25 @@
   <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;noquote@
+    @screen_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>
@@ -70,7 +76,9 @@
   <li>
     #dotlrn.Member_state#
     @member_state@
+  <if @oacs_site_wide_admin_p@ true> 
     @change_state_links;noquote@
+  </if>
   </li>
 
 </ul>
@@ -117,7 +125,7 @@
     <ul>
 <multiple name="member_classes">
       <li>
-        <a href="@member_classes.url@">@member_classes.description@</a>
+        <a href="@member_classes.url@">@member_classes.pretty_name@</a>
         @member_classes.term_name@ @member_classes.term_year@
         (@member_classes.role_pretty_name@)
       </li>
@@ -133,7 +141,7 @@
     <ul>
 <multiple name="member_clubs">
       <li>
-        <a href="@member_clubs.url@">@member_clubs.description@</a>
+        <a href="@member_clubs.url@">@member_clubs.pretty_name@</a>
         (@member_clubs.role_pretty_name@)
       </li>
 </multiple>
@@ -148,7 +156,7 @@
     <ul>
 <multiple name="member_subgroups">
       <li>
-        <a href="@member_subgroups.url@">@member_subgroups.description@</a>
+        <a href="@member_subgroups.url@">@member_subgroups.pretty_name@</a>
         (@member_subgroups.role_pretty_name@)
       </li>
 </multiple>
@@ -181,16 +189,8 @@
   <if @portrait_p@>
     <li><a href="/user/portrait/index.tcl?@export_edit_vars@">#dotlrn.lt_Manage_this_users_por#</a></li>
   </if>
-  <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>
+
+ <if @oacs_site_wide_admin_p@ true>
   <li><a href="/acs-admin/users/become?user_id=@user_id@">#dotlrn.Become_this_user#</a></li>
+ </if> 
 </ul>