Index: openacs-4/packages/assessment/lib/assessment.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/assessment.tcl,v
diff -u -r1.18.2.2 -r1.18.2.3
--- openacs-4/packages/assessment/lib/assessment.tcl	2 Feb 2007 17:07:35 -0000	1.18.2.2
+++ openacs-4/packages/assessment/lib/assessment.tcl	5 Feb 2007 14:10:42 -0000	1.18.2.3
@@ -237,6 +237,7 @@
 	# for sections with a limited number of items per page
 	if {![empty_string_p $display(num_items)] && $page_total > 1} {
 	    set progress_bar_list [template::util::number_list $page_total 1]
+	    set total_pages [llength $progress_bar_list]
 	}
 	if {![info exists show_progress]} {
 	    set show_progress 0
@@ -245,6 +246,7 @@
 	if {![info exists progress_bar_list] && [llength $section_list] > 1} {
 	    set progress_bar_list [template::util::number_list [llength $section_list] 1]
 	    set current_page [expr {[lsearch $section_list $section_id] +1 }]
+	    set total_pages [llength $progress_bar_list]
 	}
     }
 }
@@ -309,7 +311,7 @@
 	set section_order $new_section_order
 	set item_order $new_item_order
 #	ad_returnredirect [export_vars -base assessment {assessment_id session_id section_order item_order password return_url next_asm section_id item_id_list:multiple single_section_id}]
-	ad_returnredirect [export_vars -base feedback {assessment_id session_id section_order item_order password return_url next_asm section_id item_id_list:multiple}]
+	ad_returnredirect [export_vars -base feedback {assessment_id session_id section_order item_order password return_url next_asm section_id item_id_list:multiple total_pages current_page}]
 	ad_script_abort
     } else {
 	# calculate session points at end of session
@@ -324,7 +326,7 @@
 	} else {
 	    set return_url $assessment_data(return_url)
 	}
-	ad_returnredirect [export_vars -base feedback {assessment_id session_id section_id return_url {return_p 1} item_id_list:multiple }]
+	ad_returnredirect [export_vars -base feedback {assessment_id session_id section_id return_url {return_p 1} item_id_list:multiple total_pages current_page}]
 	ad_script_abort
     }
 }
@@ -428,7 +430,7 @@
 	set after_submit "{
         
 \#	ad_returnredirect \[export_vars -base assessment {assessment_id session_id section_order item_order password return_url next_asm section_id item_id_list:multiple single_section_id}\]
-	ad_returnredirect \[export_vars -base feedback {assessment_id session_id section_order item_order password return_url next_asm section_id item_id_list:multiple single_section_id}\]
+	ad_returnredirect \[export_vars -base feedback {assessment_id session_id section_order item_order password return_url next_asm section_id item_id_list:multiple single_section_id total_pages current_page}\]
 	    ad_script_abort
 	}"
 	
@@ -530,7 +532,7 @@
             }
 	    set item_order \$new_item_order
 \#	ad_returnredirect \[export_vars -base assessment {assessment_id session_id section_order item_order password return_url next_asm section_id item_id_list:multiple single_section_id}\]
-	ad_returnredirect \[export_vars -base feedback {assessment_id session_id section_order item_order password return_url next_asm section_id item_id_list:multiple nxt_url}\]
+	ad_returnredirect \[export_vars -base feedback {assessment_id session_id section_order item_order password return_url next_asm section_id item_id_list:multiple nxt_url total_pages current_page}\]
 	    ad_script_abort
 	} else {
 	    # calculate session points at end of session
@@ -545,7 +547,7 @@
 	} else {
 	    set return_url \$assessment_data(return_url)
 	}
-	ad_returnredirect \[export_vars -base feedback {assessment_id session_id section_id return_url {return_p 1} item_id_list:multiple }\]
+	ad_returnredirect \[export_vars -base feedback {assessment_id session_id section_id return_url {return_p 1} item_id_list:multiple total_pages current_page}\]
 	    ad_script_abort
 	}
     }"
@@ -591,7 +593,7 @@
 	    set section_order $new_section_order
 	    set item_order $new_item_order
 \#	ad_returnredirect [export_vars -base assessment {assessment_id session_id section_order item_order password return_url next_asm section_id item_id_list:multiple single_section_id}]
-	    ad_returnredirect [export_vars -base feedback {assessment_id session_id section_order item_order password return_url next_asm section_id item_id_list:multiple next_url}]
+	    ad_returnredirect [export_vars -base feedback {assessment_id session_id section_order item_order password return_url next_asm section_id item_id_list:multiple next_url total_pages current_page}]
 	    ad_script_abort
 	} else {
 	    # calculate session points at end of session
@@ -607,12 +609,13 @@
 		set return_url $assessment_data(return_url)
 	    }
 #	ad_returnredirect [export_vars -base assessment {assessment_id session_id section_order item_order password return_url next_asm section_id item_id_list:multiple single_section_id}]
-	    ad_returnredirect [export_vars -base feedback {assessment_id session_id section_id return_url {return_p 1} item_id_list:multiple next_url}]
+	    ad_returnredirect [export_vars -base feedback {assessment_id session_id section_id return_url {return_p 1} item_id_list:multiple next_url total_pages current_page}]
 	    ad_script_abort
 	}
     }
 }
 
 set form_is_submit [template::form::is_submission show_item_form]
 set form_is_valid [template::form::is_valid show_item_form]
-ad_return_template $template
\ No newline at end of file
+ad_return_template $template
+
Index: openacs-4/packages/assessment/lib/feedback.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/feedback.adp,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/assessment/lib/feedback.adp	27 Jun 2006 19:11:40 -0000	1.3
+++ openacs-4/packages/assessment/lib/feedback.adp	5 Feb 2007 14:10:42 -0000	1.3.2.1
@@ -1,7 +1,19 @@
+<property name="title">@assessment_data.html_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
-  <property name="title">@assessment_data.html_title;noquote@</property>
-  <property name="context">@context;noquote@</property>
+<if @assessment_data.html_title@ not nil><h2>@assessment_data.html_title;noquote@: Feedback</h2></if>
 
+<if @total_pages@ defined>
+  <include src="/packages/assessment/lib/progress-bar" total="@total_pages@" current="@current_page@" />
+</if>
+
+<fieldset style="padding:10px;margin-bottom:10px"><!-- Section FieldSet -->
+  <legend><b>@section_title@</b></legend>
+
   <include src="/packages/assessment/lib/session-items" section_id="@section_id@" subject_id="@subject_id@" session_id="@session_id@" show_item_name_p="@assessment_data.show_item_name_p@" show_feedback="@assessment_data.show_feedback@" survey_p="@assessment_data.survey_p@" feedback_only_p="1" next_url="@next_url;noquote@" item_id_list=@item_id_list@ return_p=@return_p@  &=assessment_data>
+
   <p />
-  <a href="@next_url;noquote@" class="button">Next</a>
\ No newline at end of file
+
+  <a href="@next_url;noquote@" class="button">Next</a>
+
+</fieldset><!-- End Section FieldSet -->
Index: openacs-4/packages/assessment/lib/feedback.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/feedback.tcl,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/assessment/lib/feedback.tcl	12 Jul 2006 07:05:04 -0000	1.5
+++ openacs-4/packages/assessment/lib/feedback.tcl	5 Feb 2007 14:10:42 -0000	1.5.2.1
@@ -21,6 +21,8 @@
     {item_id_list:multiple,optional {}}
     {next_url ""}
     no_complaint:optional
+    total_pages:optional
+    current_page:optional
 } -properties {
 } -validate {
 } -errors {
@@ -34,6 +36,9 @@
 set page_title "[_ assessment.Show_Items]"
 set context [list $page_title]
 ns_log notice "feedback.tcl '${next_url}' '${return_url}'"
+
+set section_title [db_string section_title "select title from cr_revisions where revision_id=:section_id"]
+
 if { $next_url eq "" } {
     if { $return_p && [exists_and_not_null return_url] } {
 	set next_url $return_url
Index: openacs-4/packages/assessment/lib/session-items.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/session-items.adp,v
diff -u -r1.12.2.1 -r1.12.2.2
--- openacs-4/packages/assessment/lib/session-items.adp	26 Jan 2007 00:33:57 -0000	1.12.2.1
+++ openacs-4/packages/assessment/lib/session-items.adp	5 Feb 2007 14:10:42 -0000	1.12.2.2
@@ -2,16 +2,20 @@
     <if @items:rowcount@ eq 0>
       #assessment.not_answered#
     </if>
-<ul>
+
     <multiple name="items">
-<li><if @feedback_only_p@ eq 0 or @items.has_feedback_p@ eq 1>
+<if @feedback_only_p@ eq 0 or @items.has_feedback_p@ eq 1>
      <if @show_item_name_p@ eq t><b>@items.name@:</b></if>
       <if @survey_p@ ne t and @items.title@ ne @items.next_title@>
 	<if @items.max_time_to_complete@ not nil> (#assessment.max_time# @items.max_time_to_complete@) </if>
 	    </b>
       </if>
      </if>
 
+<div class="feedback-message"><if @items.correct_p@ eq 1>
+<if @show_feedback@ eq correct or @show_feedback@ eq all><div class="right">@items.feedback_right;noquote@</div></if></if>
+	    <if @items.correct_p@ eq 0><if @show_feedback@ eq all or @show_feedback@ eq incorrect><div class="wrong">@items.feedback_wrong;noquote@</div></if></if>
+</div>
 	  <if @items.presentation_type@ ne fitb>
 	    <b>@items.title;noquote@</b>
 	     @items.content;noquote@
@@ -22,12 +26,11 @@
 		<if @survey_p@ ne t>
 		  <if @items.title@ eq @items.next_title@ or @items.groupnum@ gt 1>
 		    <if @items.presentation_type@ eq @items.next_pr_type@ or @items.choice_orientation@ eq horizontal>
-		      <if @items.result_points@ not nil><br><b>@items.result_points@ / @items.points@ #assessment.points#
+
 			    <if @show_feedback@ ne none>
 			      <if @items.feedback@ not nil>:<br>@items.feedback;noquote@</if>
 			    </if>
-			  </b>
-		      </if>
+		      <~--- fixme --->
 		      <else>
 			<if @items.answered_p@ eq t><br><b>#assessment.not_yet_reviewed#</b> </if>
 			<else><br><b>#assessment.not_answered#</b> </else>
@@ -82,14 +85,10 @@
     </group>
 </if>
 
-	    <if @items.correct_p@ eq 1><if @show_feedback@ eq correct or @show_feedback@ eq all>@items.feedback_right;noquote@</if></if>
-	    <if @items.correct_p@ eq 0><if @show_feedback@ eq all or @show_feedback@ eq incorrect>@items.feedback_wrong;noquote@</if></if>
-<ul> <include src="/packages/assessment/lib/results-messages" session_id="@session_id@" section_id="@section_id@" as_item_id="@items.as_item_id@" &=assessment>	    <if @edit_p@ eq 1 and @items.answered_p@ eq t><li><a href="results-edit?session_id=@session_id@&section_id=@section_id@&as_item_id=@items.as_item_id@">#assessment.Add_Comment#</a></li></if>
-<!-- FIXME TODO move points to indented block with comments -->
-	    <if @assessment_data.type@ ne survey and @items.result_points@ not nil and @showpoints@ eq 1><li><b>@items.result_points@ / @items.points@ #assessment.points#</b></li></if>
+<ul> <include src="/packages/assessment/lib/results-messages" session_id="@session_id@" section_id="@section_id@" as_item_id="@items.as_item_id@" &=assessment>    <if @edit_p@ eq 1 and @items.answered_p@ eq t><li><a href="results-edit?session_id=@session_id@&section_id=@section_id@&as_item_id=@items.as_item_id@">#assessment.Add_Comment#</a></li></if>
+	    <if @feedback_only_p@ ne "t" and @assessment_data.type@ ne survey and @items.result_points@ not nil and @showpoints@ eq 1><li><b>@items.result_points@ / @items.points@ #assessment.points#</b></li></if>
 </ul>
-</li>
 <hr>
 </multiple>
-</ul>
+
 </formtemplate>
Index: openacs-4/packages/assessment/lib/session.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/session.adp,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/assessment/lib/session.adp	26 Sep 2006 00:22:44 -0000	1.5
+++ openacs-4/packages/assessment/lib/session.adp	5 Feb 2007 14:10:42 -0000	1.5.2.1
@@ -22,10 +22,9 @@
 <multiple name="sections">
 
   <fieldset style="padding:10px;margin-bottom:10px"><!-- Section FieldSet -->
-    <legend><b>@sections.title@</b></legend>
+    <legend><b>@sections.title@   <if @assessment_data.survey_p@ ne t> <if @showpoints@ eq 1>(@sections.points@ / @sections.max_points@ #assessment.points#)</p></if> </if></b></legend>
 
   <if @sections.max_time_to_complete@ not nil><p>(#assessment.max_time# @sections.max_time_to_complete@)</p></if>
-  <if @assessment_data.survey_p@ ne t> <if @showpoints@ eq 1><p>(@sections.points@ / @sections.max_points@ #assessment.points#)</p></if> </if>
 
     <if @sections.description@ not nil><p>@sections.description;noquote@</p></if>    
     <if @assessment_data.show_feedback@ ne none><p>@sections.feedback_text@</p></if>
Index: openacs-4/packages/assessment/www/feedback.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/feedback.adp,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/assessment/www/feedback.adp	12 Jun 2006 12:20:17 -0000	1.1
+++ openacs-4/packages/assessment/www/feedback.adp	5 Feb 2007 14:10:42 -0000	1.1.2.1
@@ -1,2 +1,5 @@
 <master>
+<property name="header_stuff">
+      <link rel="stylesheet" type="text/css" href="/resources/assessment/assessment.css" media="all">
+</property>
 <include src="/packages/assessment/lib/feedback">
\ No newline at end of file
Index: openacs-4/packages/assessment/www/session.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/session.adp,v
diff -u -r1.30 -r1.30.2.1
--- openacs-4/packages/assessment/www/session.adp	12 Jun 2006 19:25:40 -0000	1.30
+++ openacs-4/packages/assessment/www/session.adp	5 Feb 2007 14:10:42 -0000	1.30.2.1
@@ -1,5 +1,7 @@
 <master>
 <property name="title">@page_title;noquote@</property>
 <property name="context_bar">@context_bar;noquote@</property>
-
+<property name="header_stuff">
+      <link rel="stylesheet" type="text/css" href="/resources/assessment/assessment.css" media="all">
+</property>
 <include src="/packages/assessment/lib/session">