Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml,v diff -u -r1.51.2.2 -r1.51.2.3 --- openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml 4 May 2004 13:42:14 -0000 1.51.2.2 +++ openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml 13 May 2004 15:16:14 -0000 1.51.2.3 @@ -230,6 +230,7 @@ Uploaded: %pretty_date% Uploaded: %publish_date% Use the "Browse..." button to locate your file, then click "Open". + This user has a entered a biography or uploaded a portrait We can't find you (user %user_id%) in the users table. Probably your account was deleted for some reason. We had a problem processing your entry. @@ -297,6 +298,7 @@ Permissions for %name% Please return to %home_link%. Portrait + Profile Question Re-enable Recover Password Index: openacs-4/packages/dotlrn/tcl/community-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.tcl,v diff -u -r1.183.2.3 -r1.183.2.3.4.1 --- openacs-4/packages/dotlrn/tcl/community-procs.tcl 21 Feb 2004 02:36:51 -0000 1.183.2.3 +++ openacs-4/packages/dotlrn/tcl/community-procs.tcl 13 May 2004 15:08:26 -0000 1.183.2.3.4.1 @@ -665,6 +665,13 @@ } { Returns list of admin users } { + set bio_attribute_id [db_string bio_attribute_id { + select attribute_id + from acs_attributes + where object_type = 'person' + and attribute_name = 'bio' + }] + return [list_users -rel_type dotlrn_admin_rel $community_id] } Index: openacs-4/packages/dotlrn/tcl/community-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.xql,v diff -u -r1.81.2.1.4.1 -r1.81.2.1.4.2 --- openacs-4/packages/dotlrn/tcl/community-procs.xql 13 May 2004 13:59:29 -0000 1.81.2.1.4.1 +++ openacs-4/packages/dotlrn/tcl/community-procs.xql 13 May 2004 15:08:26 -0000 1.81.2.1.4.2 @@ -141,6 +141,15 @@ acs_users_all.first_names, acs_users_all.last_name, acs_users_all.email + (select count(*) + from acs_rels + where rel_type = 'user_portrait_rel' + and object_id_one = dotlrn_member_rels_approved.user_id) as portrait_p, + (select count(*) + from acs_attribute_values + where object_id = dotlrn_member_rels_approved.user_id + and attribute_id = :bio_attribute_id + and attr_value != '') as bio_p from acs_users_all, dotlrn_member_rels_approved where dotlrn_member_rels_approved.community_id = :community_id Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.adp,v diff -u -r1.13.2.1 -r1.13.2.1.4.1 --- openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.adp 26 Nov 2003 16:22:00 -0000 1.13.2.1 +++ openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.adp 13 May 2004 15:10:41 -0000 1.13.2.1.4.1 @@ -24,7 +24,7 @@ - @@ -39,6 +39,11 @@ +
+ #dotlrn-portlet.Sort##dotlrn-portlet.Sortmanage#
+ + #acs-subsite.Profile# + + <%= [acs_community_member_link -user_id $users(user_id) -label "$users(first_names) $users(last_name)"] %> Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.tcl,v diff -u -r1.10.2.2 -r1.10.2.2.4.1 --- openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.tcl 21 Feb 2004 02:36:51 -0000 1.10.2.2 +++ openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.tcl 13 May 2004 15:10:41 -0000 1.10.2.2.4.1 @@ -39,7 +39,10 @@ -rows [dotlrn_community::list_users $community_id] \ -var_name "users" +template::multirow extend users community_member_url + template::multirow foreach users { set role [dotlrn_community::get_role_pretty_name -community_id $community_id -rel_type $rel_type] + set community_member_url [acs_community_member_url -user_id $user_id] }