summaryrefslogtreecommitdiff
path: root/yaksh/templates
diff options
context:
space:
mode:
authorPrabhu Ramachandran2016-05-27 12:32:21 +0530
committerPrabhu Ramachandran2016-05-27 12:32:21 +0530
commit033d116bc803fe165cbe6f7e228c29d8f0b019a9 (patch)
tree6553297f4855810eb349916a4a5947a1f88c4fb2 /yaksh/templates
parent5c74697b00ea08a2b78615637d8b322410fca4b0 (diff)
parent7b762b4550f08b95c1ebf8196bd79c3f77a306ca (diff)
downloadonline_test-033d116bc803fe165cbe6f7e228c29d8f0b019a9.tar.gz
online_test-033d116bc803fe165cbe6f7e228c29d8f0b019a9.tar.bz2
online_test-033d116bc803fe165cbe6f7e228c29d8f0b019a9.zip
Merge pull request #99 from adityacp/fix_timezone
Fix timezone
Diffstat (limited to 'yaksh/templates')
-rw-r--r--yaksh/templates/yaksh/intro.html4
-rw-r--r--yaksh/templates/yaksh/quizzes_user.html2
2 files changed, 4 insertions, 2 deletions
diff --git a/yaksh/templates/yaksh/intro.html b/yaksh/templates/yaksh/intro.html
index 1ed82e2..f05e9a1 100644
--- a/yaksh/templates/yaksh/intro.html
+++ b/yaksh/templates/yaksh/intro.html
@@ -12,7 +12,9 @@
</div>
{% else %}
<div class="alert">
- You can attempt this Quiz at any time between {{ questionpaper.quiz.start_date_time }} GMT and {{ questionpaper.quiz.end_date_time }} GMT
+ {% load tz %}
+ {% get_current_timezone as TIME_ZONE %}
+ You can attempt this Quiz at any time between {{ questionpaper.quiz.start_date_time }} {{ TIME_ZONE }} and {{ questionpaper.quiz.end_date_time }} {{ TIME_ZONE }}
<br/>
You are not allowed to attempt the Quiz before or after this duration
<br/>
diff --git a/yaksh/templates/yaksh/quizzes_user.html b/yaksh/templates/yaksh/quizzes_user.html
index 223952e..6403a21 100644
--- a/yaksh/templates/yaksh/quizzes_user.html
+++ b/yaksh/templates/yaksh/quizzes_user.html
@@ -42,7 +42,7 @@
{% if cannot_attempt %}
<p>You have not passed the prerequisite & hence you cannot take the quiz.</p>
{% endif %}
- <h4>List of quizzes availbale for you</h4>
+ <h4>List of quizzes available for you</h4>
{% if not quizzes %}
<h5>No active quizzes for you</h5>
{% endif %}