summaryrefslogtreecommitdiff
path: root/yaksh/templates
diff options
context:
space:
mode:
Diffstat (limited to 'yaksh/templates')
-rw-r--r--yaksh/templates/base.html63
-rw-r--r--yaksh/templates/yaksh/intro.html4
-rw-r--r--yaksh/templates/yaksh/quizzes_user.html2
3 files changed, 44 insertions, 25 deletions
diff --git a/yaksh/templates/base.html b/yaksh/templates/base.html
index 83db7ff..efa1d58 100644
--- a/yaksh/templates/base.html
+++ b/yaksh/templates/base.html
@@ -1,35 +1,52 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!doctype html>
+<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7" lang=""> <![endif]-->
+<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8" lang=""> <![endif]-->
+<!--[if IE 8]> <html class="no-js lt-ie9" lang=""> <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang=""> <!--<![endif]-->
+<head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <title>
+ {% block title %}
+ {% endblock %}
+ </title>
+ <meta name="description" content="">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <link rel="apple-touch-icon" href="apple-touch-icon.png">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <title>
- {% block title %}
- {% endblock %}
- </title>
+ <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/bootstrap.min.css">
+ <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/base.css">
- {% block meta %}
- <meta charset="utf-8">
- <meta name="description" content="">
- <meta name="author" content="">
- {% endblock %}
-
- <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/base.css" type="text/css" />
- {% block css %}
- {% endblock %}
-<script language="JavaScript" type="text/javascript" src="{{ URL_ROOT }}/static/yaksh/js/jquery-1.4.2.min.js"></script>
- {% block script %}
- {% endblock %}
- </head>
+ <style>
+ body {
+ padding-top: 50px;
+ padding-bottom: 20px;
+ }
+ </style>
+ {% block meta %}
+ <meta charset="utf-8">
+ <meta name="description" content="">
+ <meta name="author" content="">
+ {% endblock %}
-<body {% block onload %}{% endblock %}>
+ {% block css %}
+ {% endblock %}
+ <script src="{{ URL_ROOT }}/static/yaksh/js/bootstrap.min.js"></script>
+ <script language="JavaScript" type="text/javascript" src="{{ URL_ROOT }}/static/yaksh/js/jquery-1.4.2.min.js"></script>
+ {% block script %}
+ {% endblock %}
+</head>
+
+<body
+ {% block onload %}
+ {% endblock %}>
<div class="container">
<div class="content">
<div class="page-header">
<h1><Strong><center>{% block pagetitle %} {% endblock pagetitle %}</center></strong></h1>
</div>
<div class=row>
- <div class=span14>
+ <div class=span12>
<h3><center>{% block formtitle %} {% endblock formtitle %}</center></h3><br>
{% block content %}
{% endblock %}
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 %}