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 -r1.13
--- openacs-4/packages/assessment/lib/session-items.adp	26 Sep 2006 00:22:44 -0000	1.12
+++ openacs-4/packages/assessment/lib/session-items.adp	15 May 2007 20:14:16 -0000	1.13
@@ -2,32 +2,36 @@
     <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 @admin_p@><p><a href="asm-admin/item-edit-general?as_item_id=@items.as_item_id@&assessment_id=@assessment_id@&section_id=@items.section_id@" target="_new">Edit this question</a></p></if>
+<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@
+	     @items.content;noquote@
 <br />
 	</if>
 	    <group column=title>
 	      <td valign=top>@items.description;noquote@
 		<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>
@@ -81,14 +85,11 @@
 	  </if>
     </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>