Index: openacs-4/packages/imsld/lib/monitor/activity.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/lib/monitor/activity.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/imsld/lib/monitor/activity.tcl	18 Feb 2009 19:01:13 -0000	1.1
+++ openacs-4/packages/imsld/lib/monitor/activity.tcl	20 Feb 2009 12:34:12 -0000	1.2
@@ -22,62 +22,17 @@
 	
 	db_1row get_learning_activity_info { *SQL* }
 	
-	set user_choice_p [db_string user_choice_p {
-	    select user_choice_p
-	    from imsld_complete_actsi
-	    where item_id = :complete_act_id
-	    and content_revision__is_live(complete_act_id) = 't'
-	} -default "f"]
-
-	set href [export_vars -base "activity-frame" -url {activity_id run_id type}]
+	set href [export_vars -base "activity-frame" -url {activity_item_id run_id type}]
 	set div $href
 	
     }
     support {
 	# add the support activity to the tree
 	db_1row get_support_activity_info { *SQL* }
-	set started_activity_p [db_0or1row already_started {
-	    select 1 from imsld_status_user 
-	    where related_id = :activity_id 
-	    and user_id = :user_id 
-	    and run_id = :run_id
-	    and status = 'started'
-	}]
-	set completed_activity_p [db_0or1row already_completed {
-	    select 1 from imsld_status_user 
-	    where related_id = :activity_id 
-	    and user_id = :user_id 
-	    and run_id = :run_id
-	    and status = 'finished'
-	}]
-
-	set user_choice_p [db_string user_choice_p {select user_choice_p from imsld_complete_actsi where item_id = :complete_act_id and content_revision__is_live(complete_act_id) = 't'} -default "f"]
-
-	if { $completed_activity_p 
-	     || ($structure_type eq "selection")
-	     || (!$completion_restriction)
-	     || ([lsearch -exact $next_activity_id_list $activity_id] != -1)
-	     || ([string eq $complete_act_id ""] && [string eq $is_visible_p "t"]
-		 && [lsearch -exact $active_acts_list $act_item_id] != -1) } {
-
-	    set activity_node [$dom_doc createElement li]
-	    $activity_node setAttribute class "liOpen"
-	    if { !$started_activity_p && [string eq $is_visible_p "t"] } {
-		# bold letters
-		set href [imsld::activity_url -activity_id $activity_id -run_id $run_id -user_id $user_id]
-		set div [imsld::activity_url -div -activity_id $activity_id -run_id $run_id -user_id $user_id]
-
-		set class "liOpen has_focus"
-	    } else {
-		set href [imsld::activity_url -activity_id $activity_id -run_id $run_id -user_id $user_id]
-		set div [imsld::activity_url -div -activity_id $activity_id -run_id $run_id -user_id $user_id]
-
-		set class "liOpen"
-	    }
-
-	    set finish_href "finish-component-element-${imsld_id}-${run_id}-${play_id}-${act_id}-${role_part_id}-${activity_id}-support.imsld"
-
-	}
+	
+	set href [export_vars -base "activity-frame" -url {activity_item_id run_id type}]
+	set div $href
+	
     }
     structure {
 	# this is a special case since there are some conditions to check
@@ -92,7 +47,7 @@
 	#  in the "structure_next_activity" function. which is the case when structure-type is "sequence")
 	db_1row get_activity_structure_info { *SQL* }
 
-	set href [export_vars -base "activity-frame" -url {activity_id run_id type}]
+	set href [export_vars -base "activity-frame" -url {activity_item_id run_id type}]
 	set div $href
 	
 	db_multirow -extend {r_activity_id} referenced_activities struct_referenced_activities { *SQL* } {