Index: openacs-4/packages/courses/catalog/courses.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/courses/catalog/courses.en_US.ISO-8859-1.xml,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/courses/catalog/courses.en_US.ISO-8859-1.xml	3 Feb 2005 22:41:27 -0000	1.4
+++ openacs-4/packages/courses/catalog/courses.en_US.ISO-8859-1.xml	4 Feb 2005 23:05:52 -0000	1.5
@@ -4,9 +4,15 @@
   <msg key="add_course">Add Course</msg>
   <msg key="asm">Assessment</msg>
   <msg key="associate">Associate</msg>
+  <msg key="associate_more">Associate more classes or communities</msg>
   <msg key="associate_this">Associate this course</msg>
   <msg key="associate_to_class">Associate to this class</msg>
+  <msg key="associate_to_com">Associate to this community</msg>
+  <msg key="associated">Already Associated</msg>
+  <msg key="class">Class</msg>
   <msg key="class_name">Class Name</msg>
+  <msg key="com_name">Community Name:</msg>
+  <msg key="community">Community</msg>
   <msg key="course_admin">Course Administration</msg>
   <msg key="course_catalog">Course Catalog Index</msg>
   <msg key="course_info">Course Info:</msg>
@@ -26,6 +32,7 @@
   <msg key="grant_to_others">Grant permissions to other users</msg>
   <msg key="granted">Granted</msg>
   <msg key="is_assoc">is associated to:</msg>
+  <msg key="label_title">Check/uncheck all rows</msg>
   <msg key="make_live">Make This Course Live</msg>
   <msg key="new_ver">New Course Version</msg>
   <msg key="no">No</msg>
@@ -46,6 +53,7 @@
   <msg key="see_all_rev">See All Revisions</msg>
   <msg key="subject_name">Subject Name</msg>
   <msg key="term_name">Term Name</msg>
+  <msg key="title">Check/uncheck this row, and select an action to perform below</msg>
   <msg key="to">To</msg>
   <msg key="user_name">User Name:</msg>
   <msg key="users_to_grant">users to grant permissions that match that search</msg>
Index: openacs-4/packages/courses/tcl/course-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/courses/tcl/course-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/courses/tcl/course-procs.tcl	3 Feb 2005 22:41:27 -0000	1.3
+++ openacs-4/packages/courses/tcl/course-procs.tcl	4 Feb 2005 23:05:52 -0000	1.4
@@ -76,25 +76,43 @@
     db_exec_plsql add_relation { }
 }
 
-ad_proc -private course_catalog::has_relation {
+ad_proc -private course_catalog::has_relation_rel_id {
     -course_id:required
 } {
     Returns  the class_id of dotlrn_class_instance related to course_id, returns 0 otherwise.
     @course_id The id of the course in course_catalog
 } {
-    return [db_string has_relation { } -default 0]
+    return [db_string has_relation_rel_id { } -default 0]
 }
 
-ad_proc -private course_catalog::has_relation_rel_id {
+ad_proc -private course_catalog::has_relation {
     -course_id:required
 } {
-    Returns  the class_id of dotlrn_class_instance related to course_id, returns 0 otherwise.
+    Returns 1 if there is a class_id of dotlrn_class_instance related to course_id, returns 0 otherwise.
     @course_id The id of the course in course_catalog
 } {
-    return [db_string has_relation_rel_id { } -default 0]
+    if { [db_string has_relation { } -default 0] == 0 } {
+	return 0
+    } else {
+	return 1
+    }
 }
 
 
+ad_proc -private course_catalog::com_has_relation {
+    -community_id:required
+} {
+    Returns 1 if there is a community of dotlrn related to course_id, returns 0 otherwise.
+    @community_id The id of the community in dotlrn
+} {
+    if { [db_string com_has_relation { } -default 0] == 0 } {
+	return 0
+    } else {
+	return 1
+    }
+}
+
+
 ad_proc -private course_catalog::check_live_latest {
     -revision_id:required
 } {
Index: openacs-4/packages/courses/tcl/course-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/courses/tcl/course-procs.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/courses/tcl/course-procs.xql	3 Feb 2005 22:41:27 -0000	1.3
+++ openacs-4/packages/courses/tcl/course-procs.xql	4 Feb 2005 23:05:52 -0000	1.4
@@ -41,12 +41,19 @@
 
 <fullquery name="course_catalog::has_relation.has_relation">      
       <querytext>
-            select object_id_two 
-	    from acs_rels where
-	    rel_type = 'course_catalog_rel' and object_id_one = :course_id
+            select count (rel_id)
+	    from acs_rels where rel_type = 'course_catalog_rel' and object_id_one = :course_id 
       </querytext>
 </fullquery>
 
+<fullquery name="course_catalog::com_has_relation.com_has_relation">      
+      <querytext>
+            select count (rel_id)
+	    from acs_rels where rel_type = 'course_catalog_rel' and object_id_two = :community_id
+      </querytext>
+</fullquery>
+
+
 <fullquery name="course_catalog::has_relation_rel_id.has_relation_rel_id">      
       <querytext>
             select rel_id
Index: openacs-4/packages/courses/www/admin/grant-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/courses/www/admin/grant-list.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/courses/www/admin/grant-list.tcl	3 Feb 2005 22:41:27 -0000	1.2
+++ openacs-4/packages/courses/www/admin/grant-list.tcl	4 Feb 2005 23:05:53 -0000	1.3
@@ -30,6 +30,7 @@
     }
     {user_email:text(text),optional
 	{label "[_ courses.search_user_email]"}
+	{help_text "[_ courses.search_email_help]"}
     }
 }
 
Index: openacs-4/packages/courses/www/cc-admin/associate-course.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/courses/www/cc-admin/associate-course.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/courses/www/cc-admin/associate-course.tcl	3 Feb 2005 22:41:28 -0000	1.2
+++ openacs-4/packages/courses/www/cc-admin/associate-course.tcl	4 Feb 2005 23:05:53 -0000	1.3
@@ -6,14 +6,16 @@
     @creation date   31-01-2005
 } {
     course_id:notnull
-    class_id:notnull
+    object_id:multiple
     { return_url ""}
 }
 
-course_catalog::add_relation -course_id $course_id -class_id $class_id
+foreach object $object_id {
+    course_catalog::add_relation -course_id $course_id -class_id $object
+}
 
 if { [string equal $return_url ""] } {
-    ad_returnredirect "/courses/cc-admin/dotlrn-list"
+    ad_returnredirect "/courses/cc-admin/dotlrn-list?course_id=$course_id"
 } else {
     ad_returnredirect "$return_url"
 }
Index: openacs-4/packages/courses/www/cc-admin/dotlrn-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/courses/www/cc-admin/dotlrn-list.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/courses/www/cc-admin/dotlrn-list.adp	2 Feb 2005 17:26:55 -0000	1.1
+++ openacs-4/packages/courses/www/cc-admin/dotlrn-list.adp	4 Feb 2005 23:05:53 -0000	1.2
@@ -3,6 +3,18 @@
 <property name="context">@context;noquote@</property>
 
 <if @course_key@ not nil>
-	<h2>#courses.associate# @course_key@ #courses.to#:</h2> 
+	<h2>#courses.associate# @course_key@ #courses.to# #courses.class#:</h2> 
 </if>
+<else>
+        <h2>#courses.associate# #courses.to# #courses.class#:</h2> 
+</else>
+
 <listtemplate name="dotlrn_classes"></listtemplate>
+
+<if @course_key@ not nil>
+	<h2>#courses.associate# @course_key@ #courses.to# #courses.community#:</h2> 
+</if>
+<else>
+        <h2>#courses.associate# #courses.to# #courses.community#:</h2> 
+</else>
+<listtemplate name="dotlrn_communities"></listtemplate>
\ No newline at end of file
Index: openacs-4/packages/courses/www/cc-admin/dotlrn-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/courses/www/cc-admin/dotlrn-list.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/courses/www/cc-admin/dotlrn-list.tcl	3 Feb 2005 22:41:28 -0000	1.2
+++ openacs-4/packages/courses/www/cc-admin/dotlrn-list.tcl	4 Feb 2005 23:05:53 -0000	1.3
@@ -23,20 +23,41 @@
 
 set asm_package_id [apm_package_id_from_key assessment]
 
-db_multirow classes_list get_dotlrn_classes {}
+db_multirow -extend { rel } classes_list get_dotlrn_classes {} {
+    set rel [course_catalog::has_relation -course_id $object_id]
+}
 
 template::list::create \
     -name dotlrn_classes \
     -multirow classes_list \
-    -key class_id \
+    -key object_id \
+    -has_checkboxes\
+    -bulk_actions {"\#courses.associate\#" "associate-course" "\#courses.associate_to_class\#" }\
     -bulk_action_method post \
-    -bulk_action_export_vars {}\
+    -bulk_action_export_vars {
+	course_id
+    }\
     -row_pretty_plural "[_ courses.dotlrn_classes]" \
     -elements {
+	check_box {
+	    class "list-narrow"
+	    label "<input type=\"checkbox\" name=\"_dummy\" onclick=\"acs_ListCheckAll('dotlrn_classes', this.checked)\" \
+                   title=\"\#courses.label_title\#\">"
+	    display_template {
+		<if @classes_list.rel@ eq 0>
+		    <input type="checkbox" name="object_id" value="@classes_list.object_id@" \
+		    id="dotlrn_classes,@classes_list.object_id@" \
+		    title="\#courses.title\#">
+		</if>
+		<else>
+		    <input type="checkbox" checked disabled>
+		</else>
+	    }
+	}
 	class  {
 	    label "[_ courses.class_name]"
 	    display_template {
-		    <a href="@classes_list.url@">@classes_list.pretty_name@</a>
+		<a href="@classes_list.url@">@classes_list.pretty_name@</a> 
 	    }
 	}
 	dep_name {
@@ -59,7 +80,60 @@
 	}
 	associate {
 	    display_template {
-		<a href="associate-course?course_id=$course_id&class_id=@classes_list.class_id@&return_url=$return_url" title="\#courses.associate_to_class\#\">#courses.associate#</a>
+		<if @classes_list.rel@ eq 0>
+		<a href="associate-course?course_id=$course_id&object_id=@classes_list.object_id@&return_url=$return_url" title="\#courses.associate_to_class\#\">#courses.associate#</a>
+		</if>
+		<else>
+		#courses.associated#
+                </else>
 	    }
 	}
     }
+
+db_multirow -extend { rel } com_list get_dotlrn_communities { } {
+    set rel [course_catalog::com_has_relation -community_id $object_id]
+}
+
+template::list::create \
+    -name dotlrn_communities \
+    -multirow com_list \
+    -key object_id \
+    -has_checkboxes \
+    -bulk_actions {"\#courses.associate\#" "associate-course" "\#courses.associate_to_com\#" }\
+    -bulk_action_method post \
+    -bulk_action_export_vars {
+	course_id
+    }\
+    -row_pretty_plural "[_ courses.dotlrn_classes]" \
+    -elements {
+	check_box {
+	    class "list-narrow"
+	    label "<input type=\"checkbox\" name=\"_dummy\" onclick=\"acs_ListCheckAll('dotlrn_communities', this.checked)\"                  title=\"\#courses.lable_title\#\">"
+	    display_template {
+		<if @com_list.rel@ eq 0>
+		    <input type="checkbox" name="object_id" value="@com_list.object_id@" \
+		    id="dotlrn_communities,@com_list.object_id@" \
+		    title="\#courses.title\#">
+		</if>
+		<else>
+		    <input type="checkbox" checked disabled>
+		</else>
+	    }
+	}
+	community  {
+	    label "[_ courses.com_name]"
+	    display_template {
+		<a href="@com_list.url@">@com_list.pretty_name@</a>
+	    }
+	}
+	associate {
+	    display_template {
+		<if @com_list.rel@ eq 0>
+	  	   <a href="associate-course?course_id=$course_id&object_id=@com_list.object_id@&return_url=$return_url" title="\#courses.associate_to_class\#\">#courses.associate#</a>
+		</if>
+		<else>
+		#courses.associated#
+                </else>
+	    }
+	}
+    }
Index: openacs-4/packages/courses/www/cc-admin/dotlrn-list.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/courses/www/cc-admin/dotlrn-list.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/courses/www/cc-admin/dotlrn-list.xql	2 Feb 2005 17:26:55 -0000	1.1
+++ openacs-4/packages/courses/www/cc-admin/dotlrn-list.xql	4 Feb 2005 23:05:53 -0000	1.2
@@ -3,10 +3,16 @@
 
     <fullquery name="get_dotlrn_classes">
         <querytext>
-            select class_instance_id as class_id, department_name, term_name, class_name, pretty_name, url
+            select class_instance_id as object_id, department_name, term_name, class_name, pretty_name, url
 	    from dotlrn_class_instances_full 
 	    order by department_name, term_name, class_name, pretty_name
         </querytext>
     </fullquery>
 
+    <fullquery name="get_dotlrn_communities">
+        <querytext>
+	    select community_id as object_id, pretty_name, url from dotlrn_clubs_full order by pretty_name
+        </querytext>
+    </fullquery>
+
 </queryset>
\ No newline at end of file
Index: openacs-4/packages/courses/www/cc-admin/grant-user-list.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/courses/www/cc-admin/grant-user-list.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/courses/www/cc-admin/grant-user-list.xql	3 Feb 2005 22:41:28 -0000	1.2
+++ openacs-4/packages/courses/www/cc-admin/grant-user-list.xql	4 Feb 2005 23:05:53 -0000	1.3
@@ -13,21 +13,15 @@
 	  select first_names, last_name, user_id as p_user_id
 	  from cc_users where user_id <> :user_id
 	  and (lower(first_names) like '%$user_name%'
-   	  or lower(last_name) like '%$user_name%') and user_id in (
-		select grantee_id from acs_permissions where privilege = 'create' and
-	 	object_id = :cc_package_id
-	  ) order by first_names, last_name
+   	  or lower(last_name) like '%$user_name%') order by first_names, last_name
       </querytext>
 </fullquery>
 
 <fullquery name="select_users_email">      
       <querytext>
 	  select first_names, last_name, user_id as p_user_id
 	  from cc_users where user_id <> :user_id 
-	  and lower(email) like '%$user_email%' and user_id in (
-		select grantee_id from acs_permissions where privilege = 'create' and
-	 	object_id = :cc_package_id
-	  ) order by email
+	  and lower(email) like '%$user_email%' order by email
       </querytext>
 </fullquery>
 
@@ -36,10 +30,7 @@
 	  select first_names, last_name, user_id as p_user_id
 	  from cc_users where user_id <> :user_id 
 	  lower(first_names) like '%$user_name%' or lower(last_name) like '%$user_name%')
-	  and lower(email) like '%$user_email%' and user_id in (
-		select grantee_id from acs_permissions where privilege = 'create' and
-	 	object_id = :cc_package_id
-	  ) order by email
+	  and lower(email) like '%$user_email%' order by email
       </querytext>
 </fullquery>
 
Index: openacs-4/packages/courses/www/cc-admin/revision-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/courses/www/cc-admin/revision-list.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/courses/www/cc-admin/revision-list.tcl	3 Feb 2005 22:41:28 -0000	1.3
+++ openacs-4/packages/courses/www/cc-admin/revision-list.tcl	4 Feb 2005 23:05:53 -0000	1.4
@@ -44,9 +44,6 @@
 	key {
 	    label "[_ courses.course_key]"
 	    display_template {
-	      <if @course_list.delete_p@ eq 1>
- 	         <a href="delete-revision?revision_id=@course_list.course_id@&course_key=@course_list.course_key@"><img border=0 src="/resources/Delete16.gif"></a>
-		</if><else>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</else>
 	      @course_list.course_key@
 	    }
 	}
Index: openacs-4/packages/courses/www/cc-admin/watch-association.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/courses/www/cc-admin/watch-association.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/courses/www/cc-admin/watch-association.adp	2 Feb 2005 17:26:55 -0000	1.1
+++ openacs-4/packages/courses/www/cc-admin/watch-association.adp	4 Feb 2005 23:05:53 -0000	1.2
@@ -2,12 +2,11 @@
 <property name=title>@page_title@</property>
 <property name="context">@context;noquote@</property>
 
+
 <h2>@course_key;noquote@ #courses.is_assoc#</h2>
-<table>
-<tr><td><b>#courses.dep_name#:</b></td><td>@department_name;noquote@</td></tr>
-<tr><td><b>#courses.term_name#:</b></td><td>@term_name;noquote@</td></tr>
-<tr><td><b>#courses.term_name#:</b></td><td>@class_name;noquote@</td></tr>
-<tr><td><b>#courses.class_name#:</b></td><td><a  href="@url@">@pretty_name;noquote@</a></td></tr>
-<tr><td><b>#courses.description#:</b></td><td>@description;noquote@</td></tr>
-</table>
 
+<multiple name="relations">
+    <include src="/packages/courses/lib/dotlrn-chunk" class_id=@relations.class_id@>
+</multiple>
+
+<a href="dotlrn-list?course_id=@course_id@&course_key=@course_key@">#courses.associate_more#</a>
\ No newline at end of file
Index: openacs-4/packages/courses/www/cc-admin/watch-association.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/courses/www/cc-admin/watch-association.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/courses/www/cc-admin/watch-association.tcl	3 Feb 2005 22:41:28 -0000	1.2
+++ openacs-4/packages/courses/www/cc-admin/watch-association.tcl	4 Feb 2005 23:05:53 -0000	1.3
@@ -1,7 +1,6 @@
 ad_page_contract {
-    Displays a information about course_catalog(course_id) and dotlrn_class_instance
-    list of all revisions for one course
-
+    Shows all associations that course_id has
+    
     @author          Miguel Marin (miguelmarin@viaro.net)
     @author          Viaro Networks www.viaro.net
     @creation date   28-01-2005
@@ -19,8 +18,6 @@
 # Check if users has admin permission to edit course_catalog
 permission::require_permission -party_id $user_id -object_id $course_id -privilege "admin"
 
+set inlcludes ""
+db_multirow relations relation { }
 
-set class_id [course_catalog::has_relation -course_id $course_id]
-
-db_1row get_class_info { }
-
Index: openacs-4/packages/courses/www/cc-admin/watch-association.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/courses/www/cc-admin/watch-association.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/courses/www/cc-admin/watch-association.xql	2 Feb 2005 17:26:55 -0000	1.1
+++ openacs-4/packages/courses/www/cc-admin/watch-association.xql	4 Feb 2005 23:05:53 -0000	1.2
@@ -9,4 +9,11 @@
         </querytext>
     </fullquery>
 
+    <fullquery name="relation">
+        <querytext>
+            select object_id_two as class_id from acs_rels
+	    where object_id_one = :course_id
+        </querytext>
+    </fullquery>
+
 </queryset>
\ No newline at end of file