diff options
| author | prathamesh | 2013-07-03 16:58:34 +0530 |
|---|---|---|
| committer | prathamesh | 2013-07-03 16:58:34 +0530 |
| commit | 8de499263ec00be5e500693b8db7f4b5ee0d15bd (patch) | |
| tree | a508cfbcd65d16ffb3801a218b6037a8b3bd555f /testapp/templates | |
| parent | 156bb47ecebcca190683b8e59f917a5b742d11fd (diff) | |
| parent | b522a1ba1c1edff7648c6c7d69fa2867a08b4100 (diff) | |
| download | online_test-8de499263ec00be5e500693b8db7f4b5ee0d15bd.tar.gz online_test-8de499263ec00be5e500693b8db7f4b5ee0d15bd.tar.bz2 online_test-8de499263ec00be5e500693b8db7f4b5ee0d15bd.zip | |
Merge branch 'fresh_java' of https://github.com/prathamesh920/online_test into deploy_server
Conflicts:
testapp/templates/exam/question.html
Diffstat (limited to 'testapp/templates')
| -rw-r--r-- | testapp/templates/exam/question.html | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/testapp/templates/exam/question.html b/testapp/templates/exam/question.html index 7260d15..529b620 100644 --- a/testapp/templates/exam/question.html +++ b/testapp/templates/exam/question.html @@ -76,8 +76,14 @@ function update_time() <h4><u> {{ question.summary }} </u><font class=pull-right>(Marks : {{ question.points }}) </font></h4><br> <font size=3 face=arial> {{ question.description|safe }} </font> + {% if error_message %} + <div class="alert alert-error"> + {% for e in error_message.splitlines %} + {{ e|join:"" }} + <br/> + {% endfor%} + </div>{% endif %} - {% if error_message %}<h5>ERROR:</h5><div class="alert alert-error">{{ error_message }}</div>{% endif %} {% if success_msg %} <script type="text/javascript"> alert("Congratulations, that's correct. Let's go to next question"); |