From 074ca3fe68b790279c6ed8e0dda580b5ade8586e Mon Sep 17 00:00:00 2001 From: adityacp Date: Thu, 25 Aug 2016 16:24:56 +0530 Subject: changed templates to view demo quiz --- yaksh/templates/yaksh/courses.html | 5 ++++- yaksh/templates/yaksh/showquestions.html | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html index 06c848c..910a68d 100644 --- a/yaksh/templates/yaksh/courses.html +++ b/yaksh/templates/yaksh/courses.html @@ -15,9 +15,12 @@ {% else %}

Course(s) Added

{% for course in courses %} - {% if user != course.creator %} + {% if user != course.creator and course.name != "Demo_course"%}

{{course.creator.get_full_name}} added you to this course

{% endif %} + {% if course.name == "Demo_course" %} +

This is Demo Course

+ {% endif %}
diff --git a/yaksh/templates/yaksh/showquestions.html b/yaksh/templates/yaksh/showquestions.html index 2f4d218..185cbfb 100644 --- a/yaksh/templates/yaksh/showquestions.html +++ b/yaksh/templates/yaksh/showquestions.html @@ -11,7 +11,7 @@ {% block manage %} -

Upload json file for adding questions

+

Upload ZIP file for adding questions

{% csrf_token %} {{ upload_form.as_p }} -- cgit From 2efd65cb2dd276e1560c8993e13d9db95e6c8ba0 Mon Sep 17 00:00:00 2001 From: adityacp Date: Fri, 16 Sep 2016 19:25:33 +0530 Subject: changed courses template --- yaksh/templates/yaksh/courses.html | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html index 4852d25..df46ba6 100644 --- a/yaksh/templates/yaksh/courses.html +++ b/yaksh/templates/yaksh/courses.html @@ -15,11 +15,24 @@ {% else %}

Course(s) Created

{% for course in courses %} - {% if user != course.creator and course.name != "Demo_course"%} + {% if user != course.creator and course.name != "Yaksh_Demo_course"%}

{{course.creator.get_full_name}} added you to this course

{% endif %} - {% if course.name == "Demo_course" %} -

This is Demo Course

+ {% if course.name == "Yaksh_Demo_course" %} +
This is a Demo Course + Help +
+ {% endif %}
@@ -83,7 +96,7 @@

{% endfor %} {% endif %} - +
{% if allotted_courses %}

Course(s) Allotted

@@ -150,6 +163,7 @@ {% else %}

No new Courses allotted

{% endif %} +
{% if courses or allotted_courses %} -- cgit From 89376074f8dcee778dfc43587d623d4e8d1b5520 Mon Sep 17 00:00:00 2001 From: adityacp Date: Mon, 19 Sep 2016 14:46:19 +0530 Subject: changed template tag --- yaksh/templates/yaksh/courses.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html index fe15342..bfc3cd8 100644 --- a/yaksh/templates/yaksh/courses.html +++ b/yaksh/templates/yaksh/courses.html @@ -144,6 +144,7 @@ {% endif %}
+
@@ -156,7 +157,7 @@
{% if demo_course %} {% with demo_course as course %} -
This is a Demo Course +
Demo Course Help
{% endwith %} -{% endif %}
+{% endif %}
{% endblock %} -- cgit From 6d3ece46b9a6569c711e20db2c3220e32a82751c Mon Sep 17 00:00:00 2001 From: adityacp Date: Tue, 20 Sep 2016 14:53:01 +0530 Subject: changed manage and courses template --- yaksh/templates/manage.html | 20 ++++++++++++++++ yaksh/templates/yaksh/courses.html | 47 -------------------------------------- 2 files changed, 20 insertions(+), 47 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/manage.html b/yaksh/templates/manage.html index b628a44..ea587df 100644 --- a/yaksh/templates/manage.html +++ b/yaksh/templates/manage.html @@ -77,6 +77,26 @@

Moderator's Dashboard!

Click on the button given below to add a new course.
+
Click on the button to Create a Demo course. + Help
+ + + {% if msg %} +

{{ msg }}

+ {% endif %} {% if trial_paper %}
You have trial papers. diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html index bfc3cd8..43f323b 100644 --- a/yaksh/templates/yaksh/courses.html +++ b/yaksh/templates/yaksh/courses.html @@ -155,52 +155,5 @@

{% endif %}
-{% if demo_course %} -{% with demo_course as course %} -
Demo Course - Help -
- -
-
-
-
-

- Course - {% if course.active %} - Active - {% else %} - Closed - {% endif %} -

-
{{ course.name }}
-

-
-
-

Quiz(zes)

- {% if course.get_quizzes %} - {% for quiz in course.get_quizzes %} - {{ quiz.description }}
- {% endfor %} - {% else %} -

No quiz

- {% endif %} -
-
-
-
-{% endwith %} -
-{% endif %}
{% endblock %} -- cgit From e1811e3560742a4070f3e92e059a7cd1c50f1f36 Mon Sep 17 00:00:00 2001 From: adityacp Date: Wed, 21 Sep 2016 14:38:00 +0530 Subject: changed func name from create_demo_que_ppr to create_demo_quiz_paper --- yaksh/templates/manage.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/manage.html b/yaksh/templates/manage.html index ea587df..a736b0a 100644 --- a/yaksh/templates/manage.html +++ b/yaksh/templates/manage.html @@ -88,7 +88,7 @@
  • In Courses you can view Demo Quiz.
  • Click on the Demo Quiz and Click on User Mode or God Mode to take the quiz.
    • -
  • You can also edit Demo quiz. +
  • You can also edit the Demo quiz.

    • -- cgit