Index: openacs-4/packages/dotlrn/dotlrn.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/dotlrn.info,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn/dotlrn.info	7 Nov 2001 22:22:09 -0000	1.9
+++ openacs-4/packages/dotlrn/dotlrn.info	9 Nov 2001 01:11:31 -0000	1.10
@@ -69,6 +69,8 @@
             <file type="content_page" path="www/admin/classes.adp"/>
             <file type="content_page" path="www/admin/classes.tcl"/>
             <file type="query_file" path="www/admin/classes.xql"/>
+            <file type="content_page" path="www/admin/community-user-add.tcl"/>
+            <file type="query_file" path="www/admin/community-user-add.xql"/>
             <file type="content_page" path="www/admin/index.adp"/>
             <file type="content_page" path="www/admin/index.tcl"/>
             <file type="content_page" path="www/admin/master.adp"/>
@@ -87,6 +89,7 @@
             <file type="query_file" path="www/admin/users.xql"/>
             <file type="content_page" path="www/applet-add.tcl"/>
             <file type="content_page" path="www/applet-remove.tcl"/>
+            <file type="content_page" path="www/classes.adp"/>
             <file type="content_page" path="www/classes.tcl"/>
             <file type="query_file" path="www/classes.xql"/>
             <file type="content_page" path="www/community-deregister.tcl"/>
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-users-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/Attic/dotlrn-users-create.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-users-create.sql	8 Nov 2001 23:57:40 -0000	1.2
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-users-create.sql	9 Nov 2001 01:11:31 -0000	1.3
@@ -28,7 +28,9 @@
 );
 
 
+create view dotlrn_users_full as select registered_users.user_id, first_names, last_name, email, role, page_id from dotlrn_users, registered_users where dotlrn_users.user_id= registered_users.user_id;
 
+
 declare
 begin
    acs_object_type.create_type (
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.16 -r1.17
--- openacs-4/packages/dotlrn/tcl/community-procs.tcl	8 Nov 2001 23:57:40 -0000	1.16
+++ openacs-4/packages/dotlrn/tcl/community-procs.tcl	9 Nov 2001 01:11:31 -0000	1.17
@@ -96,6 +96,15 @@
 	# Not sure what to do here yet
     }
 
+    ad_proc -public get_pretty_rel_type {
+	rel_type
+    } {
+	Returns a pretty version of the rel_type
+    } {
+	set pretty_name [db_string select_pretty_name "select pretty_name from acs_object_types where object_type=:rel_type"]
+	return $pretty_name
+    }
+
     ad_proc -public list_admin_users {
 	community_id
     } {
Index: openacs-4/packages/dotlrn/www/admin/community-user-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/community-user-add.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn/www/admin/community-user-add.adp	9 Nov 2001 01:11:31 -0000	1.1
@@ -0,0 +1,12 @@
+<master src="../master">
+<property name="title">dotLRN Admin: Add a User to a Community</property>
+
+The results of your search are:
+<ul>
+<multiple name="users">
+<li> <a href=community-add-user-2?community_type=@community_type@&community_id=@community_id@&user_id=@users.user_id@>@users.last_name@, @users.first_names@ (@users.email@)
+</multiple>
+</ul>
+
+
+
Index: openacs-4/packages/dotlrn/www/admin/community-user-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/community-user-add.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn/www/admin/community-user-add.tcl	9 Nov 2001 01:11:31 -0000	1.1
@@ -0,0 +1,16 @@
+
+ad_page_contract {
+    Search for a new user for dotLRN
+    
+    @author Ben Adida (ben@openforce.net)
+    @creation-date 2001-11-04
+} {
+    search_text
+    community_id
+    community_type
+}
+
+# Just search
+db_multirow users select_users {}
+
+ad_return_template
Index: openacs-4/packages/dotlrn/www/admin/community-user-add.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/community-user-add.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn/www/admin/community-user-add.xql	9 Nov 2001 01:11:31 -0000	1.1
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+
+<queryset>
+
+<fullquery name="select_users">
+<querytext>
+select user_id, first_names, last_name, email from dotlrn_users_full where lower(last_name) like lower('%' || :search_text || '%') or lower(email) like lower('%' || :search_text || '%') and user_id not in (select user_id from dotlrn_member_rels_full where community_id= :community_id)
+</querytext>
+</fullquery>
+
+</queryset>
Index: openacs-4/packages/dotlrn/www/admin/one-class-instance.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/one-class-instance.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/admin/one-class-instance.adp	7 Nov 2001 22:22:56 -0000	1.1
+++ openacs-4/packages/dotlrn/www/admin/one-class-instance.adp	9 Nov 2001 01:11:31 -0000	1.2
@@ -4,10 +4,10 @@
 <h3>Users</h3>
 <ul>
 <multiple name="users">
-<li> @users.last_name@, @users.first_names@ (<a href=mailto:@users.email@>@users.email@</a>)
+<li> @users.last_name@, @users.first_names@ (<a href=mailto:@users.email@>@users.email@</a>), <i>@users.rel_type@</i>
 </multiple>
 
 <p>
 
-<li> <a href=user-new>add a user</a>
+<form method=get action=community-user-add><li> Add a user: <input type=hidden name=community_id value=@class_instance_id@><input type=hidden name=community_type value=dotlrn_class><input type=text name=search_text> <input type=submit value=search></form>
 </ul>
Index: openacs-4/packages/dotlrn/www/admin/one-class-instance.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/one-class-instance.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/admin/one-class-instance.tcl	7 Nov 2001 22:22:56 -0000	1.1
+++ openacs-4/packages/dotlrn/www/admin/one-class-instance.tcl	9 Nov 2001 01:11:31 -0000	1.2
@@ -15,12 +15,12 @@
 }
 
 # Get all users for this community, including role
-set users [dotlrn_community::list_users $class_instance_id]
+set list_of_users [dotlrn_community::list_users $class_instance_id]
 
 template::multirow create users rel_id rel_type user_id first_names last_name email
 
-foreach user $users {
-    template::multirow append users [lindex $user 0] [lindex $user 1] [lindex $user 2] [lindex $user 3] [lindex $user 4] [lindex $user 5]
+foreach user $list_of_users {
+    template::multirow append users [lindex $user 0] [dotlrn_community::get_pretty_rel_type [lindex $user 1]] [lindex $user 2] [lindex $user 3] [lindex $user 4] [lindex $user 5]
 }
 
 ad_return_template