Index: openacs-4/packages/lorsm/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/admin/index.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/lorsm/www/admin/index.tcl	14 Feb 2009 22:32:19 -0000	1.6
+++ openacs-4/packages/lorsm/www/admin/index.tcl	28 Apr 2009 15:24:15 -0000	1.7
@@ -12,8 +12,8 @@
 
 set title "[_ lorsm.lt_Manage_Courses_in_Rep]"
 set context [list "[_ lorsm.Manage_Courses]"]
+set return_url [ad_conn url]
 
-
 set package_id [ad_conn package_id]
 set user_id [ad_conn user_id]
 set community_id [lors::get_community_id]
@@ -42,7 +42,7 @@
     -elements {
         course_name {
             label "[_ lorsm.Available_Courses]"
-            display_template {@d_courses.course_url;noquote@}
+            link_url_col course_url
             display_col course_name
             link_html {title "Access Course"}
 
@@ -124,10 +124,7 @@
 
 db_multirow -extend { ims_md_id course_url } d_courses select_d_courses {} {
     set ims_md_id $man_id
-#    if { [string eq $format_name "default"] } {
-    set course_url "<a href=\"[ad_conn package_url]delivery/?[export_vars man_id]\" title=\"[_ lorsm.Access_Course]\">$course_name</a>"
- #   } else {
-#   set course_url "<a href=\"${folder_name}/?[export_vars man_id]\" title=\"[_ lorsm.Access_Course]\" target=_blank>$course_name</a>"
-#    }
+    set course_url [export_vars -base "../delivery" { man_id return_url }]
+
 }
 
Index: openacs-4/packages/lorsm/www/delivery/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/index.tcl,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/lorsm/www/delivery/index.tcl	14 Feb 2009 22:33:20 -0000	1.17
+++ openacs-4/packages/lorsm/www/delivery/index.tcl	28 Apr 2009 15:24:15 -0000	1.18
@@ -13,6 +13,7 @@
     menu_off:integer,notnull,optional
     item_id:integer,notnull,optional
     ims_id:integer,notnull,optional
+    {return_url ""}
 } -properties {
 } -validate {
 } -errors {
@@ -42,7 +43,7 @@
 } else {
     if { $menu_off == 0 } {
         ad_set_client_property lorsm ims_id ""
-        ns_log notice "UNSETTING LORSM IMS_ID '[ad_conn url]'"
+        ns_log debug "UNSETTING LORSM IMS_ID '[ad_conn url]'"
     } else {
         #given menu_off without ims_id, i have to provide a default one!
         #since an ims_item_id wasn't provided, we just pick up the first one
@@ -84,7 +85,10 @@
 }
 
 set community_id [lors::get_community_id]
-set return_url [lors::get_community_url]
+if { $return_url eq "" } {
+    set return_url [lors::get_community_url]
+}
+ad_set_client_property lorsm return_url $return_url
 
 # Student tracking
 set package_id [ad_conn package_id]
Index: openacs-4/packages/lorsm/www/delivery/menu-mk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/menu-mk.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/lorsm/www/delivery/menu-mk.tcl	14 Feb 2009 22:33:20 -0000	1.8
+++ openacs-4/packages/lorsm/www/delivery/menu-mk.tcl	28 Apr 2009 15:24:15 -0000	1.9
@@ -405,5 +405,5 @@
     }
 }
 # return_url
-set return_url [lors::get_community_url]
+set return_url [ad_get_client_property lorsm return_url]
 
Index: openacs-4/packages/lorsm/www/delivery/menu.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/menu.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/lorsm/www/delivery/menu.tcl	14 Feb 2009 22:33:20 -0000	1.12
+++ openacs-4/packages/lorsm/www/delivery/menu.tcl	28 Apr 2009 15:24:15 -0000	1.13
@@ -179,5 +179,6 @@
     set TREE_ITEMS [generate_tree_menu $js $index 1]
     set TREE_HASH [join $TREE_HASH "\n"]
 }
+
 # return_url
-set return_url [lors::get_community_url]
+set return_url [ad_get_client_property lorsm return_url]