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/question.html') 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/question.html | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'testapp/templates/exam/question.html') 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 %} -- 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/question.html') 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 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/question.html | 190 ++++++++++++++++------------------- 1 file changed, 88 insertions(+), 102 deletions(-) (limited to 'testapp/templates/exam/question.html') 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 %} -- 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/question.html | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) (limited to 'testapp/templates/exam/question.html') 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 %} -- cgit From 480fc524eaffa99bbcec65b0829f6116ccace673 Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Thu, 15 Mar 2012 18:12:49 +0530 Subject: minor UI changes --- testapp/templates/exam/question.html | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'testapp/templates/exam/question.html') diff --git a/testapp/templates/exam/question.html b/testapp/templates/exam/question.html index f5dcdf4..d3da9fc 100644 --- a/testapp/templates/exam/question.html +++ b/testapp/templates/exam/question.html @@ -4,6 +4,10 @@ {% block title %} Answer question {% endblock %} +{% block css %} + +{% endblock %} + {% block script %} + {% endblock script %} {% block onload %} onload="update_time()" {% endblock onload %} -- cgit From 64b38d3365f1d65132942fce6e29fed7da076bba Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Wed, 28 Mar 2012 11:55:34 +0530 Subject: minor changes --- testapp/templates/exam/question.html | 40 +++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) (limited to 'testapp/templates/exam/question.html') diff --git a/testapp/templates/exam/question.html b/testapp/templates/exam/question.html index 981af7f..87ed40d 100644 --- a/testapp/templates/exam/question.html +++ b/testapp/templates/exam/question.html @@ -9,7 +9,45 @@ {% endblock %} {% block script %} - + {% endblock script %} {% block onload %} onload="update_time()" {% endblock onload %} -- cgit From 6c0d75e784b87ed05e4c138110f987e88a37701b Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Wed, 18 Apr 2012 01:56:51 +0530 Subject: changes for student interface --- testapp/templates/exam/question.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'testapp/templates/exam/question.html') diff --git a/testapp/templates/exam/question.html b/testapp/templates/exam/question.html index 87ed40d..584ab72 100644 --- a/testapp/templates/exam/question.html +++ b/testapp/templates/exam/question.html @@ -70,9 +70,9 @@ - + {% csrf_token %} - +
@@ -85,7 +85,7 @@ {% if error_message %}
ERROR:
{{ error_message }}
{% endif %}

-
+ {% csrf_token %} {% if question.type == "mcq" %} {% for option in question.options.strip.splitlines %} -- cgit From 1712353f3646e24de7ec359bdbb9c9a3012b1597 Mon Sep 17 00:00:00 2001 From: Jay Parikh Date: Mon, 25 Jun 2012 17:28:28 +0530 Subject: implemented tabs & line numbers in textarea --- testapp/templates/exam/question.html | 123 ++++++++++++++++++++++++++++++++++- 1 file changed, 122 insertions(+), 1 deletion(-) (limited to 'testapp/templates/exam/question.html') diff --git a/testapp/templates/exam/question.html b/testapp/templates/exam/question.html index 584ab72..b2f5816 100644 --- a/testapp/templates/exam/question.html +++ b/testapp/templates/exam/question.html @@ -6,9 +6,123 @@ {% block css %} + {% endblock %} {% block script %} + + + + + {% endblock script %} + {% block onload %} onload="update_time()" {% endblock onload %} {% block pagetitle %} @@ -92,7 +207,13 @@ {{option}}
{% endfor %} {% else %} - + + +
+ + {% endif %} {% if question.type == "mcq" %} -- cgit From c12f20984aa75751af89a0d6213bc35924bc593b Mon Sep 17 00:00:00 2001 From: Jay Parikh Date: Mon, 18 Mar 2013 15:11:15 +0530 Subject: Added code snippets for questions --- testapp/templates/exam/question.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testapp/templates/exam/question.html') diff --git a/testapp/templates/exam/question.html b/testapp/templates/exam/question.html index b2f5816..aaf7270 100644 --- a/testapp/templates/exam/question.html +++ b/testapp/templates/exam/question.html @@ -208,7 +208,7 @@ function catchTab(item,e){ {% endfor %} {% else %} - +
- - - - + {% endblock script %} -{% block onload %} onload="update_time()" {% endblock onload %} + +{% block onload %} onload="update_time()" {% endblock %} {% block pagetitle %} @@ -178,6 +28,7 @@ function catchTab(item,e){ {% endblock %} {% block content %} +
-- cgit From c8b68813ca80aee16261e5f02d541ed48712feae Mon Sep 17 00:00:00 2001 From: Hardik Ghaghada Date: Fri, 26 Apr 2013 16:40:34 +0530 Subject: Dumped JS from HTML pages to separate JS files --- testapp/templates/exam/question.html | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) (limited to 'testapp/templates/exam/question.html') diff --git a/testapp/templates/exam/question.html b/testapp/templates/exam/question.html index c74564c..8cd2599 100644 --- a/testapp/templates/exam/question.html +++ b/testapp/templates/exam/question.html @@ -11,6 +11,35 @@ {% block script %} + + {% endblock script %} @@ -28,7 +57,6 @@ {% endblock %} {% block content %} -
-- cgit From 92852b6f04e82abbe8eea9d296b5bbc5a15399cf Mon Sep 17 00:00:00 2001 From: Hardik Ghaghada Date: Fri, 26 Apr 2013 16:46:06 +0530 Subject: missed this file in the previous commit --- testapp/templates/exam/question.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testapp/templates/exam/question.html') diff --git a/testapp/templates/exam/question.html b/testapp/templates/exam/question.html index 8cd2599..4f65b64 100644 --- a/testapp/templates/exam/question.html +++ b/testapp/templates/exam/question.html @@ -13,7 +13,7 @@