diff options
author | Prabhu Ramachandran | 2017-11-14 19:14:32 +0530 |
---|---|---|
committer | GitHub | 2017-11-14 19:14:32 +0530 |
commit | 320db8272a826bbf3f37b5b6098e0807ecd9868e (patch) | |
tree | 0d585fba7198f374bd2371feab7e95c8275d75db /yaksh/templates | |
parent | 1996f5d6409a5f936700a906f7da1afacb664ce6 (diff) | |
parent | a6fd44d9dd9c1e76929e715754bb4a215795b6b8 (diff) | |
download | online_test-320db8272a826bbf3f37b5b6098e0807ecd9868e.tar.gz online_test-320db8272a826bbf3f37b5b6098e0807ecd9868e.tar.bz2 online_test-320db8272a826bbf3f37b5b6098e0807ecd9868e.zip |
Merge pull request #390 from maheshgudi/regrade_fix
Regrade fix
Diffstat (limited to 'yaksh/templates')
-rw-r--r-- | yaksh/templates/yaksh/grade_user.html | 11 | ||||
-rw-r--r-- | yaksh/templates/yaksh/user_data.html | 4 | ||||
-rw-r--r-- | yaksh/templates/yaksh/view_answerpaper.html | 4 |
3 files changed, 9 insertions, 10 deletions
diff --git a/yaksh/templates/yaksh/grade_user.html b/yaksh/templates/yaksh/grade_user.html index 3339177..1fef026 100644 --- a/yaksh/templates/yaksh/grade_user.html +++ b/yaksh/templates/yaksh/grade_user.html @@ -8,7 +8,6 @@ {% block content %} {% block script %} -<script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-MML-AM_CHTML"></script> <script src="{{ URL_ROOT }}/static/yaksh/js/jquery.tablesorter.min.js"></script> <script type="text/javascript"> $(document).ready(function() @@ -107,10 +106,10 @@ End time: {{ paper.end_time }} <br/> {%if paper.percent%} Percentage obtained: {{paper.percent}}% <br/> {% endif %} -{% if paper.passed == 0 %} -Status : <b style="color: red;"> Failed </b><br/> -{% else %} +{% if paper.passed %} Status : <b style="color: green;"> Passed </b><br/> +{% else %} +Status : <b style="color: red;"> Failed </b><br/> {% endif %} </p> {% if paper.answers.count %} @@ -230,7 +229,7 @@ Status : <b style="color: green;"> Passed </b><br/> </tr> </table> {% endif %} - <table class="table table-bordered" width="100%" id="output"> + <table class="table table-bordered" width="100%" id="output" style="table-layout: fixed"> <col width="10%"> <col width="40%"> <col width="40%"> @@ -268,7 +267,7 @@ Status : <b style="color: green;"> Passed </b><br/> {% endif %} <p> <b>The following error took place: </b></p> <div class="well well-sm"> - <table class="table table-bordered" width="100%"> + <table class="table table-bordered" width="100%" style="table-layout: fixed"> <col width="30%"> <tr class = "active"> <td><b>Exception Name: </b></td> diff --git a/yaksh/templates/yaksh/user_data.html b/yaksh/templates/yaksh/user_data.html index a0219dd..73157ff 100644 --- a/yaksh/templates/yaksh/user_data.html +++ b/yaksh/templates/yaksh/user_data.html @@ -150,7 +150,7 @@ User IP address: {{ paper.user_ip }} </tr> </table> {% endif %} - <table class="table table-bordered" width="100%" id="output"> + <table class="table table-bordered" width="100%" id="output" style="table-layout: fixed"> <col width="10%"> <col width="40%"> <col width="40%"> @@ -188,7 +188,7 @@ User IP address: {{ paper.user_ip }} {% endif %} <p> <b>The following error took place: </b></p> <div class="well well-sm"> - <table class="table table-bordered" width="100%"> + <table class="table table-bordered" width="100%" style="table-layout: fixed"> <col width="30%"> <tr class = "active"> <td><b>Exception Name: </b></td> diff --git a/yaksh/templates/yaksh/view_answerpaper.html b/yaksh/templates/yaksh/view_answerpaper.html index fa16a08..b433ad5 100644 --- a/yaksh/templates/yaksh/view_answerpaper.html +++ b/yaksh/templates/yaksh/view_answerpaper.html @@ -143,7 +143,7 @@ </tr> </table> {% endif %} - <table class="table table-bordered" width="100%" id="output"> + <table class="table table-bordered" width="100%" id="output" style="table-layout: fixed"> <col width="10%"> <col width="40%"> <col width="40%"> @@ -181,7 +181,7 @@ {% endif %} <p> <b>The following error took place: </b></p> <div class="well well-sm"> - <table class="table table-bordered" width="100%"> + <table class="table table-bordered" width="100%" style="table-layout: fixed"> <col width="30%"> <tr class = "active"> <td><b>Exception Name: </b></td> |