Index: openacs-4/packages/assessment/www/session.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/session.adp,v
diff -u -r1.28 -r1.29
--- openacs-4/packages/assessment/www/session.adp	12 Jun 2006 02:49:51 -0000	1.28
+++ openacs-4/packages/assessment/www/session.adp	12 Jun 2006 03:02:38 -0000	1.29
@@ -2,52 +2,8 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context_bar">@context_bar;noquote@</property>
 
-<table width="100%" cellpadding="3" cellspacing="0" border="0">
-<tr>
-<th colspan="3" align=left>#assessment.Assessment#: <a href="assessment?assessment_id=@assessment_id@">@assessment_data.title@</a></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 @assessment_data.anonymous_p@ eq "t"><br />#assessment.lt_bNoteb_This_assessmen#</if></if><else>#assessment.anonymous_name#</else></span></td>
-<td nowrap><b>#assessment.Attempt#:</b> <span><a href="sessions?assessment_id=@assessment_id@&subject_id=@subject_id@">@session_attempt@</a><if @assessment_data.number_tries@ not nil> / @assessment_data.number_tries@</if></span></td>
-<td nowrap><if @assessment_data.survey_p@ ne t> <if @showpoints@ eq 1> <b>#assessment.Percent_Score#:</b>  <span>@assessment_score@</span></if></if> </td></tr>
+<include src="/packages/assessment/lib/session">
 
-<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@
-<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><if @assessment_data.show_feedback@ ne none>@sections.feedback_text@</if></td></tr>
-</table>      
-
-<blockquote>
-  <include src="/packages/assessment/lib/session-items" section_id="@sections.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@">
-</blockquote>
-
-</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 @comments_installed_p@>
 <include src="/packages/assessment/lib/comments-chunk" object_id="@session_id@" />
 </if>