Index: openacs-4/packages/dotlrn-catalog/catalog/dotlrn-catalog.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/catalog/dotlrn-catalog.en_US.ISO-8859-1.xml,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn-catalog/catalog/dotlrn-catalog.en_US.ISO-8859-1.xml	16 Feb 2005 22:21:30 -0000	1.5
+++ openacs-4/packages/dotlrn-catalog/catalog/dotlrn-catalog.en_US.ISO-8859-1.xml	17 Feb 2005 22:56:10 -0000	1.6
@@ -67,6 +67,7 @@
   <msg key="not_associate">Not Associate</msg>
   <msg key="not_associated">Not Associated</msg>
   <msg key="one_course_info">One Course Information</msg>
+  <msg key="permission">Permission</msg>
   <msg key="please_type">Please type a keyword</msg>
   <msg key="privilege_on">Privilege on</msg>
   <msg key="privilege_on_catalog">Privilege on dotLRN-Catalog:</msg>
Index: openacs-4/packages/dotlrn-catalog/lib/course-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/lib/course-chunk.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn-catalog/lib/course-chunk.adp	16 Feb 2005 22:21:30 -0000	1.5
+++ openacs-4/packages/dotlrn-catalog/lib/course-chunk.adp	17 Feb 2005 22:56:10 -0000	1.6
@@ -105,6 +105,16 @@
 <if @obj_n@ not eq "0">
    <h3>#dotlrn-catalog.dotlrn_assoc#:</h3>
 </if>
+<else>
+   <if @admin_p@ eq 1>
+      <if @index@ not eq "yes">
+        <h3>#dotlrn-catalog.dotlrn_assoc#:</h3>
+        &nbsp;&nbsp;&nbsp;#dotlrn-catalog.no# 
+        (<a href="dotlrn-list?course_id=@course_id@&course_key=@course_key@&course_name=@name@" title="#dotlrn-catalog.associate_this#"><i>#dotlrn-catalog.associate#</i></a>)
+      </if>
+   </if>
+</else>
+
 <multiple name="relations">
     <if @relations.type@ eq "dotlrn_catalog_class_rel">
     	<include src="/packages/dotlrn-catalog/lib/dotlrn-chunk" class_id=@relations.object_id@>
Index: openacs-4/packages/dotlrn-catalog/www/dt-admin/associate-course.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/www/dt-admin/associate-course.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-catalog/www/dt-admin/associate-course.tcl	14 Feb 2005 22:46:11 -0000	1.1
+++ openacs-4/packages/dotlrn-catalog/www/dt-admin/associate-course.tcl	17 Feb 2005 22:56:10 -0000	1.2
@@ -23,6 +23,4 @@
 
 if { [string equal $return_url ""] } {
     ad_returnredirect "dotlrn-list?course_id=$course_id"
-} else {
-    ad_returnredirect "$return_url"
 }
Index: openacs-4/packages/dotlrn-catalog/www/dt-admin/dotlrn-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/www/dt-admin/dotlrn-list.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-catalog/www/dt-admin/dotlrn-list.tcl	14 Feb 2005 22:46:11 -0000	1.1
+++ openacs-4/packages/dotlrn-catalog/www/dt-admin/dotlrn-list.tcl	17 Feb 2005 22:56:10 -0000	1.2
@@ -83,12 +83,9 @@
 	}
 	associate {
 	    display_template {
-		<if @classes_list.rel@ eq 0>
-		<a href="associate-course?course_id=$course_id&object_id=@classes_list.object_id@&return_url=$return_url&type=@classes_list.type@" title="\#dotlrn-catalog.associate_to_class\#\">#dotlrn-catalog.associate#</a>
+		<if @classes_list.rel@ not eq 0>
+		    #dotlrn-catalog.associated#
 		</if>
-		<else>
-		#dotlrn-catalog.associated#
-                </else>
 	    }
 	}
     }
@@ -133,12 +130,9 @@
 	}
 	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&type=@com_list.type@" title="\#dotlrn-catalog.associate_to_class\#\">#dotlrn-catalog.associate#</a>
-		</if>
-		<else>
+		<if @com_list.rel@ not eq 0>
 		#dotlrn-catalog.associated#
-                </else>
+		</if>
 	    }
 	}
     }