From 8c002a7d5fed7f4a452ce9ca1c02638c45310125 Mon Sep 17 00:00:00 2001 From: Hardik Ghaghada Date: Tue, 31 Jan 2012 18:19:21 +0530 Subject: updated login form (new UI) with forgot password link --- testapp/templates/exam/login.html | 47 ++++++++++++++++++++++++++++++++------- 1 file changed, 39 insertions(+), 8 deletions(-) (limited to 'testapp/templates/exam') diff --git a/testapp/templates/exam/login.html b/testapp/templates/exam/login.html index 8e6352e..9420903 100644 --- a/testapp/templates/exam/login.html +++ b/testapp/templates/exam/login.html @@ -3,18 +3,49 @@ {% block title %}Login{% endblock title %} {% block content %} -

Welcome to the Examination. -Please login to proceed.

- + + +
+
+
+

Online Test

+
+
+
+

Login


{% csrf_token %} - + +
{{ form.as_table }} -
+ - +
 
+
Forgot Password?

+
New User? Sign-Up
- -New User Registration +
+
+
+ + +
+ + + + + {% endblock content %} \ No newline at end of file -- cgit From cfe90f043d387fbca3d2312f14819133d668a59b Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Tue, 31 Jan 2012 19:05:38 +0530 Subject: Updated register.html with new look --- testapp/templates/exam/register.html | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) (limited to 'testapp/templates/exam') diff --git a/testapp/templates/exam/register.html b/testapp/templates/exam/register.html index 921e7b5..a90f21c 100644 --- a/testapp/templates/exam/register.html +++ b/testapp/templates/exam/register.html @@ -3,15 +3,37 @@ {% block title %}Registration form {% endblock %} {% block content %} -Please provide the following details. + + +
+
+
+

New User Registration

+
+
+
+

Please fill in the following details


+
{% csrf_token %} - -{{ form.as_table }} -
- +
+{{ form.as_table }} +
+
  
+
+
+
+ + + +
+ + + -{% endblock content %} \ No newline at end of file +{% endblock content %} -- cgit From 1a3ce22d9397a1fc95dcf99fc424a47f3fc660f7 Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Tue, 31 Jan 2012 19:08:00 +0530 Subject: Updated Question.html with new looks --- testapp/templates/exam/question.html | 60 ++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 23 deletions(-) (limited to 'testapp/templates/exam') diff --git a/testapp/templates/exam/question.html b/testapp/templates/exam/question.html index 8b589b6..eeb78c3 100644 --- a/testapp/templates/exam/question.html +++ b/testapp/templates/exam/question.html @@ -1,10 +1,12 @@ {% extends "base.html" %} - -{% block title %} Answer question {% endblock %} + + + + {% block title %} Answer question {% endblock %} {% block script %} {% endblock script %} - -{% block onload %} onload="update_time()" {% endblock %} + + +{% block onload %} onload="update_time()" {% endblock onload %} {% block content %} -

{{ question.summary }}

-

{{ question.description|safe }} -
-(Marks: {{ question.points }})

+
+ +
+
+

Online Test

+
+
+
-{% if error_message %}

ERROR:

{{ error_message }}
{% endif %} +

{{ question.summary }}

+
{{ question.description|safe }}
+
(Marks : {{ question.points }})
+ + +{% if error_message %}
ERROR:
{{ error_message }}
{% endif %}

@@ -65,27 +77,29 @@ function update_time() {{option}}
{% endfor %} {% else %} - + {% endif %} -
+ {% if question.type == "mcq" %} - +
   + {% else %} - +   + {% endif %} - + + -

{{ user.first_name.title }} {{ user.last_name.title }}, -you have {{ paper.questions_left }} question(s) left in {{ quiz_name }}.

+
{{ user.first_name.title }} {{ user.last_name.title }}, You have {{ paper.questions_left }} question(s) left in {{ quiz_name }}
-

Time left:

+

Time left:

{% csrf_token %} - + +
- + {% endblock content %} -- cgit From 20346cca57a525c155fdd7f18253689c68645efd Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Wed, 1 Feb 2012 10:31:51 +0530 Subject: Updated html file with new look --- testapp/templates/exam/complete.html | 26 ++++++++++++++++++++++---- testapp/templates/exam/question.html | 5 +++++ testapp/templates/exam/quit.html | 33 ++++++++++++++++++++++++++++----- 3 files changed, 55 insertions(+), 9 deletions(-) (limited to 'testapp/templates/exam') diff --git a/testapp/templates/exam/complete.html b/testapp/templates/exam/complete.html index 4c3f3d5..6790ea1 100644 --- a/testapp/templates/exam/complete.html +++ b/testapp/templates/exam/complete.html @@ -3,10 +3,28 @@ {% block title %}Good bye!{% endblock %} {% block content %} -

Good bye!

-

{{message}}

-
-

You may now close the browser.

+ + +
+
+
+

Online Test

+
+
+
+

Good bye!

+ +

{{message}}

+ +

You may now close the browser.

+ +
+
+

© FOSSEE group, IIT Bombay

+
+
+ + {% endblock content %} diff --git a/testapp/templates/exam/question.html b/testapp/templates/exam/question.html index eeb78c3..d843981 100644 --- a/testapp/templates/exam/question.html +++ b/testapp/templates/exam/question.html @@ -101,5 +101,10 @@ function update_time() +
+ +
{% endblock content %} diff --git a/testapp/templates/exam/quit.html b/testapp/templates/exam/quit.html index 37b5c08..c31fd87 100644 --- a/testapp/templates/exam/quit.html +++ b/testapp/templates/exam/quit.html @@ -2,13 +2,36 @@ {% block title %}Quit exam {% endblock %} + + {% block content %} -

Your current answers are saved.

-

Are you sure you wish to quit the exam?

+ +
+
+
+

Online Test

+
+
+
+ + +

Your current answers are saved.

+

Are you sure you wish to quit the exam?

{% csrf_token %} - - + + +
 
+
-{% endblock content %} \ No newline at end of file +
+
+
+ +
+ + +{% endblock content %} -- cgit From 5aa7fb163af95c27bb3aea4a1dee75ef406e0582 Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Wed, 1 Feb 2012 10:32:30 +0530 Subject: Updated Introduction form with new look --- testapp/templates/exam/intro.html | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) (limited to 'testapp/templates/exam') diff --git a/testapp/templates/exam/intro.html b/testapp/templates/exam/intro.html index 1d3e5de..2306fb7 100644 --- a/testapp/templates/exam/intro.html +++ b/testapp/templates/exam/intro.html @@ -3,7 +3,16 @@ {% block title %}Instructions and Rules {% endblock %} {% block content %} -

Important rules and instructions

+ + +
+
+
+

Online Test

+
+
+
+

Important instructions & rules


Welcome {{user.first_name.title}} {{user.last_name.title}}, to the programming quiz!

@@ -43,11 +52,23 @@ carefully. -

We hope you enjoy taking this exam.

+

We hope you enjoy taking this exam !!!

{% csrf_token %} - +
+
+
+
+
+ -{% endblock content %} \ No newline at end of file +
+ + + + +{% endblock content %} -- cgit From 6809186e406f96fa321b55060364bcaf7bfc4a99 Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Thu, 2 Feb 2012 12:39:30 +0530 Subject: Updated user_data and grade_user forms (new UI) --- testapp/templates/exam/grade_user.html | 31 ++++++++++++++++++++++++++----- testapp/templates/exam/user_data.html | 24 +++++++++++++++++++++++- 2 files changed, 49 insertions(+), 6 deletions(-) (limited to 'testapp/templates/exam') diff --git a/testapp/templates/exam/grade_user.html b/testapp/templates/exam/grade_user.html index 75ed2e0..2237475 100644 --- a/testapp/templates/exam/grade_user.html +++ b/testapp/templates/exam/grade_user.html @@ -3,8 +3,17 @@ {% block title %} Grading papers for {{ data.user.get_full_name.title }} {% endblock title %} {% block content %} + + +
+
+
+

Online Test

+
+
+
+

Grading papers for {{ data.user.get_full_name.title }}


-

Grading papers for {{ data.user.get_full_name.title }}

Name: {{ data.user.get_full_name.title }} @@ -30,7 +39,7 @@ Start time: {{ paper.start_time }}

{% if paper.answers.count %} -

Answers

+

Answers


{% csrf_token %} @@ -54,14 +63,15 @@ Start time: {{ paper.start_time }}
{% with answers|last as answer %} Marks: + value="{{ answer.marks }}">

{% endwith %} {% endfor %} {# for question, answers ... #}

Teacher comments:

-
- +
+
+
{% endif %} {# if paper.answers.count #} @@ -80,4 +90,15 @@ Marks: Admin +
+
+
+ + +
+ + + {% endblock content %} diff --git a/testapp/templates/exam/user_data.html b/testapp/templates/exam/user_data.html index 9fb442a..8026a73 100644 --- a/testapp/templates/exam/user_data.html +++ b/testapp/templates/exam/user_data.html @@ -3,8 +3,18 @@ {% block title %} Data for user {{ data.user.get_full_name.title }} {% endblock title %} {% block content %} + + +
+
+
+

Online Test

+
+
+
+

Data for user {{ data.user.get_full_name.title }}


+
-

Data for user {{ data.user.get_full_name.title }}

Name: {{ data.user.get_full_name.title }}
@@ -81,4 +91,16 @@ User IP address: {{ paper.user_ip }}
Admin +

+
+
+ + +
+ + + + {% endblock content %} -- cgit From 573dcc6149f3ccf8ffaa2df2dba3461b3b795c48 Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Thu, 2 Feb 2012 12:45:09 +0530 Subject: Updated Views.py, monitor.html and login.html with new changes --- testapp/templates/exam/login.html | 11 +++++----- testapp/templates/exam/monitor.html | 43 +++++++++++++++++++++++++++++++------ 2 files changed, 43 insertions(+), 11 deletions(-) (limited to 'testapp/templates/exam') diff --git a/testapp/templates/exam/login.html b/testapp/templates/exam/login.html index 9420903..0908fc2 100644 --- a/testapp/templates/exam/login.html +++ b/testapp/templates/exam/login.html @@ -19,19 +19,20 @@
{{ form.as_table }}
-
 
+
    

Forgot Password?

New User? Sign-Up
@@ -48,4 +49,4 @@ -{% endblock content %} \ No newline at end of file +{% endblock content %} diff --git a/testapp/templates/exam/monitor.html b/testapp/templates/exam/monitor.html index fb6cb58..0b59f76 100644 --- a/testapp/templates/exam/monitor.html +++ b/testapp/templates/exam/monitor.html @@ -1,22 +1,35 @@ {% extends "base.html" %} + + {% block title %} Quiz results {% endblock title %} {% block meta %} {% endblock meta %} + + {% block content %} +
+
+
{% if not quizzes and not quiz %} -

Quiz results

+

Quiz results

+
+
+
-

No quizzes available.

+
No quizzes available.
{% endif %} {# ############################################################### #} {# This is rendered when we are just viewing exam/monitor #} {% if quizzes %} -

Available quizzes

+

Available quizzes

+
+
+
    {% for quiz in quizzes %} @@ -28,11 +41,24 @@ {# ############################################################### #} {# This is rendered when we are just viewing exam/monitor/quiz_num #} {% if quiz %} -

    {{ quiz.description }} results

    +

    {{ quiz.description }} results

    +
+
+
+ {% if papers %} {#

Quiz: {{ quiz_name }}

#}

Number of papers: {{ papers|length }}

- + @@ -61,7 +87,12 @@

No answer papers so far.

{% endif %} {# if papers #} {% endif %} - Admin + + +
+

© FOSSEE group, IIT Bombay

+
+ {% endblock content %} -- cgit From 493f228229d96dab4a13b21cf7d4d089fcf7b2fd Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Mon, 6 Feb 2012 15:20:41 +0530 Subject: removed & tags from the forms --- testapp/templates/exam/grade_user.html | 5 +--- testapp/templates/exam/intro.html | 6 +---- testapp/templates/exam/login.html | 8 ++---- testapp/templates/exam/quit.html | 46 ++++++++++++++-------------------- testapp/templates/exam/register.html | 5 ---- testapp/templates/exam/user_data.html | 6 +---- 6 files changed, 24 insertions(+), 52 deletions(-) (limited to 'testapp/templates/exam') diff --git a/testapp/templates/exam/grade_user.html b/testapp/templates/exam/grade_user.html index 2237475..89faf46 100644 --- a/testapp/templates/exam/grade_user.html +++ b/testapp/templates/exam/grade_user.html @@ -3,8 +3,7 @@ {% block title %} Grading papers for {{ data.user.get_full_name.title }} {% endblock title %} {% block content %} - - +
@@ -99,6 +98,4 @@ Marks: - - {% endblock content %} diff --git a/testapp/templates/exam/intro.html b/testapp/templates/exam/intro.html index 2306fb7..35a6923 100644 --- a/testapp/templates/exam/intro.html +++ b/testapp/templates/exam/intro.html @@ -3,8 +3,7 @@ {% block title %}Instructions and Rules {% endblock %} {% block content %} - - +
@@ -68,7 +67,4 @@ carefully.
- - - {% endblock content %} diff --git a/testapp/templates/exam/login.html b/testapp/templates/exam/login.html index 9420903..770ceb4 100644 --- a/testapp/templates/exam/login.html +++ b/testapp/templates/exam/login.html @@ -3,8 +3,7 @@ {% block title %}Login{% endblock title %} {% block content %} - - +
@@ -44,8 +43,5 @@
- - - -{% endblock content %} \ No newline at end of file +{% endblock content %} diff --git a/testapp/templates/exam/quit.html b/testapp/templates/exam/quit.html index c31fd87..3ee85db 100644 --- a/testapp/templates/exam/quit.html +++ b/testapp/templates/exam/quit.html @@ -2,36 +2,28 @@ {% block title %}Quit exam {% endblock %} - -{% block content %} - -
-
-
-

Online Test

-
-
-
- - -

Your current answers are saved.

-

Are you sure you wish to quit the exam?

- -
-{% csrf_token %} +{% block content %} -
 
- - -
-
+
+
+
+

Online Test

+
+
+
+

Your current answers are saved.

+

Are you sure you wish to quit the exam?

+
+ {% csrf_token %} +
 
+ +
+
-
-

© FOSSEE group, IIT Bombay

-
+
+

© FOSSEE group, IIT Bombay

+
- - {% endblock content %} diff --git a/testapp/templates/exam/register.html b/testapp/templates/exam/register.html index a90f21c..1555ab3 100644 --- a/testapp/templates/exam/register.html +++ b/testapp/templates/exam/register.html @@ -4,7 +4,6 @@ {% block content %} -
@@ -16,8 +15,6 @@
{% csrf_token %} - -
Name
{{ form.as_table }}
@@ -33,7 +30,5 @@
- - {% endblock content %} diff --git a/testapp/templates/exam/user_data.html b/testapp/templates/exam/user_data.html index 8026a73..b9cbbb5 100644 --- a/testapp/templates/exam/user_data.html +++ b/testapp/templates/exam/user_data.html @@ -3,8 +3,7 @@ {% block title %} Data for user {{ data.user.get_full_name.title }} {% endblock title %} {% block content %} - - +
@@ -100,7 +99,4 @@ User IP address: {{ paper.user_ip }}
- - - {% endblock content %} -- cgit From f9540ba9b83ac2dc33885f3c8089f36a218d6273 Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Mon, 6 Feb 2012 15:29:25 +0530 Subject: removed & tags --- testapp/templates/exam/complete.html | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'testapp/templates/exam') diff --git a/testapp/templates/exam/complete.html b/testapp/templates/exam/complete.html index 6790ea1..6a401a4 100644 --- a/testapp/templates/exam/complete.html +++ b/testapp/templates/exam/complete.html @@ -4,8 +4,7 @@ {% block content %} - - +
@@ -25,6 +24,5 @@

© FOSSEE group, IIT Bombay

- - + {% endblock content %} -- cgit From 85a76d4777d3917cf5dbb716107581d4998c408d Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Tue, 7 Feb 2012 11:45:56 +0530 Subject: changes in question.html --- testapp/templates/exam/question.html | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) (limited to 'testapp/templates/exam') diff --git a/testapp/templates/exam/question.html b/testapp/templates/exam/question.html index d843981..a02e8c4 100644 --- a/testapp/templates/exam/question.html +++ b/testapp/templates/exam/question.html @@ -1,7 +1,6 @@ {% extends "base.html" %} - - + {% block title %} Answer question {% endblock %} {% block script %} @@ -46,20 +45,32 @@ function update_time() {% endblock script %} - - + {% block onload %} onload="update_time()" {% endblock onload %} {% block content %} -
+
+
+
+

Online Test

+ + + + {% csrf_token %} + + +
+
+
+
-

Online Test

+

Test for {{ user.first_name.title }} {{ user.last_name.title }}

-
-
+
+

{{ question.summary }}

{{ question.description|safe }}
@@ -96,15 +107,11 @@ function update_time()

Time left:

-
-{% csrf_token %} - - -
+

© FOSSEE group, IIT Bombay

- + {% endblock content %} -- cgit From 7c65d02d8a1f2ea72eabf3f13f85b8b444b1505e Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Wed, 15 Feb 2012 18:35:40 +0530 Subject: New views to manage/moderate Quiz --- testapp/templates/exam/grade_user.html | 24 ++++-------------------- testapp/templates/exam/monitor.html | 29 +++-------------------------- 2 files changed, 7 insertions(+), 46 deletions(-) (limited to 'testapp/templates/exam') diff --git a/testapp/templates/exam/grade_user.html b/testapp/templates/exam/grade_user.html index 89faf46..fa0e516 100644 --- a/testapp/templates/exam/grade_user.html +++ b/testapp/templates/exam/grade_user.html @@ -1,18 +1,10 @@ -{% extends "base.html" %} +{% extends "manage.html" %} {% block title %} Grading papers for {{ data.user.get_full_name.title }} {% endblock title %} -{% block content %} - -
-
-
-

Online Test

-
-
-
-

Grading papers for {{ data.user.get_full_name.title }}


+{% block subtitle %}Grading papers for {{ data.user.get_full_name.title }}{% endblock %} +{% block manage %}

Name: {{ data.user.get_full_name.title }} @@ -89,13 +81,5 @@ Marks: Admin -

-
-
-
-

© FOSSEE group, IIT Bombay

-
- -
-{% endblock content %} +{% endblock%} diff --git a/testapp/templates/exam/monitor.html b/testapp/templates/exam/monitor.html index 0b59f76..4847545 100644 --- a/testapp/templates/exam/monitor.html +++ b/testapp/templates/exam/monitor.html @@ -1,23 +1,13 @@ -{% extends "base.html" %} - - +{% extends "manage.html" %} {% block title %} Quiz results {% endblock title %} {% block meta %} {% endblock meta %} - -{% block content %} -
-
-
- +{% block manage %} {% if not quizzes and not quiz %}

Quiz results

-
-
-
No quizzes available.
@@ -27,9 +17,6 @@ {# This is rendered when we are just viewing exam/monitor #} {% if quizzes %}

Available quizzes

-
-
-
    {% for quiz in quizzes %} @@ -42,9 +29,6 @@ {# This is rendered when we are just viewing exam/monitor/quiz_num #} {% if quiz %}

    {{ quiz.description }} results

    -
-
-
{% if papers %} {#

Quiz: {{ quiz_name }}

#} @@ -88,11 +72,4 @@ table tbody th { {% endif %} {# if papers #} {% endif %} Admin -
- - -
-

© FOSSEE group, IIT Bombay

-
-
-{% endblock content %} +{% endblock %} -- cgit From 8c548960349a01393141845d0ae1e728e9130b7c Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Thu, 16 Feb 2012 11:18:55 +0530 Subject: The new html files --- testapp/templates/exam/add_question.html | 9 +++++++++ testapp/templates/exam/add_quiz.html | 10 ++++++++++ testapp/templates/exam/showusers.html | 12 ++++++++++++ 3 files changed, 31 insertions(+) create mode 100644 testapp/templates/exam/add_question.html create mode 100644 testapp/templates/exam/add_quiz.html create mode 100644 testapp/templates/exam/showusers.html (limited to 'testapp/templates/exam') diff --git a/testapp/templates/exam/add_question.html b/testapp/templates/exam/add_question.html new file mode 100644 index 0000000..fb5d38b --- /dev/null +++ b/testapp/templates/exam/add_question.html @@ -0,0 +1,9 @@ +{% extends "manage.html" %} + +{% block subtitle %} +Add Question +{% endblock %} + +{% block manage %} +

Add Question +{% endblock %} diff --git a/testapp/templates/exam/add_quiz.html b/testapp/templates/exam/add_quiz.html new file mode 100644 index 0000000..d568b30 --- /dev/null +++ b/testapp/templates/exam/add_quiz.html @@ -0,0 +1,10 @@ +{% extends "manage.html" %} + + +{% block subtitle %} +Add Quiz +{% endblock %} + +{% block manage %} +

Add Quiz +{% endblock %} diff --git a/testapp/templates/exam/showusers.html b/testapp/templates/exam/showusers.html new file mode 100644 index 0000000..ad9534f --- /dev/null +++ b/testapp/templates/exam/showusers.html @@ -0,0 +1,12 @@ +{% extends "manage.html" %} + + +{% block subtitle %} +List of Users +{% endblock %} + +{% block manage %} +{% for name in user %} +{{ name }}
+{% endfor %} +{% endblock %} -- cgit From d18df85469fc993520ee397f4a28b422c550408a Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Thu, 16 Feb 2012 12:51:32 +0530 Subject: Form to Add New Quiz --- testapp/templates/exam/add_quiz.html | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'testapp/templates/exam') diff --git a/testapp/templates/exam/add_quiz.html b/testapp/templates/exam/add_quiz.html index d568b30..a412ecc 100644 --- a/testapp/templates/exam/add_quiz.html +++ b/testapp/templates/exam/add_quiz.html @@ -6,5 +6,22 @@ Add Quiz {% endblock %} {% block manage %} -

Add Quiz + + +

+{% csrf_token %} +
+ +{{ form.as_table }} +
+
+
+
{% endblock %} -- cgit From c20539ed5f879c945cc89323e00daad96047d247 Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Thu, 16 Feb 2012 13:02:49 +0530 Subject: Form to add New Question --- testapp/templates/exam/add_question.html | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'testapp/templates/exam') diff --git a/testapp/templates/exam/add_question.html b/testapp/templates/exam/add_question.html index fb5d38b..a0ba14d 100644 --- a/testapp/templates/exam/add_question.html +++ b/testapp/templates/exam/add_question.html @@ -1,9 +1,26 @@ {% extends "manage.html" %} -{% block subtitle %} +{% block subtitle %} Add Question {% endblock %} + {% block manage %} -

Add Question + + +

+{% csrf_token %} +
+{{ form.as_table }} +
+
+ {% endblock %} + -- cgit From 467adb5d403e7dd29a83f44d06c80cdca8b4e7a1 Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Thu, 16 Feb 2012 15:37:20 +0530 Subject: Form to add New Quiz --- testapp/templates/exam/add_question.html | 1 + testapp/templates/exam/add_quiz.html | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'testapp/templates/exam') diff --git a/testapp/templates/exam/add_question.html b/testapp/templates/exam/add_question.html index a0ba14d..ae86ed1 100644 --- a/testapp/templates/exam/add_question.html +++ b/testapp/templates/exam/add_question.html @@ -21,6 +21,7 @@ table th, table td { {{ form.as_table }}
+
{% endblock %} diff --git a/testapp/templates/exam/add_quiz.html b/testapp/templates/exam/add_quiz.html index a412ecc..80a52ed 100644 --- a/testapp/templates/exam/add_quiz.html +++ b/testapp/templates/exam/add_quiz.html @@ -22,6 +22,7 @@ table th, table td { {{ form.as_table }}
-
+
+
{% endblock %} -- cgit From e8ba4ba5301a805194a555f52275407f045b91ab Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Mon, 20 Feb 2012 19:51:32 +0530 Subject: New file to manage questions --- testapp/templates/exam/showquestions.html | 35 +++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 testapp/templates/exam/showquestions.html (limited to 'testapp/templates/exam') diff --git a/testapp/templates/exam/showquestions.html b/testapp/templates/exam/showquestions.html new file mode 100644 index 0000000..38d4bcc --- /dev/null +++ b/testapp/templates/exam/showquestions.html @@ -0,0 +1,35 @@ +{% extends "manage.html" %} + + +{% block subtitle %} +List of Questions +{% endblock %} + +{% block script %} + +{% endblock %} + +{% block manage %} +
+{% csrf_token %} +{% for i in questions %} +  {{ i }}
+{% endfor %} +
+   + +
+{% endblock %} -- cgit From f6a90c1eb603c9f3b8178102e387025880c0a5ac Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Mon, 20 Feb 2012 19:51:58 +0530 Subject: changes to manage questions --- testapp/templates/exam/add_question.html | 2 +- testapp/templates/exam/grade_user.html | 6 +++--- testapp/templates/exam/monitor.html | 2 +- testapp/templates/exam/showusers.html | 3 ++- testapp/templates/exam/user_data.html | 8 ++++---- 5 files changed, 11 insertions(+), 10 deletions(-) (limited to 'testapp/templates/exam') diff --git a/testapp/templates/exam/add_question.html b/testapp/templates/exam/add_question.html index ae86ed1..2d42b34 100644 --- a/testapp/templates/exam/add_question.html +++ b/testapp/templates/exam/add_question.html @@ -21,7 +21,7 @@ table th, table td { {{ form.as_table }}
-
+
{% endblock %} diff --git a/testapp/templates/exam/grade_user.html b/testapp/templates/exam/grade_user.html index fa0e516..bad1765 100644 --- a/testapp/templates/exam/grade_user.html +++ b/testapp/templates/exam/grade_user.html @@ -32,7 +32,7 @@ Start time: {{ paper.start_time }}
{% if paper.answers.count %}

Answers


+ action="{{URL_ROOT}}/exam/manage/grade_user/{{data.user.username}}/" method="post"> {% csrf_token %} {% for question, answers in paper.get_question_answers.items %}

@@ -71,11 +71,11 @@ Marks: 1 %} - + Monitor quiz {% else %} {% with data.papers.0 as paper %} - + Monitor quiz {% endwith %} {% endif %} diff --git a/testapp/templates/exam/monitor.html b/testapp/templates/exam/monitor.html index 4847545..a802de2 100644 --- a/testapp/templates/exam/monitor.html +++ b/testapp/templates/exam/monitor.html @@ -20,7 +20,7 @@

{% endif %} diff --git a/testapp/templates/exam/showusers.html b/testapp/templates/exam/showusers.html index ad9534f..038cb8b 100644 --- a/testapp/templates/exam/showusers.html +++ b/testapp/templates/exam/showusers.html @@ -5,8 +5,9 @@ List of Users {% endblock %} + {% block manage %} {% for name in user %} -{{ name }}
+{{ name }}
{% endfor %} {% endblock %} diff --git a/testapp/templates/exam/user_data.html b/testapp/templates/exam/user_data.html index b9cbbb5..c835f61 100644 --- a/testapp/templates/exam/user_data.html +++ b/testapp/templates/exam/user_data.html @@ -30,7 +30,7 @@ Last login: {{ data.user.last_login }}

{% if data.papers %} -

+

Grade/correct paper

@@ -75,15 +75,15 @@ User IP address: {{ paper.user_ip }} {% endif %} {# if data.papers #}
- + Grade/correct paper
{% if data.papers.count > 1 %} - + Monitor quiz {% else %} {% with data.papers.0 as paper %} - + Monitor quiz {% endwith %} {% endif %} -- cgit From c61396a219efb3b078094d028e41fe51bc857fe3 Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Mon, 20 Feb 2012 20:28:51 +0530 Subject: new file to manage quiz --- testapp/templates/exam/show_quiz.html | 46 +++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 testapp/templates/exam/show_quiz.html (limited to 'testapp/templates/exam') diff --git a/testapp/templates/exam/show_quiz.html b/testapp/templates/exam/show_quiz.html new file mode 100644 index 0000000..a113953 --- /dev/null +++ b/testapp/templates/exam/show_quiz.html @@ -0,0 +1,46 @@ +{% extends "manage.html" %} + +{% block title %} Quiz List {% endblock title %} + +{% block script %} + +{% endblock %} + +{% block manage %} +{% if not quizzes and not quiz %} +

Available Quiz

+ +
No quizzes available.
+ +{% endif %} + +{# ############################################################### #} +{# This is rendered when we are just viewing exam/monitor #} +{% if quizzes %} +

List of Quizzes

+ +{% csrf_token %} +{% for quiz in quizzes %} + +  {{ quiz.description }}
+{% endfor %} +

+   + +{% endif %} +{% endblock %} -- cgit From ddb7f4e07771f4e4ca514c253d671698e1b74020 Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Mon, 20 Feb 2012 20:29:06 +0530 Subject: changes to manage quiz --- testapp/templates/exam/add_quiz.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testapp/templates/exam') diff --git a/testapp/templates/exam/add_quiz.html b/testapp/templates/exam/add_quiz.html index 80a52ed..d51d129 100644 --- a/testapp/templates/exam/add_quiz.html +++ b/testapp/templates/exam/add_quiz.html @@ -23,6 +23,6 @@ table th, table td {
-
+ {% endblock %} -- cgit From 6b608e174fbd9367c9453f7933b69a35516811d2 Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Tue, 21 Feb 2012 11:35:56 +0530 Subject: add docstrings to each view in views.py --- testapp/templates/exam/show_quiz.html | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'testapp/templates/exam') diff --git a/testapp/templates/exam/show_quiz.html b/testapp/templates/exam/show_quiz.html index a113953..bbea77f 100644 --- a/testapp/templates/exam/show_quiz.html +++ b/testapp/templates/exam/show_quiz.html @@ -23,16 +23,14 @@ function my_confirm(frm) {% block manage %} {% if not quizzes and not quiz %} -

Available Quiz

- +
Available Quiz
No quizzes available.
- {% endif %} {# ############################################################### #} {# This is rendered when we are just viewing exam/monitor #} {% if quizzes %} -

List of Quizzes

+

Quiz List

{% csrf_token %} {% for quiz in quizzes %} -- cgit From 2b6b595ca8652696ab9059add8ea54661cab5f31 Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Tue, 21 Feb 2012 12:38:38 +0530 Subject: views for editing quiz and questions --- testapp/templates/exam/show_quiz.html | 2 +- testapp/templates/exam/showquestions.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'testapp/templates/exam') diff --git a/testapp/templates/exam/show_quiz.html b/testapp/templates/exam/show_quiz.html index bbea77f..2e9059d 100644 --- a/testapp/templates/exam/show_quiz.html +++ b/testapp/templates/exam/show_quiz.html @@ -35,7 +35,7 @@ function my_confirm(frm) {% csrf_token %} {% for quiz in quizzes %} -  {{ quiz.description }}
+  {{ quiz.description }}
{% endfor %}

   diff --git a/testapp/templates/exam/showquestions.html b/testapp/templates/exam/showquestions.html index 38d4bcc..994ca26 100644 --- a/testapp/templates/exam/showquestions.html +++ b/testapp/templates/exam/showquestions.html @@ -26,7 +26,7 @@ function my_confirm(frm) {% csrf_token %} {% for i in questions %} -  {{ i }}
+  {{ i }}
{% endfor %}
   -- cgit From f2d65592affd34bc60cf4a3a2c72de1d84c934c0 Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Wed, 22 Feb 2012 16:02:07 +0530 Subject: Changes related to Authentication of Moderator --- testapp/templates/exam/monitor.html | 4 ++-- testapp/templates/exam/show_quiz.html | 1 + testapp/templates/exam/showusers.html | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'testapp/templates/exam') diff --git a/testapp/templates/exam/monitor.html b/testapp/templates/exam/monitor.html index a802de2..60814c7 100644 --- a/testapp/templates/exam/monitor.html +++ b/testapp/templates/exam/monitor.html @@ -55,9 +55,9 @@ table tbody th { {% for paper in papers %} - + {{ paper.user.get_full_name.title }} - + {{ paper.user.username }} {{ paper.profile.roll_number }} {{ paper.profile.institute }} diff --git a/testapp/templates/exam/show_quiz.html b/testapp/templates/exam/show_quiz.html index 2e9059d..001b2fe 100644 --- a/testapp/templates/exam/show_quiz.html +++ b/testapp/templates/exam/show_quiz.html @@ -33,6 +33,7 @@ function my_confirm(frm)

Quiz List

{% csrf_token %} + {% for quiz in quizzes %}   {{ quiz.description }}
diff --git a/testapp/templates/exam/showusers.html b/testapp/templates/exam/showusers.html index 038cb8b..441b921 100644 --- a/testapp/templates/exam/showusers.html +++ b/testapp/templates/exam/showusers.html @@ -8,6 +8,6 @@ List of Users {% block manage %} {% for name in user %} -{{ name }}
+{{ name }}
{% endfor %} {% endblock %} -- cgit From 9acff5f2cf9f9ae3d2fc097e1fcd84712d3199d0 Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Thu, 23 Feb 2012 16:30:36 +0530 Subject: more changes to edit multiple questions at a time --- testapp/templates/exam/edit_question.html | 29 +++++++++++++++++++++++++++++ testapp/templates/exam/showquestions.html | 18 ++++++++++++++++-- 2 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 testapp/templates/exam/edit_question.html (limited to 'testapp/templates/exam') diff --git a/testapp/templates/exam/edit_question.html b/testapp/templates/exam/edit_question.html new file mode 100644 index 0000000..04217ab --- /dev/null +++ b/testapp/templates/exam/edit_question.html @@ -0,0 +1,29 @@ +{% extends "manage.html" %} + +{% block subtitle %} +Edit Question +{% endblock %} + + +{% block manage %} + + + +{% csrf_token %} +{% for form in forms %} + +{{ form.as_table }} +
+
+{% endfor %} +
+
+
+{% endblock %} diff --git a/testapp/templates/exam/showquestions.html b/testapp/templates/exam/showquestions.html index 994ca26..edcba6f 100644 --- a/testapp/templates/exam/showquestions.html +++ b/testapp/templates/exam/showquestions.html @@ -7,7 +7,7 @@ List of Questions {% block script %} {% endblock %} @@ -30,6 +42,8 @@ function my_confirm(frm) {% endfor %}
   - +   + + {% endblock %} -- cgit From dd3fd7b8c58d836baba24441e7d55c6d51858eab Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Thu, 23 Feb 2012 18:49:36 +0530 Subject: View for Editing Quiz --- testapp/templates/exam/edit_quiz.html | 31 +++++++++++++++++++++++++++++++ testapp/templates/exam/show_quiz.html | 15 ++++++++++++++- testapp/templates/exam/user_data.html | 28 ++++------------------------ 3 files changed, 49 insertions(+), 25 deletions(-) create mode 100644 testapp/templates/exam/edit_quiz.html (limited to 'testapp/templates/exam') diff --git a/testapp/templates/exam/edit_quiz.html b/testapp/templates/exam/edit_quiz.html new file mode 100644 index 0000000..7744623 --- /dev/null +++ b/testapp/templates/exam/edit_quiz.html @@ -0,0 +1,31 @@ +{% extends "manage.html" %} + + +{% block subtitle %} +Edit Quiz(zes) +{% endblock %} + +{% block manage %} + + +
+{% csrf_token %} +{% for form in forms %} +
+ +{{ form.as_table }} +
+
+
+{% endfor %} +
+
+
+{% endblock %} diff --git a/testapp/templates/exam/show_quiz.html b/testapp/templates/exam/show_quiz.html index 001b2fe..d546b06 100644 --- a/testapp/templates/exam/show_quiz.html +++ b/testapp/templates/exam/show_quiz.html @@ -17,6 +17,17 @@ function my_confirm(frm) } } +function confirm_edit(frm) +{ + var n = 0; + for (var i =0;i {% endblock %} @@ -39,7 +50,9 @@ function my_confirm(frm)   {{ quiz.description }}
{% endfor %}

-   +   +   + {% endif %} {% endblock %} diff --git a/testapp/templates/exam/user_data.html b/testapp/templates/exam/user_data.html index c835f61..943dfe8 100644 --- a/testapp/templates/exam/user_data.html +++ b/testapp/templates/exam/user_data.html @@ -1,20 +1,11 @@ -{% extends "base.html" %} +{% extends "manage.html" %} {% block title %} Data for user {{ data.user.get_full_name.title }} {% endblock title %} -{% block content %} +{% block manage %} -
-
-
-

Online Test

-
-
-
-

Data for user {{ data.user.get_full_name.title }}


+{% block subtitle %}Data for user {{ data.user.get_full_name.title }}{% endblock %}
- -

Name: {{ data.user.get_full_name.title }}
Username: {{ data.user.username }}
@@ -87,16 +78,5 @@ User IP address: {{ paper.user_ip }} Monitor quiz {% endwith %} {% endif %} -
-Admin - -

-
-
-
-

© FOSSEE group, IIT Bombay

-
- -
-{% endblock content %} +{% endblock %} -- cgit From b1fbf5b02280de5b78b0249e777a179e34b50b98 Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Fri, 24 Feb 2012 16:16:38 +0530 Subject: formating and identation --- testapp/templates/exam/add_question.html | 32 +++-- testapp/templates/exam/add_quiz.html | 36 +++--- testapp/templates/exam/complete.html | 37 +++--- testapp/templates/exam/edit_question.html | 38 +++--- testapp/templates/exam/edit_quiz.html | 43 ++++--- testapp/templates/exam/grade_user.html | 4 +- testapp/templates/exam/intro.html | 103 ++++++---------- testapp/templates/exam/login.html | 76 ++++++------ testapp/templates/exam/monitor.html | 53 ++++----- testapp/templates/exam/question.html | 190 ++++++++++++++---------------- testapp/templates/exam/quit.html | 39 +++--- testapp/templates/exam/register.html | 46 ++++---- testapp/templates/exam/show_quiz.html | 39 +++--- testapp/templates/exam/showquestions.html | 40 +++---- testapp/templates/exam/user_data.html | 6 +- 15 files changed, 351 insertions(+), 431 deletions(-) (limited to 'testapp/templates/exam') diff --git a/testapp/templates/exam/add_question.html b/testapp/templates/exam/add_question.html index 2d42b34..d5503b5 100644 --- a/testapp/templates/exam/add_question.html +++ b/testapp/templates/exam/add_question.html @@ -1,27 +1,25 @@ {% extends "manage.html" %} -{% block subtitle %} -Add Question -{% endblock %} +{% block subtitle %}Add Question{% endblock %} {% block manage %} - + -{% csrf_token %} -
-{{ form.as_table }} -
-
-
+ {% csrf_token %} +
+ {{ form.as_table }} +
+
+
{% endblock %} diff --git a/testapp/templates/exam/add_quiz.html b/testapp/templates/exam/add_quiz.html index d51d129..4dae30b 100644 --- a/testapp/templates/exam/add_quiz.html +++ b/testapp/templates/exam/add_quiz.html @@ -1,28 +1,26 @@ {% extends "manage.html" %} -{% block subtitle %} -Add Quiz -{% endblock %} +{% block subtitle %}Add Quiz{% endblock %} {% block manage %} + -
-{% csrf_token %} -
- -{{ form.as_table }} -
-
-
-
+ {% csrf_token %} +
+ + {{ form.as_table }} +
+
+
+
{% endblock %} diff --git a/testapp/templates/exam/complete.html b/testapp/templates/exam/complete.html index 6a401a4..f5c658f 100644 --- a/testapp/templates/exam/complete.html +++ b/testapp/templates/exam/complete.html @@ -3,26 +3,21 @@ {% block title %}Good bye!{% endblock %} {% block content %} - - -
-
-
-

Online Test

-
-
-
- -

Good bye!

- -

{{message}}

- -

You may now close the browser.

- -
-
-

© FOSSEE group, IIT Bombay

-
+
+
+
+

Online Test

+
+
+
+

Good bye!

+

{{message}}

+

You may now close the browser.

+
+
+
+
+

© FOSSEE group, IIT Bombay

+
- {% endblock content %} diff --git a/testapp/templates/exam/edit_question.html b/testapp/templates/exam/edit_question.html index 04217ab..7613cc6 100644 --- a/testapp/templates/exam/edit_question.html +++ b/testapp/templates/exam/edit_question.html @@ -1,29 +1,27 @@ {% extends "manage.html" %} -{% block subtitle %} -Edit Question -{% endblock %} +{% block subtitle %}Edit Question{% endblock %} {% block manage %} - +
-{% csrf_token %} -{% for form in forms %} - -{{ form.as_table }} -
-
-{% endfor %} -
-
+ {% csrf_token %} + {% for form in forms %} + + {{ form.as_table }} +
+
+ {% endfor %} +
+
{% endblock %} diff --git a/testapp/templates/exam/edit_quiz.html b/testapp/templates/exam/edit_quiz.html index 7744623..27b179f 100644 --- a/testapp/templates/exam/edit_quiz.html +++ b/testapp/templates/exam/edit_quiz.html @@ -1,31 +1,28 @@ {% extends "manage.html" %} -{% block subtitle %} -Edit Quiz(zes) -{% endblock %} +{% block subtitle %}Edit Quiz(zes){% endblock %} {% block manage %} - - +
-{% csrf_token %} -{% for form in forms %} -
- -{{ form.as_table }} -
-
-
-{% endfor %} -
-
+ {% csrf_token %} + {% for form in forms %} +
+ + {{ form.as_table }} +
+
+
+ {% endfor %} +
+
{% endblock %} diff --git a/testapp/templates/exam/grade_user.html b/testapp/templates/exam/grade_user.html index bad1765..5b0e1a7 100644 --- a/testapp/templates/exam/grade_user.html +++ b/testapp/templates/exam/grade_user.html @@ -71,8 +71,7 @@ Marks: 1 %} - - Monitor quiz +Monitor quiz {% else %} {% with data.papers.0 as paper %} @@ -81,5 +80,4 @@ Marks: Admin - {% endblock%} diff --git a/testapp/templates/exam/intro.html b/testapp/templates/exam/intro.html index 35a6923..167a4b2 100644 --- a/testapp/templates/exam/intro.html +++ b/testapp/templates/exam/intro.html @@ -3,68 +3,43 @@ {% block title %}Instructions and Rules {% endblock %} {% block content %} - -
-
-
-

Online Test

-
-
-
-

Important instructions & rules


- -

Welcome {{user.first_name.title}} {{user.last_name.title}}, -to the programming quiz!

- -

-This examination system has been developed with the intention of making you -learn programming and be assessed in an interactive and fun manner. -You will be presented with a series of programming questions and problems that -you will answer online and get immediate feedback for. -

- -

Here are some important instructions and rules that you should understand -carefully. -

- -
    - -
  • For any programming questions, you can submit solutions as many times as - you want without a penalty. You may skip questions and solve them later. -
    • - -
  • You may use your computer's Python/IPython shell or - an editor to solve - the problem and cut/paste the solution to the web interface. -
    • - -
  • You are not allowed to use any internet - resources, i.e. no google etc.
    • - -
  • Do not copy or share the questions or answers with anyone until the - exam is complete for everyone.
    • - -
  • All your attempts at the questions are logged. - Do not try to outsmart and break the testing system. If you do, we know - who you are and we will expell you from the course. You have been warned. -
    • - -
- -

We hope you enjoy taking this exam !!!

- -
-{% csrf_token %} -
- -
-
-
-
-
-

© FOSSEE group, IIT Bombay

-
- -
- +
+
+
+

Online Test

+
+
+
+

Important instructions & rules


+

Welcome {{user.first_name.title}} {{user.last_name.title}}, to the programming quiz!

+

+ This examination system has been developed with the intention of making you + learn programming and be assessed in an interactive and fun manner. + You will be presented with a series of programming questions and problems that + you will answer online and get immediate feedback for. +

+

Here are some important instructions and rules that you should understand carefully.

+
    +
  • For any programming questions, you can submit solutions as many times as you want without a penalty. You may skip questions and solve them later. +
    • +
  • You may use your computer's Python/IPython shell or an editor to solve the problem and cut/paste the solution to the web interface. +
    • +
  • You are not allowed to use any internet resources, i.e. no google etc.
    • +
  • Do not copy or share the questions or answers with anyone until the exam is complete for everyone.
    • +
  • All your attempts at the questions are logged. Do not try to outsmart and break the testing system. If you do, we know who you are and we will expell you from the course. You have been warned. +
    • +
+

We hope you enjoy taking this exam !!!

+ +
+ {% csrf_token %} +
+
+
+
+
+
+

© FOSSEE group, IIT Bombay

+
+
{% endblock content %} diff --git a/testapp/templates/exam/login.html b/testapp/templates/exam/login.html index 62aedcf..07a91fc 100644 --- a/testapp/templates/exam/login.html +++ b/testapp/templates/exam/login.html @@ -3,46 +3,40 @@ {% block title %}Login{% endblock title %} {% block content %} - -
-
-
-

Online Test

-
-
-
-

Login


-
-{% csrf_token %} - - -
-{{ form.as_table }} -
- -
    
-
Forgot Password?

-
New User? Sign-Up
-
+
+
+
+

Online Test

+
+
+
+

Login


+
+ {% csrf_token %} + +
+ {{ form.as_table }} +
+
    
+
Forgot Password?

+
New User? Sign-Up
+
+
+
+
+
+

© FOSSEE group, IIT Bombay

+
-
-
-
-

© FOSSEE group, IIT Bombay

-
- -
- - {% endblock content %} diff --git a/testapp/templates/exam/monitor.html b/testapp/templates/exam/monitor.html index 60814c7..a0287e7 100644 --- a/testapp/templates/exam/monitor.html +++ b/testapp/templates/exam/monitor.html @@ -6,18 +6,15 @@ {% block manage %} -{% if not quizzes and not quiz %} -

Quiz results

- -
No quizzes available.
- -{% endif %} + {% if not quizzes and not quiz %} +

Quiz results

+
No quizzes available.
+ {% endif %} {# ############################################################### #} {# This is rendered when we are just viewing exam/monitor #} {% if quizzes %}

Available quizzes

-
    {% for quiz in quizzes %}
  • {{ quiz.description }}
    • @@ -33,32 +30,32 @@ {% if papers %} {#

    Quiz: {{ quiz_name }}

    #}

    Number of papers: {{ papers|length }}

    - + - - - - - - - + + + + + + + {% for paper in papers %} - - + + diff --git a/testapp/templates/exam/question.html b/testapp/templates/exam/question.html index a02e8c4..113a9ae 100644 --- a/testapp/templates/exam/question.html +++ b/testapp/templates/exam/question.html @@ -1,117 +1,103 @@ {% extends "base.html" %} + - {% block title %} Answer question {% endblock %} +{% block title %} Answer question {% endblock %} {% block script %} - + {% endblock script %} {% block onload %} onload="update_time()" {% endblock onload %} {% block content %} -
    -
    -
    -

    Online Test

    - - -
    - {% csrf_token %} - - -
    -
    -
    +
    +
    +

    Online Test

    +
    + {% csrf_token %} + + +
    +
    +
    -
    -
    -

    Test for {{ user.first_name.title }} {{ user.last_name.title }}

    -
    -
    -
    - -

    {{ question.summary }}

    -
    {{ question.description|safe }}
    -
    (Marks : {{ question.points }})
    - - -{% if error_message %}
    ERROR:
    {{ error_message }}
    {% endif %} - -

    - -
    -{% csrf_token %} -{% if question.type == "mcq" %} -{% for option in question.options.strip.splitlines %} -{{option}}
    -{% endfor %} -{% else %} - -{% endif %} - -{% if question.type == "mcq" %} -
       - -{% else %} -   - -{% endif %} - - - - -
    {{ user.first_name.title }} {{ user.last_name.title }}, You have {{ paper.questions_left }} question(s) left in {{ quiz_name }}
    - -

    Time left:

    - -
    - -
    -
    -

    © FOSSEE group, IIT Bombay

    -
    +
    +
    +

    Test for {{ user.first_name.title }} {{ user.last_name.title }}

    +
    +
    +
    +

    {{ question.summary }}

    +
    {{ question.description|safe }}
    +
    (Marks : {{ question.points }})
    + {% if error_message %}
    ERROR:
    {{ error_message }}
    {% endif %} +

    +
    + {% csrf_token %} + {% if question.type == "mcq" %} + {% for option in question.options.strip.splitlines %} + {{option}}
    + {% endfor %} + {% else %} + + {% endif %} + + {% if question.type == "mcq" %} +
       + {% else %} +    + {% endif %} + + +
    {{ user.first_name.title }} {{ user.last_name.title }}, You have {{ paper.questions_left }} question(s) left in {{ quiz_name }}
    +

    Time left:

    +
    +
    +
    +
    +
    +

    © FOSSEE group, IIT Bombay

    +
    - {% endblock content %} diff --git a/testapp/templates/exam/quit.html b/testapp/templates/exam/quit.html index 3ee85db..118ea07 100644 --- a/testapp/templates/exam/quit.html +++ b/testapp/templates/exam/quit.html @@ -2,28 +2,25 @@ {% block title %}Quit exam {% endblock %} - - {% block content %} -
    -
    -
    -

    Online Test

    -
    -
    -
    -

    Your current answers are saved.

    -

    Are you sure you wish to quit the exam?

    -
    - {% csrf_token %} -
     
    - -
    -
    -
    -
    -

    © FOSSEE group, IIT Bombay

    -
    +
    +
    +

    Online Test

    +
    +
    +
    +

    Your current answers are saved.

    +

    Are you sure you wish to quit the exam?

    +
    + {% csrf_token %} +
     
    + +
    +
    +
    +
    +

    © FOSSEE group, IIT Bombay

    +
    {% endblock content %} diff --git a/testapp/templates/exam/register.html b/testapp/templates/exam/register.html index 1555ab3..e416470 100644 --- a/testapp/templates/exam/register.html +++ b/testapp/templates/exam/register.html @@ -3,32 +3,26 @@ {% block title %}Registration form {% endblock %} {% block content %} - -
    -
    -
    -

    New User Registration

    -
    -
    -
    +
    +
    +
    +

    Online Test

    +
    +
    +

    Please fill in the following details


    - -
    -{% csrf_token %} -
    Name Username Roll number Institute Questions answered Total marks Attempts Name Username Roll number Institute Questions answered Total marks Attempts
    - {{ paper.user.get_full_name.title }} - {{ paper.user.username }} {{ paper.user.get_full_name.title }} {{ paper.user.username }} {{ paper.profile.roll_number }} {{ paper.profile.institute }} {{ paper.get_answered_str }}
    -{{ form.as_table }} -
-
  
- +
+ {% csrf_token %} +
+ {{ form.as_table }} +
+
  
+
+
+
+
+
+

© FOSSEE group, IIT Bombay

+
-
-
- -
-

© FOSSEE group, IIT Bombay

-
- -
- - {% endblock content %} diff --git a/testapp/templates/exam/show_quiz.html b/testapp/templates/exam/show_quiz.html index d546b06..e6aecd6 100644 --- a/testapp/templates/exam/show_quiz.html +++ b/testapp/templates/exam/show_quiz.html @@ -3,33 +3,31 @@ {% block title %} Quiz List {% endblock title %} {% block script %} - + } + {% endblock %} {% block manage %} @@ -46,13 +44,14 @@ function confirm_edit(frm) {% csrf_token %} {% for quiz in quizzes %} -   {{ quiz.description }}
{% endfor %} +

      {% endif %} + {% endblock %} diff --git a/testapp/templates/exam/showquestions.html b/testapp/templates/exam/showquestions.html index edcba6f..116e747 100644 --- a/testapp/templates/exam/showquestions.html +++ b/testapp/templates/exam/showquestions.html @@ -1,37 +1,34 @@ {% extends "manage.html" %} -{% block subtitle %} -List of Questions -{% endblock %} +{% block subtitle %}List of Questions {% endblock %} {% block script %} - + } + {% endblock %} {% block manage %} @@ -44,6 +41,5 @@ function confirm_edit(frm)       - {% endblock %} diff --git a/testapp/templates/exam/user_data.html b/testapp/templates/exam/user_data.html index 943dfe8..fad0310 100644 --- a/testapp/templates/exam/user_data.html +++ b/testapp/templates/exam/user_data.html @@ -70,12 +70,10 @@ User IP address: {{ paper.user_ip }} Grade/correct paper
{% if data.papers.count > 1 %} - - Monitor quiz +Monitor quiz {% else %} {% with data.papers.0 as paper %} - - Monitor quiz +Monitor quiz {% endwith %} {% endif %} -- cgit From b7ad768a6cc4fe5c8a05e20b1968f13a678c22cc Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Tue, 28 Feb 2012 12:09:28 +0530 Subject: changes to remove the inline css from every page --- testapp/templates/exam/add_question.html | 12 +++-------- testapp/templates/exam/add_quiz.html | 13 ++++------- testapp/templates/exam/complete.html | 16 ++------------ testapp/templates/exam/edit_question.html | 14 ++++-------- testapp/templates/exam/edit_quiz.html | 12 ++++------- testapp/templates/exam/grade_user.html | 11 +++++++--- testapp/templates/exam/intro.html | 19 ++++------------ testapp/templates/exam/login.html | 36 +++++++------------------------ testapp/templates/exam/monitor.html | 15 +++---------- testapp/templates/exam/question.html | 23 ++++++-------------- testapp/templates/exam/quit.html | 17 ++------------- testapp/templates/exam/register.html | 36 ++++++++++++------------------- 12 files changed, 62 insertions(+), 162 deletions(-) (limited to 'testapp/templates/exam') diff --git a/testapp/templates/exam/add_question.html b/testapp/templates/exam/add_question.html index d5503b5..59a1d64 100644 --- a/testapp/templates/exam/add_question.html +++ b/testapp/templates/exam/add_question.html @@ -2,17 +2,11 @@ {% block subtitle %}Add Question{% endblock %} +{% block css %} + +{% endblock %} {% block manage %} - -
{% csrf_token %}
diff --git a/testapp/templates/exam/add_quiz.html b/testapp/templates/exam/add_quiz.html index 4dae30b..dedc627 100644 --- a/testapp/templates/exam/add_quiz.html +++ b/testapp/templates/exam/add_quiz.html @@ -3,16 +3,11 @@ {% block subtitle %}Add Quiz{% endblock %} -{% block manage %} - +{% block css %} + +{% endblock %} +{% block manage %} {% csrf_token %}
diff --git a/testapp/templates/exam/complete.html b/testapp/templates/exam/complete.html index f5c658f..dfeee6c 100644 --- a/testapp/templates/exam/complete.html +++ b/testapp/templates/exam/complete.html @@ -2,22 +2,10 @@ {% block title %}Good bye!{% endblock %} +{% block pagetitle %}Online Test{% endblock %} {% block content %} -
-
-
-

Online Test

-
-
-
+

Good bye!

{{message}}

You may now close the browser.

-
-
-
-
-

© FOSSEE group, IIT Bombay

-
-
{% endblock content %} diff --git a/testapp/templates/exam/edit_question.html b/testapp/templates/exam/edit_question.html index 7613cc6..6a4f1ec 100644 --- a/testapp/templates/exam/edit_question.html +++ b/testapp/templates/exam/edit_question.html @@ -2,21 +2,15 @@ {% block subtitle %}Edit Question{% endblock %} +{% block css %} + +{% endblock %} {% block manage %} - - {% csrf_token %} {% for form in forms %} -
+
{{ form.as_table }}
diff --git a/testapp/templates/exam/edit_quiz.html b/testapp/templates/exam/edit_quiz.html index 27b179f..56eb0c0 100644 --- a/testapp/templates/exam/edit_quiz.html +++ b/testapp/templates/exam/edit_quiz.html @@ -3,15 +3,11 @@ {% block subtitle %}Edit Quiz(zes){% endblock %} +{% block css %} + +{% endblock %} + {% block manage %} - {% csrf_token %} {% for form in forms %} diff --git a/testapp/templates/exam/grade_user.html b/testapp/templates/exam/grade_user.html index 5b0e1a7..fccdaaa 100644 --- a/testapp/templates/exam/grade_user.html +++ b/testapp/templates/exam/grade_user.html @@ -3,6 +3,10 @@ {% block title %} Grading papers for {{ data.user.get_full_name.title }} {% endblock title %} {% block subtitle %}Grading papers for {{ data.user.get_full_name.title }}{% endblock %} + +{% block css %} + +{% endblock %} {% block manage %} @@ -32,12 +36,13 @@ Start time: {{ paper.start_time }}
{% if paper.answers.count %}

Answers


+ action="{{URL_ROOT}}/exam/manage/gradeuser/{{data.user.username}}/" method="post"> {% csrf_token %} {% for question, answers in paper.get_question_answers.items %}

- - Question: {{ question.id }}. {{ question.summary }} + + Question: {{ question.id }}. {{ question.summary }} (Points: {{ question.points }})

{% if question.type == "mcq" %}

Choices: diff --git a/testapp/templates/exam/intro.html b/testapp/templates/exam/intro.html index 167a4b2..ef218a2 100644 --- a/testapp/templates/exam/intro.html +++ b/testapp/templates/exam/intro.html @@ -3,14 +3,10 @@ {% block title %}Instructions and Rules {% endblock %} {% block content %} -

-
-
-

Online Test

-
-
-
-

Important instructions & rules


+ +{% block pagetitle %}Online Test {% endblock %} +{% block formtitle %}Important instructions & rules {% endblock %} +

Welcome {{user.first_name.title}} {{user.last_name.title}}, to the programming quiz!

This examination system has been developed with the intention of making you @@ -35,11 +31,4 @@ {% csrf_token %}

-
-
-
-
-

© FOSSEE group, IIT Bombay

-
-
{% endblock content %} diff --git a/testapp/templates/exam/login.html b/testapp/templates/exam/login.html index 07a91fc..078e7a7 100644 --- a/testapp/templates/exam/login.html +++ b/testapp/templates/exam/login.html @@ -1,30 +1,16 @@ {% extends "base.html" %} {% block title %}Login{% endblock title %} - +{% block pagetitle %} Online Test {% endblock %} +{% block formtitle %}Login{% endblock %} +{% block css %} + +{% endblock %} {% block content %} -
-
-
-

Online Test

-
-
-
-

Login


+
{% csrf_token %} - +
{{ form.as_table }}
@@ -32,11 +18,5 @@
Forgot Password?

New User? Sign-Up
-
-
-
-
-

© FOSSEE group, IIT Bombay

-
-
+ {% endblock content %} diff --git a/testapp/templates/exam/monitor.html b/testapp/templates/exam/monitor.html index a0287e7..9385e73 100644 --- a/testapp/templates/exam/monitor.html +++ b/testapp/templates/exam/monitor.html @@ -4,6 +4,9 @@ {% block meta %} {% endblock meta %} +{% block css %} + +{% endblock %} {% block manage %} {% if not quizzes and not quiz %} @@ -30,18 +33,6 @@ {% if papers %} {#

Quiz: {{ quiz_name }}

#}

Number of papers: {{ papers|length }}

- diff --git a/testapp/templates/exam/question.html b/testapp/templates/exam/question.html index 113a9ae..f5dcdf4 100644 --- a/testapp/templates/exam/question.html +++ b/testapp/templates/exam/question.html @@ -48,6 +48,7 @@ {% block onload %} onload="update_time()" {% endblock onload %} +{% block pagetitle %}

Test for {{ user.first_name.title }} {{ user.last_name.title }}

{% endblock %} {% block content %}
@@ -61,16 +62,10 @@
-
-
-
-

Test for {{ user.first_name.title }} {{ user.last_name.title }}

-
-
-
-

{{ question.summary }}

-
{{ question.description|safe }}
-
(Marks : {{ question.points }})
+ +

{{ question.summary }} (Marks : {{ question.points }})


+ {{ question.description|safe }} + {% if error_message %}
ERROR:
{{ error_message }}
{% endif %}

@@ -93,11 +88,5 @@
{{ user.first_name.title }} {{ user.last_name.title }}, You have {{ paper.questions_left }} question(s) left in {{ quiz_name }}

Time left:

-
-
-
-
-

© FOSSEE group, IIT Bombay

-
-
+ {% endblock content %} diff --git a/testapp/templates/exam/quit.html b/testapp/templates/exam/quit.html index 118ea07..40a0a92 100644 --- a/testapp/templates/exam/quit.html +++ b/testapp/templates/exam/quit.html @@ -1,26 +1,13 @@ {% extends "base.html" %} {% block title %}Quit exam {% endblock %} - +{% block pagetitle %}Online Test {% endblock %} {% block content %} -
-
-
-

Online Test

-
-
-
+

Your current answers are saved.

Are you sure you wish to quit the exam?

{% csrf_token %}
 
-
-
-
-
-

© FOSSEE group, IIT Bombay

-
-
{% endblock content %} diff --git a/testapp/templates/exam/register.html b/testapp/templates/exam/register.html index e416470..5ff79cc 100644 --- a/testapp/templates/exam/register.html +++ b/testapp/templates/exam/register.html @@ -2,27 +2,19 @@ {% block title %}Registration form {% endblock %} +{% block pagetitle %}Online Test {% endblock %} +{% block formtitle %}Please fill in the following details {% endblock %} + {% block content %} -
-
-
-

Online Test

-
-
-
-

Please fill in the following details


-
- {% csrf_token %} -
Name
- {{ form.as_table }} -
-
  
- -
-
-
-
-

© FOSSEE group, IIT Bombay

-
-
+ + + +
+ {% csrf_token %} +
+ {{ form.as_table }} +
+
  
+
+ {% endblock content %} -- cgit From 7660073c5c83534a869f685b27c0fe0152b9983c Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Tue, 28 Feb 2012 18:14:17 +0530 Subject: Minor changes for displaying question details in grade_user and licensing in css --- testapp/templates/exam/grade_user.html | 37 ++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) (limited to 'testapp/templates/exam') diff --git a/testapp/templates/exam/grade_user.html b/testapp/templates/exam/grade_user.html index fccdaaa..5d3aa58 100644 --- a/testapp/templates/exam/grade_user.html +++ b/testapp/templates/exam/grade_user.html @@ -8,6 +8,22 @@ {% endblock %} +{% block script %} + +{% endblock %} {% block manage %}

@@ -35,14 +51,25 @@ Start time: {{ paper.start_time }}
{% if paper.answers.count %}

Answers


-
{% csrf_token %} {% for question, answers in paper.get_question_answers.items %}

- - Question: {{ question.id }}. {{ question.summary }} + Question: {{ question.id }}. {{ question.summary }} +

+
+ +
+ + (Points: {{ question.points }})

{% if question.type == "mcq" %}

Choices: @@ -62,6 +89,8 @@ Marks:

{% endwith %} {% endfor %} {# for question, answers ... #} + +

Teacher comments:

-- cgit From 87862b8c8d7822a4578b5cb5f413bedb37454bd2 Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Wed, 29 Feb 2012 13:14:00 +0530 Subject: minor changes for rendering question(s) --- testapp/templates/exam/add_question.html | 17 +++++++++++++++-- testapp/templates/exam/edit_question.html | 19 +++++++++++++++++-- testapp/templates/exam/grade_user.html | 4 ++-- 3 files changed, 34 insertions(+), 6 deletions(-) (limited to 'testapp/templates/exam') diff --git a/testapp/templates/exam/add_question.html b/testapp/templates/exam/add_question.html index 59a1d64..8bccb66 100644 --- a/testapp/templates/exam/add_question.html +++ b/testapp/templates/exam/add_question.html @@ -2,18 +2,31 @@ {% block subtitle %}Add Question{% endblock %} +{% block script %} + +{% endblock %} {% block css %} {% endblock %} {% block manage %} - + {% csrf_token %} +Look of Question in HTML Format : +

+
{{ form.as_table }}
+
-{% endblock %} +{% endblock %} diff --git a/testapp/templates/exam/edit_question.html b/testapp/templates/exam/edit_question.html index 6a4f1ec..a189ac5 100644 --- a/testapp/templates/exam/edit_question.html +++ b/testapp/templates/exam/edit_question.html @@ -5,11 +5,25 @@ {% block css %} {% endblock %} - +{% block script %} + +{% endblock %} {% block manage %} -
+ {% csrf_token %} + {% for form in forms %} +Look of Question in HTML Format : +

{{ form.as_table }}
@@ -19,3 +33,4 @@
{% endblock %} + diff --git a/testapp/templates/exam/grade_user.html b/testapp/templates/exam/grade_user.html index 5d3aa58..b7970e8 100644 --- a/testapp/templates/exam/grade_user.html +++ b/testapp/templates/exam/grade_user.html @@ -56,7 +56,7 @@ Start time: {{ paper.start_time }}
{% csrf_token %} {% for question, answers in paper.get_question_answers.items %}

- Question: {{ question.id }}. {{ question.summary }} + Question: {{ question.id }}. {{ question.summary }} (Points: {{ question.points }})

- (Points: {{ question.points }})

+ {% if question.type == "mcq" %}

Choices: {% for option in question.options.strip.splitlines %} {{option}}, {% endfor %} -- cgit From a7c84a478789e9e835dcbb3ea41b1d519ba69b4d Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Tue, 13 Mar 2012 18:44:01 +0530 Subject: minor changes for UI --- testapp/templates/exam/add_quiz.html | 14 +++++++++-- testapp/templates/exam/edit_question.html | 40 +++++++++++++++++++++++++++++-- testapp/templates/exam/edit_quiz.html | 21 ++++++++++++---- testapp/templates/exam/grade_user.html | 29 ++++++++++++---------- testapp/templates/exam/monitor.html | 18 +++++++++----- testapp/templates/exam/show_quiz.html | 5 ++-- testapp/templates/exam/user_data.html | 4 ++-- 7 files changed, 98 insertions(+), 33 deletions(-) (limited to 'testapp/templates/exam') diff --git a/testapp/templates/exam/add_quiz.html b/testapp/templates/exam/add_quiz.html index dedc627..fe99ce6 100644 --- a/testapp/templates/exam/add_quiz.html +++ b/testapp/templates/exam/add_quiz.html @@ -6,9 +6,18 @@ {% block css %} {% endblock %} +{% block script %} + +{% endblock %} +{% block onload %} onload="javascript:test();" {% endblock %} {% block manage %} -

+ {% csrf_token %}
@@ -16,6 +25,7 @@
-
+ +
{% endblock %} diff --git a/testapp/templates/exam/edit_question.html b/testapp/templates/exam/edit_question.html index a189ac5..b1395e9 100644 --- a/testapp/templates/exam/edit_question.html +++ b/testapp/templates/exam/edit_question.html @@ -15,15 +15,49 @@ function my_render(frm) } } +function load_form() +{ + +} + +function data(showContent,showHideDiv) +{ + var con = document.getElementById(showContent); + var ele=document.getElementById(showHideDiv); + if (ele.style.display=="block") + { + con.style.display = "none" + ele.style.display = "none"; + } + else + { + con.style.display = "block"; + ele.style.display = "block"; + } +} {% endblock %} +{% block onload %} onload='javascript:load_form();' {% endblock %} {% block manage %}
{% csrf_token %} - {% for form in forms %} -Look of Question in HTML Format : + {% for form in forms %} + + {{ form.summary.value }}Show
+ Look of Question in HTML Format :

+
+ +
+
+ {% endfor %} + + {% for form in forms %} + {{ form.as_table }}
@@ -32,5 +66,7 @@ function my_render(frm)
+ + {% endblock %} diff --git a/testapp/templates/exam/edit_quiz.html b/testapp/templates/exam/edit_quiz.html index 56eb0c0..d513e7a 100644 --- a/testapp/templates/exam/edit_quiz.html +++ b/testapp/templates/exam/edit_quiz.html @@ -5,19 +5,30 @@ {% block css %} + {% endblock %} {% block manage %}
{% csrf_token %} - {% for form in forms %}
- - {{ form.as_table }} +
+ + + {% for form in forms %} + + + + {% endfor %}
Start Date Duration Active Description +
{{ form.start_date}} {{ form.duration }} {{ form.active }} {{ form.description }} +
-
- {% endfor %}
diff --git a/testapp/templates/exam/grade_user.html b/testapp/templates/exam/grade_user.html index b7970e8..c6f6343 100644 --- a/testapp/templates/exam/grade_user.html +++ b/testapp/templates/exam/grade_user.html @@ -10,17 +10,20 @@ {% block script %} {% endblock %} @@ -56,9 +59,9 @@ Start time: {{ paper.start_time }}
{% csrf_token %} {% for question, answers in paper.get_question_answers.items %}

- Question: {{ question.id }}. {{ question.summary }} (Points: {{ question.points }})

-
-
+ Question: {{ question.id }}. {{ question.summary }} ... + (Points: {{ question.points }})

+