Index: openacs-4/packages/dotlrn/dotlrn.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/dotlrn.info,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/dotlrn/dotlrn.info	27 Nov 2001 23:32:03 -0000	1.15
+++ openacs-4/packages/dotlrn/dotlrn.info	28 Nov 2001 00:11:48 -0000	1.16
@@ -62,8 +62,6 @@
             <file type="tcl_procs" path="tcl/dotlrn-security-procs.tcl"/>
             <file type="query_file" path="tcl/dotlrn-security-procs.xql"/>
             <file type="tcl_procs" path="tcl/navigation-procs.tcl"/>
-            <file type="content_page" path="www/admin/applet-add.tcl"/>
-            <file type="content_page" path="www/admin/applet-remove.tcl"/>
             <file type="content_page" path="www/admin/class-instance-new.adp"/>
             <file type="content_page" path="www/admin/class-instance-new.tcl"/>
             <file type="content_page" path="www/admin/class-new-2.tcl"/>
@@ -72,15 +70,6 @@
             <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-applets.adp"/>
-            <file type="content_page" path="www/admin/community-applets.tcl"/>
-            <file type="query_file" path="www/admin/community-applets.xql"/>
-            <file type="content_page" path="www/admin/community-user-add-2.adp"/>
-            <file type="content_page" path="www/admin/community-user-add-2.tcl"/>
-            <file type="content_page" path="www/admin/community-user-add-3.tcl"/>
-            <file type="content_page" path="www/admin/community-user-add.adp"/>
-            <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"/>
@@ -105,8 +94,19 @@
             <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-applet-add.tcl"/>
+            <file type="content_page" path="www/community-applet-remove.tcl"/>
+            <file type="content_page" path="www/community-applets.adp"/>
+            <file type="content_page" path="www/community-applets.tcl"/>
+            <file type="query_file" path="www/community-applets.xql"/>
             <file type="content_page" path="www/community-deregister.tcl"/>
             <file type="content_page" path="www/community-register.tcl"/>
+            <file type="content_page" path="www/community-user-add-2.adp"/>
+            <file type="content_page" path="www/community-user-add-2.tcl"/>
+            <file type="content_page" path="www/community-user-add-3.tcl"/>
+            <file type="content_page" path="www/community-user-add.adp"/>
+            <file type="content_page" path="www/community-user-add.tcl"/>
+            <file type="query_file" path="www/community-user-add.xql"/>
             <file type="content_page" path="www/configure-2.tcl"/>
             <file type="content_page" path="www/configure-element-2.tcl"/>
             <file type="content_page" path="www/configure-element.adp"/>
Index: openacs-4/packages/dotlrn/www/community-applet-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-applet-add.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/community-applet-add.tcl	27 Nov 2001 23:42:34 -0000	1.1
+++ openacs-4/packages/dotlrn/www/community-applet-add.tcl	28 Nov 2001 00:11:48 -0000	1.2
@@ -5,10 +5,11 @@
     @author Ben Adida (ben@openforce.net)
     @creation-date 2001-10-08
 } {
-    community_id
     applet_key
 }
 
+set community_id [dotlrn_community::get_community_id]
+
 # Check access
 if {![dotlrn_community::admin_access_p $community_id]} {
     ns_returnredirect /
Index: openacs-4/packages/dotlrn/www/community-applets.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-applets.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/community-applets.adp	27 Nov 2001 23:32:03 -0000	1.1
+++ openacs-4/packages/dotlrn/www/community-applets.adp	28 Nov 2001 00:11:48 -0000	1.2
@@ -17,6 +17,6 @@
 <h3>Applets to Add</h3>
 <ul>
 <multiple name=all_applets>
-<li> @all_applets.applet_pretty_name@ - [<a href=applet-add?community_id=@community_id@&applet_key=@all_applets.applet_key@>add</a>]
+<li> @all_applets.applet_pretty_name@ - [<a href=community-applet-add?applet_key=@all_applets.applet_key@>add</a>]
 </multiple>
 </ul>
Index: openacs-4/packages/dotlrn/www/community-applets.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-applets.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/community-applets.tcl	27 Nov 2001 23:32:03 -0000	1.1
+++ openacs-4/packages/dotlrn/www/community-applets.tcl	28 Nov 2001 00:11:48 -0000	1.2
@@ -6,9 +6,10 @@
     @author Ben Adida (ben@openforce.net)
     @creation-date 2001-10-05
 } {
-    community_id
 }
 
+set community_id [dotlrn_community::get_community_id]
+
 set user_id [ad_conn user_id]
 
 # Load some community type info
@@ -35,6 +36,6 @@
     }
 }
 
-set context_bar {Admin}
+set context_bar {Applets}
 
 ad_return_template
Index: openacs-4/packages/dotlrn/www/community-user-add-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-user-add-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/community-user-add-2.adp	27 Nov 2001 23:42:34 -0000	1.2
+++ openacs-4/packages/dotlrn/www/community-user-add-2.adp	28 Nov 2001 00:11:48 -0000	1.3
@@ -5,7 +5,6 @@
 
 <FORM method=get action=community-user-add-3>
 <INPUT TYPE=hidden name=user_id value=@user_id@>
-<INPUT TYPE=hidden name=community_id value=@community_id@>
 Role: 
 <SELECT name=rel_type>
 <multiple name="roles">
Index: openacs-4/packages/dotlrn/www/community-user-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-user-add-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/community-user-add-2.tcl	27 Nov 2001 23:32:03 -0000	1.1
+++ openacs-4/packages/dotlrn/www/community-user-add-2.tcl	28 Nov 2001 00:11:48 -0000	1.2
@@ -6,9 +6,10 @@
     @creation-date 2001-11-04
 } {
     user_id
-    community_id
 }
 
+set community_id [dotlrn_community::get_community_id]
+
 # Get user information
 db_1row select_user_info "select first_names, last_name, email from dotlrn_users_full where user_id=:user_id"
 
Index: openacs-4/packages/dotlrn/www/community-user-add-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-user-add-3.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/community-user-add-3.tcl	27 Nov 2001 23:32:03 -0000	1.1
+++ openacs-4/packages/dotlrn/www/community-user-add-3.tcl	28 Nov 2001 00:11:48 -0000	1.2
@@ -5,11 +5,12 @@
     @author Ben Adida (ben@openforce.net)
     @creation-date 2001-11-04
 } {
-    community_id
     user_id
     rel_type
 }
 
+set community_id [dotlrn_community::get_community_id]
+
 # Add the relation
 dotlrn_community::add_user -rel_type $rel_type $community_id $user_id
 
Index: openacs-4/packages/dotlrn/www/community-user-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-user-add.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/community-user-add.adp	27 Nov 2001 23:42:34 -0000	1.2
+++ openacs-4/packages/dotlrn/www/community-user-add.adp	28 Nov 2001 00:11:48 -0000	1.3
@@ -4,7 +4,7 @@
 The results of your search are:
 <ul>
 <multiple name="users">
-<li> <a href=community-user-add-2?community_id=@community_id@&user_id=@users.user_id@>@users.last_name@, @users.first_names@ (@users.email@)
+<li> <a href=community-user-add-2?user_id=@users.user_id@>@users.last_name@, @users.first_names@ (@users.email@)
 </multiple>
 </ul>
 
Index: openacs-4/packages/dotlrn/www/community-user-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-user-add.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/community-user-add.tcl	27 Nov 2001 23:32:03 -0000	1.1
+++ openacs-4/packages/dotlrn/www/community-user-add.tcl	28 Nov 2001 00:11:48 -0000	1.2
@@ -6,9 +6,10 @@
     @creation-date 2001-11-04
 } {
     search_text
-    community_id
 }
 
+set community_id [dotlrn_community::get_community_id]
+
 # Just search
 db_multirow users select_users {}
 
Index: openacs-4/packages/dotlrn/www/one-community-admin.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-admin.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/one-community-admin.adp	27 Nov 2001 23:32:03 -0000	1.3
+++ openacs-4/packages/dotlrn/www/one-community-admin.adp	28 Nov 2001 00:11:48 -0000	1.4
@@ -1,8 +1,9 @@
 <master src="./master">
-<property name="title">dotLRN Class Instance</property>
+<property name="title">dotLRN Community Admin</property>
+<property name="context_bar">@context_bar@</property>
 
 <h3>Applets</h3>
-<a href=community-applets?community_id=@community_id@>manage applets</a>
+<a href=community-applets>manage applets</a>
 
 <p>
 
@@ -14,7 +15,7 @@
 
 <p>
 
-<form method=get action=community-user-add><li> Add a user: <input type=hidden name=community_id value=@community_id@><input type=text name=search_text> <input type=submit value=search></form>
+<form method=get action=community-user-add><li> Add a user: <input type=text name=search_text> <input type=submit value=search></form>
 </ul>
 
 <h3>Portal Template</h3>
Index: openacs-4/packages/dotlrn/www/one-community-admin.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-admin.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn/www/one-community-admin.tcl	27 Nov 2001 23:32:03 -0000	1.5
+++ openacs-4/packages/dotlrn/www/one-community-admin.tcl	28 Nov 2001 00:11:48 -0000	1.6
@@ -5,9 +5,10 @@
     @author Ben Adida (ben@openforce.net)
     @creation-date 2001-11-27
 } {
-    community_id
 }
 
+set community_id [dotlrn_community::get_community_id]
+
 # Permissions
 dotlrn::require_user_admin_community $community_id
 
@@ -23,4 +24,6 @@
     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]
 }
 
+set context_bar {Admin}
+
 ad_return_template
Index: openacs-4/packages/dotlrn/www/one-community-type.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-type.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/dotlrn/www/one-community-type.adp	27 Nov 2001 23:32:03 -0000	1.8
+++ openacs-4/packages/dotlrn/www/one-community-type.adp	28 Nov 2001 00:11:48 -0000	1.9
@@ -22,7 +22,7 @@
 <h3>Active Communities of this Type</h3>
 <ul>
 <multiple name=active_communities>
-<li><a href=@active_communities.url@>@active_communities.pretty_name@</a> <if @active_communities.admin_p@ eq 1>(<a href=one-community-admin?community_id=@active_communities.community_id@>admin</a>)</if>
+<li><a href=@active_communities.url@>@active_communities.pretty_name@</a> <if @active_communities.admin_p@ eq 1>(<a href=@active_communities.url@one-community-admin>admin</a>)</if>
 </multiple>
 </ul>
 </else>
Index: openacs-4/packages/dotlrn/www/one-community.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn/www/one-community.adp	9 Nov 2001 03:55:36 -0000	1.5
+++ openacs-4/packages/dotlrn/www/one-community.adp	28 Nov 2001 00:11:48 -0000	1.6
@@ -5,6 +5,7 @@
 You are registered! You may <a href=community-deregister>deregister</a> if you'd like.
 <p>
 <a href=configure>Configure</a> this page.
+<if @admin_p@ eq 1><a href=one-community-admin>Admin</a> this community.</if>
 <p>
 
 @rendered_page@
Index: openacs-4/packages/dotlrn/www/one-community.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/one-community.tcl	13 Nov 2001 17:57:30 -0000	1.6
+++ openacs-4/packages/dotlrn/www/one-community.tcl	28 Nov 2001 00:11:48 -0000	1.7
@@ -44,5 +44,7 @@
 
     set context_bar {View}
 
+    set admin_p [dotlrn::user_can_admin_community_p $community_id]
+
     ad_return_template
 }
Fisheye: Tag 1.8 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/one-class-instance.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/one-class-instance.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/admin/one-class-instance.xql'.
Fisheye: No comparison available.  Pass `N' to diff?