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.11 -r1.11.2.1
--- openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.adp 3 Jul 2015 10:47:36 -0000 1.11
+++ openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.adp 1 Dec 2016 13:22:58 -0000 1.11.2.1
@@ -6,83 +6,91 @@
<if @evaluations_wa:rowcount@ gt 0>
<form action="evaluate-students-2" method="post">
- @export_vars;noquote@
- <div>
- <input type="hidden" name="task_id" value="@task_id@">
- <input type="hidden" name="max_grade" value="@max_grade@">
- <input type="submit" value="#evaluation.Grade_1#" > <input type="button" value="#evaluation.Go#" onClick="history.go(-1)">
- </div>
- <table>
- <multiple name="evaluations_wa">
- <if @evaluations_wa.rownum@ odd><table bgcolor="#EAF2FF"></if><else><table bgcolor="white"></else>
- <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>
- </table>
- </multiple>
- </table>
- <div>
- <input type="submit" value="#evaluation.Grade_1#" > <input type="button" value="#evaluation.Go#" onClick="history.go(-1)">
- </div>
+ @export_vars;noquote@
+ <div>
+ <input type="hidden" name="task_id" value="@task_id@">
+ <input type="hidden" name="max_grade" value="@max_grade@">
+ <input type="submit" value="#evaluation.Grade_1#" > <input class="backbuttons" type="button" value="#evaluation.Go#">
+ </div>
+ <table>
+ <multiple name="evaluations_wa">
+ <if @evaluations_wa.rownum@ odd>
+ <table style="background-color: #EAF2FF;">
+ </if>
+ <else>
+ <table style="background-color: white;">
+ </else>
+ <tr><th style="text-align:right">#evaluation.Name#</th><td>@evaluations_wa.party_name@</td></tr>
+ <tr><th style="text-align:right">#evaluation.Grade#</th><td>@evaluations_wa.grade@ / @max_grade@</td></tr>
+ <tr><th style="text-align:right">#evaluation.Comments#</th><td>@evaluations_wa.comment@</td></tr>
+ <tr><th style="text-align:right">#evaluation.Will_the_studens_be# <br> #evaluation.lt_able_to_see_the_grade#</th><td>@evaluations_wa.show_student@</td></tr>
+ </table>
+ </multiple>
+ </table>
+ <div>
+ <input type="submit" value="#evaluation.Grade_1#" > <input class="backbuttons" type="button" value="#evaluation.Go#">
+ </div>
</form>
</if>
<if @evaluations_na:rowcount@ gt 0>
<form action="evaluate-students-2" method="post">
- @export_vars;noquote@
- <div>
- <input type="hidden" name="task_id" value="@task_id@">
- <input type="hidden" name="max_grade" value="@max_grade@">
- <input type="submit" value="#evaluation.Grade_1#" >
- </div>
-
+ @export_vars;noquote@
+ <div>
+ <input type="hidden" name="task_id" value="@task_id@">
+ <input type="hidden" name="max_grade" value="@max_grade@">
+ <input type="submit" value="#evaluation.Grade_1#" >
+ </div>
<table>
- <multiple name="evaluations_na">
- <if @evaluations_na.rownum@ odd> <table bgcolor="#EAF2FF"> </if>
- <else><table bgcolor="white"></else>
- <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>
- </table>
- </multiple>
+ <multiple name="evaluations_na">
+ <if @evaluations_na.rownum@ odd>
+ <table style="background-color: #EAF2FF;">
+ </if>
+ <else>
+ <table style="background-color: white;">
+ </else>
+ <tr><th style="text-align:right">#evaluation.Name#</th><td>@evaluations_na.party_name@</td></tr>
+ <tr><th style="text-align:right">#evaluation.Grade#</th><td>@evaluations_na.grade@ / @max_grade@</td></tr>
+ <tr><th style="text-align:right">#evaluation.Comments#</th><td>@evaluations_na.comment@</td></tr>
+ <tr><th style="text-align:right">#evaluation.Will_the_studens_be# <br> #evaluation.lt_able_to_see_the_grade#</th><td>@evaluations_na.show_student@</td></tr>
+ </table>
+ </multiple>
</table>
- <div>
- <input type="submit" value="#evaluation.Grade_1#" >
- <input type="button" value="#evaluation.Go#" onClick="history.go(-1)">
- </div>
+ <div>
+ <input type="submit" value="#evaluation.Grade_1#" >
+ <input class="backbuttons" type="button" value="#evaluation.Go#">
+ </div>
</form>
</if>
-
<if @evaluations:rowcount@ gt 0>
<form action="evaluate-students-2" method="post">
- @export_vars;noquote@
- <div>
- <input type="hidden" name="task_id" value="@task_id@">
- <input type="hidden" name="max_grade" value="@max_grade@">
- <input type="submit" value="#evaluation.Confirm#">
- </div>
-
- <table>
- <multiple name="evaluations">
- <if @evaluations.rownum@ odd><table bgcolor="#EAF2FF"></if><else><table bgcolor="white"></else>
- <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>
- </table>
- </multiple>
- </table>
- <div>
- <input type="submit" value="#evaluation.Confirm#">
- </div>
- </form>
+ @export_vars;noquote@
+ <div>
+ <input type="hidden" name="task_id" value="@task_id@">
+ <input type="hidden" name="max_grade" value="@max_grade@">
+ <input type="submit" value="#evaluation.Confirm#">
+ </div>
+ <table>
+ <multiple name="evaluations">
+ <if @evaluations.rownum@ odd>
+ <table style="background-color: #EAF2FF;">
+ </if>
+ <else>
+ <table style="background-color: white;">
+ </else>
+ <tr><th style="text-align:right">#evaluation.Name#</th><td>@evaluations.party_name@</td></tr>
+ <tr><th style="text-align:right">#evaluation.Grade#</th><td>@evaluations.grade@ / @max_grade@</td></tr>
+ <tr><th style="text-align:right">#evaluation.Edit_Reason#</th><td>@evaluations.reason@</td></tr>
+ <tr><th style="text-align:right">#evaluation.Will_the_studens_be# <br> #evaluation.lt_able_to_see_the_grade#</th><td>@evaluations.show_student@</td></tr>
+ </table>
+ </multiple>
+ </table>
+ <div>
+ <input type="submit" value="#evaluation.Confirm#">
+ </div>
+ </form>
</if>
-</p>
+<p></p>
Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.tcl,v
diff -u -r1.12.2.1 -r1.12.2.2
--- openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.tcl 12 Sep 2015 11:06:03 -0000 1.12.2.1
+++ openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.tcl 1 Dec 2016 13:22:58 -0000 1.12.2.2
@@ -203,9 +203,11 @@
set export_vars [export_vars -form { grades_wa comments_wa show_student_wa grades_na comments_na show_student_na item_ids grades_to_edit reasons_to_edit show_student_to_edit item_to_edit_ids }]
+template::add_event_listener -CSSclass "backbuttons" -script {history.go(-1);}
+
# Local variables:
# mode: tcl
# tcl-indent-level: 4