Index: openacs-4/packages/evaluation/www/admin/evaluations/audit-info.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/audit-info.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/evaluation/www/admin/evaluations/audit-info.adp 17 Dec 2004 18:11:01 -0000 1.7
+++ openacs-4/packages/evaluation/www/admin/evaluations/audit-info.adp 14 Mar 2008 12:33:59 -0000 1.8
@@ -8,7 +8,7 @@
<ul>
<multiple name="parties">
<li><strong>@parties.party_name@</strong>
- <include src="../../../lib/audit-chunk" task_item_id=@task_item_id@ task_id=@task_id@ party_id=@parties.party_id@ orderby=@orderby@>
+ <include src="/packages/evaluation/lib/audit-chunk" task_item_id=@task_item_id@ task_id=@task_id@ party_id=@parties.party_id@ orderby=@orderby@>
</li>
</multiple>
</ul>
Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.adp 10 Sep 2004 19:16:31 -0000 1.7
+++ openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.adp 14 Mar 2008 12:33:59 -0000 1.8
@@ -17,7 +17,7 @@
<tr><th align="right">#evaluation.Name#</th><td>@evaluations_wa.party_name@</td></tr>
<tr><th align="right">#evaluation.Grade#</th><td>@evaluations_wa.grade@ / @max_grade@</td></tr>
<tr><th align="right">#evaluation.Comments#</th><td>@evaluations_wa.comment@</td></tr>
- <tr><th align="right">#evaluation.Will_the_studens_be# <br /> #evaluation.lt_able_to_see_the_grade#</th><td>@evaluations_wa.show_student@</td></tr>
+ <tr><th align="right">#evaluation.Will_the_studens_be# <br> #evaluation.lt_able_to_see_the_grade#</th><td>@evaluations_wa.show_student@</td></tr>
</tr>
</table>
</multiple>
@@ -40,7 +40,7 @@
<tr><th align="right">#evaluation.Name#</th><td>@evaluations_na.party_name@</td></tr>
<tr><th align="right">#evaluation.Grade#</th><td>@evaluations_na.grade@ / @max_grade@</td></tr>
<tr><th align="right">#evaluation.Comments#</th><td>@evaluations_na.comment@</td></tr>
- <tr><th align="right">#evaluation.Will_the_studens_be# <br /> #evaluation.lt_able_to_see_the_grade#</th><td>@evaluations_na.show_student@</td></tr>
+ <tr><th align="right">#evaluation.Will_the_studens_be# <br> #evaluation.lt_able_to_see_the_grade#</th><td>@evaluations_na.show_student@</td></tr>
</tr>
</table>
</multiple>
@@ -64,7 +64,7 @@
<tr><th align="right">#evaluation.Name#</th><td>@evaluations.party_name@</td></tr>
<tr><th align="right">#evaluation.Grade#</th><td>@evaluations.grade@ / @max_grade@</td></tr>
<tr><th align="right">#evaluation.Edit_Reason#</th><td>@evaluations.reason@</td></tr>
- <tr><th align="right">#evaluation.Will_the_studens_be# <br /> #evaluation.lt_able_to_see_the_grade#</th><td>@evaluations.show_student@</td></tr>
+ <tr><th align="right">#evaluation.Will_the_studens_be# <br> #evaluation.lt_able_to_see_the_grade#</th><td>@evaluations.show_student@</td></tr>
</tr>
</table>
</multiple>
Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete.adp 15 Jun 2004 23:20:29 -0000 1.3
+++ openacs-4/packages/evaluation/www/admin/evaluations/evaluation-delete.adp 14 Mar 2008 12:33:59 -0000 1.4
@@ -6,9 +6,7 @@
<p>
-<center>
-<include src="../../../lib/confirm-delete-form" action="evaluation-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_#">
-</center>
+<include src="/packages/evaluation/lib/confirm-delete-form" action="evaluation-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_#">
</p>
Index: openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-explanation.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-explanation.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-explanation.adp 10 Jun 2004 21:08:53 -0000 1.2
+++ openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-explanation.adp 14 Mar 2008 12:33:59 -0000 1.3
@@ -4,9 +4,9 @@
<p style="text-align:justify">
- #evaluation.lt_This_funcionallity_al# <br />
+ #evaluation.lt_This_funcionallity_al# <br>
- #evaluation.lt_The_file_should_have_# <br />
+ #evaluation.lt_The_file_should_have_# <br>
<ol>
<li>
@@ -25,7 +25,7 @@
#evaluation.lt_Do_NOT_change_the_par#
</li>
</ul>
- #evaluation.lt_If_you_do_not_want_to# <br />
+ #evaluation.lt_If_you_do_not_want_to# <br>
#evaluation.lt_The_system_assumes_th#
</li>
<li>
Index: openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.adp 30 Jul 2004 22:50:10 -0000 1.4
+++ openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.adp 14 Mar 2008 12:33:59 -0000 1.5
@@ -14,7 +14,7 @@
<tr><th align="right">#evaluation.Name#</th><td>@evaluations_gs.party_name@</td></tr>
<tr><th align="right">#evaluation.Grade#</th><td>@evaluations_gs.grade@ / @max_grade@</td></tr>
<tr><th align="right">#evaluation.CommentsEdit_reason#</th><td>@evaluations_gs.comment@</td></tr>
- <tr><th align="right">#evaluation.Will_the_studens_be# <br /> #evaluation.lt_able_to_see_the_grade#</th><td>@evaluations_gs.show_student@</td></tr>
+ <tr><th align="right">#evaluation.Will_the_studens_be#<br> #evaluation.lt_able_to_see_the_grade#</th><td>@evaluations_gs.show_student@</td></tr>
</tr>
</table>
</multiple>
Index: openacs-4/packages/evaluation/www/admin/evaluations/grades-sheets.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/grades-sheets.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/evaluation/www/admin/evaluations/grades-sheets.tcl 8 Aug 2006 21:26:42 -0000 1.9
+++ openacs-4/packages/evaluation/www/admin/evaluations/grades-sheets.tcl 14 Mar 2008 12:33:59 -0000 1.10
@@ -52,7 +52,7 @@
label {}
sub_class narrow
display_template {
- <img src="/resources/acs-subsite/Zoom16.gif" width="16" height="16" border="0">
+ <img src="/resources/acs-subsite/Zoom16.gif" width="16" height="16" alt="" style="border:0px">
}
link_url_col view_url
link_html { title "[_ evaluation.View_grades_sheet_]" }
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.11 -r1.12
--- openacs-4/packages/evaluation/www/admin/evaluations/student-list.adp 8 Aug 2006 21:26:42 -0000 1.11
+++ openacs-4/packages/evaluation/www/admin/evaluations/student-list.adp 14 Mar 2008 12:33:59 -0000 1.12
@@ -2,7 +2,6 @@
<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>
@@ -51,7 +50,7 @@
<br>
<div id="evaluations">
-<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>#evaluation.lt_Evaluated_Students_to#</b></text></td>
<td valign="middle" width="67%" align="right" style="font-size: 10px; color: #354785; font-weight: bold;">
@@ -94,11 +93,11 @@
<p>#evaluation.Theese#</p>
</else>
<blockquote><listtemplate name="evaluated_students"></listtemplate></blockquote>
-<br />
+<br>
<if @forums_related_p@ eq f>
<if @simple_p@ eq 1>
<div id="evaluations">
-<table width="100%" border="0" cellpadding="0" cellspacing="0" height="40">
+<table width="100%" style="border:0" alt="" cellpadding="0" cellspacing="0" height="40">
<tr>
<td valign="middle" width="30%" style="padding-left: 10px;"><text class="blue"><b>#evaluation.lt_Students_with_answers#</b></text></td>
</tr>
@@ -187,10 +186,10 @@
<p>#evaluation.lt_There_are_no_students#</p>
</else>
-<br />
+<br>
<if @simple_p@ eq 1>
<div id="evaluations">
-<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>#evaluation.lt_Students_who_have_not#</b></text></td>
</tr>
@@ -230,7 +229,7 @@
</table>
</blockquote>
</form>
-<br />
+<br>
<blockquote>
<if @simple_p@ eq 0>
<form name="grades_sheet_form" enctype="multipart/form-data" method="POST" action="grades-sheet-parse.tcl">
@@ -255,7 +254,7 @@
<li class="arrow"><text class="blue">#evaluation.download#<b><a href="grades-sheet-csv-@task_id@.csv">#evaluation.students_without_subm#</a></b>#evaluation.spreadsheet#</text><br>
<li class="arrow"><text class="blue">#evaluation.upload_graded##evaluation.students_without_subm#</text>
</ul>
-<br />
+<br>
<blockquote>
<form name="grades_sheet_form" enctype="multipart/form-data" method="POST" action="grades-sheet-parse.tcl">
@@ -284,7 +283,7 @@
<else>
<if @simple_p@ eq 1>
<div id="evaluations">
-<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>#evaluation.Class_Students#</b></text></td>
</tr>
@@ -367,7 +366,7 @@
</if><else>
<p><text class="blue">#evaluation.lt_There_are_no_students#</text></p>
</else>
-<br />
+<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.23 -r1.24
--- openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl 7 Oct 2007 22:36:59 -0000 1.23
+++ openacs-4/packages/evaluation/www/admin/evaluations/student-list.tcl 14 Mar 2008 12:33:59 -0000 1.24
@@ -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\" border=\"0\" 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 }]]
@@ -114,7 +114,7 @@
]\
points \
[list label "[_ evaluation.points]" \
- display_template {<center>@evaluated_students.points@</center>} \
+ display_template {<div style="text-align:center;">@evaluated_students.points@</div>} \
orderby_asc {grade asc} \
orderby_desc {grade desc} \
] \
@@ -124,29 +124,29 @@
] \
comments \
[list label "[_ evaluation.Comments]" \
- display_template { <center>@evaluated_students.comments@</center> } \
+ display_template { <div style="text-align:center;">@evaluated_students.comments@</div> } \
]\
if { !$simple_p } {
lappend elements view \
[list label "" \
sub_class narrow \
- display_template {<img src="/resources/acs-subsite/Zoom16.gif" width="16" height="16" border="0">} \
+ display_template {<img src="/resources/acs-subsite/Zoom16.gif" width="16" height="16" style="border:0px" alt="">} \
link_url_eval {[export_vars -base "one-evaluation-edit" { evaluation_id task_id evaluation_mode }]} \
link_html { title "[_ evaluation.View_evaluation_]" } \
]
}
lappend elements edit \
[list label "" \
sub_class narrow \
- display_template {<if @simple_p@ eq 1>#evaluation.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:0px" alt=""></else>} \
link_url_eval {[export_vars -base "one-evaluation-edit" { evaluation_id task_id }]} \
link_html { title "[_ evaluation.Edit_evaluation_]" } \
]
lappend elements delete \
[list label {} \
sub_class narrow \
- display_template {<if @simple_p@ eq 1>#evaluation.delete# </if><else><img src="/resources/acs-subsite/Delete16.gif" width="16" height="16" border="0"></else>} \
+ display_template {<if @simple_p@ eq 1>#evaluation.delete# </if><else><img src="/resources/acs-subsite/Delete16.gif" width="16" height="16" style="border:0px" alt=""></else>} \
link_url_eval {[export_vars -base "evaluation-delete" { evaluation_id return_url task_id }]} \
link_html { title "[_ evaluation.Delete_evaluation_]" } \
]
@@ -254,7 +254,7 @@
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>" \
- display_template {<center> <input type=text name=grades_wa.@not_evaluated_wa.party_id@ maxlength=\"6\" size=\"3\"> <if @simple_p@ eq 1> <br> $max_grade max</if></center>} ]
+ display_template {<div style="text-align:center;"> <input type=text name=grades_wa.@not_evaluated_wa.party_id@ maxlength=\"6\" size=\"3\"> <if @simple_p@ eq 1> <br> $max_grade max</if></div>} ]
lappend elements comments \
[list label "[_ evaluation.Comments]" \
display_template { <textarea rows="3" cols="15" name=comments_wa.@not_evaluated_wa.party_id@></textarea> } \
@@ -344,7 +344,7 @@
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>" \
- display_template { <center><input type=text name=grades_na.@not_evaluated_na.party_id@ maxlength=\"6\" size=\"3\"> <if @simple_p@ eq 1><br>$max_grade max.</if></center>}]
+ display_template { <div style="text-align:center;"><input type=text name=grades_na.@not_evaluated_na.party_id@ maxlength=\"6\" size=\"3\"> <if @simple_p@ eq 1><br>$max_grade max.</if></div>}]
lappend elements comments \
[list label "[_ evaluation.Comments]" \
display_template { <textarea rows="3" cols="15" name=comments_na.@not_evaluated_na.party_id@></textarea> } \
@@ -444,7 +444,7 @@
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>" \
- display_template {<center> <input type=text name=grades_na.@class_students.party_id@ maxlength=\"6\" size=\"3\"> <if @simple_p@ eq 1><br>$max_grade max.</if></center>}]
+ display_template {<div style="text-align:center;"> <input type=text name=grades_na.@class_students.party_id@ maxlength=\"6\" size=\"3\"> <if @simple_p@ eq 1><br>$max_grade max.</if></div>}]
lappend elements comments \
[list label "[_ evaluation.Comments]" \
display_template { <textarea rows="3" cols="15" name=comments_na.@class_students.party_id@></textarea> } \
@@ -515,3 +515,6 @@
set total_processed [llength $done_students]
set grades_sheet_item_id [db_nextval acs_object_id_seq]
+
+template::head::add_css -href "/resources/evaluation/evaluation.css"
+ad_return_template