Index: openacs-4/packages/evaluation/catalog/evaluation.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/catalog/evaluation.en_US.ISO-8859-1.xml,v
diff -u -r1.25 -r1.26
--- openacs-4/packages/evaluation/catalog/evaluation.en_US.ISO-8859-1.xml	14 Mar 2008 11:19:35 -0000	1.25
+++ openacs-4/packages/evaluation/catalog/evaluation.en_US.ISO-8859-1.xml	14 Mar 2008 16:22:09 -0000	1.26
@@ -320,7 +320,7 @@
   <msg key="lt_Grade_students_using_">Grade students using generated file:</msg>
   <msg key="lt_Grade_students_using_file">Grade students using generated file:</msg>
   <msg key="lt_Grade_students_with_0">Grade students with 0</msg>
-  <msg key="lt_Grades_Report_for_stu">Grades Report for $student_name </msg>
+  <msg key="lt_Grades_Report_for_stu">Grades Report for %student_name%</msg>
   <msg key="lt_Grades_report_of_stud">Grade report for &quot;%student_name%&quot;</msg>
   <msg key="lt_Grades_Sheet_Explanat">Grades Sheet Explanation </msg>
   <msg key="lt_Grades_sheet_for_assi">Grades sheet for assighment &quot;%task_name%&quot;</msg>
@@ -345,7 +345,7 @@
   <msg key="lt_No_group_for_student_">No group for student </msg>
   <msg key="lt_No_I_want_to_cancel_m">No, I want to cancel my request </msg>
   <msg key="lt_No_portrait_for_party">No portrait for $party_name </msg>
-  <msg key="lt_No_portrait_for_stude">No portrait for $student_name </msg>
+  <msg key="lt_No_portrait_for_stude">No portrait for %student_name%</msg>
   <msg key="lt_Notification_for_assi">Notification for assignments </msg>
   <msg key="lt_Notification_for_eval">Notification for evaluations </msg>
   <msg key="lt_Number_of_members_for">Number of members for this task:</msg>
Index: openacs-4/packages/evaluation/catalog/evaluation.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/catalog/evaluation.es_ES.ISO-8859-1.xml,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/evaluation/catalog/evaluation.es_ES.ISO-8859-1.xml	14 Mar 2008 11:19:35 -0000	1.9
+++ openacs-4/packages/evaluation/catalog/evaluation.es_ES.ISO-8859-1.xml	14 Mar 2008 16:22:09 -0000	1.10
@@ -367,7 +367,7 @@
   <msg key="lt_No_I_want_to_cancel_m">No, quiero cancelar mi solicitud
 </msg>
   <msg key="lt_No_portrait_for_party">No hay foto para $party_name</msg>
-  <msg key="lt_No_portrait_for_stude">No hay foto para $student_name</msg>
+  <msg key="lt_No_portrait_for_stude">No hay foto para %student_name%</msg>
   <msg key="lt_Notification_for_assi">Notificaci�n para asignaciones </msg>
   <msg key="lt_Notification_for_eval">Notificaci�n para evaluaciones   </msg>
   <msg key="lt_Number_of_members_for">Numero de miembros para esta tarea:
Index: openacs-4/packages/evaluation/www/answer-add-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/answer-add-edit.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/answer-add-edit.adp	28 Apr 2004 11:06:41 -0000	1.1
+++ openacs-4/packages/evaluation/www/answer-add-edit.adp	14 Mar 2008 16:22:09 -0000	1.2
@@ -2,4 +2,4 @@
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
-<p><formtemplate id="answer"></formtemplate></p>
+<formtemplate id="answer"></formtemplate>
Index: openacs-4/packages/evaluation/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/index.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/evaluation/www/index.adp	14 Mar 2008 14:57:35 -0000	1.11
+++ openacs-4/packages/evaluation/www/index.adp	14 Mar 2008 16:22:09 -0000	1.12
@@ -3,7 +3,7 @@
 <property name="context">@context;noquote@</property>
 
 <if @admin_p@ eq 1>
-	<a href=admin/index>#evaluation.Evaluations_Admin#</a>
+	<a href="admin/index">#evaluation.Evaluations_Admin#</a>
 </if>
 
 <h2>#evaluation.Assignments#</h2><br>
Index: openacs-4/packages/evaluation/www/admin/evaluations/student-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/student-list.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/evaluation/www/admin/evaluations/student-list.adp	14 Mar 2008 12:33:59 -0000	1.12
+++ openacs-4/packages/evaluation/www/admin/evaluations/student-list.adp	14 Mar 2008 16:22:09 -0000	1.13
@@ -9,7 +9,7 @@
 <table>
 <tr>
 	<td class="blue"><b>#evaluation.name#:</b></td>
-	<td class="blue">@task_name@&nbsp;<a class="tlmidnav" href=@task_admin_url@><b>(#evaluation.edit#)</b></a></td>
+	<td class="blue">@task_name@&nbsp;<a class="tlmidnav" href="@task_admin_url@"><b>(#evaluation.edit#)</b></a></td>
 </tr>
 <tr>
 	<td class="blue"><b>#evaluation.Due_Date#:</b></td>
@@ -35,7 +35,7 @@
 <if @number_of_members@ eq "1">
 
  < if @show_portrait_p@ eq "f">
-	<td class="blue"><b>#evaluation.view_portraits#</b></td><td class="blue"><b>(<a href=@this_url@>#evaluation.yes_#</b></a>/#evaluation.no_#<b>)</b></td>
+	<td class="blue"><b>#evaluation.view_portraits#</b></td><td class="blue"><b>(<a href="@this_url@">#evaluation.yes_#</b></a>/#evaluation.no_#<b>)</b></td>
 < /if><else>
 	<td class="blue"><b>#evaluation.view_portraits#</b></td><td class="blue"><b>(</b>#evaluation.yes_#/<b><a href=@this_url@>#evaluation.no_#</a>)</b></td>
  < /else >
@@ -62,7 +62,7 @@
 </if>
 <else>
 
-<table align="center">
+<table style="text-align:center">
 <tr>
 	<th>#evaluation.Task_Name#</th>
 	<td>@task_name@</td>
@@ -111,38 +111,38 @@
 </else>
 <if @not_evaluated_wa:rowcount@ gt 0>
 <if @simple_p@ eq 0>
-<p>#evaluation.Click# <a href=download-archive/?task_id=@task_id@>#evaluation.here#</a> #evaluation.lt_if_you_want_to_downlo#</p>
+<p>#evaluation.Click# <a href="download-archive/?task_id=@task_id@">#evaluation.here#</a> #evaluation.lt_if_you_want_to_downlo#</p>
 <if @number_of_members@ eq "1">
  <if @show_portrait_p@ eq "t">
-	<p>#evaluation.Click# <a href=@this_url@> #evaluation.here# </a> #evaluation.lt_if_you_do_not_want_to#</p>
+	<p>#evaluation.Click# <a href="@this_url@"> #evaluation.here# </a> #evaluation.lt_if_you_do_not_want_to#</p>
  </if><else>
-	<p>#evaluation.Click# <a href=@this_url@> #evaluation.here# </a> #evaluation.lt_if_you_want_to_see_th#</p>
+	<p>#evaluation.Click# <a href="@this_url@"> #evaluation.here# </a> #evaluation.lt_if_you_want_to_see_th#</p>
  </else>
 </if><else>
 <p>#evaluation.If#</p>
 </else>
 </if>
 <form action="evaluate-students" method="post">
-    <input type=hidden name=task_id value="@task_id@">
-    <input type=hidden name=grade_id value="@grade_id@">
+    <div><input type=hidden name=task_id value="@task_id@"></div>
+    <div><input type=hidden name=grade_id value="@grade_id@"></div>
 	<blockquote>
 	<listtemplate name="not_evaluated_wa"></listtemplate>
     <if @simple_p@ eq 1>
 	<br>
-    	<input type=image src="/resources/evaluation/submit.gif">
+    	<div><input type=image src="/resources/evaluation/submit.gif"></div>
     </if>
     <else>
-    <input type=submit value="#evaluation.Grade_1#">
+    <div><input type=submit value="#evaluation.Grade_1#"></div>
     </else>
-    <input type=submit value="#evaluation.Grade_1#">
+    <div><input type=submit value="#evaluation.Grade_1#"></div>
     </else>
     </blockquote>
 </form>
 <blockquote>
 <if @simple_p@ eq 0>
   <form name="grades_sheet_form" enctype="multipart/form-data" method="POST" action="grades-sheet-parse.tcl">  
-    <input type="hidden" name="grades_sheet_item_id" value=@grades_sheet_item_id@> 
-    <input type="hidden" name="task_id" value=@task_id@> 
+    <div><input type="hidden" name="grades_sheet_item_id" value=@grades_sheet_item_id@></div>
+    <div><input type="hidden" name="task_id" value=@task_id@></div>
        <table> 
           <tr> 
           <th style="text-align:right;">#evaluation.lt_Grade_students_using_#</th> 
@@ -163,8 +163,8 @@
 <li class="arrow"><text class="blue">#evaluation.upload_graded##evaluation.students_ready#</text>
 <blockquote>
   <form name="grades_sheet_form" enctype="multipart/form-data" method="POST" action="grades-sheet-parse.tcl">  
-    <input type="hidden" name="grades_sheet_item_id" value=@grades_sheet_item_id@> 
-    <input type="hidden" name="task_id" value=@task_id@> 
+    <div><input type="hidden" name="grades_sheet_item_id" value=@grades_sheet_item_id@></div>
+    <div><input type="hidden" name="task_id" value=@task_id@></div>
        <table> 
           <tr> 
           <th style="text-align:right;"><text class="blue">#evaluation.lt_Grade_students_using_#</text></th> 
@@ -215,7 +215,7 @@
 </else>
 </if>
 <form action="evaluate-students" method="post">
-    <input type=hidden name=task_id value=@task_id@>
+    <div><input type=hidden name=task_id value=@task_id@></div>
 	<blockquote>
 	<listtemplate name="not_evaluated_na"></listtemplate>
 	<table width="100%">
@@ -233,8 +233,8 @@
 <blockquote>
 <if @simple_p@ eq 0>
   <form name="grades_sheet_form" enctype="multipart/form-data" method="POST" action="grades-sheet-parse.tcl">  
-    <input type="hidden" name="grades_sheet_item_id" value="@grades_sheet_item_id@"> 
-    <input type="hidden" name="task_id" value=@task_id@> 
+    <div><input type="hidden" name="grades_sheet_item_id" value="@grades_sheet_item_id@"></div>
+    <div><input type="hidden" name="task_id" value=@task_id@></div>
        <table> 
           <tr> 
           <th style="text-align:right;">#evaluation.lt_Grade_students_using_#</th> 
@@ -258,8 +258,8 @@
 <blockquote>
 
   <form name="grades_sheet_form" enctype="multipart/form-data" method="POST" action="grades-sheet-parse.tcl">  
-    <input type="hidden" name="grades_sheet_item_id" value="@grades_sheet_item_id@"> 
-    <input type="hidden" name="task_id" value=@task_id@> 
+    <div><input type="hidden" name="grades_sheet_item_id" value="@grades_sheet_item_id@"></div>
+    <div><input type="hidden" name="task_id" value=@task_id@></div>
        <table> 
           <tr> 
           <th style="text-align:right;"><text class="blue">#evaluation.lt_Grade_students_using_#</text></th> 
@@ -301,8 +301,8 @@
 </else>
 
 <form action="evaluate-students" method="post">
-    <input type=hidden name=task_id value="@task_id@">
-    <input type=hidden name=grade_id value="@grade_id@">
+    <div><input type=hidden name=task_id value="@task_id@"></div>
+    <div><input type=hidden name=grade_id value="@grade_id@"></div>
 	<blockquote>
 	<listtemplate name="class_students"></listtemplate>
 	<if @simple_p@ eq 1>
@@ -315,15 +315,15 @@
 	</table>
         </if>
 	<else>
-	    <input type=submit value="#evaluation.Grade_1#">
-            <input type=checkbox name="grade_all">#evaluation.lt_Grade_students_with_0#
+	    <div><input type=submit value="#evaluation.Grade_1#"></div>
+        <div><input type=checkbox name="grade_all">#evaluation.lt_Grade_students_with_0#</div>
 	</else>
     </blockquote>
 </form>
 <if @simple_p@ eq 0>
   <form name="grades_sheet_form" enctype="multipart/form-data" method="POST" action="grades-sheet-parse.tcl">  
-    <input type="hidden" name="grades_sheet_item_id" value=@grades_sheet_item_id@> 
-    <input type="hidden" name="task_id" value=@task_id@> 
+    <div><input type="hidden" name="grades_sheet_item_id" value=@grades_sheet_item_id@></div>
+    <div><input type="hidden" name="task_id" value=@task_id@></div>
        <table> 
           <tr> 
           <th style="text-align:right;">#evaluation.lt_Grade_students_using_#</th> 
@@ -368,6 +368,3 @@
 </else>
 <br>
 </else>
-
-
-
Index: openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl,v
diff -u -r1.24 -r1.25
--- openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl	14 Mar 2008 12:33:59 -0000	1.24
+++ openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl	14 Mar 2008 16:22:09 -0000	1.25
@@ -57,13 +57,13 @@
 set due_date_pretty  [lc_time_fmt $due_date_ansi "%q %r"]
 
 if { $number_of_members > 1 } {
-    set groups_admin "<a href=[export_vars -base ../groups/one-task { task_id }]>[_ evaluation.lt_Groups_administration]</a>"
+    set groups_admin "<a href=\"[export_vars -base ../groups/one-task { task_id }]\">[_ evaluation.lt_Groups_administration]</a>"
 } else {
     set groups_admin ""
 }
 set task_admin_url "[export_vars -base ../tasks/task-add-edit { task_id grade_id return_url }]"
 
-set task_admin "<a href=[export_vars -base ../tasks/task-add-edit { task_id grade_id return_url }]>[_ evaluation.lt_task_name_administrat]</a>"
+set task_admin "<a href=\"[export_vars -base ../tasks/task-add-edit { task_id grade_id return_url }]\">[_ evaluation.lt_task_name_administrat]</a>"
 
 set done_students [list]
 set evaluation_mode "display"
@@ -80,7 +80,7 @@
 #
 
 
-set actions "<a class=\"tlmidnav\" href=evaluations-edit?task_id=$task_id&grade_id=$grade_id\><img src=\"/resources/evaluation/cross.gif\" width=\"10\" height=\"9\" hspace=\"5\" vspace=\"1\" style=\"border:0px\" alt=\"\" align=\"absmiddle\">[_ evaluation.Edit_Evaluations_]</a>"
+set actions "<a class=\"tlmidnav\" href=\"evaluations-edit?task_id=$task_id&grade_id=$grade_id\"><img src=\"/resources/evaluation/cross.gif\" width=\"10\" height=\"9\" hspace=\"5\" vspace=\"1\" style=\"border:0px\" alt=\"\" align=\"absmiddle\">[_ evaluation.Edit_Evaluations_]</a>"
 
 if { !$simple_p } {
     set bulk_actions [list "[_ evaluation.Edit_Evaluations_]" [export_vars -base "evaluations-edit" { task_id }]]  
@@ -193,11 +193,11 @@
 	    } else {
 		# we assume it's a file
 		set action_url "[export_vars -base "../../view/$answer_title" { revision_id }]"
-		set action "<a href=$action_url target=new>[_ evaluation.View_answer_]</a>"
+		set action "<a href=\"$action_url\">[_ evaluation.View_answer_]</a>"
 	    }
 
 	    if { [string eq $action "[_ evaluation.View_answer_]"] && ([db_string compare_evaluation_date { *SQL* } -default 0] ) } {
-		set action "<a href=$action_url target=new><span style=\"color:red;\"> [_ evaluation.View_NEW_answer_]</span></a>"
+		set action "<a href=\"$action_url\"><span style=\"color:red;\"> [_ evaluation.View_NEW_answer_]</span></a>"
 	    }
 	    set submission_date_pretty [lc_time_fmt $submission_date_ansi "%q %r"]
 	    if { [db_string compare_submission_date { *SQL* } -default 0] } {
@@ -211,7 +211,7 @@
     if {[string eq $forums_related_p "t"]} {
 
 	set action_url [export_vars -base "../../../forums/user-history" {{user_id $party_id} {view "forum"}}]
-	set action "<a href=$action_url target=new>[_ evaluation.view_post]</a>"
+	set action "<a href=\"$action_url\">[_ evaluation.view_post]</a>"
     }
     
 } 
@@ -250,7 +250,7 @@
 	 orderby_desc {submission_date_ansi desc}]
 lappend elements answer \
     [list label "[_ evaluation.answer]" \
-	 display_template {<a href=@not_evaluated_wa.answer_url@ target=new>@not_evaluated_wa.answer@</a>} \
+	 display_template {<a href="@not_evaluated_wa.answer_url@">@not_evaluated_wa.answer@</a>} \
 	 link_html { title "[_ evaluation.View_answer_]"}] 
 lappend elements grade \
     [list label "[_ evaluation.Grade] <if @simple_p@ eq 0><input type=text name=\"max_grade\" maxlength=\"6\" size=\"3\" value=\"$max_grade\"><\/if><else><input type=hidden name=max_grade value=$max_grade></else>" \
Index: openacs-4/packages/evaluation/www/admin/grades/grades-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-delete.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/evaluation/www/admin/grades/grades-delete.tcl	8 Aug 2006 21:26:42 -0000	1.9
+++ openacs-4/packages/evaluation/www/admin/grades/grades-delete.tcl	14 Mar 2008 16:22:10 -0000	1.10
@@ -21,6 +21,6 @@
 
 db_1row get_grade_info { *SQL* }
 
-set export_vars [export_form_vars grade_id return_url]
+set export_vars [export_vars -form -- {grade_id return_url}]
 
 ad_return_template
Index: openacs-4/packages/evaluation/www/admin/grades/grades-reports.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-reports.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/evaluation/www/admin/grades/grades-reports.tcl	14 Mar 2008 13:20:39 -0000	1.14
+++ openacs-4/packages/evaluation/www/admin/grades/grades-reports.tcl	14 Mar 2008 16:22:10 -0000	1.15
@@ -47,7 +47,7 @@
 
 db_foreach grade_type { *SQL* } {
     set weight [lc_numeric $weight]
-    set grade_label_${grade_id} "${grade_plural_name} ($weight%) <a href=[export_vars -base "grades-type-reports" { grade_id }]><img src=\"/resources/acs-subsite/Zoom16.gif\" width=\"16\" height=\"16\" style=\"border:0px;\" alt=\"\"></a>"
+    set grade_label_${grade_id} "${grade_plural_name} ($weight%)"
     append pass_grades " grade_label_${grade_id} "
     lappend elements grade_$grade_id \
 	[list label "@grade_label_${grade_id};noquote@" \
Index: openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.adp	15 Jun 2004 23:20:30 -0000	1.3
+++ openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.adp	14 Mar 2008 16:22:10 -0000	1.4
@@ -2,6 +2,5 @@
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
-#evaluation.lt_Upload_a_solution_for#
-<p><formtemplate id="solution"></formtemplate></p>
-
+<p>#evaluation.lt_Upload_a_solution_for#</p>
+<formtemplate id="solution"></formtemplate>
Index: openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.tcl	22 Sep 2006 16:46:08 -0000	1.18
+++ openacs-4/packages/evaluation/www/admin/tasks/solution-add-edit.tcl	14 Mar 2008 16:22:10 -0000	1.19
@@ -108,7 +108,7 @@
 		{url:text(text),optional
 		    {label "[_ evaluation.URL__1]"} 
 		    {value "$content"}
-		    {after_html "<a href=$content>$content</a>"}
+		    {after_html "<a href=\"$content\">$content</a>"}
 		}			
 		{unattach_p:text(hidden)
 		}
Index: openacs-4/packages/evaluation/www/admin/tasks/task-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-delete.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/evaluation/www/admin/tasks/task-delete.adp	14 Mar 2008 14:48:49 -0000	1.4
+++ openacs-4/packages/evaluation/www/admin/tasks/task-delete.adp	14 Mar 2008 16:22:10 -0000	1.5
@@ -2,7 +2,7 @@
 <property name="context">@context;noquote@</property>
 <property name="title">#evaluation.Remove_Grade#</property>
 
-#evaluation.lt_Are_you_sure_you_want_2#
+<p>#evaluation.lt_Are_you_sure_you_want_2#</p>
 
 <include src="/packages/evaluation/lib/confirm-delete-form" action="task-delete-2" export_vars="@export_vars;noquote@" no_button="#evaluation.lt_No_I_want_to_cancel_m#" yes_button="#evaluation.lt_Yes_I_really_want_to__3#">
 
Index: openacs-4/packages/evaluation/www/admin/tasks/task-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-delete.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/evaluation/www/admin/tasks/task-delete.tcl	8 Aug 2006 21:26:43 -0000	1.6
+++ openacs-4/packages/evaluation/www/admin/tasks/task-delete.tcl	14 Mar 2008 16:22:10 -0000	1.7
@@ -19,6 +19,6 @@
 
 db_1row get_task_info { *SQL* }
 
-set export_vars [export_form_vars task_id grade_id return_url]
+set export_vars [export_vars -form -- {task_id grade_id return_url}]
 
 ad_return_template