Index: openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl,v
diff -u -r1.28.2.2 -r1.28.2.3
--- openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl	10 Apr 2007 16:49:35 -0000	1.28.2.2
+++ openacs-4/packages/dotlrn/www/admin/class-instance-new.tcl	5 Sep 2007 15:40:16 -0000	1.28.2.3
@@ -114,11 +114,11 @@
     db_dml update_community_info {}
 
     if {[empty_string_p $referer]} {
-        set referer "admin/class?[export_url_vars class_key]"
+        set referer "[dotlrn::get_admin_url]/class?[export_url_vars class_key]"
     }
 
     if {${add_instructor}} {
-	set community_id $class_instance_id 
+        set community_id $class_instance_id 
         ad_returnredirect "add-instructor?[export_url_vars community_id referer]"
         ad_script_abort
     }
Index: openacs-4/packages/dotlrn/www/admin/classes-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/classes-chunk.tcl,v
diff -u -r1.11 -r1.11.2.1
--- openacs-4/packages/dotlrn/www/admin/classes-chunk.tcl	8 Aug 2006 21:26:28 -0000	1.11
+++ openacs-4/packages/dotlrn/www/admin/classes-chunk.tcl	5 Sep 2007 15:40:16 -0000	1.11.2.1
@@ -55,7 +55,7 @@
 }
 
 if {![exists_and_not_null referer]} {
-    set referer "classes?[export_vars department_key]"
+    set referer "classes"
 }
 
 set query select_classes
@@ -82,7 +82,7 @@
 set actions ""
 
 if { $can_create } {
-    set actions [list "[_ dotlrn.new_class_1]" "[export_vars -base "class-new" -url { department_key referer }]"]
+    set actions [list "[_ dotlrn.new_class_1]" "[export_vars -base "class-new" -url { department_key referer }]" "[_ dotlrn.new_class_1]"]
 }
 
 template::list::create \
@@ -117,18 +117,14 @@
             label "[_ dotlrn.Actions]"
 	    display_template {
 		<if @can_instantiate@>
-		<nobr>
 		<small>\[
-		<a href="class-instance-new?class_key=@classes.class_key@">[_ dotlrn.new_class_instance]</a>
+            <a href="class-instance-new?class_key=@classes.class_key@&amp;referer=$referer" title="[_ dotlrn.new_class_instance]">[_ dotlrn.new_class_instance]</a>
 		       \]</small>
-		</nobr>
 		</if>
         <if @classes.n_instances@ eq 0>
-		<nobr>
 		<small>\[
-		<a href="class-delete?class_key=@classes.class_key@">[_ dotlrn.lt_Delete_class]</a>
+            <a href="class-delete?class_key=@classes.class_key@" title="[_ dotlrn.lt_Delete_class]">[_ dotlrn.lt_Delete_class]</a>
 		       \]</small>
-		</nobr>
         </if>
 	    }
         }