From 8f583b3a00f9b2d65c19b99c886d69cb9d0e2d27 Mon Sep 17 00:00:00 2001 From: ankitjavalkar Date: Tue, 25 Aug 2020 16:12:52 +0530 Subject: Add form labesl to editprofile form rendering --- yaksh/templates/yaksh/editprofile.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/editprofile.html b/yaksh/templates/yaksh/editprofile.html index 47e74ea..509b2f6 100644 --- a/yaksh/templates/yaksh/editprofile.html +++ b/yaksh/templates/yaksh/editprofile.html @@ -34,7 +34,9 @@ {% endfor %} {% endif %} {% for field in form %} - {{ field }} {{ field.help_text }} + + +
{{ field.label }}{{ field }}{{ field.help_text }}

{% endfor %}
-- cgit From c83f596fcc12528f72b0ae302b42b988a492e461 Mon Sep 17 00:00:00 2001 From: ankitjavalkar Date: Tue, 25 Aug 2020 16:23:16 +0530 Subject: Fix form label position --- yaksh/templates/yaksh/editprofile.html | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/editprofile.html b/yaksh/templates/yaksh/editprofile.html index 509b2f6..c95da88 100644 --- a/yaksh/templates/yaksh/editprofile.html +++ b/yaksh/templates/yaksh/editprofile.html @@ -6,13 +6,11 @@
{% csrf_token %} -
{% csrf_token %} -
{% if form.errors %} {% for field in form %} {% for error in field.errors %} @@ -34,16 +32,17 @@ {% endfor %} {% endif %} {% for field in form %} - - -
{{ field.label }}{{ field }}{{ field.help_text }}
-
+
+ + {{ field }} +
{% endfor %}

-
   - Cancel
+ Cancel
-- cgit From 5c0d64f8a100a74bda7f9160f2f33db7807c3171 Mon Sep 17 00:00:00 2001 From: ankitjavalkar Date: Wed, 26 Aug 2020 15:59:46 +0530 Subject: Add correct column name to question statistics page --- yaksh/templates/yaksh/statistics_question.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/statistics_question.html b/yaksh/templates/yaksh/statistics_question.html index 58fd8db..606f5e9 100644 --- a/yaksh/templates/yaksh/statistics_question.html +++ b/yaksh/templates/yaksh/statistics_question.html @@ -19,7 +19,7 @@ {% if question_stats %}

Total number of participants: {{ total }}

- + {% for question, value in question_stats.items %} {% endfor %} -- cgit From d8b7314c38a0a1ae4e0cfea9399e943b94366c5b Mon Sep 17 00:00:00 2001 From: ankitjavalkar Date: Wed, 26 Aug 2020 17:12:45 +0530 Subject: Display question details --- yaksh/templates/yaksh/statistics_question.html | 107 ++++++++++++++++++++++++- 1 file changed, 106 insertions(+), 1 deletion(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/statistics_question.html b/yaksh/templates/yaksh/statistics_question.html index 606f5e9..9a54501 100644 --- a/yaksh/templates/yaksh/statistics_question.html +++ b/yaksh/templates/yaksh/statistics_question.html @@ -21,10 +21,115 @@
QuestionTypeTotalAnswered
QuestionTypeTotalAnswered Correctly
{{ question.summary }}{{ question.type }}{{value.1}}{{ value.0 }} ({% widthratio value.0 value.1 100 %}%)
{% for question, value in question_stats.items %} - + + + + + + + {% endfor %}
QuestionTypeTotalAnswered Correctly
{{ question.summary }}{{ question.type }}{{value.1}}{{ value.0 }} ({% widthratio value.0 value.1 100 %}%)
{{ question.summary }} + +
+
+ + Summary: + +

+ {{ question.summary }} +

+ + Description: + +

+ {{ question.description }} +

+ + Points: + +

+ {{ question.points }} +

+ + Type: + +

+ {{ question.type }} +

+ {% if question.type in 'mcq mcc' %} + + Test Cases: + +

+

    + {% for tc in question.testcase_set.all %} +
  1. + {{ tc.mcqtestcase.options }} + {% if tc.mcqtestcase.correct %} + Correct + {% endif %} +
    2. + {% endfor %} +
+

+ {% endif %} +
+
+ 		{{ question.type }}{{value.1}}{{ value.0 }} ({% widthratio value.0 value.1 100 %}%)
{% endif %} + + + + + + + -- cgit From de9ac5e647622f0e9908bf830a4a962306d350a1 Mon Sep 17 00:00:00 2001 From: adityacp Date: Thu, 27 Aug 2020 17:25:36 +0530 Subject: Add mathjax support in lesson and module --- yaksh/templates/yaksh/add_lesson.html | 28 ++++++++++--------- yaksh/templates/yaksh/add_module.html | 51 ++++++++++++++++++++--------------- yaksh/templates/yaksh/show_video.html | 6 ++++- 3 files changed, 50 insertions(+), 35 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/add_lesson.html b/yaksh/templates/yaksh/add_lesson.html index b984db0..4211b1b 100644 --- a/yaksh/templates/yaksh/add_lesson.html +++ b/yaksh/templates/yaksh/add_lesson.html @@ -9,6 +9,8 @@ + {% endblock %} {% block css %} @@ -17,15 +19,15 @@ {% endblock %} {% block content %} -
+
{% if error %}
{{error}}
{% endif %} -
+
-
+
 Back @@ -137,18 +139,20 @@
-
+
+
+
+
+

Description Preview

+
+
+
+
+
+
{% endblock %} \ No newline at end of file diff --git a/yaksh/templates/yaksh/add_module.html b/yaksh/templates/yaksh/add_module.html index 262c009..7112485 100644 --- a/yaksh/templates/yaksh/add_module.html +++ b/yaksh/templates/yaksh/add_module.html @@ -11,6 +11,8 @@ + {% endblock %} {% block css %} @@ -19,17 +21,7 @@ {% endblock %} {% block content %} -
-{% if messages %} - {% for message in messages %} -
- - {{ message }} -
- {% endfor %} -{% endif %} +
{% if course_id %} @@ -43,10 +35,23 @@ {% endif %}

-{% if status == "add" %}
+{% if messages %} + {% for message in messages %} +
+ + {{ message }} +
+ {% endfor %} +{% endif %} +
+
+{% if status == "add" %} +
-
+
{% csrf_token %} @@ -92,18 +97,20 @@
-
+
+
+
+
+

Description Preview

+
+
+
+
+
+
{% endif %} diff --git a/yaksh/templates/yaksh/show_video.html b/yaksh/templates/yaksh/show_video.html index a2edbe0..9c8d133 100644 --- a/yaksh/templates/yaksh/show_video.html +++ b/yaksh/templates/yaksh/show_video.html @@ -1,8 +1,12 @@ {% extends "user.html" %} +{% load static %} {% load custom_filters %} {% block title %} {{ learning_module.name }} {% endblock %} - +{% block script %} + +{% endblock %} {% block main %}
-- cgit