Index: openacs-4/packages/curriculum-central/www/coordinate/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/index.adp,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/curriculum-central/www/coordinate/index.adp	18 May 2006 06:34:17 -0000	1.12
+++ openacs-4/packages/curriculum-central/www/coordinate/index.adp	1 Jun 2006 05:41:41 -0000	1.13
@@ -4,7 +4,6 @@
 
 <h3>#curriculum-central.manage_items_related_to_your_teaching_style#</h3>
 <ul>
-<li><a href="tl-methods">#curriculum-central.manage_your_list_of_tl_approaches#</a></i>
 <li><a href="gradattrs">#curriculum-central.manage_your_list_of_graduate_attributes#</a></li>
 <li><a href="assess-methods">#curriculum-central.manage_your_list_of_assessment_methods#</a></li>
 <li><a href="textbooks">#curriculum-central.manage_your_list_of_textbooks#</a></li>
Index: openacs-4/packages/curriculum-central/www/coordinate/tl-method-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/tl-method-ae.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/curriculum-central/www/coordinate/tl-method-ae.tcl	6 Jan 2006 05:46:13 -0000	1.2
+++ openacs-4/packages/curriculum-central/www/coordinate/tl-method-ae.tcl	1 Jun 2006 05:41:41 -0000	1.3
@@ -1,4 +1,6 @@
 ad_page_contract {
+    This has been deprecated in favour of iframe/tl-method-ae.
+
     Add/Edit a teaching and learning method.
 
     @author Nick Carroll (nick.c@rroll.net)
Index: openacs-4/packages/curriculum-central/www/coordinate/tl-method-del.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/tl-method-del.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/curriculum-central/www/coordinate/tl-method-del.tcl	12 Apr 2006 02:36:14 -0000	1.2
+++ openacs-4/packages/curriculum-central/www/coordinate/tl-method-del.tcl	1 Jun 2006 05:41:41 -0000	1.3
@@ -1,4 +1,6 @@
 ad_page_contract {
+    This has been deprecated in favour of iframe/tl-method-del.
+
     Deletes a Teaching and Learning method.
 
     @param method_id The ID of the Teaching and Learning method to remove.
Index: openacs-4/packages/curriculum-central/www/coordinate/tl-methods.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/tl-methods.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/curriculum-central/www/coordinate/tl-methods.tcl	12 Apr 2006 02:06:18 -0000	1.4
+++ openacs-4/packages/curriculum-central/www/coordinate/tl-methods.tcl	1 Jun 2006 05:41:41 -0000	1.5
@@ -1,4 +1,6 @@
 ad_page_contract {
+    This has been deprecated in favour of iframe/tl-methods-view.
+
     Page for listing Teaching and Learning Approaches.
 
     @author Nick Carroll (nick.c@rroll.net)
Index: openacs-4/packages/curriculum-central/www/coordinate/uos-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/coordinate/uos-edit.tcl,v
diff -u -N -r1.18 -r1.19
--- openacs-4/packages/curriculum-central/www/coordinate/uos-edit.tcl	9 Feb 2006 11:41:37 -0000	1.18
+++ openacs-4/packages/curriculum-central/www/coordinate/uos-edit.tcl	1 Jun 2006 05:41:41 -0000	1.19
@@ -242,22 +242,47 @@
     -uos_id $uos_id \
     -array uos_tl
 
+set edit_tl_p 0
+if { $enabled_action_id ne "" } {
+    # Retrieve some workflow information
+    workflow::case::enabled_action_get \
+	-enabled_action_id $enabled_action_id \
+	-array enabled_action_info
+
+    workflow::action::get \
+	-action_id $enabled_action_info(action_id) \
+	-array action_info
+
+    # If the current action is edit_assessment, then set the
+    # grade descriptor fields as editable.
+    if { $action_info(short_name) eq "edit_tl"} {
+	set edit_tl_p 1
+    }
+}
+
+set tl_methods_url [export_vars -url -base "iframe/tl-methods-view" {uos_id {edit_p $edit_tl_p}}]
+
 # Add widgets for Teaching and Learning.
 ad_form -extend -name uos -form {
     {tl_id:integer(hidden),optional
 	{value $uos_tl(tl_id)}
     }
-    {tl_approach_ids:text(multiselect),multiple,optional
+    {tl_approach_ids:text(inform)
 	{label "[_ curriculum-central.teaching_and_learning_approach]"}
-	{options [curriculum_central::uos::tl_method_get_options]}
-	{html {size 5}}
-	{values $uos_tl(tl_approach_ids)}
 	{mode display}
-        {help_text "[_ curriculum-central.help_tl_approach_ids]"}
+	{after_html
+	    {
+		<iframe src="$tl_methods_url" width="600px" height="350" marginwidth="0" marginheight="0">
+		Your browser does not support IFRAMES,
+		please consider upgrading your browser.
+		</iframe>
+	    }
+	}
     }
 }
 
 
+
 # Retrieve graduate attribute info for Unit of Study.
 curriculum_central::uos::get_graduate_attributes \
     -uos_id $uos_id \
@@ -299,7 +324,6 @@
     }
 }
 
-
 # Retrieve workload info for Unit of Study.
 curriculum_central::uos::get_workload \
     -uos_id $uos_id \
@@ -530,7 +554,7 @@
 
 	curriculum_central::uos::update_tl \
 	    -tl_id $tl_id \
-	    -tl_approach_ids $tl_approach_ids
+	    -uos_id $uos_id
 
 	curriculum_central::uos::update_textbooks \
 	    -textbook_set_id $textbook_set_id \