Index: openacs-4/packages/imsld/lib/activity-tree.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/lib/activity-tree.adp,v
diff -u -N -r1.3.2.2 -r1.3.2.3
--- openacs-4/packages/imsld/lib/activity-tree.adp	3 Aug 2009 12:09:28 -0000	1.3.2.2
+++ openacs-4/packages/imsld/lib/activity-tree.adp	11 Aug 2009 12:28:52 -0000	1.3.2.3
@@ -3,17 +3,11 @@
     @imsld_title@
     <ul id="mktree_activities" class="mktree">
       <multiple name="activities">
-        <li id="mktree_activities_@activities.act_id@"><include src="act" act_id="@activities.act_id@" />
-          <ul>
-            <group column="act_id">
-              <include src="activity" run_id="@run_id@" type="@activities.type@"
-                user_id="@user_id@" activity_id="@activities.activity_id@"
-                next_activity_id_list="@next_activity_id_list@" imsld_id="@imsld_id@"
-                play_id="@activities.play_id@" act_id="@activities.act_id@"
-                role_part_id="@activities.role_part_id@" />
-            </group>
-          </ul>
-        </li>
+        <include src="activity" run_id="@run_id@" type="@activities.type@"
+          user_id="@user_id@" activity_id="@activities.activity_id@"
+          next_activity_id_list="@next_activity_id_list@" imsld_id="@imsld_id@"
+          play_id="@activities.play_id@" act_id="@activities.act_id@"
+          role_part_id="@activities.role_part_id@" />
       </multiple>
     </ul>
   </li>
Index: openacs-4/packages/imsld/lib/activity.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/lib/activity.tcl,v
diff -u -N -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/imsld/lib/activity.tcl	28 Jul 2009 19:52:33 -0000	1.5.2.1
+++ openacs-4/packages/imsld/lib/activity.tcl	11 Aug 2009 12:28:52 -0000	1.5.2.2
@@ -151,7 +151,7 @@
 			and attr.run_id = :run_id
 			and attr.user_id = :user_id
 			and attr.type = 'isvisible'
-		    } -default 0]
+		    } -default "t"]
 		} else {
 		    set visible_p t
 		}
@@ -162,19 +162,6 @@
 		
 	    }
 
-# 	    set nested_list [imsld::generate_structure_activities_list -imsld_id $imsld_id \
-# 				 -run_id $run_id \
-# 				 -structure_item_id $structure_item_id \
-# 				 -user_id $user_id \
-# 				 -next_activity_id_list $next_activity_id_list \
-# 				 -role_part_id $role_part_id \
-# 				 -play_id $play_id \
-# 				 -act_id $act_id \
-# 				 -dom_doc $dom_doc \
-# 				 -dom_node $dom_node]
-# 	    # the nested finished activities are returned as a tcl list in tDOM format
-# 	    $structure_node appendFromList [list ul [list] [concat [list] $nested_list]]
-# 	    $dom_node appendChild $structure_node
 	}
     }
 }
Index: openacs-4/packages/imsld/www/activity-frame.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/activity-frame.adp,v
diff -u -N -r1.19.2.1 -r1.19.2.2
--- openacs-4/packages/imsld/www/activity-frame.adp	4 Aug 2009 21:53:19 -0000	1.19.2.1
+++ openacs-4/packages/imsld/www/activity-frame.adp	11 Aug 2009 12:28:52 -0000	1.19.2.2
@@ -28,8 +28,9 @@
   </if>
   <else>
     @activities;noquote@
-    <!-- This message should appear only if there is more than one link! -->
-    <p class="notice">#imsld.navigate#</p>
+    <if @node_list:rowcount@ gt 1>
+      <p class="notice">#imsld.navigate#</p>
+    </if>
   </else>
 
   <iframe id="object" name="object" src="@iframe_activity_url@" style="left:0; top:0;" width="98%" height="60%"></iframe>
Index: openacs-4/packages/imsld/www/activity-frame.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/activity-frame.tcl,v
diff -u -N -r1.22 -r1.22.2.1
--- openacs-4/packages/imsld/www/activity-frame.tcl	17 Jun 2009 08:00:01 -0000	1.22
+++ openacs-4/packages/imsld/www/activity-frame.tcl	11 Aug 2009 12:28:52 -0000	1.22.2.1
@@ -153,10 +153,11 @@
         imsld::grant_permissions -resources_activities_list $resources_list -user_id $user_id -run_id $run_id
     }
 
-    set nodeList [$dom_root selectNodes {descendant::a}]
+    set node_list [$dom_root selectNodes {descendant::a}]
+    set {node_list:rowcount} [llength $node_list]
     set activity_url ""
 
-    foreach node $nodeList {
+    foreach node $node_list {
 	set href [$node getAttribute href]
 	if { $href ne "" && ![string match {*\#*} $href] } {
 	    set iframe_activity_url $href