Index: openacs-4/packages/assessment/lib/session.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/session.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/lib/session.adp	12 Jun 2006 12:17:10 -0000	1.1
@@ -0,0 +1,44 @@
+<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>@percent_score@</span></if></if> </td></tr>
+
+<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>
+
+
+<multiple name="sections">
+
+  <fieldset style="padding:10px;margin-bottom:10px"><!-- Section FieldSet -->
+    <legend><b>@sections.title@</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>
+
+
+  <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@">
+
+
+      </fieldset><!-- End Section FieldSet -->
+
+</multiple>
+</p>
+<p><include src="/packages/assessment/lib/actions-results" session_id="@session_id@"></p>
+
+<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>
Index: openacs-4/packages/assessment/lib/user-assessment.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/user-assessment.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/lib/user-assessment.tcl	20 Dec 2004 13:46:46 -0000	1.2
+++ openacs-4/packages/assessment/lib/user-assessment.tcl	12 Jun 2006 12:17:10 -0000	1.3
@@ -3,7 +3,7 @@
     
     testing background
     
-    @author Natalia P�rez (nperper@it.uc3m.es)
+    @author Natalia Pérez (nperper@it.uc3m.es)
     @creation-date 2004-11-24    
 } {
     
Index: openacs-4/packages/assessment/www/assessment.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/assessment.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/assessment.adp	12 Jun 2006 12:17:10 -0000	1.19
@@ -0,0 +1,2 @@
+<master>
+<include src="/packages/assessment/lib/assessment">
\ No newline at end of file
Index: openacs-4/packages/assessment/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/index.tcl,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/assessment/www/index.tcl	12 Jun 2006 02:49:51 -0000	1.15
+++ openacs-4/packages/assessment/www/index.tcl	12 Jun 2006 12:17:10 -0000	1.16
@@ -2,7 +2,7 @@
 
 	Lists all the assessments that can be taken and their sessions.
 
-	@author Eduardo P�rez Ureta (eperez@it.uc3m.es)
+	@author Eduardo Pérez Ureta (eperez@it.uc3m.es)
 	@creation-date 2004-09-03
 } {
 } -properties {
Index: openacs-4/packages/assessment/www/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/index.vuh,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/assessment/www/index.vuh	12 Jun 2006 12:17:10 -0000	1.1
@@ -0,0 +1,12 @@
+set path_info [ad_conn path_info]
+# set a list of includable pages that also may be used standalone
+# this way you can't get to just any includable page by tacking it onto
+# the url
+set valid_pages {assessment feedback finish session}
+if {![lsearch $valid_pages $path_info] \
+    || ![file exists "[acs_root_dir]/packages/assessment/lib/${path_info}.tcl"]} {
+    ns_returnnotfound
+}
+
+
+rp_internal_redirect /packages/assessment/lib/include 
\ No newline at end of file