Index: openacs-4/packages/lorsm/www/delivery/delivery-progress-bar.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/delivery-progress-bar.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/lorsm/www/delivery/delivery-progress-bar.adp 4 Dec 2006 02:43:43 -0000 1.3 +++ openacs-4/packages/lorsm/www/delivery/delivery-progress-bar.adp 4 Dec 2006 18:43:23 -0000 1.4 @@ -14,16 +14,15 @@ @include_content;noquote@ - +

Next

- + EXIT COURSE - - +
\ No newline at end of file Index: openacs-4/packages/lorsm/www/delivery/delivery-progress-bar.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/delivery-progress-bar.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/lorsm/www/delivery/delivery-progress-bar.tcl 4 Dec 2006 02:43:43 -0000 1.5 +++ openacs-4/packages/lorsm/www/delivery/delivery-progress-bar.tcl 4 Dec 2006 18:43:23 -0000 1.6 @@ -76,10 +76,11 @@ set prev_title [db_string get_title "select item_title from ims_cp_items where ims_item_id=:prev_item_id" -default ""] set next_title [db_string get_title "select item_title from ims_cp_items where ims_item_id=:next_item_id" -default ""] -set current_title [db_string get_title "select item_title from ims_cp_items where ims_item_id=:last_item_viewed" -default ""] +set current_title [db_string get_title "select item_title from ims_cp_items where ims_item_id=:item_id" -default ""] set progress_list [template::util::number_list [llength $item_list] 1] set progress_index [expr {$curr_index + 1}] +set last_item_p [expr {$curr_index == [expr {[llength $item_list] - 1}]}] if {[string match "*assessment*" $__include] && ![string match "*assessment/lib/session*" $__include]} { set show_next 0 } else { Index: openacs-4/packages/lorsm/www/delivery/record-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/www/delivery/record-view.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/lorsm/www/delivery/record-view.tcl 30 Nov 2006 17:28:11 -0000 1.9 +++ openacs-4/packages/lorsm/www/delivery/record-view.tcl 4 Dec 2006 18:43:23 -0000 1.10 @@ -50,8 +50,8 @@ # Get the item title set item_title [lorsm::delivery::get_ims_item_title -ims_item_id $revision_id] - -switch $type { +ns_log notice "lorsm record-viw.tcl type='${type}'" +switch -glob -- $type { as_sections { # FIXME stupidly assume that a section can only be in one assessment set section_item_id [string trimleft $href "/o/"] @@ -61,7 +61,7 @@ ad_returnredirect [export_vars -base assessment/assessment {assessment_id {single_section_id $section_id}}] ad_script_abort } - ::xowiki::Page { + ::xowiki::* { set form [rp_getform] ns_set delkey $form item_id rp_form_put template_file view-plain