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.32 -r1.33
--- openacs-4/packages/dotlrn/www/admin/user.adp	9 Nov 2008 23:29:23 -0000	1.32
+++ openacs-4/packages/dotlrn/www/admin/user.adp	15 Apr 2009 16:44:12 -0000	1.33
@@ -18,35 +18,36 @@
 
 %>
 
-<master src="dotlrn-admin-master">
-<property name="title">@first_names@ @last_name@</property>
-<property name="context_bar">@context_bar@</property>
+<master>
 
-<h3>#dotlrn.General_Information#</h3>
+<property name="&doc">doc</property>
+<property name="context">@context;noquote@</property>
 
+<h1>#dotlrn.General_Information#</h1>
+
 <ul>
 
   <li>
     #dotlrn.Person_name#
     <strong>@first_names@ @last_name@</strong>
   <if @site_wide_admin_p@ true> 
-    [<small> <a href="/user/basic-info-update?@export_edit_vars@">#dotlrn.Edit#</a> </small>]
+    [<a href="/user/basic-info-update?@export_edit_vars@">#dotlrn.Edit#</a>]
   </if>
   </li>
 
   <li>
     #dotlrn.Email#
     <strong><a href="mailto:@email@">@email@</a></strong>
   <if @site_wide_admin_p@ true>
-    [<small> <a href="/user/basic-info-update?@export_edit_vars@">#dotlrn.Edit#</a> </small>]
+    [<a href="/user/basic-info-update?@export_edit_vars@">#dotlrn.Edit#</a>]
   </if> 
   </li>
 
   <li>
     #dotlrn.Screen_name#
     <strong>@screen_name@</strong>
   <if @site_wide_admin_p@ true>
-    [<small> <a href="/user/basic-info-update?@export_edit_vars@">#dotlrn.Edit#</a> </small>]
+    [<a href="/user/basic-info-update?@export_edit_vars@">#dotlrn.Edit#</a>]
   </if>
   </li>
 
@@ -68,7 +69,8 @@
 </if>
 <else>
   <li>
-    #dotlrn.lt_Last_Visit_None_#: @remove_user_url;noquote@
+    #dotlrn.lt_Last_Visit_None_#: 
+    [<a href="@remove_user_url@">#dotlrn.Nuke#</a>]
   </li>
 </else>
 
@@ -88,7 +90,7 @@
 
 </ul>
 
-<h3>#dotlrn.dotLRN_Information#</h3>
+<h1>#dotlrn.dotLRN_Information#</h1>
 
 <if @dotlrn_user_p@>
 
@@ -101,30 +103,28 @@
 
   <li>
     #dotlrn.Access_level#
-    <if @can_browse_p@><strong>#dotlrn.Full#</strong> [ <small><a href="browse-toggle?user_id=@user_id@&can_browse_p=0&referer=@return_url@">#dotlrn.Limited#</a> </small>]</if><else><strong>#dotlrn.Limited#</strong> [ <small><a href="browse-toggle?user_id=@user_id@&can_brow
-se_p=1&referer=@return_url@">#dotlrn.Full#</a></small> ]</else>
+    <if @can_browse_p@><strong>#dotlrn.Full#</strong> [<a href="browse-toggle?user_id=@user_id@&can_browse_p=0&referer=@return_url@">#dotlrn.Limited#</a>]</if><else><strong>#dotlrn.Limited#</strong> [<a href="browse-toggle?user_id=@user_id@&can_brow
+se_p=1&referer=@return_url@">#dotlrn.Full#</a>]</else>
   </li>
 
   <li>
     #dotlrn.Guest#
-    <if @guest_p@ eq t><strong>#dotlrn.Yes#</strong> [ <small><a href="guest-toggle?user_id=@user_id@&guest_p=f&referer=@return_url@">#dotlrn.No#</a> </small>]</if><else><strong>#dotlrn.No#</strong> [ <small><a href="guest-toggle?user_id=@user_id@&guest_p=t&referer=@return_url@">#dotlrn.Yes#</a> </small>]</else>
+    <if @guest_p@ eq t><strong>#dotlrn.Yes#</strong> [<a href="guest-toggle?user_id=@user_id@&guest_p=f&referer=@return_url@">#dotlrn.No#</a>]</if><else><strong>#dotlrn.No#</strong> [<a href="guest-toggle?user_id=@user_id@&guest_p=t&referer=@return_url@">#dotlrn.Yes#</a>]</else>
   </li>
 
   <li>
     #dotlrn.ID#
     <if @id@ nil><strong>#dotlrn.ltnone_set_upgt#</strong></if><else><strong>@id@</strong></else>
   </li>
 
-  <br>
-
   <li>
     <a href="user-edit?@export_edit_vars@">#dotlrn.Edit#</a> #dotlrn.lt_dotLRN_properties_for#
   </li>
 
 </ul>
 
 <if @member_classes:rowcount@ gt 0>
-    <h4>#dotlrn.class_memberships#</h4>
+    <h2>#dotlrn.class_memberships#</h2>
 
     <ul>
 <multiple name="member_classes">
@@ -138,7 +138,7 @@
 </if>
 
 <if @member_clubs:rowcount@ gt 0>
-    <h4>#dotlrn.community_memberships#</h4>
+    <h2>#dotlrn.community_memberships#</h2>
 
     <ul>
 <multiple name="member_clubs">
@@ -151,7 +151,7 @@
 </if>
 
 <if @member_subgroups:rowcount@ gt 0>
-    <h4>#dotlrn.subcommunity_memberships#</h4>
+    <h2>#dotlrn.subcommunity_memberships#</h2>
 
     <ul>
 <multiple name="member_subgroups">
@@ -182,14 +182,14 @@
 </else>
 
 <if @portrait_p@ true or @administrative_action_p@ true>
-<h3>#dotlrn.lt_Administrative_Action#</h3>
+<h1>#dotlrn.lt_Administrative_Action#</h1>
 
 <ul>
   <if @portrait_p@>
     <li><a href="/user/portrait/index.tcl?@export_edit_vars@">#dotlrn.lt_Manage_this_users_por#</a></li>
   </if>
  <if @site_wide_admin_p@ true>
-  <li><a href="@toggle_swa_url;noquote@">@toggle_text;noquote@</a></li>
+  <li><a href="@toggle_swa_url@">@toggle_text@</a></li>
  </if>
  <if @site_wide_admin_p@ true or @dotlrn_admin_p@ true>
   <li><a href="password-update?@export_edit_vars@">#dotlrn.lt_Update_this_users_pas#</a></li>
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.23 -r1.24
--- openacs-4/packages/dotlrn/www/admin/user.tcl	9 Nov 2008 23:29:24 -0000	1.23
+++ openacs-4/packages/dotlrn/www/admin/user.tcl	15 Apr 2009 16:44:12 -0000	1.24
@@ -23,7 +23,7 @@
 } {
     user_id:integer,notnull
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     first_names:onevalue
     last_name:onevalue
     email:onevalue
@@ -45,7 +45,7 @@
 dotlrn::require_admin 
 
 set return_url "[ad_parameter -package_id [ad_acs_kernel_id] CommunityMemberAdminURL]?user_id=$user_id"
-set export_edit_vars "user_id=$user_id&return_url=$return_url"
+set export_edit_vars [export_vars {user_id return_url}]
 
 set dotlrn_url [dotlrn::get_url]
 set root_object_id [acs_magic_object security_context_root]
@@ -73,7 +73,7 @@
     set portrait_p 1
 }
 
-set change_state_links "\[ <small>[join [ad_registration_finite_state_machine_admin_links $member_state $email_verified_p $user_id $return_url] " | "]</small> \]"
+set change_state_links "\[[join [ad_registration_finite_state_machine_admin_links $member_state $email_verified_p $user_id $return_url] " | "]\]"
 
 db_multirow member_classes select_member_classes {} {
     set role_pretty_name [dotlrn_community::get_role_pretty_name -community_id $class_instance_id -rel_type $rel_type]
@@ -92,21 +92,20 @@
 
 set administrative_action_p [expr {$site_wide_admin_p || $dotlrn_admin_p}]
 
-set context_bar [list [list users [_ dotlrn.Users]] "$first_names $last_name"]
+set doc(title) "$first_names $last_name"
+set context [list [list users [_ dotlrn.Users]] $doc(title)]
 
-set dual_approve_return_url [ns_urlencode [dotlrn::get_admin_url]/user-new-2?user_id=$user_id&referer=$return_url]
+set dual_approve_return_url [export_vars -base "[dotlrn::get_admin_url]/user-new-2" {user_id {referer $return_url}}]
 
-set approve_user_url "/acs-admin/users/member-state-change?user_id=$user_id&member_state=approved&return_url=$dual_approve_return_url"
+set approve_user_url [export_vars -base "/acs-admin/users/member-state-change" {user_id {member_state approved} {return_url $dual_approve_return_url}}]
 
-set remove_user_url "\[<small><a href=\"[export_vars -base user-nuke {user_id}]\">Nuke</a></small>\]"
+set remove_user_url [export_vars -base user-nuke {user_id}]
 
 # Used in some en_US messages in the adp file
 set class_instances_pretty_name [parameter::get -localize -parameter class_instances_pretty_name]
 set clubs_pretty_name [parameter::get -localize -parameter clubs_pretty_name]
 set subcommunities_pretty_name [parameter::get -localize -parameter subcommunities_pretty_name]
 
-set dual_approve_return_url [ns_urlencode [dotlrn::get_admin_url]/user-new-2?user_id=$user_id&referer=$return_url]
-
 if { [acs_user::site_wide_admin_p -user_id $user_id] } {
     set toggle_value revoke
     set toggle_text [_ dotlrn.Revoke_site_wide_admin]