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 -N -r1.35 -r1.36 --- openacs-4/packages/imsld/catalog/imsld.en_US.ISO-8859-1.xml 29 May 2007 09:12:08 -0000 1.35 +++ openacs-4/packages/imsld/catalog/imsld.en_US.ISO-8859-1.xml 30 May 2007 08:36:21 -0000 1.36 @@ -11,13 +11,10 @@ active Activity Identifier Activity Name - Activity report Activity Structures Activity Type Acts in play %count% - Add Members Admin IMS LD - Admin roles Back to admin Calculate(expression) Caluclate Identifier @@ -36,7 +33,6 @@ Context info Create New? create new run - Create role instance Creating default Run... Creating new IMS-LD... Creation Date @@ -64,11 +60,9 @@ Finished Date Go back go back - Go to UoL page Group members Groups in role Hide - panel Href Identifier Identifier Reference @@ -146,10 +140,8 @@ 2. Local-personal Properties 3. Local-role Properties 4. Global-personal Properties - [_ imsld.create_new_run] Activity Description Identifier Activity Structure Identifier - Add selected members to the group Are all the students asigned to the proper roles? If you confirm now, no more changes will be acepted later. <br>\ Go to the activity <a href=\"%activity_url%\">%activity_title%</a> (of the UoL <a href=\"%imsld_url%\">%imsld_title%</a> in the community <a href=\"%community_url%\">%community_name%</a>) for further details. @@ -160,11 +152,9 @@ Change Property Value XML %community_name%: %imsld_title% Complete Act Identifier - Confirm roles assignments Could not determine whit what program uncompress the file %upload_file% has. Aborting Couldn't determine if this is a well formed IMS-LD: %message% Creaginting new IMS-LD - Create a new instance of a role Dear %recepient_name% <br> %sender_name has% triggered this notification. Please do not replay to this email. <br> Email Propery Identifier @@ -243,7 +233,6 @@ Parent Role Identifier Please, confirm the information you are uploading Please submit a value - Please wait for other users... Property String Identifier Referenced activity structure %ref% does not exist Referenced activity structure (%activity_structure_ref_ref%) in role part %identifier% does not exist. @@ -270,7 +259,6 @@ Referenced support activity %support_activity_ref_ref% in role part %identifier% is actually an activity structure. Referenced support activity %support_activity_ref% in role part %identifier% is actually a learning activity. Referenced support activity (%support_activity_ref%) from notification does not exist - Remove selected members from the group Select a role to send the email Select parent for the new instance Select role to support... @@ -281,7 +269,6 @@ Sorry, that service type (%service_type%) hasn't been implemented yet. Sorry, your browser doesn't support JavaScript (or it is disabled). This is needed to access the course. Support Activity Identifier - The course has been finished The decimal digits can't be more than %restriction_value% The file %filex_href% was not created, it wasn't found in the manifest The integer part can't have more than %restriction_value% digits @@ -337,7 +324,6 @@ %sender_name% has triggered this notification. Please do not replay to this email. <br><br> 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 started and/or finished this activity @@ -367,7 +353,6 @@ &nbsp;&nbsp;&nbsp;done New IMS-LD information found in the imsmanifest.xml file. Nothing to do. - No group selected No IMS LD No info was found No properties found. @@ -384,7 +369,6 @@ Parameter Identifier Parameters Parent role: - role info Party Identifier Path to File Play Identifier @@ -400,7 +384,6 @@ Recipients Reference Identifier Reference Type - Remove Members Resource Identifier Restriction Type Role Identifier @@ -415,15 +398,13 @@ Select a role Select role... Self - mail send-mail service sendmail Sendmail Identifier Sequence Used Service Identifier Service Type Show - panel since Sort Sort Order @@ -433,7 +414,6 @@ Status stopped Structure Type - info Support Activities user: %supported_user_name% The selected role has no parent @@ -456,7 +436,6 @@ Version view file View members - View Roles waiting When Condition True With Control Index: openacs-4/packages/imsld/lib/imsld-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/lib/imsld-chunk.tcl,v diff -u -N -r1.13 -r1.14 --- openacs-4/packages/imsld/lib/imsld-chunk.tcl 29 May 2007 09:12:08 -0000 1.13 +++ openacs-4/packages/imsld/lib/imsld-chunk.tcl 30 May 2007 08:36:22 -0000 1.14 @@ -6,7 +6,7 @@ [list label "[_ imsld.IMS_LD_Name]" \ orderby_asc {imsld_title asc} \ orderby_desc {imsld_title desc} \ - display_template {@imsld_runs.imsld_title@}] \ + display_template {@imsld_runs.imsld_title@}] \ user_roles \ [list label "[_ imsld.Roles_in_Run]" \ display_template {@imsld_runs.user_roles;noquote@}] \ 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 -N -r1.96 -r1.97 --- openacs-4/packages/imsld/tcl/imsld-procs.tcl 29 May 2007 09:12:09 -0000 1.96 +++ openacs-4/packages/imsld/tcl/imsld-procs.tcl 30 May 2007 08:36:22 -0000 1.97 @@ -2123,7 +2123,6 @@ set file_url [acs_sc::invoke -contract FtsContentProvider -operation url -impl $object_type -call_args [list $acs_object_id]] set a_node [$dom_doc createElement a] $a_node setAttribute href "[export_vars -base "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]imsld-finish-resource" {file_url $file_url resource_item_id $resource_item_id run_id $run_id}]" - $a_node setAttribute title "$object_title" set img_node [$dom_doc createElement img] $img_node setAttribute src "[imsld::object_type_image_path -object_type $object_type]" $img_node setAttribute border "0" @@ -2151,7 +2150,6 @@ set file_url "imsld-content-serve" set a_node [$dom_doc createElement a] $a_node setAttribute href "[export_vars -base "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]imsld-finish-resource" {file_url $file_url resource_item_id $resource_item_id run_id $run_id}]" - $a_node setAttribute title "$file_name" set img_node [$dom_doc createElement img] $img_node setAttribute src "[imsld::object_type_image_path -object_type file-storage]" $img_node setAttribute border "0" @@ -2179,7 +2177,6 @@ set file_url "[apm_package_url_from_id $fs_package_id]view/${file_url}" set a_node [$dom_doc createElement a] $a_node setAttribute href "[export_vars -base "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]imsld-finish-resource" {file_url $file_url resource_item_id $resource_item_id run_id $run_id}]" - $a_node setAttribute title "$file_name" set img_node [$dom_doc createElement img] $img_node setAttribute src "[imsld::object_type_image_path -object_type file-storage]" $img_node setAttribute border "0" @@ -2197,7 +2194,6 @@ db_foreach associated_urls { *SQL* } { set a_node [$dom_doc createElement a] $a_node setAttribute href "[export_vars -base "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]imsld-finish-resource" { {file_url "[export_vars -base $url]"} resource_item_id run_id}]" - $a_node setAttribute title "$url" set img_node [$dom_doc createElement img] $img_node setAttribute src "[imsld::object_type_image_path -object_type url]" $img_node setAttribute border "0" @@ -2731,6 +2727,7 @@ if { !$completed_p } { set input_node [$dom_doc createElement input] $input_node setAttribute type "checkbox" + $input_node setAttribute style "vertical-align: bottom;" $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 } else { @@ -2771,6 +2768,7 @@ if { !$completed_p } { set input_node [$dom_doc createElement input] $input_node setAttribute type "checkbox" + $input_node setAttribute style "vertical-align: bottom;" $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 } else { @@ -2892,6 +2890,7 @@ if { !$completed_activity_p } { set input_node [$dom_doc createElement input] $input_node setAttribute type "checkbox" + $input_node setAttribute style "vertical-align: bottom;" $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 } else { @@ -2931,6 +2930,7 @@ if { !$completed_activity_p } { set input_node [$dom_doc createElement input] $input_node setAttribute type "checkbox" + $input_node setAttribute style "vertical-align: bottom;" $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 } else { @@ -3043,6 +3043,7 @@ if { !$completed_activity_p } { set input_node [$dom_doc createElement input] $input_node setAttribute type "checkbox" + $input_node setAttribute style "vertical-align: bottom;" $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 } else { @@ -3074,6 +3075,7 @@ if { !$completed_activity_p } { set input_node [$dom_doc createElement input] $input_node setAttribute type "checkbox" + $input_node setAttribute style "vertical-align: bottom;" $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 } else { 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.14 -r1.15 --- openacs-4/packages/imsld/www/activity-frame.adp 29 May 2007 09:12:09 -0000 1.14 +++ openacs-4/packages/imsld/www/activity-frame.adp 30 May 2007 08:36:22 -0000 1.15 @@ -22,14 +22,6 @@ html {margin:13px; border:15px; padding:3px;} body {margin:3px; border:3px; padding:5px;} --> -.show-hide { - position:absolute; - top:0px; - left:0px; -} -.hide { - display:none; -} - 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 -N -r1.8 -r1.9 --- openacs-4/packages/imsld/www/environment-frame.tcl 29 May 2007 09:12:09 -0000 1.8 +++ openacs-4/packages/imsld/www/environment-frame.tcl 30 May 2007 08:36:22 -0000 1.9 @@ -20,6 +20,7 @@ $environments_node_li appendChild $text set environments_node [$doc createElement ul] $environments_node setAttribute class "mktree" +$environments_node setAttribute style "white-space: nowrap;" # FIX-ME: if the ul is empty, the browser shows the ul incorrectly set text [$doc createTextNode ""] Index: openacs-4/packages/imsld/www/imsld-sendmail.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/imsld-sendmail.adp,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/imsld/www/imsld-sendmail.adp 29 May 2007 09:12:09 -0000 1.3 +++ openacs-4/packages/imsld/www/imsld-sendmail.adp 30 May 2007 08:36:22 -0000 1.4 @@ -5,7 +5,7 @@ + + -
-
-

#imsld.Not_members#

- -
-
-

#imsld.Group_members#

- -
-
- -
-
+ + +

#imsld.Not_members#

+ + + +

#imsld.Group_members#

+ + + +
+ + + Index: openacs-4/packages/imsld/www/admin/imsld-role-members.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/imsld-role-members.tcl,v diff -u -N -r1.9 -r1.10 --- openacs-4/packages/imsld/www/admin/imsld-role-members.tcl 29 May 2007 09:12:09 -0000 1.9 +++ openacs-4/packages/imsld/www/admin/imsld-role-members.tcl 30 May 2007 08:36:22 -0000 1.10 @@ -67,14 +67,15 @@ if {![db_0or1row get_group_name {}]} { - set group_name "[_ imsld.No_group_selected]" + set group_name "No group selected" +# set create_instance_url [export_vars -base imsld-create-instance {{imsld_id $imsld_id} {role $role}}] set create_instance_url imsld-create-instance - set bulk_actions "{Create new instance} $create_instance_url {Create a new instance of a role #>}" - set bulk_actions_not "{Create new instance} $create_instance_url {[_ imsld.lt_Create_a_new_instance]}" + set bulk_actions "{Create new instance} $create_instance_url {Create a new instance of a role}" + set bulk_actions_not "{Create new instance} $create_instance_url {Create a new instance of a role}" set bulk_action_export_vars "{imsld_id} {role} {run_id}" } else { - set bulk_actions "{<------} {imsld-role-remove-members} {[_ imsld.lt_Remove_selected_membe]}" - set bulk_actions_not "{------->} {imsld-role-add-members} {[_ imsld.lt_Add_selected_members_]}" + set bulk_actions "{<------} {imsld-role-remove-members} {Remove selected members from the group}" + set bulk_actions_not "{------->} {imsld-role-add-members} {Add selected members to the group}" set bulk_action_export_vars "{group_instance} {role} {imsld_id} {run_id} {members_list}" } @@ -95,6 +96,11 @@ -bulk_actions "$bulk_actions"\ -bulk_action_export_vars "$bulk_action_export_vars" +#set orderby [template::list::orderby_clause -orderby -name asign_members] +#if {[string equal $orderby ""]} { +# set orderby " order by username asc" +#} + template::list::create \ -name asign_not_members \ -multirow asign_not_members \ Index: openacs-4/packages/imsld/www/admin/imsld-role-remove-members.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/imsld-role-remove-members.adp,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/imsld/www/admin/imsld-role-remove-members.adp 29 May 2007 09:12:09 -0000 1.2 +++ openacs-4/packages/imsld/www/admin/imsld-role-remove-members.adp 30 May 2007 08:36:22 -0000 1.3 @@ -1,5 +1,3 @@ - @page_title;noquote@ - @context;noquote@ @user_id@ Index: openacs-4/packages/imsld/www/admin/imsld-role-remove-members.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/imsld-role-remove-members.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/imsld/www/admin/imsld-role-remove-members.tcl 29 May 2007 09:12:09 -0000 1.3 +++ openacs-4/packages/imsld/www/admin/imsld-role-remove-members.tcl 30 May 2007 08:36:22 -0000 1.4 @@ -1,4 +1,4 @@ -#/packages/imsld/www/admin/imsld-role-remove-members.tcl +#/packages/imsld/www/admin/imsld-role-add-members.tcl ad_page_contract { Remove members from an specified group @@ -13,9 +13,6 @@ imsld_id run_id } -set page_title "[_ imsld.Remove_Members]" -set context "" - #only set required variables set temp_list [list] foreach member $members_list { Index: openacs-4/packages/imsld/www/admin/imsld-view-roles.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/imsld-view-roles.adp,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/imsld/www/admin/imsld-view-roles.adp 29 May 2007 09:12:09 -0000 1.2 +++ openacs-4/packages/imsld/www/admin/imsld-view-roles.adp 30 May 2007 08:36:22 -0000 1.3 @@ -1,6 +1,4 @@ - @page_title;noquote@ - @context;noquote@ Index: openacs-4/packages/imsld/www/admin/imsld-view-roles.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/imsld-view-roles.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/imsld/www/admin/imsld-view-roles.tcl 29 May 2007 09:12:09 -0000 1.2 +++ openacs-4/packages/imsld/www/admin/imsld-view-roles.tcl 30 May 2007 08:36:22 -0000 1.3 @@ -24,8 +24,6 @@ set roles_list [imsld::roles::get_list_of_roles -imsld_id $imsld_id] set roles_list_names [imsld::roles::get_roles_names -roles_list $roles_list] -set page_title "[_ imsld.View_Roles]" -set context "" set lista [list] lappend lista [list "[_ imsld.Select_a_role]" 0] Index: openacs-4/packages/imsld/www/admin/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/index.adp,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/imsld/www/admin/index.adp 29 May 2007 09:12:09 -0000 1.3 +++ openacs-4/packages/imsld/www/admin/index.adp 30 May 2007 08:36:22 -0000 1.4 @@ -1,15 +1,7 @@ @page_title;noquote@ @context;noquote@ - - - +

#imsld.IMS-LDs_1#

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 -N -r1.15 -r1.16 --- openacs-4/packages/imsld/www/admin/index.tcl 29 May 2007 09:12:09 -0000 1.15 +++ openacs-4/packages/imsld/www/admin/index.tcl 30 May 2007 08:36:22 -0000 1.16 @@ -79,11 +79,11 @@ db_multirow -extend { delete_template create_run } imslds get_imslds { *SQL* } { if { [empty_string_p $live_revision] } { - set delete_template "[_ imsld.Deleted] [_ imsld.Make_it_live]" + set delete_template "[_ imsld.Deleted] [_ imsld.Make_it_live]" set create_run "" } else { - set delete_template "\"[_" - set create_run " [_ imsld.create_new_run] " + set delete_template "\"<\#_\">" + set create_run " [_ imsld.create_new_run] " } } @@ -135,31 +135,31 @@ 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]" + 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" - set manage "[_ imsld.View_members] | [_ imsld.Monitor]" + set manage "[_ imsld.View_members] | [_ imsld.Monitor]" } waiting { set image_alt "[_ imsld.waiting]" set image_title "[_ imsld.waiting]" set image_path "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]/resources/waiting.png" - set create_run " [_ imsld.create_new_run] " - set manage "[_ imsld.Manage_Members]" + set create_run " [_ imsld.create_new_run] " + set manage "[_ imsld.Manage_Members]" } stopped { set image_alt "[_ imsld.stopped]" set image_title "[_ imsld.stopped]" set image_path "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]/resources/completed.png" - set manage "[_ imsld.View_members] | [_ imsld.Monitor]" + set manage "[_ imsld.View_members] | [_ imsld.Monitor]" } } } 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 -N -r1.3 -r1.4 --- openacs-4/packages/imsld/www/admin/monitor/activity-frame.adp 29 May 2007 09:12:09 -0000 1.3 +++ openacs-4/packages/imsld/www/admin/monitor/activity-frame.adp 30 May 2007 08:36:22 -0000 1.4 @@ -1,20 +1,12 @@ @page_title;noquote@ @context;noquote@ - - - -#imsld.Hide# + +#imsld.Hide# -