Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/imsld/www/activity-frame-div.adp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/imsld/www/activity-frame-div.tcl'.
Fisheye: No comparison available. Pass `N' to diff?
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 -r1.18 -r1.19
--- openacs-4/packages/imsld/www/activity-frame.tcl 5 Jun 2008 17:36:53 -0000 1.18
+++ openacs-4/packages/imsld/www/activity-frame.tcl 8 Jul 2008 15:32:34 -0000 1.19
@@ -291,18 +291,19 @@
set resources_list [concat $resources_list [concat $prerequisites_list $objectives_list]]
imsld::grant_permissions -resources_activities_list $resources_list -user_id $user_id -run_id $run_id
}
+
set nodeList [$dom_root selectNodes {descendant::a}]
set activity_url ""
foreach node $nodeList {
set href [$node getAttribute href]
if { $href ne "" && ![string match {*\#*} $href] } {
- ns_log notice "href: $href"
set iframe_activity_url $href
break
}
}
set activities [$dom_root asXML]
+
} else {
# a user has been selected to be supported
# get the associated resource of the support activity
@@ -332,6 +333,8 @@
}
set activities [export_vars -base "imsld-content-serve" -url { run_id resource_item_id role_id {owner_user_id $supported_user_id} }]
+
+ set iframe_activity_url $activities
}
set page_title {}
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/imsld/www/environment-frame-div.adp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/imsld/www/environment-frame-div.tcl'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/imsld/www/environment-frame.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/environment-frame.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/imsld/www/environment-frame.adp 17 Apr 2008 17:17:54 -0000 1.7
+++ openacs-4/packages/imsld/www/environment-frame.adp 8 Jul 2008 15:32:34 -0000 1.8
@@ -8,11 +8,6 @@
@environments;noquote@
Index: openacs-4/packages/imsld/www/environment-frame.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/environment-frame.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/imsld/www/environment-frame.tcl 5 Jun 2008 17:36:53 -0000 1.11
+++ openacs-4/packages/imsld/www/environment-frame.tcl 8 Jul 2008 15:32:34 -0000 1.12
@@ -28,8 +28,7 @@
-activity_item_id $activity_item_id \
-run_id $run_id \
-dom_node $dom_root \
- -dom_doc $doc \
- -target "content"
+ -dom_doc $doc
# Set the result only if it is not empty
if { [$dom_root hasChildNodes]} {
Index: openacs-4/packages/imsld/www/imsld-divset.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/imsld-divset.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/imsld/www/imsld-divset.adp 5 Jun 2008 17:36:53 -0000 1.1
+++ openacs-4/packages/imsld/www/imsld-divset.adp 8 Jul 2008 15:32:34 -0000 1.2
@@ -1,17 +1,40 @@
-
+
@course_name@
+
-
+
+
+
+
+
+
+
Index: openacs-4/packages/imsld/www/imsld-divset.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/imsld-divset.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/imsld/www/imsld-divset.tcl 5 Jun 2008 17:36:53 -0000 1.1
+++ openacs-4/packages/imsld/www/imsld-divset.tcl 8 Jul 2008 15:32:34 -0000 1.2
@@ -9,9 +9,19 @@
@cvs-id $Id$
} {
run_id:integer,notnull
+ {activity_id:optional ""}
} -properties {
} -validate {
} -errors {
}
set course_name ""
+
+set environment_src ""
+set content_src ""
+
+if { $activity_id ne ""} {
+ set content_src [export_vars -base "activity-frame" {{run_id $run_id} {activity_id $activity_id}}]
+ set environment_src [export_vars -base "environment-frame" {{run_id $run_id} {activity_id $activity_id}}]
+}
+
Fisheye: Tag 1.11 refers to a dead (removed) revision in file `openacs-4/packages/imsld/www/imsld-frameset.adp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `openacs-4/packages/imsld/www/imsld-frameset.tcl'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/imsld/www/imsld-tree-div.adp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/imsld/www/imsld-tree-div.tcl'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/imsld/www/imsld-tree.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/imsld-tree.adp,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/imsld/www/imsld-tree.adp 17 Apr 2008 17:17:54 -0000 1.16
+++ openacs-4/packages/imsld/www/imsld-tree.adp 8 Jul 2008 15:32:35 -0000 1.17
@@ -30,22 +30,3 @@
@user_message@
-
-
-
-
-
-
Index: openacs-4/packages/imsld/www/monitor-frame.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/monitor-frame.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/imsld/www/monitor-frame.tcl 16 Jan 2008 10:30:40 -0000 1.2
+++ openacs-4/packages/imsld/www/monitor-frame.tcl 8 Jul 2008 15:32:35 -0000 1.3
@@ -16,7 +16,6 @@
set user_id [ad_conn user_id]
-ns_log Notice "role_id: $role_id"
if { ![ string eq $role_id ""] } {
db_1row monitor_service_info { *SQL* }
} else {
Index: openacs-4/packages/imsld/www/admin/imsld-admin-roles.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/imsld-admin-roles.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/imsld/www/admin/imsld-admin-roles.adp 17 Apr 2008 17:17:54 -0000 1.6
+++ openacs-4/packages/imsld/www/admin/imsld-admin-roles.adp 8 Jul 2008 15:32:35 -0000 1.7
@@ -41,7 +41,7 @@
-
+
Index: openacs-4/packages/imsld/www/admin/imsld-role-members.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/imsld-role-members.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/imsld/www/admin/imsld-role-members.adp 17 Apr 2008 17:17:54 -0000 1.7
+++ openacs-4/packages/imsld/www/admin/imsld-role-members.adp 8 Jul 2008 15:32:35 -0000 1.8
@@ -11,15 +11,15 @@