diff options
author | Prabhu Ramachandran | 2016-02-15 11:49:12 +0530 |
---|---|---|
committer | Prabhu Ramachandran | 2016-02-15 11:49:12 +0530 |
commit | 53949a87278136a9faa705bcef0bb0a474551b31 (patch) | |
tree | 14682c8c8d08ec716bf867eb27c3c523a9960c72 | |
parent | 417eaf11018e25e83ce33bf2ddfe309c20de9426 (diff) | |
parent | b652db6c27fc41db733fb4cf127ca0cde98fcc4c (diff) | |
download | online_test-53949a87278136a9faa705bcef0bb0a474551b31.tar.gz online_test-53949a87278136a9faa705bcef0bb0a474551b31.tar.bz2 online_test-53949a87278136a9faa705bcef0bb0a474551b31.zip |
Merge pull request #72 from ankitjavalkar/minorfrontendchanges
Typos fixed and minor interface fixes
-rw-r--r-- | yaksh/templates/yaksh/grade_user.html | 2 | ||||
-rw-r--r-- | yaksh/templates/yaksh/intro.html | 2 | ||||
-rw-r--r-- | yaksh/templates/yaksh/question.html | 8 | ||||
-rw-r--r-- | yaksh/templates/yaksh/quizzes_user.html | 2 |
4 files changed, 3 insertions, 11 deletions
diff --git a/yaksh/templates/yaksh/grade_user.html b/yaksh/templates/yaksh/grade_user.html index 9537251..f0d9520 100644 --- a/yaksh/templates/yaksh/grade_user.html +++ b/yaksh/templates/yaksh/grade_user.html @@ -29,7 +29,7 @@ Institute: {{ data.profile.institute }} <br/> {{ paper.total_marks }} -<h2> Quiz: {{ paper.quiz.description }} </h2> +<h2> Quiz: {{ paper.question_paper.quiz.description }} </h2> <p> Questions correctly answered: {{ paper.get_answered_str }} <br/> diff --git a/yaksh/templates/yaksh/intro.html b/yaksh/templates/yaksh/intro.html index 9c5c14d..2542795 100644 --- a/yaksh/templates/yaksh/intro.html +++ b/yaksh/templates/yaksh/intro.html @@ -13,7 +13,7 @@ </div> {% else %} <div class="alert"> - You can attempt this Quiz at any time between {{ enable_quiz_time }} and {{ disable_quiz_time }} + You can attempt this Quiz at any time between {{ enable_quiz_time }} GMT and {{ disable_quiz_time }} GMT <br/> You are not allowed to attempt the Quiz before or after this duration <br/> diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html index 650cef0..a0b74fa 100644 --- a/yaksh/templates/yaksh/question.html +++ b/yaksh/templates/yaksh/question.html @@ -149,14 +149,6 @@ function call_skip(url) <h4><u> {{ question.summary }} </u><font class=pull-right>(Marks : {{ question.points }}) </font></h4><br> <font size=3 face=arial> {{ question.description|safe }} </font> <br><font size=3 face=arial> Language: {{ question.language }} </font><br> - {% if error_message %} - <div class="alert alert-error"> - {% for e in error_message.splitlines %} - {{ e|join:"" }} - <br/> - {% endfor%} - </div> - {% endif %} </div> {% if error_message %} <div class="alert alert-error"> diff --git a/yaksh/templates/yaksh/quizzes_user.html b/yaksh/templates/yaksh/quizzes_user.html index fbd50ce..1dcd20d 100644 --- a/yaksh/templates/yaksh/quizzes_user.html +++ b/yaksh/templates/yaksh/quizzes_user.html @@ -51,7 +51,7 @@ <table class="bordered-table zebra-striped"> <th>Quiz</th> <th>Result</th> - <th>Mraks Obtained</th> + <th>Marks Obtained</th> <th>Total Marks</th> <th>Percentage</th> {% for paper in quizzes_taken %} |