Index: openacs-4/packages/dotlrn/www/admin/class.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/admin/class.tcl	14 Mar 2002 23:30:26 -0000	1.7
+++ openacs-4/packages/dotlrn/www/admin/class.tcl	21 Mar 2002 19:43:03 -0000	1.8
@@ -61,7 +61,7 @@
 
 set can_instantiate [dotlrn_class::can_instantiate -class_key $class_key]
 
-set context_bar [list [list classes [ad_parameter "classes_pretty_plural"]] One]
+set context_bar [list [list classes [ad_parameter "classes_pretty_plural"]] $pretty_name]
 set referer "[ns_conn url]?[ns_conn query]"
 
 ad_return_template
Index: openacs-4/packages/dotlrn/www/admin/club.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/club.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/admin/club.tcl	7 Mar 2002 19:02:38 -0000	1.7
+++ openacs-4/packages/dotlrn/www/admin/club.tcl	21 Mar 2002 19:43:03 -0000	1.8
@@ -16,8 +16,8 @@
     description:onevalue
 }
 
-set context_bar [list [list clubs [ad_parameter clubs_pretty_plural]] One]
-
 db_1row select_club {}
 
+set context_bar [list [list clubs [ad_parameter clubs_pretty_plural]] $pretty_name]
+
 ad_return_template
Index: openacs-4/packages/dotlrn/www/admin/department.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/department.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/admin/department.tcl	14 Mar 2002 23:30:26 -0000	1.4
+++ openacs-4/packages/dotlrn/www/admin/department.tcl	21 Mar 2002 19:43:03 -0000	1.5
@@ -25,7 +25,7 @@
     ad_script_abort
 }
 
-set context_bar [list [list departments [ad_parameter departments_pretty_plural]] One]
+set context_bar [list [list departments [ad_parameter departments_pretty_plural]] $pretty_name]
 set referer "[ns_conn url]?[ns_conn query]"
 
 ad_return_template
Index: openacs-4/packages/dotlrn/www/admin/term.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/term.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/admin/term.tcl	7 Mar 2002 20:58:40 -0000	1.6
+++ openacs-4/packages/dotlrn/www/admin/term.tcl	21 Mar 2002 19:43:03 -0000	1.7
@@ -92,7 +92,7 @@
     set context_bar {{terms Terms} {All Terms}}
 } else {
     set title "$term_name $term_year ($start_date - $end_date)"
-    set context_bar {{terms Terms} One}
+    set context_bar [list [list terms Terms] "$term_name $term_year"]
 }
 
 ad_return_template
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.5 -r1.6
--- openacs-4/packages/dotlrn/www/admin/user.adp	19 Mar 2002 01:23:15 -0000	1.5
+++ openacs-4/packages/dotlrn/www/admin/user.adp	21 Mar 2002 19:43:03 -0000	1.6
@@ -65,27 +65,30 @@
   <li>
     User type:
     @pretty_type@
-    [<small><a href="user-edit?@export_edit_vars@">edit</a></small>]
   </li>
 
   <li>
     Access level:
     @access_level@
-    [<small><a href="user-edit?@export_edit_vars@">edit</a></small>]
   </li>
 
   <li>
     Guest?:
     <if @read_private_data_p@ eq "t">No</if><else>Yes</else>
-    [<small><a href="user-edit?@export_edit_vars@">edit</a></small>]
   </li>
 
   <li>
     ID:
     <if @id@ nil>&lt;none set up&gt;</if><else>@id@</else>
-    [<small><a href="user-edit?@export_edit_vars@">edit</a></small>]
   </li>
 
+  <br>
+
+  <li>
+    <a href="user-edit?@export_edit_vars@">Edit</a> dotLRN properties for this
+    user.
+  </li>
+
 </ul>
 
 <if @member_classes:rowcount@ gt 0>
Index: openacs-4/packages/dotlrn/www/admin/user.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/admin/user.tcl	19 Mar 2002 01:23:15 -0000	1.2
+++ openacs-4/packages/dotlrn/www/admin/user.tcl	21 Mar 2002 19:43:03 -0000	1.3
@@ -26,7 +26,6 @@
 }
 
 set return_url "[ad_parameter -package_id [ad_acs_kernel_id] CommunityMemberAdminURL]?user_id=$user_id"
-set context_bar {{users Users} {One User}}
 set export_edit_vars [export_url_vars user_id return_url]
 
 if {![db_0or1row select_user_info {}]} {
@@ -58,4 +57,6 @@
 db_multirow member_clubs select_member_clubs {}
 db_multirow member_subgroups select_member_subgroups {}
 
+set context_bar [list [list users Users] "$first_names $last_name"]
+
 ad_return_template