Index: openacs-4/packages/assessment/www/asm-admin/results-session.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-session.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/assessment/www/asm-admin/results-session.adp	19 Jul 2006 13:58:13 -0000	1.4
+++ openacs-4/packages/assessment/www/asm-admin/results-session.adp	26 Sep 2006 00:22:46 -0000	1.5
@@ -2,55 +2,28 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<table width="100%" cellpadding="3" cellspacing="0" border="0">
-<tr>
-<th colspan="3" align=left>#assessment.Assessment#: @assessment_data.title@</th></tr>
-<tr><td nowrap><b>#assessment.User_ID#:</b> <span><if @show_username_p@><a href="@session_user_url@">@first_names@ @last_name@</a></if><else>#assessment.anonymous_name#</else></span></td>
-<td nowrap><b>#assessment.Attempt#:</b> <span>@session_attempt@<if @assessment_data.number_tries@ not nil> / @assessment_data.number_tries@</if></span></td>
-<td nowrap><if @assessment_data.survey_p@ ne t><b>#assessment.Percent_Score#:</b> <span>@assessment_score@</span></if></td></tr>
+<div class="result">
+<h1>@assessment_data.title@</h1>
+<p><span><b>#acs-subsite.Name#:</b> <if @show_username_p@><a href="@session_user_url@">@first_names@ @last_name@</a></if><else>#assessment.anonymous_name#</else></span>
+   <span><b>#assessment.Attempt#:</b> @session_attempt@<if @assessment_data.number_tries@ not nil> / @assessment_data.number_tries@</if></span>
+   <if @assessment_data.type@ ne survey><span><b>#assessment.Percent_Score#:</b> @assessment_score@</span></if>
+ <span><b>#assessment.Started#:</b> @session_start@</span>
+ <span><b>#assessment.Finished#:</b> @session_finish@</span>
+ <span><b>#assessment.Time_spent#:</b> @session_time@</span>
+</p>
 
-<tr><td><b>#assessment.Started#:</b> <span>@session_start@</span></td>
-<td><b>#assessment.Finished#:</b> <span>@session_finish@</font></td>
-<td><b>#assessment.Time_spent#:</b> <span>@session_time@</span></td></tr>
-<tr>
-<td colspan="3"></td>
-</tr>
-
-</table>
-<p>
-
-
-<table>
-<tr>
-<td>
 <multiple name="sections">
-
-<table cellspacing=0>
-<tr><td valign="top">#assessment.section# @sections.title@
+<div class="section">
+<h2>@sections.title@</h2>
 <if @sections.max_time_to_complete@ not nil> (#assessment.max_time# @sections.max_time_to_complete@) </if>
-<if @assessment_data.survey_p@ ne t> <if @showpoints@ eq 1>(@sections.points@ / @sections.max_points@ #assessment.points#) </if></if>
-</td></tr>
-
-<tr><td><i> @sections.description@ </i><br></td></tr>
-<tr><td>@sections.feedback_text@</td></tr>
-</table>      
-
-<blockquote>
-  <include src="/packages/assessment/lib/session-items" edit_p=1 section_id="@sections.section_id@" subject_id="@subject_id@" session_id="@session_id@" &assessment_data="assessment_data" show_item_name_p="@assessment_data.show_item_name_p@" show_feedback="@assessment_data.show_feedback@" survey_p="@assessment_data.survey_p@">
-</blockquote>
-
+<if @sections.description@ not nil><p>@sections.description@</p></if>
+<if @sections.feedback_text@ not nil><p>@sections.feedback_text@</p></if>
+<include src="/packages/assessment/lib/session-items" edit_p=1 section_id="@sections.section_id@" subject_id="@subject_id@" session_id="@session_id@" &assessment_data="assessment_data" show_item_name_p="@assessment_data.show_item_name_p@" show_feedback="@assessment_data.show_feedback@" survey_p="@assessment_data.survey_p@"></p>
+</div>
 </multiple>
-</td>
-<td>
-<include src="/packages/assessment/lib/actions-results" session_id="@session_id@">
-</td>
-</tr>
-</table>
 <hr>
-<if @assessment_data.survey_p@ ne t and @assessment_data.show_feedback@ ne none ><b>#assessment.Total_score#:</b> @session_score@ / @assessment_score@ = @percent_score@%</if>
-
+<if @assessment_data.type@ ne survey and @assessment_data.show_feedback@ ne none ><b>#assessment.Total_score#:</b> @session_score@ / @assessment_score@ = @percent_score@%</if>
 <if @comments_installed_p@>
 <include src="/packages/assessment/lib/comments-chunk" object_id="@session_id@" />
 </if>
-</master>
-
+</master>
\ No newline at end of file