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/monitor.html | 43 +++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 6 deletions(-) (limited to 'testapp/templates/exam/monitor.html') 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 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/monitor.html | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) (limited to 'testapp/templates/exam/monitor.html') 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 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/monitor.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testapp/templates/exam/monitor.html') 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 %} -- 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 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'testapp/templates/exam/monitor.html') 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 %} - - -- 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/monitor.html | 53 +++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 28 deletions(-) (limited to 'testapp/templates/exam/monitor.html') 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 }}

    - +
Name
+ {{ paper.user.get_full_name.title }} + {{ paper.user.username }} {{ paper.profile.roll_number }} {{ paper.profile.institute }}
- - - - - - - + + + + + + + {% for paper in papers %} - - + + -- 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/monitor.html | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'testapp/templates/exam/monitor.html') 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 }}

-
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 }}
-- 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/monitor.html | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'testapp/templates/exam/monitor.html') diff --git a/testapp/templates/exam/monitor.html b/testapp/templates/exam/monitor.html index 9385e73..29cb6e9 100644 --- a/testapp/templates/exam/monitor.html +++ b/testapp/templates/exam/monitor.html @@ -7,17 +7,25 @@ {% block css %} {% endblock %} - +{% block subtitle %} + {% if not quizzes and not quiz %} + Quiz Results + {% endif %} + {% if quizzes %} + Available Quizzes + {% endif %} + {% if quiz %} + {{ quiz.description }} Results + {% endif %} +{% endblock %} {% block manage %} {% if not quizzes and not quiz %} -

Quiz results

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

Available quizzes

    {% for quiz in quizzes %}
  • {{ quiz.description }}
    • @@ -28,7 +36,6 @@ {# ############################################################### #} {# This is rendered when we are just viewing exam/monitor/quiz_num #} {% if quiz %} -

    {{ quiz.description }} results

    {% if papers %} {#

    Quiz: {{ quiz_name }}

    #} @@ -59,5 +66,4 @@

    No answer papers so far.

    {% endif %} {# if papers #} {% endif %} -Admin {% endblock %} -- cgit From 9d0a737afdb23a50b28237055c87bfa72197d99b Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Sat, 14 Apr 2012 07:24:02 +0530 Subject: minor changes as model changes --- testapp/templates/exam/monitor.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'testapp/templates/exam/monitor.html') diff --git a/testapp/templates/exam/monitor.html b/testapp/templates/exam/monitor.html index 29cb6e9..aa8b678 100644 --- a/testapp/templates/exam/monitor.html +++ b/testapp/templates/exam/monitor.html @@ -27,8 +27,8 @@ {# This is rendered when we are just viewing exam/monitor #} {% if quizzes %} {% endif %} -- cgit
Name