Index: openacs-4/packages/imsld/tcl/imsld-install-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-install-procs.tcl,v diff -u -r1.20 -r1.21 --- openacs-4/packages/imsld/tcl/imsld-install-procs.tcl 30 Mar 2006 15:48:39 -0000 1.20 +++ openacs-4/packages/imsld/tcl/imsld-install-procs.tcl 4 Apr 2006 17:07:59 -0000 1.21 @@ -340,11 +340,11 @@ ### IMS-LD Production and Delivery # properties instances -# content::type::new -content_type imsld_property_instance -supertype imsld_property -pretty_name "<#_ Property Instance #>" -pretty_plural "<#_ Property Instances #>" -table_name imsld_property_instances -id_column instance_id + content::type::new -content_type imsld_property_instance -supertype content_revision -pretty_name "#imsld.Property_Instance#" -pretty_plural "#imsld.Property_Instances#" -table_name imsld_property_instances -id_column instance_id -# content::type::attribute::new -content_type imsld_property_instance -attribute_name property_id -datatype number -pretty_name "<#_ Property Identifier #> " -column_spec "integer" -# content::type::attribute::new -content_type imsld_property_instance -attribute_name party_id -datatype number -pretty_name "<#_ Party Identifier #>" -column_spec "integer" -# content::type::attribute::new -content_type imsld_property_instance -attribute_name value -datatype string -pretty_name "<#_ Value #>" -column_spec "varchar(4000)" + content::type::attribute::new -content_type imsld_property_instance -attribute_name property_id -datatype number -pretty_name "#imsld.Property_Identifier# " -column_spec "integer" + content::type::attribute::new -content_type imsld_property_instance -attribute_name party_id -datatype number -pretty_name "#imsld.Party_Identifier#" -column_spec "integer" + content::type::attribute::new -content_type imsld_property_instance -attribute_name value -datatype string -pretty_name "#imsld.Value#" -column_spec "varchar(4000)" } ad_proc -public imsld::install::create_group_types { 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.49 -r1.50 --- openacs-4/packages/imsld/tcl/imsld-procs.tcl 3 Apr 2006 09:41:29 -0000 1.49 +++ openacs-4/packages/imsld/tcl/imsld-procs.tcl 4 Apr 2006 17:07:59 -0000 1.50 @@ -37,11 +37,14 @@ -package_key "[imsld::package_key]"] switch $object_type { forums_forum { - set image_path "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]/resources/resources/forums.png" + set image_path "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]/resources/forums.png" } as_assessments { set image_path "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]/resources/assessment.png" } + sessions { + set image_path "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]/resources/sessions.png" + } send-mail { set image_path "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]/resources/send-mail.png" } @@ -428,11 +431,18 @@ -type $type \ -user_id $user_id \ -code_call + + if { [string eq $$type "learning"] } { + set resources_activities_list [imsld::process_learning_activity -activity_item_id $activity_item_id -resource_mode "t"] + } elseif { [string eq $$type "support"] } { + set resources_activities_list [imsld::process_support_activity -activity_item_id $activity_item_id -resource_mode "t"] + } else { + set resources_activities_list [imsld::process_activity_structure -structure_item_id $activity_item_id -resource_mode "t"] + } + #grant permissions for newly showed resources + imsld::grant_permissions -resources_activities_list $resources_activities_list -user_id $user_id } - set resources_activities_list [imsld::process_learning_activity -activity_item_id $activity_item_id -resource_mode "t"] - #grant permissions for newly showed resources - imsld::grant_permissions -resources_activities_list $resources_activities_list -user_id $user_id } ad_proc -public imsld::mark_act_finished { @@ -626,7 +636,6 @@ set item_id [expr { [string eq "" $item_id] ? [db_nextval "acs_object_id_seq"] : $item_id }] set item_name "${item_id}_content_type" - set title [expr { [string eq "" $title] ? $item_name : $title }] if { !$edit_p } { # create @@ -1394,6 +1403,7 @@ } set environment_node_li [$dom_doc createElement li] + $environment_node_li setAttribute class "liOpen" set text [$dom_doc createTextNode "$environment_title"] $environment_node_li appendChild $text set environment_node [$dom_doc createElement ul] @@ -1406,7 +1416,7 @@ select item_id as learning_object_item_id, learning_object_id, identifier, - title as lo_title + coalesce(title,identifier) as lo_title from imsld_learning_objectsi where environment_id = :environment_item_id and content_revision__is_live(learning_object_id) = 't' @@ -2280,7 +2290,7 @@ }] set file_url "[apm_package_url_from_id $fs_package_id]view/${file_url}" - append files_urls "\"$file_name\" " + append files_urls "\"$file_name\" " } # get associated urls db_foreach associated_urls { @@ -2291,7 +2301,7 @@ and ar.object_id_two = links.extlink_id } { - append files_urls "\"$url\" " + append files_urls "\"$url\" " } } return $files_urls Index: openacs-4/packages/imsld/tcl/imsld-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-procs.xql,v diff -u -r1.17 -r1.18 --- openacs-4/packages/imsld/tcl/imsld-procs.xql 29 Mar 2006 15:52:41 -0000 1.17 +++ openacs-4/packages/imsld/tcl/imsld-procs.xql 4 Apr 2006 17:07:59 -0000 1.18 @@ -1464,7 +1464,7 @@ and im.imsld_id = ii.item_id and ii.imsld_id = :imsld_id and content_revision__is_live(rp.role_part_id) = 't' - order by rp.sort_order + order by ip.sort_order, ia.sort_order, rp.sort_order 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.2 -r1.3 --- openacs-4/packages/imsld/www/environment-frame.tcl 4 Apr 2006 13:44:39 -0000 1.2 +++ openacs-4/packages/imsld/www/environment-frame.tcl 4 Apr 2006 17:07:58 -0000 1.3 @@ -13,12 +13,12 @@ dom createDocument ul doc set dom_root [$doc documentElement] -set environments_node_ul [$doc createElement ul] -$environments_node_ul setAttribute class "mktree" +#set environments_node_ul [$doc createElement ul] set environments_node_li [$doc createElement li] set text [$doc createTextNode "Environments"] $environments_node_li appendChild $text set environments_node [$doc createElement ul] +$environments_node setAttribute class "mktree" # FIX-ME: if the ul is empty, the browser shows the ul incorrectly set text [$doc createTextNode ""] $environments_node appendChild $text @@ -29,9 +29,15 @@ -dom_node $environments_node \ -dom_doc $doc -$environments_node_ul appendChild $environments_node_li -$environments_node_ul appendChild $environments_node -set environments [$environments_node_ul asXML] +$dom_root appendChild $environments_node_li +set environments_node_li [$doc createElement li] +$environments_node_li setAttribute class "liOpen" + +$environments_node_li appendChild $environments_node +$dom_root appendChild $environments_node_li + +set environments [$dom_root asXML] + set page_title {} set context [list]