Index: openacs-4/packages/dotlrn/www/members.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members.tcl,v
diff -u -r1.28 -r1.29
--- openacs-4/packages/dotlrn/www/members.tcl	9 Nov 2008 23:29:23 -0000	1.28
+++ openacs-4/packages/dotlrn/www/members.tcl	15 Apr 2009 16:27:18 -0000	1.29
@@ -88,44 +88,40 @@
         label ""
         html "align right"
         display_template {
-        <if @members.portrait_p@ true>
-            <a href="@members.member_url@">
-                <img src="/resources/acs-subsite/profile-16.png" height="16" width="16" alt="#acs-subsite.Profile#" title="#acs-subsite.lt_User_has_portrait_title#" style="border:0">
-            </a>
-        </if>
+            <if @members.portrait_p@ true>
+              <a href="@members.member_url@" title="#acs-subsite.lt_User_has_portrait_title#">
+                <img src="/resources/acs-subsite/profile-16.png" height="16" width="16" alt="#acs-subsite.Profile#" style="border:0">
+              </a>
+            </if>
         }
         hide_p $csv_p
     } last_name {
         label "[_ acs-subsite.Last_name]"
         html "align left"
-        display_template {
-            <a href="@members.member_url@">@members.last_name;noquote@</a>
-        }
+        link_url_col member_url
     } first_names {
         label "[_ acs-subsite.First_names]"
         html "align left"
-        display_template {
-            <a href="@members.member_url@">@members.first_names@</a>
-        }
+        link_url_col member_url
     } email {
         label "[_ dotlrn.Email_1]"
         html "align left"
         display_template {@members.email_pretty;noquote@}
-    } role {
-        label "[_ dotlrn.Role]"
-        html "align left"
-    } 
+	} role {
+	    label "[_ dotlrn.Role]"
+	    html "align left"
+	} 
 }
 
 if {$admin_p && !$csv_p} {
     lappend elm_list {action} {
-        label "[_ dotlrn.Actions]"
-        html "align left"
-        display_template {
-        <if @members.user_id@ ne \"\">
+	    label "[_ dotlrn.Actions]"
+	    html "align left"
+	    display_template {
+            <if @members.user_id@ ne \"\">
             <a href="member-confirm?user_id=@members.user_id@&amp;referer=@members.member_referer@">#dotlrn.Drop_Membership#</a> | 
             <a href="member-add-2?user_id=@members.user_id@&amp;referer=@members.member_referer@">#dotlrn.User_Admin_Page#</a>
-        </if>
+            </if>
         }
     }
 }
@@ -145,8 +141,8 @@
 set member_page [acs_community_member_page]
 
 db_multirow -extend { member_url member_referer email_pretty } members select_current_members {} {
-
     set email_pretty [email_image::get_user_email -user_id $user_id -return_url $return_url]
+
     set member_url "$member_page?user_id=$user_id"
     set member_referer $referer
 
@@ -161,6 +157,7 @@
 db_multirow -extend { member_url pending_user_referer } pending_users select_pending_users {} {
     set role [dotlrn_community::get_role_pretty_name -community_id $community_id -rel_type $rel_type]
     append user_ids "user_id=$user_id&"
+    set email [email_image::get_user_email -user_id $user_id -return_url $return_url]
     set member_url "$member_page?user_id=$user_id"
     set pending_user_referer $referer
 }
@@ -169,7 +166,7 @@
 if {$admin_p} {
     if { [template::multirow size pending_users] > 0 } {
         set pend_actions [list "[_ dotlrn.Approve_all]" "approve?${user_ids}referer=$referer" "[_ dotlrn.Approve_all]" \
-                "[_ dotlrn.Reject_all]" "reject?${user_ids}referer=$referer" "[_ dotlrn.Reject_all]"]
+                              "[_ dotlrn.Reject_all]" "reject?${user_ids}referer=$referer" "[_ dotlrn.Reject_all]"]
     } else {
         set pend_actions ""
     }
@@ -181,15 +178,11 @@
     last_name {
         label "[_ acs-subsite.Last_name]"
         html "align left"
-        display_template {
-            <a href="@pending_users.member_url@">@pending_users.last_name;noquote@</a>
-        }
+        link_url_col member_url
     } first_names {
         label "[_ acs-subsite.First_names]"
         html "align left"
-        display_template {
-            <a href="@pending_users.member_url@">@pending_users.first_names@</a>
-        }
+        link_url_col member_url
     } email {
         label "[_ dotlrn.Email_1]"
         html "align left"
@@ -203,8 +196,8 @@
         label "[_ dotlrn.Actions]"
         html "align left"
         display_template {
-            <a href="approve?user_id=@pending_users.user_id@&referer=@pending_users.pending_user_referer@">#dotlrn.Approve#</a> |
-            <a href="reject?user_id=@pending_users.user_id@&referer=@pending_users.pending_user_referer@">#dotlrn.Reject#</a>
+            <a href="approve?user_id=@pending_users.user_id@&amp;referer=@pending_users.pending_user_referer@">#dotlrn.Approve#</a> |
+            <a href="reject?user_id=@pending_users.user_id@&amp;referer=@pending_users.pending_user_referer@">#dotlrn.Reject#</a>
         }
     }
 }