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.4
--- openacs-4/packages/assessment/lib/feedback.adp	27 Jun 2006 19:11:40 -0000	1.3
+++ openacs-4/packages/assessment/lib/feedback.adp	15 May 2007 20:14:15 -0000	1.4
@@ -1,7 +1,18 @@
+<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@" finished_page="@finished_page@"/>
+</if>
+
+  <h2>@section_title@</h2>
+
   <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
+
+	<formtemplate id="next"></formtemplate>
+
+