Index: openacs-4/packages/assessment/lib/session-items.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/session-items.tcl,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/assessment/lib/session-items.tcl	2 Sep 2008 17:36:40 -0000	1.20
+++ openacs-4/packages/assessment/lib/session-items.tcl	1 Dec 2008 16:57:02 -0000	1.21
@@ -37,15 +37,15 @@
     {section_id:text(hidden) {value $section_id}}
 }
 set feedback_count 0
-db_multirow -extend { presentation_type html result_points feedback answered_p choice_orientation next_title next_pr_type num content has_feedback_p correct_p view} items session_items {} {
-
+set admin_package_url [ad_conn package_url]asm-admin/
+db_multirow -extend { presentation_type html result_points feedback answered_p choice_orientation next_as_item_id next_pr_type num content has_feedback_p correct_p view item_edit_general_url results_edit_url} items session_items {} {
     # build URLs
-    set item_edit_general_url [export_vars -base "asm-admin/item-edit-general" {as_item_id assessment_id section_id}]
-    set results_edit_url [export_vars -base "results-edit" {session_id section_id as_item_id}]
+    set item_edit_general_url [export_vars -base "${admin_package_url}item-edit-general" {as_item_id assessment_id section_id}]
+    set results_edit_url [export_vars -base "${admin_package_url}results-edit" {session_id section_id as_item_id}]
 
     set default_value [as::item_data::get -subject_id $subject_id -as_item_id $as_item_id -session_id $session_id]
     array set item [as::item::item_data -as_item_id $as_item_id]
-
+    
     set presentation_type [as::item_form::add_item_to_form -name session_results_$section_id -section_id $section_id -item_id $as_item_id -session_id $session_id -default_value $default_value -show_feedback $show_feedback -random_p $assessment_data(random_p)]
 
     if {$presentation_type == "fitb"} {
@@ -79,7 +79,7 @@
 		set correct_p 0
 		if {$show_feedback != "correct"} {
 		    if { $feedback_wrong ne "" } {
-			set feedback "<font color=red>$feedback_wrong</font>"
+			set feedback "<span style=\"color:red\">$feedback_wrong</span>"
 			set has_feedback_p 1
 		    } else {
 			set feedback ""
@@ -89,7 +89,7 @@
 		set correct_p 1
 		if {$show_feedback ne "incorrect"} {
 		    if { $feedback_right ne "" } {
-			set feedback "<font color=green>$feedback_right</font>"
+			set feedback "<span style=\"color:green\">$feedback_right</span>"
 			set has_feedback_p 1
 		    } else {
 			set feedback ""
@@ -110,7 +110,7 @@
 			set correct_p 0
 			if {$show_feedback != "correct"} {
 			    if { $feedback_wrong ne "" } {
-				set feedback "<font color=red>$feedback_wrong</font>"
+				set feedback "<span style=\"color:red\">$feedback_wrong</span>"
 				set has_feedback_p 1
 			    } else {
 				set feedback ""
@@ -119,7 +119,7 @@
 		    } else {
 			if {$show_feedback != "incorrect"} {
 			    if { $feedback_right ne "" } {
-				set feedback "<font color=green>$feedback_right</font>"
+				set feedback "<span style=\"color:green\">$feedback_right</span>"
 				set has_feedback_p 1
 			    } else {
 				set feedback ""
@@ -145,7 +145,7 @@
 		    if { !$correct_p } {
 			if {$show_feedback != "correct"} {
 			    if { $feedback_wrong ne "" } {
-				set feedback "<font color=red>$feedback_wrong</font>"
+				set feedback "<span style=\"color:red\">$feedback_wrong</span>"
 				set has_feedback_p 1
 			    } else {
 				set feedback ""
@@ -154,7 +154,7 @@
 		    } else {
 			if {$show_feedback != "incorrect"} {
 			    if { $feedback_right ne "" } {
-				set feedback "<font color=green>$feedback_right</font>"
+				set feedback "<span style=\"color:green\">$feedback_right</span>"
 				set has_feedback_p 1
 			    } else {
 				set feedback ""
@@ -193,13 +193,13 @@
     set this(num) $counter
     if {$i < ${items:rowcount}} {
 	upvar 0 items:$j next
-	set this(next_title) $next(title)
+	set this(next_as_item_id) $next(as_item_id)
 	set this(next_pr_type) $next(presentation_type)
-	if {$this(title) != $next(title)} {
+	if {$this(as_item_id) != $next(as_item_id)} {
 	    incr counter
 	}
     } else {
-	set this(next_title) ""
+	set this(next_as_item_id) ""
 	set this(next_pr_type) ""
     }
 }