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.7 -r1.8
--- openacs-4/packages/courses/catalog/courses.en_US.ISO-8859-1.xml	9 Feb 2005 22:54:02 -0000	1.7
+++ openacs-4/packages/courses/catalog/courses.en_US.ISO-8859-1.xml	10 Feb 2005 22:45:22 -0000	1.8
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="courses" package_version="0.1a3" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="courses" package_version="0.1a4" locale="en_US" charset="ISO-8859-1">
 
+  <msg key="add_course_to">Add this course to one category.</msg>
   <msg key="and_has">and has</msg>
   <msg key="asm">Assessment</msg>
   <msg key="associate">Associate</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="categories">Categories</msg>
+  <msg key="categorize">Categorize</msg>
   <msg key="class">Class</msg>
   <msg key="class_name">Class Name</msg>
   <msg key="com_name">Community Name:</msg>
@@ -40,7 +43,7 @@
   <msg key="grant_to_others">Grant permissions to other users</msg>
   <msg key="granted">Granted</msg>
   <msg key="grantrevoke">Grant/Revoke</msg>
-  <msg key="has_no">and has No associations to dotLRN class or community</msg>
+  <msg key="has_no">and has &lt;b&gt;No&lt;/b&gt; associations to dotLRN class or community</msg>
   <msg key="has_one">has one association to dotLRN class or community</msg>
   <msg key="is_assoc">is associated to:</msg>
   <msg key="label_title">Check/uncheck all rows</msg>
Index: openacs-4/packages/courses/lib/course-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/courses/lib/course-chunk.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/courses/lib/course-chunk.adp	9 Feb 2005 22:54:02 -0000	1.2
+++ openacs-4/packages/courses/lib/course-chunk.adp	10 Feb 2005 22:45:22 -0000	1.3
@@ -34,15 +34,15 @@
 	   #courses.no# 
 	  <if @edit@ eq "yes">
 	     <if @dotlrn_url@ eq "/dotlrn">
-             (<a href="dotlrn-list?course_id=@course_id@&course_key=@course_key@&return_url=@return_url@" title="#courses.associate_this#"><i>#courses.associate#</i></a>)</if>
+             (<a href="dotlrn-list?course_id=@course_id@&course_key=@course_key@&course_name=@name@&return_url=@return_url@" title="#courses.associate_this#"><i>#courses.associate#</i></a>)</if>
           </if>
 	</if>
 	<else>
 	   <if @index@ eq "yes">
 	       #courses.yes# (<a href="cc-admin/watch-association?course_id=@course_id@&course_key=@course_key@&return_url=@return_url@&course_name=@name@" title="#courses.watch_assoc#"><i>#courses.watch#</i></a>)
 	   </if>
 	   <else>
-	       #courses.yes# (<a href="watch-association?course_id=@course_id@&course_key=@course_key@&return_url=@return_url@" title="#courses.watch_assoc#"><i>#courses.watch#</i></a>)
+	       #courses.yes# (<a href="watch-association?course_id=@course_id@&course_key=@course_key@&return_url=@return_url@&course_name=@name@" title="#courses.watch_assoc#"><i>#courses.watch#</i></a>)
 	   </else>
 	</else>
     </td>
@@ -66,7 +66,11 @@
    </if>
    <else>
 	<a class=button href="grant-user-list?object_id=@item_id@&creation_user=@creation_user@&course_key=@course_key@" title="#courses.grantrevoke#">#courses.manage_per#</a>
-        <a class=button href="course-delete?object_id=@item_id@&creation_user=@creation_user@&course_key=@course_key@" title="#courses.delete_this#">#courses.delete#</a></td>
+         <a class=button href="course-delete?object_id=@item_id@&creation_user=@creation_user@&course_key=@course_key@" title="#courses.delete_this#">#courses.delete#</a>
+	<if @category_p@ eq "-1">
+	   <a class=button href="course-categorize?course_id=@course_id@&name=@name@">#courses.categorize#</a>
+	</if>
+   </td>
    </else>
 </tr>
 </table>
Index: openacs-4/packages/courses/lib/course-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/courses/lib/course-chunk.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/courses/lib/course-chunk.tcl	9 Feb 2005 22:54:02 -0000	1.2
+++ openacs-4/packages/courses/lib/course-chunk.tcl	10 Feb 2005 22:45:22 -0000	1.3
@@ -14,4 +14,6 @@
 
 if { ![info exists asmid] } {
     set asmid "-1"
-}
\ No newline at end of file
+}
+
+set category_p [db_string get_category { } -default -1]
\ No newline at end of file
Index: openacs-4/packages/courses/lib/course-chunk.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/courses/lib/course-chunk.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/courses/lib/course-chunk.xql	10 Feb 2005 22:46:09 -0000	1.1
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<queryset>
+
+    <fullquery name="get_category">
+        <querytext>
+	     select 1 from category_object_map where object_id = :course_id
+        </querytext>
+    </fullquery>
+
+</queryset>
\ No newline at end of file
Index: openacs-4/packages/courses/www/cc-admin/add-edit-course.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/courses/www/cc-admin/Attic/add-edit-course.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/courses/www/cc-admin/add-edit-course.tcl	9 Feb 2005 22:54:02 -0000	1.6
+++ openacs-4/packages/courses/www/cc-admin/add-edit-course.tcl	10 Feb 2005 22:45:22 -0000	1.7
@@ -29,6 +29,8 @@
     set mode edit
 }
 
+set cc_package_id [apm_package_id_from_key "courses"]
+
 # Get assessments
 set asm_package_id [apm_package_id_from_key assessment]
 set asm_list [list [list "[_ courses.not_associate]" "-1"]]
@@ -86,6 +88,14 @@
 
 ad_form -extend -name add_course -form $elements
 
+ad_form -extend -name add_course -form {
+    {category_ids:integer(category),multiple,optional
+	{label "[_ courses.categories]"}
+	{html {size 4}}
+	{value "-1"}
+    }
+}
+
 ad_form -extend -name add_course -validate {
     { course_key
 	{ [course_catalog::check_name -name $course_key] }
@@ -107,7 +117,11 @@
 
     # Grant admin privileges to the user over the item in the CR
     permission::grant -party_id $user_id -object_id $item_id  -privilege "admin"
-
+    
+    set revision_id [db_string get_revision_id { } -default "-1"]
+    if { ![string equal $category_ids "-1"] } {
+	category::map_object -remove_old -object_id $revision_id $category_ids
+    }
 } -edit_data {
     # New revision in the CR
     set folder_id [course_catalog::get_folder_id]
@@ -119,12 +133,13 @@
 	lappend form_attributes [list $attr_name [set $attr_name]]
     }
 
-    set course_id [content::revision::new -item_id $item_id -attributes $form_attributes]
+    set course_id [content::revision::new -item_id $item_id -attributes $form_attributes -content_type "course_catalog"]
 
     # Set the new revision live  
     course_catalog::set_live -revision_id $course_id
-
-
+    if { ![string equal $category_ids "-1"] } {
+	category::map_object -remove_old -object_id $course_id $category_ids
+    }
 } -new_request {
     set context [list [list course-list "[_ courses.course_list]"] "[_ courses.new_course]"]
     set page_title "[_ courses.new_course]"
Index: openacs-4/packages/courses/www/cc-admin/add-edit-course.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/courses/www/cc-admin/Attic/add-edit-course.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/courses/www/cc-admin/add-edit-course.xql	8 Feb 2005 23:07:53 -0000	1.2
+++ openacs-4/packages/courses/www/cc-admin/add-edit-course.xql	10 Feb 2005 22:45:22 -0000	1.3
@@ -26,5 +26,11 @@
       </querytext>
 </fullquery>
 
+<fullquery name="get_revision_id">      
+      <querytext>
+            select revision_id from cr_revisions where item_id = :item_id
+      </querytext>
+</fullquery>
 
+
 </queryset>
Index: openacs-4/packages/courses/www/cc-admin/course-categorize.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/courses/www/cc-admin/course-categorize.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/courses/www/cc-admin/course-categorize.adp	10 Feb 2005 22:46:09 -0000	1.1
@@ -0,0 +1,7 @@
+<master>
+<property name=title>@page_title@</property>
+<property name="context">@context;noquote@</property>
+
+#courses.add_course_to#
+<br><br>
+<formtemplate id="course_categorize"></formtemplate>
\ No newline at end of file
Index: openacs-4/packages/courses/www/cc-admin/course-categorize.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/courses/www/cc-admin/course-categorize.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/courses/www/cc-admin/course-categorize.tcl	10 Feb 2005 22:46:09 -0000	1.1
@@ -0,0 +1,30 @@
+ad_page_contract {
+    Categorize one course
+    @author          Miguel Marin (miguelmarin@viaro.net) 
+    @author          Viaro Networks www.viaro.net
+    @creation-date   10-02-2005
+} {
+    course_id:notnull
+    name:notnull
+}
+
+set user_id [ad_conn user_id]
+set context [list "[_ courses.categorize] $name"]
+set page_title "[_ courses.categorize] $name"
+set return_url "course-list"
+
+
+ad_form -export { name } -name course_categorize -cancel_url "course-list" -form {
+    {course_id:text(hidden) 
+	{ value $course_id }
+    }
+    {category_ids:integer(category),multiple
+	{label "[_ courses.categories]"}
+	{html {size 4}}
+	{value "-1"}
+   }
+} -on_submit {
+    category::map_object -remove_old -object_id $course_id $category_ids
+} -after_submit {
+    ad_returnredirect "course-list"
+}
Index: openacs-4/packages/courses/www/cc-admin/course-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/courses/www/cc-admin/course-list.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/courses/www/cc-admin/course-list.adp	9 Feb 2005 22:54:02 -0000	1.3
+++ openacs-4/packages/courses/www/cc-admin/course-list.adp	10 Feb 2005 22:45:22 -0000	1.4
@@ -4,6 +4,7 @@
  <a href="add-edit-course?return_url=@return_url@">#courses.new_course#</a>
 <if @admin_p@ eq 1>
 | <a href="../admin/grant-list?return_url=@return_url@">#courses.grant_per#</a>
+| <a href="/categories/cadmin/one-object?object_id=@cc_package_id@">Categories</a>
 </if>
 <br><br>
 <multiple name="course_list">
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.2 -r1.3
--- openacs-4/packages/courses/www/cc-admin/dotlrn-list.adp	4 Feb 2005 23:05:53 -0000	1.2
+++ openacs-4/packages/courses/www/cc-admin/dotlrn-list.adp	10 Feb 2005 22:45:22 -0000	1.3
@@ -3,7 +3,7 @@
 <property name="context">@context;noquote@</property>
 
 <if @course_key@ not nil>
-	<h2>#courses.associate# @course_key@ #courses.to# #courses.class#:</h2> 
+	<h2>#courses.associate# @course_key@ (@course_name@) #courses.to# #courses.class#:</h2> 
 </if>
 <else>
         <h2>#courses.associate# #courses.to# #courses.class#:</h2> 
@@ -12,7 +12,7 @@
 <listtemplate name="dotlrn_classes"></listtemplate>
 
 <if @course_key@ not nil>
-	<h2>#courses.associate# @course_key@ #courses.to# #courses.community#:</h2> 
+	<h2>#courses.associate# @course_key@ (@course_name@) #courses.to# #courses.community#:</h2> 
 </if>
 <else>
         <h2>#courses.associate# #courses.to# #courses.community#:</h2> 
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.4 -r1.5
--- openacs-4/packages/courses/www/cc-admin/dotlrn-list.tcl	8 Feb 2005 23:07:53 -0000	1.4
+++ openacs-4/packages/courses/www/cc-admin/dotlrn-list.tcl	10 Feb 2005 22:45:22 -0000	1.5
@@ -8,6 +8,7 @@
     course_id:notnull
     { course_key ""}
     { return_url "" }
+    { course_name ""}
 }
 
 set page_title "[_ courses.dotlrn_list]"
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.3 -r1.4
--- openacs-4/packages/courses/www/cc-admin/watch-association.adp	8 Feb 2005 23:07:53 -0000	1.3
+++ openacs-4/packages/courses/www/cc-admin/watch-association.adp	10 Feb 2005 22:45:22 -0000	1.4
@@ -3,7 +3,7 @@
 <property name="context">@context;noquote@</property>
 
 
-<h2>@course_key;noquote@ #courses.is_assoc#</h2>
+<h2>@course_key;noquote@ (@course_name@) #courses.is_assoc#</h2>
 
 <multiple name="relations">
     <if @relations.type@ eq "course_catalog_class_rel">
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.5 -r1.6
--- openacs-4/packages/courses/www/cc-admin/watch-association.tcl	9 Feb 2005 22:54:02 -0000	1.5
+++ openacs-4/packages/courses/www/cc-admin/watch-association.tcl	10 Feb 2005 22:45:22 -0000	1.6
@@ -1,6 +1,5 @@
 ad_page_contract {
     Shows all associations that course_id has
-    
     @author          Miguel Marin (miguelmarin@viaro.net)
     @author          Viaro Networks www.viaro.net
     @creation date   28-01-2005