Index: openacs-4/packages/imsld/catalog/imsld.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/catalog/imsld.en_US.ISO-8859-1.xml,v
diff -u -r1.34.4.1 -r1.34.4.2
--- openacs-4/packages/imsld/catalog/imsld.en_US.ISO-8859-1.xml 30 May 2007 08:06:17 -0000 1.34.4.1
+++ openacs-4/packages/imsld/catalog/imsld.en_US.ISO-8859-1.xml 4 Jun 2007 14:00:04 -0000 1.34.4.2
@@ -9,6 +9,7 @@
| Status: The run is
Act Identifier
active
+ Activities
Activity Identifier
Activity Name
Activity report
@@ -59,6 +60,8 @@
Feedbach Title
Feedback
File name
+ (finish)
+ finish activity
Finish Date
finished
Finished Date
@@ -338,8 +341,8 @@
Go to the UoL: <a href=\"%imsld_url%\">%imsld_title%</a> (in the community: <a href=\"%community_url%\">%community_name%</a> community) for further details.
Username Property Identifier
User's individual report
- Users who have <b>at least visited</b> the service
- Users who have <b>viewed/visited all</b> the referenced resources from the environment
+ Users who have at least visited the service
+ Users who have viewed or visited all the referenced resources from the environment
Users who have started and/or finished this activity
Valid types are learning, support and structure
More than one learning object in environment %identifier%. Just one used (the first one)
@@ -364,6 +367,7 @@
Monitor properties
User
Name
+ navigate through the content using the links above
done
New IMS-LD
information found in the imsmanifest.xml file. Nothing to do.
Index: openacs-4/packages/imsld/tcl/imsld-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-procs.tcl,v
diff -u -r1.95.2.1 -r1.95.2.2
--- openacs-4/packages/imsld/tcl/imsld-procs.tcl 30 May 2007 08:06:17 -0000 1.95.2.1
+++ openacs-4/packages/imsld/tcl/imsld-procs.tcl 4 Jun 2007 14:00:04 -0000 1.95.2.2
@@ -2128,6 +2128,7 @@
$img_node setAttribute src "[imsld::object_type_image_path -object_type $object_type]"
$img_node setAttribute border "0"
$img_node setAttribute alt "$object_title"
+ $img_node setAttribute title "$object_title"
$a_node appendChild $img_node
if { $li_mode_p } {
set file_node [$dom_doc createElement li]
@@ -2156,6 +2157,7 @@
$img_node setAttribute src "[imsld::object_type_image_path -object_type file-storage]"
$img_node setAttribute border "0"
$img_node setAttribute alt "$file_name"
+ $img_node setAttribute title "$file_name"
$a_node appendChild $img_node
if { $li_mode_p } {
set file_node [$dom_doc createElement li]
@@ -2184,6 +2186,7 @@
$img_node setAttribute src "[imsld::object_type_image_path -object_type file-storage]"
$img_node setAttribute border "0"
$img_node setAttribute alt "$file_name"
+ $img_node setAttribute title "$file_name"
$a_node appendChild $img_node
if { $li_mode_p } {
set file_node [$dom_doc createElement li]
@@ -2202,6 +2205,7 @@
$img_node setAttribute src "[imsld::object_type_image_path -object_type url]"
$img_node setAttribute border "0"
$img_node setAttribute alt "$url"
+ $img_node setAttribute title "$url"
$a_node appendChild $img_node
if { $li_mode_p } {
set file_node [$dom_doc createElement li]
@@ -2692,6 +2696,7 @@
@return A list of lists of the activities referenced from the activity structure
} {
+ set imsld_package_id [ad_conn package_id]
# auxiliary list to store the activities
set completed_list [list]
# get the structure info
@@ -2729,16 +2734,20 @@
$activity_node appendChild $text
if { !$completed_p } {
- set input_node [$dom_doc createElement input]
- $input_node setAttribute type "checkbox"
- $input_node setAttribute onclick "window.location=\"finish-component-element-${imsld_id}-${run_id}-${play_id}-${act_id}-${role_part_id}-${activity_id}-learning.imsld\""
+ set input_node [$dom_doc createElement a]
+ $input_node setAttribute href "finish-component-element-${imsld_id}-${run_id}-${play_id}-${act_id}-${role_part_id}-${activity_id}-learning.imsld"
+ $input_node setAttribute class "finish"
+ $input_node setAttribute title "[_ imsld.finish_activity]"
+ set text [$dom_doc createTextNode "[_ imsld.finish]"]
+ $input_node appendChild $text
$activity_node appendChild $input_node
} else {
- set input_node [$dom_doc createElement input]
- $input_node setAttribute type "checkbox"
- $input_node setAttribute checked "true"
- $input_node setAttribute disabled "true"
- $activity_node appendChild $input_node
+ set img_node [$dom_doc createElement img]
+ $img_node setAttribute src "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]/resources/completed.png"
+ $img_node setAttribute border "0"
+ $img_node setAttribute alt "[_ imsld.finished]"
+ $img_node setAttribute title "[_ imsld.finished]"
+ $activity_node appendChild $img_node
}
set completed_list [linsert $completed_list $sort_order [$activity_node asList]]
@@ -2769,16 +2778,20 @@
$activity_node appendChild $text
if { !$completed_p } {
- set input_node [$dom_doc createElement input]
- $input_node setAttribute type "checkbox"
- $input_node setAttribute onclick "window.location=\"finish-component-element-${imsld_id}-${run_id}-${play_id}-${act_id}-${role_part_id}-${activity_id}-support.imsld\""
+ set input_node [$dom_doc createElement a]
+ $input_node setAttribute href "finish-component-element-${imsld_id}-${run_id}-${play_id}-${act_id}-${role_part_id}-${activity_id}-support.imsld"
+ $input_node setAttribute class "finish"
+ $input_node setAttribute title "[_ imsld.finish_activity]"
+ set text [$dom_doc createTextNode "[_ imsld.finish]"]
+ $input_node appendChild $text
$activity_node appendChild $input_node
} else {
- set input_node [$dom_doc createElement input]
- $input_node setAttribute type "checkbox"
- $input_node setAttribute checked "true"
- $input_node setAttribute disabled "true"
- $activity_node appendChild $input_node
+ set img_node [$dom_doc createElement img]
+ $img_node setAttribute src "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]/resources/completed.png"
+ $img_node setAttribute border "0"
+ $img_node setAttribute alt "[_ imsld.finished]"
+ $img_node setAttribute title "[_ imsld.finished]"
+ $activity_node appendChild $img_node
}
set completed_list [linsert $completed_list $sort_order [$activity_node asList]]
@@ -2846,6 +2859,7 @@
where run_id = :run_id
}
# start with the role parts
+ set imsld_package_id [ad_conn package_id]
set user_role_id [db_string current_role {
select map.active_role_id as user_role_id
@@ -2890,16 +2904,20 @@
$activity_node appendChild $text
if { !$completed_activity_p } {
- set input_node [$dom_doc createElement input]
- $input_node setAttribute type "checkbox"
- $input_node setAttribute onclick "window.location=\"finish-component-element-${imsld_id}-${run_id}-${play_id}-${act_id}-${role_part_id}-${activity_id}-learning.imsld\""
+ set input_node [$dom_doc createElement a]
+ $input_node setAttribute href "finish-component-element-${imsld_id}-${run_id}-${play_id}-${act_id}-${role_part_id}-${activity_id}-learning.imsld"
+ $input_node setAttribute class "finish"
+ $input_node setAttribute title "[_ imsld.finish_activity]"
+ set text [$dom_doc createTextNode "[_ imsld.finish]"]
+ $input_node appendChild $text
$activity_node appendChild $input_node
} else {
- set input_node [$dom_doc createElement input]
- $input_node setAttribute type "checkbox"
- $input_node setAttribute checked "true"
- $input_node setAttribute disabled "true"
- $activity_node appendChild $input_node
+ set img_node [$dom_doc createElement img]
+ $img_node setAttribute src "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]/resources/completed.png"
+ $img_node setAttribute border "0"
+ $img_node setAttribute alt "[_ imsld.finished]"
+ $img_node setAttribute title "[_ imsld.finished]"
+ $activity_node appendChild $img_node
}
$dom_node appendChild $activity_node
@@ -2929,16 +2947,20 @@
$activity_node appendChild $text
if { !$completed_activity_p } {
- set input_node [$dom_doc createElement input]
- $input_node setAttribute type "checkbox"
- $input_node setAttribute onclick "window.location=\"finish-component-element-${imsld_id}-${run_id}-${play_id}-${act_id}-${role_part_id}-${activity_id}-support.imsld\""
+ set input_node [$dom_doc createElement a]
+ $input_node setAttribute href "finish-component-element-${imsld_id}-${run_id}-${play_id}-${act_id}-${role_part_id}-${activity_id}-support.imsld"
+ $input_node setAttribute class "finish"
+ $input_node setAttribute title "[_ imsld.finish_activity]"
+ set text [$dom_doc createTextNode "[_ imsld.finish]"]
+ $input_node appendChild $text
$activity_node appendChild $input_node
} else {
- set input_node [$dom_doc createElement input]
- $input_node setAttribute type "checkbox"
- $input_node setAttribute checked "true"
- $input_node setAttribute disabled "true"
- $activity_node appendChild $input_node
+ set img_node [$dom_doc createElement img]
+ $img_node setAttribute src "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]/resources/completed.png"
+ $img_node setAttribute border "0"
+ $img_node setAttribute alt "[_ imsld.finished]"
+ $img_node setAttribute title "[_ imsld.finished]"
+ $activity_node appendChild $img_node
}
$dom_node appendChild $activity_node
@@ -3007,8 +3029,8 @@
# NOTE: the activity will be shown only once, no matter from how many role parts it is referenced
set user_role_id [db_string current_role { *SQL* }]
+ set imsld_package_id [ad_conn package_id]
-
# get the referenced activities to the role, assigned at runtime (notifications, level C)
foreach activity_id [db_list runtime_activities { *SQL* } ] {
@@ -3041,16 +3063,20 @@
$activity_node appendChild $text
if { !$completed_activity_p } {
- set input_node [$dom_doc createElement input]
- $input_node setAttribute type "checkbox"
- $input_node setAttribute onclick "window.location=\"finish-component-element-${imsld_id}-${run_id}-${play_id}-${act_id}-${role_part_id}-${activity_id}-learning.imsld\""
- $activity_node appendChild $input_node
+ set input_node [$dom_doc createElement a]
+ $input_node setAttribute href "finish-component-element-${imsld_id}-${run_id}-${play_id}-${act_id}-${role_part_id}-${activity_id}-learning.imsld"
+ $input_node setAttribute class "finish"
+ $input_node setAttribute title "[_ imsld.finish_activity]"
+ set text [$dom_doc createTextNode "[_ imsld.finish]"]
+ $input_node appendChild $text
+ $activity_node appendChild $input_node
} else {
- set input_node [$dom_doc createElement input]
- $input_node setAttribute type "checkbox"
- $input_node setAttribute checked "true"
- $input_node setAttribute disabled "true"
- $activity_node appendChild $input_node
+ set img_node [$dom_doc createElement img]
+ $img_node setAttribute src "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]/resources/completed.png"
+ $img_node setAttribute border "0"
+ $img_node setAttribute alt "[_ imsld.finished]"
+ $img_node setAttribute title "[_ imsld.finished]"
+ $activity_node appendChild $img_node
}
$dom_node appendChild $activity_node
@@ -3072,16 +3098,20 @@
$activity_node appendChild $text
if { !$completed_activity_p } {
- set input_node [$dom_doc createElement input]
- $input_node setAttribute type "checkbox"
- $input_node setAttribute onclick "window.location=\"finish-component-element-${imsld_id}-${run_id}-${play_id}-${act_id}-${role_part_id}-${activity_id}-support.imsld\""
- $activity_node appendChild $input_node
+ set input_node [$dom_doc createElement a]
+ $input_node setAttribute href "finish-component-element-${imsld_id}-${run_id}-${play_id}-${act_id}-${role_part_id}-${activity_id}-support.imsld"
+ $input_node setAttribute class "finish"
+ $input_node setAttribute title "[_ imsld.finish_activity]"
+ set text [$dom_doc createTextNode "[_ imsld.finish]"]
+ $input_node appendChild $text
+ $activity_node appendChild $input_node
} else {
- set input_node [$dom_doc createElement input]
- $input_node setAttribute type "checkbox"
- $input_node setAttribute checked "true"
- $input_node setAttribute disabled "true"
- $activity_node appendChild $input_node
+ set img_node [$dom_doc createElement img]
+ $img_node setAttribute src "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]/resources/completed.png"
+ $img_node setAttribute border "0"
+ $img_node setAttribute alt "[_ imsld.finished]"
+ $img_node setAttribute title "[_ imsld.finished]"
+ $activity_node appendChild $img_node
}
$dom_node appendChild $activity_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 -r1.13.4.1 -r1.13.4.2
--- openacs-4/packages/imsld/www/activity-frame.adp 30 May 2007 08:06:17 -0000 1.13.4.1
+++ openacs-4/packages/imsld/www/activity-frame.adp 4 Jun 2007 14:00:04 -0000 1.13.4.2
@@ -30,6 +30,13 @@
.hide {
display:none;
}
+.notice {
+ font-size: x-small;
+ font-weight: bold;
+ background-color: #bbbbff;
+ padding:0px;
+ margin:0px;
+}
@@ -12,11 +11,6 @@
myform.submit()
}
-
#imsld.Exit#
Index: openacs-4/packages/imsld/www/admin/imsld-groups.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/imsld-groups.tcl,v
diff -u -r1.4.4.1 -r1.4.4.2
--- openacs-4/packages/imsld/www/admin/imsld-groups.tcl 30 May 2007 08:06:17 -0000 1.4.4.1
+++ openacs-4/packages/imsld/www/admin/imsld-groups.tcl 4 Jun 2007 14:00:04 -0000 1.4.4.2
@@ -36,7 +36,7 @@
db_multirow -extend { manage_roles delete } role_groups get_groups_list {} {
set manage_roles [export_vars -base imsld-admin-roles {imsld_id run_id role {group_instance $group_id}}]
- set delete ""
+ set delete ""
}
Index: openacs-4/packages/imsld/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/index.tcl,v
diff -u -r1.14.4.1 -r1.14.4.2
--- openacs-4/packages/imsld/www/admin/index.tcl 30 May 2007 08:06:17 -0000 1.14.4.1
+++ openacs-4/packages/imsld/www/admin/index.tcl 4 Jun 2007 14:00:04 -0000 1.14.4.2
@@ -82,7 +82,7 @@
set delete_template "[_ imsld.Deleted] [_ imsld.Make_it_live]"
set create_run ""
} else {
- set delete_template ""
+ set delete_template ""
set create_run " [_ imsld.create_new_run] "
}
}
@@ -135,14 +135,14 @@
db_multirow -extend { manage delete_template image_path image_alt image_title } imsld_runs get_runs { *SQL* } {
- set delete_template ""
+ set delete_template ""
switch $status {
deleted {
set delete_template "[_ imsld.Deleted] [_ imsld.Make_it_live]"
}
active {
- set delete_template ""
+ set delete_template ""
set image_alt "[_ imsld.active]"
set image_title "[_ imsld.active]"
set image_path "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]/resources/active.png"
Index: openacs-4/packages/imsld/www/admin/monitor/activity-frame.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/monitor/activity-frame.adp,v
diff -u -r1.2.4.1 -r1.2.4.2
--- openacs-4/packages/imsld/www/admin/monitor/activity-frame.adp 30 May 2007 08:06:18 -0000 1.2.4.1
+++ openacs-4/packages/imsld/www/admin/monitor/activity-frame.adp 4 Jun 2007 14:00:04 -0000 1.2.4.2
@@ -11,10 +11,10 @@
-
+
-
+
@list_header@
Index: openacs-4/packages/imsld/www/admin/monitor/individual-report-frame.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/monitor/individual-report-frame.adp,v
diff -u -r1.2.4.1 -r1.2.4.2
--- openacs-4/packages/imsld/www/admin/monitor/individual-report-frame.adp 30 May 2007 08:06:18 -0000 1.2.4.1
+++ openacs-4/packages/imsld/www/admin/monitor/individual-report-frame.adp 4 Jun 2007 14:00:04 -0000 1.2.4.2
@@ -11,10 +11,10 @@
-
+
-
+
#imsld.This#
Index: openacs-4/packages/imsld/www/admin/monitor/monitor-tree.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/monitor/monitor-tree.adp,v
diff -u -r1.2.4.1 -r1.2.4.2
--- openacs-4/packages/imsld/www/admin/monitor/monitor-tree.adp 30 May 2007 08:06:18 -0000 1.2.4.1
+++ openacs-4/packages/imsld/www/admin/monitor/monitor-tree.adp 4 Jun 2007 14:00:04 -0000 1.2.4.2
@@ -11,11 +11,6 @@
myform.submit()
}
-