From c17befa219b03adc4cd4c0902d9248994db90c38 Mon Sep 17 00:00:00 2001 From: adityacp Date: Tue, 21 Jan 2020 11:19:12 +0530 Subject: Fix design question paper UI --- yaksh/templates/yaksh/add_quiz.html | 41 ++- yaksh/templates/yaksh/design_questionpaper.html | 396 +++++++++++++----------- yaksh/templates/yaksh/moderator_dashboard.html | 12 +- 3 files changed, 240 insertions(+), 209 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/add_quiz.html b/yaksh/templates/yaksh/add_quiz.html index cc5a961..1e3c425 100644 --- a/yaksh/templates/yaksh/add_quiz.html +++ b/yaksh/templates/yaksh/add_quiz.html @@ -77,22 +77,8 @@ God Mode - - Help -
-
-
-
- User Mode: Attempt quiz the way normal users will attempt i.e. - -
    -
  • Quiz will have the same duration as that of the original quiz.
    • -
  • Quiz won't start if the course is inactive or the quiz time has expired.
    • -
  • You will be notified about quiz prerequisites.(You can still attempt the quiz though)
    • -
- God Mode: Attempt quiz without any time or eligibilty constraints. -
-
-
+ + Help {% endif %} {% endif %} + {% endblock %} diff --git a/yaksh/templates/yaksh/design_questionpaper.html b/yaksh/templates/yaksh/design_questionpaper.html index 0ab7cc0..c5aa25e 100644 --- a/yaksh/templates/yaksh/design_questionpaper.html +++ b/yaksh/templates/yaksh/design_questionpaper.html @@ -1,39 +1,36 @@ {% extends "manage.html" %} +{% load static %} {% block title %} Design Question Paper {% endblock title %} {% block subtitle %} Design Question Paper {% endblock %} {% block css %} - - + {% endblock %} {% block script %} - - - - + + {% endblock %} {% block content %} -
+
{% if course_id %} -
- Cancel + + +  Back + {% else %} - - Cancel + + +  Back + {% endif %} {% csrf_token %} -
Manual mode to design the {{lang}} Question Paper

+
Manual mode to design the {{lang}} Question Paper

  • @@ -55,86 +52,105 @@ select
+
-

Total Marks: {{ qpaper.total_marks }}

+

Total Marks: + {{ qpaper.total_marks }} +

-
- -
-
-
Please select Question type and Marks
+
+ {% if messages %} + {% for message in messages %} +
+ + {{ message }}
-
- {{ filter_form.question_type }} -
-
- {{ filter_form.marks }} -
-
-

- {% csrf_token %} -
-

Or

- -

Search using Tags:

- Search Questions: -
-
- - - - + {% endfor %} + {% endif %} +
+ +
+
+
Please select Question type and Marks
+
- + {{ filter_form.question_type }}
-
-
-

-
-
-

Select questions to add:

-
- {% if state == "fixed" or state == "None" %} -
    - {% for question in questions %} -
  • - -
    • - {% endfor %} -
- {% endif %} -
-

- + {{ filter_form.marks }} +
+
+
+ {% csrf_token %} +
+

Or

+ +

Search using Tags:

+ Search Questions: +
+
+ + + + +
+
-
-
-

Fixed questions currently in paper:

-
+
+

+
+
+
+
+

Select questions to add:

+
+ {% if state == "fixed" or state == "None" %} +
    + {% for question in questions %} +
  • + +
    • + {% endfor %} +
+ {% endif %} +
+
+
+ +
+
+
+

Fixed questions currently in paper:

+
    {% for question in fixed_questions %}
  • @@ -153,119 +169,125 @@ select
    • {% endfor %}
+
-
- +
+
+
+
+
+ Next >
-
-
-
- Next > -
-
+
-
-
-
-
-

Select questions to add to the pool:

-
- {% if state == "random" %} - + + {% for q in questions %} + {% if forloop.counter0 != 0 %} + + {% endif %} + {% if questions|length == 1%} + {% endif %} - {% if questions|length == 1%} - - {% endif %} + {% endfor %} + +
    + {% for question in questions %} +
  • + +
    • {% endfor %} - -
      - {% for question in questions %} -
    • - -
      • - {% endfor %} -
    - {% endif %} +
+ {% endif %} +
-

- +
+
-
-
-
-

Pool of questions currently in paper:

-
-
    - {% for random_set in random_sets %} -
  • - -
    • - {% for question in random_set.questions.all %} -
  • - -
    • +
    +
    +

    Pool of questions currently in paper:

    +
    +
      + {% for random_set in random_sets %} +
    • + +
      • + {% for question in random_set.questions.all %} +
    • + +
      • + {% endfor %} {% endfor %} - {% endfor %} -
    +
+

- +
-
-
-
-
- < Previous -
-
- Next > -
-
- -
-
-
Almost finished creating your question paper
-

-

- +

- < Previous + < Previous
- -
-
+
+ Next > +
+
+ +
+
+
Almost finished creating your question paper
+

+

+ +
+
+ < Previous +
+
+
+

diff --git a/yaksh/templates/yaksh/moderator_dashboard.html b/yaksh/templates/yaksh/moderator_dashboard.html index e9a6985..af1f546 100644 --- a/yaksh/templates/yaksh/moderator_dashboard.html +++ b/yaksh/templates/yaksh/moderator_dashboard.html @@ -19,16 +19,16 @@ Create Demo Course -
- {% if msg %} -
-
+

+ {% if messages %} + {% for message in messages %} +
- {{ msg }} + {{ message }}
-
+ {% endfor %} {% endif %} {% with objects as courses %} -- cgit