Index: openacs-4/packages/evaluation/www/admin/grades/distribution-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/distribution-edit.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/evaluation/www/admin/grades/distribution-edit.adp	8 Aug 2006 21:26:42 -0000	1.6
+++ openacs-4/packages/evaluation/www/admin/grades/distribution-edit.adp	14 Mar 2008 13:20:39 -0000	1.7
@@ -1,14 +1,14 @@
 <master>
 <property name="title">@page_title@</property>
-<property name="context">@context@</property>
-<link rel="stylesheet" type="text/css" media="all" href="/resources/evaluation/evaluation.css" />
+<property name="context">@context;noquote@</property>
+
 <if @simple_p@ eq 1>
 <h1 class="blue">#evaluation.lt_Distribution_for_grad#</h1>
 <br>
 <br>
 <div id="evaluations">
 <table class="title" width=100%>
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="40">
+<table width="100%" style="border:0px" alt="" cellpadding="0" cellspacing="0" height="40">
   <tr>
     <td valign="middle" width="30%" style="padding-left: 10px;"><text class="blue"><b>@grade_plural_name_up@</b> (@grade_weight@% #evaluation-portlet.total_grade#)</text></td>
   </tr>
@@ -28,40 +28,28 @@
 <p> #evaluation.lt_grade_plural_name_rep_1# </p>
 </if>
    <form action="distribution-edit-2">
-      <input type=hidden name=grade_id value="@grade_id@">
-		<blockquote>
-		<listtemplate name="grades"></listtemplate>
-	    </blockquote>
-
-<table align="left">
-<tr>
-<if @simple_p@ eq 1><td align= "left"><input type="image" src="/resources/evaluation/submit.gif" name=info></td></if><else><td align=left><input type=submit value=Submit></td></else>
-      </form>
-
+	  <listtemplate name="grades"></listtemplate>
+      <div><input type="hidden" name="grade_id" value="@grade_id@"></div>
+      <div>
+      <if @simple_p@ eq 1><input type="image" src="/resources/evaluation/submit.gif" name="info"></if>
+	  <else><input type="submit" value="Submit"></else>
+      </div>
+   </form>
+   <form action="distribution-edit-3" style="display:inline;">
+      <div><input type="hidden" name="grade_id" value="@grade_id@"></div>
+      <div>
+	    <if @simple_p@ eq 1><input type="image" src="/resources/evaluation/default.gif"></if>
+	    <else><input type="submit" value="Set To Default"></else>
+      </div>
     </form>
-      <form action="distribution-edit-3">
-      <input type=hidden name=grade_id value="@grade_id@">
-<td align= "left">
-	<if @simple_p@ eq 1>
-	       <input type="image" src="/resources/evaluation/default.gif">
-	</if>
-	<else>
-	<input type=submit value="Set To Default">
-        </else>
-</td>
-      </form>
-
-</tr>
-</table>
 </if><else>
 <p>#evaluation.lt_There_are_no_tasks_as#</p>
 </else>
-</p>
 </if>
 <else>
-<center>
+<div style="text-align:center">
  #evaluation.grade_weight_zero#
-</center>
+</div>
 </else>
 <br>
 <br>
Index: openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl	22 Sep 2006 16:46:08 -0000	1.11
+++ openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl	14 Mar 2008 13:20:39 -0000	1.12
@@ -35,13 +35,13 @@
 		       orderby_desc {task_name desc}] \
 		  task_weight \
 		  [list label "[_ evaluation.lt_Weight_over_grade]" \
-		       display_template { <center><input size=5 maxlength=6 type=text name=weights.@grades.task_id@ value=@grades.task_weight@> </ center>} \
+		       display_template { <div style="text-align:center"><input size=5 maxlength=6 type=text name=weights.@grades.task_id@ value=@grades.task_weight@> </div>} \
 		       aggregate sum \
 		       aggregate_label { [_ evaluation.total]}
 		  ] \
 		  relative_weight \
 		  [list label "[_ evaluation.rel_weight]" \
-		       display_template { <center>@grades.relative_weight@</center> } \
+		       display_template { <div style="text-align:center">@grades.relative_weight@</div> } \
 		       aggregate sum \
 		      ]\
 		  requires_grade \
@@ -98,13 +98,10 @@
     } elseif { $simple_p } {
 	set delete_template "<a href=\"[export_vars -base "../tasks/task-delete" { task_id grade_id return_url }]\">[_ evaluation-portlet.Delete]</a>"
     } else {
-	set delete_template "<a href=\"[export_vars -base "../tasks/task-delete" { task_id grade_id return_url }]\"><img src=\"/resources/acs-subsite/Delete16.gif\" width=\"16\" height=\"16\" border=\"0\"></a>"
+	set delete_template "<a href=\"[export_vars -base "../tasks/task-delete" { task_id grade_id return_url }]\"><img src=\"/resources/acs-subsite/Delete16.gif\" width=\"16\" height=\"16\" style=\"border:0px\" alt=\"\"></a>"
     }
     
-} 	
+}
 
-
-
-
-
-
+template::head::add_css -href "/resources/evaluation/evaluation.css"
+ad_return_template
Index: openacs-4/packages/evaluation/www/admin/grades/grades-add-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-add-edit.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/evaluation/www/admin/grades/grades-add-edit.adp	28 Apr 2004 11:06:42 -0000	1.1
+++ openacs-4/packages/evaluation/www/admin/grades/grades-add-edit.adp	14 Mar 2008 13:20:39 -0000	1.2
@@ -2,7 +2,7 @@
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
-<p><formtemplate id="grade"></formtemplate></p>
+<formtemplate id="grade"></formtemplate>
 
 
 
Index: openacs-4/packages/evaluation/www/admin/grades/grades-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-delete.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/evaluation/www/admin/grades/grades-delete.adp	10 Jun 2004 21:08:54 -0000	1.3
+++ openacs-4/packages/evaluation/www/admin/grades/grades-delete.adp	14 Mar 2008 13:20:39 -0000	1.4
@@ -6,7 +6,4 @@
 
 <p>
 
-<center>
-<include src="../../../lib/confirm-delete-form" action="grades-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__1#">
-</center>
-
+<include src="/packages/evaluation/lib/confirm-delete-form" action="grades-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__1#">
Index: openacs-4/packages/evaluation/www/admin/grades/grades-reports.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-reports.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/evaluation/www/admin/grades/grades-reports.adp	7 Jul 2004 17:26:45 -0000	1.4
+++ openacs-4/packages/evaluation/www/admin/grades/grades-reports.adp	14 Mar 2008 13:20:39 -0000	1.5
@@ -1,8 +1,8 @@
 <master>
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
-<p>#evaluation.lt_This_is_the_grades_re#<br />
-#evaluation.lt_You_can_order_the_gra# <br />
+<p>#evaluation.lt_This_is_the_grades_re#<br>
+#evaluation.lt_You_can_order_the_gra# <br>
 #evaluation.lt_If_you_click_on_the_s#
 </p>
 <blockquote><listtemplate name="grades_report"></listtemplate></blockquote>
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.13 -r1.14
--- openacs-4/packages/evaluation/www/admin/grades/grades-reports.tcl	8 Aug 2006 21:26:42 -0000	1.13
+++ openacs-4/packages/evaluation/www/admin/grades/grades-reports.tcl	14 Mar 2008 13:20:39 -0000	1.14
@@ -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\" border=\"0\"></a>"
+    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>"
     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/grades/grades-type-reports.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-type-reports.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/evaluation/www/admin/grades/grades-type-reports.adp	15 Jun 2004 23:20:29 -0000	1.3
+++ openacs-4/packages/evaluation/www/admin/grades/grades-type-reports.adp	14 Mar 2008 13:20:39 -0000	1.4
@@ -1,8 +1,8 @@
 <master>
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
-<p>#evaluation.lt_This_is_the_grades_re_1#<br />
-#evaluation.lt_You_can_order_the_gra_1# <br />
+<p>#evaluation.lt_This_is_the_grades_re_1#<br>
+#evaluation.lt_You_can_order_the_gra_1# <br>
 #evaluation.lt_If_you_click_on_the_s#
 </p>
 
Index: openacs-4/packages/evaluation/www/admin/grades/grades.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/evaluation/www/admin/grades/grades.adp	8 Aug 2006 21:26:42 -0000	1.2
+++ openacs-4/packages/evaluation/www/admin/grades/grades.adp	14 Mar 2008 13:20:39 -0000	1.3
@@ -1,13 +1,13 @@
 <master>
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
-<link rel="stylesheet" type="text/css" media="all" href="/resources/evaluation/evaluation.css" />
+
 <if @simple_p@ eq 1>
 <h1 class="blue">@page_title;noquote@</h1>
 <br>
 <div id="evaluations">
 <table class="title" width=100%>
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="40">
+<table width="100%" style="border:0px" alt="" cellpadding="0" cellspacing="0" height="40">
   <tr>
     <td valign="middle" width="30%" style="padding-left: 10px;"><text class="blue"><b>ALL ASIGNMENT TYPES</b></text></td>
 
Index: openacs-4/packages/evaluation/www/admin/grades/grades.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades.tcl,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/evaluation/www/admin/grades/grades.tcl	17 Jul 2007 12:23:57 -0000	1.17
+++ openacs-4/packages/evaluation/www/admin/grades/grades.tcl	14 Mar 2008 13:20:39 -0000	1.18
@@ -23,7 +23,7 @@
 set return_url [ad_conn url]
 set total 0
 set a_label [_ evaluation.total_of_course]
-set actions "<a href=[export_vars -base "grades-add-edit" { }] class=\"tlmidnav\"><img src=\"/resources/evaluation/cross.gif\" width=\"10\" height=\"9\" hspace=\"5\" vspace=\"1\" border=\"0\" align=\"absmiddle\">[_ evaluation.Add_assignment_type_]</a>"
+set actions "<a href=[export_vars -base "grades-add-edit" { }] class=\"tlmidnav\"><img src=\"/resources/evaluation/cross.gif\" width=\"10\" height=\"9\" hspace=\"5\" vspace=\"1\" style=\"border:0px\" alt=\"\" align=\"absmiddle\">[_ evaluation.Add_assignment_type_]</a>"
 
 if { ![empty_string_p $set_grade_id_live] } {
     evaluation::set_live_grade -grade_item_id $set_grade_id_live
@@ -83,7 +83,7 @@
 	edit {
 	    label {}
 	    sub_class narrow
-	    display_template {<if $simple_p eq 1>[_ evaluation-portlet.edit]</if><else><img src="/resources/acs-subsite/Edit16.gif" width="16" height="16" border="0"></else>
+	    display_template {<if $simple_p eq 1>[_ evaluation.edit]</if><else><img src="/resources/acs-subsite/Edit16.gif" width="16" height="16" style="border:0" alt=""></else>
 	    } 
 	    link_url_eval {[export_vars -base "grades-add-edit" { item_id grade_id }]}
 	    link_html { title "[_ evaluation.lt_Edit_assignment_type_]" }
@@ -112,9 +112,9 @@
     if { [empty_string_p $live_revision] } {
 	set delete_template "<span style=\"font-style: italic; color: red; font-size: 9pt;\">[_ evaluation.Deleted]</span> <a href=[export_vars -base "grades" { {set_grade_id_live $item_id} }]>[_ evaluation.make_it_live]</a>"
     } elseif { $simple_p } {
-	set delete_template "<a href=\"[export_vars -base "grades-delete" { grade_id return_url }]\">[_ evaluation-portlet.Delete]</a>"
+	set delete_template "<a href=\"[export_vars -base "grades-delete" { grade_id return_url }]\">[_ evaluation.delete]</a>"
     } else {
-	set delete_template "<a href=\"[export_vars -base "grades-delete" { grade_id return_url }]\"><img src=\"/resources/acs-subsite/Delete16.gif\" width=\"16\" height=\"16\" border=\"0\"></a>"
+	set delete_template "<a href=\"[export_vars -base "grades-delete" { grade_id return_url }]\"><img src=\"/resources/acs-subsite/Delete16.gif\" width=\"16\" height=\"16\" style=\"border:0px\" alt=\"\"></a>"
     }
 }
 
@@ -129,4 +129,5 @@
     set notice ""
 }
 
+template::head::add_css -href "/resources/evaluation/evaluation.css"
 ad_return_template
Index: openacs-4/packages/evaluation/www/admin/grades/student-grades-report.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/student-grades-report.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/evaluation/www/admin/grades/student-grades-report.adp	10 Sep 2004 19:16:32 -0000	1.2
+++ openacs-4/packages/evaluation/www/admin/grades/student-grades-report.adp	14 Mar 2008 13:20:39 -0000	1.3
@@ -2,28 +2,25 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<h2>#evaluation.lt_Grades_report_of_stud#</h2><br />
+<h2>#evaluation.lt_Grades_report_of_stud#</h2><br>
 
 <table>
 <tr>
  <td>@portrait;noquote@ </td>
  <td>#evaluation.Name_student_name#<br>#evaluation.Email# <a href="mailto:@email@">@email@</a></td>
 </tr>
 </table>
-<br />
-<ul>
+<br>
 <if @grades:rowcount@ eq 0>
-<li>#evaluation.lt_There_is_no_info_for_#</li>
-</if><else>
+<p>#evaluation.lt_There_is_no_info_for_#</p>
+</if>
+<else>
+<ul>
 <multiple name="grades">
-	<li><strong>@grades.grade_plural_name@</strong> <br />
-	<include src="../../../lib/student-grades-report-chunk" grade_id=@grades.grade_id@ orderby=@orderby@ student_id=@student_id@>
+	<li><strong>@grades.grade_plural_name@</strong> <br>
+	<include src="/packages/evaluation/lib/student-grades-report-chunk" grade_id=@grades.grade_id@ orderby=@orderby@ student_id=@student_id@>
 	</li>
 </multiple>
+</ul>
 <h2>#evaluation.lt_TOTAL_GRADE_total_cla# / @max_possible_grade@ </h2>
 </else>
-</ul>
-
-
-
-