From 23bf012f3428d76685cfd952cc6760eb595ff013 Mon Sep 17 00:00:00 2001 From: adityacp Date: Fri, 17 Jan 2020 10:55:51 +0530 Subject: Revamp course detail and courses page templates --- yaksh/templates/yaksh/add_module.html | 66 ++-- yaksh/templates/yaksh/addteacher.html | 138 ++++---- yaksh/templates/yaksh/course_added_modules.html | 49 +++ yaksh/templates/yaksh/course_detail.html | 414 ++++------------------- yaksh/templates/yaksh/course_detail_options.html | 47 +++ yaksh/templates/yaksh/course_progress.html | 65 ++++ yaksh/templates/yaksh/course_send_mail.html | 63 ++++ yaksh/templates/yaksh/course_students.html | 245 ++++++++++++++ yaksh/templates/yaksh/course_teachers.html | 29 ++ yaksh/templates/yaksh/courses.html | 9 +- yaksh/templates/yaksh/design_course_session.html | 30 +- yaksh/templates/yaksh/moderator_dashboard.html | 6 + yaksh/templates/yaksh/showquestions.html | 10 +- 13 files changed, 700 insertions(+), 471 deletions(-) create mode 100644 yaksh/templates/yaksh/course_added_modules.html create mode 100644 yaksh/templates/yaksh/course_detail_options.html create mode 100644 yaksh/templates/yaksh/course_progress.html create mode 100644 yaksh/templates/yaksh/course_send_mail.html create mode 100644 yaksh/templates/yaksh/course_students.html create mode 100644 yaksh/templates/yaksh/course_teachers.html (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/add_module.html b/yaksh/templates/yaksh/add_module.html index 6b2214b..55dd8b8 100644 --- a/yaksh/templates/yaksh/add_module.html +++ b/yaksh/templates/yaksh/add_module.html @@ -1,28 +1,48 @@ {% extends "manage.html" %} +{% load static %} {% block title %}Create/Edit Learning Module{% endblock %} {% block pagetitle %}

Design Learning Module

{% endblock %} {% block script %} - - - - + + + + {% endblock %} {% block css %} - - + + {% endblock %} {% block content %} -
+
{% if course_id %} - - Back to Courses + + + Back to Courses + {% else %} - - Back to Learning Modules + + + Back to Learning Modules + +{% endif %} +

+{% if messages %} + {% for message in messages %} +
+ + {{ message }} +
+ {% endfor %} {% endif %} {% if status == "add" %}
@@ -35,13 +55,13 @@

- - -
@@ -60,11 +80,15 @@ {% if status == "design" %}

Add/Edit Learning Units

- +{% if course_id %} + +{% else %} + +{% endif %} {% csrf_token %}
-
+

Available Lessons and quizzes: (Add Lessons and Quizzes)

@@ -87,13 +111,13 @@

-


-
+

Chosen Lessons and quizzes:

@@ -152,7 +176,7 @@

- +
diff --git a/yaksh/templates/yaksh/addteacher.html b/yaksh/templates/yaksh/addteacher.html index fa322f3..58f48d9 100644 --- a/yaksh/templates/yaksh/addteacher.html +++ b/yaksh/templates/yaksh/addteacher.html @@ -1,76 +1,86 @@ -{% extends "manage.html" %} - -{% block title %} Add teacher {% endblock title %} -{% block subtitle %} {{ course.name }} {% endblock %} - -{% block content %} -
-

Add Teachers for this course


-

Search teacher with username, firstname, lastname, email


-
- - {% csrf_token %} - Search Teacher:

-
-
-
+
+

Add Teachers/TAs


+
+ {% csrf_token %} +
+ +
+
+ +
+


-
-{% csrf_token %} -{% if success == True %} - {% if teachers|length == 0 %} -

No results found

- {% else %} -
Search Results

-
Search results does not include teachers already added

- +{% if success %} + {% if teachers|length == 0 %} +

No results found

+ {% else %} +
Search Results

+
+

+ Search results does not include teachers already added +

+
+
+ + {% csrf_token %} +
- - - - - + + + + + - {% for teacher in teachers %} - {% if teacher not in course.get_teachers %} - - - - - - - - - - - {% endif %} - {% endfor %} -
UsernameFirst NameLast NameEmailInstituteDepartmentFirst NameLast NameEmailInstituteDepartment Position
{{ teacher.username }}{{ teacher.first_name }}{{ teacher.last_name }}{{ teacher.email }}{{ teacher.profile.institute }}{{ teacher.profile.department }}{{ teacher.profile.position }}
-
- - {% endif %} + {% for teacher in teachers %} + {% if teacher not in course.get_teachers %} + + + {{ teacher.username }} + {{ teacher.first_name }} + {{ teacher.last_name }} + {{ teacher.email }} + {{ teacher.profile.institute }} + {{ teacher.profile.department }} + {{ teacher.profile.position }} + + {% endif %} + {% endfor %} + +
+ +
+ {% endif %} {% endif %} - -{% if status == True %} -
-
+ + +{% if status %} +
+
Teacher(s) added
+
{% if teachers_added %} - {% for teacher in teachers_added %} -
-
-
-
{{ teacher.get_full_name }}
-
-
-
- {% endfor %} + + + + + + {% for teacher in teachers_added %} + + + + + {% endfor %} +
Sr No.Name
{{forloop.counter}}{{ teacher.get_full_name }}
{% else %} -
No Teacher(s) Added
+
No Teacher(s)TA(s) Added
{% endif %} - {% endif %} -{% endblock %} diff --git a/yaksh/templates/yaksh/course_added_modules.html b/yaksh/templates/yaksh/course_added_modules.html new file mode 100644 index 0000000..99f5dda --- /dev/null +++ b/yaksh/templates/yaksh/course_added_modules.html @@ -0,0 +1,49 @@ +{% if is_modules %} + {% block pagetitle %}

Course Modules

{% endblock %} + {% if modules %} +
+ + + + + + {% for module in modules %} + + + + + + {% endfor %} +
ModuleModule DesignLessons/Quizzes
+ + {{module.name}} + + + Add Quizzes/Lessons for {{module.name}} + + + {% for unit in module.get_learning_units %} + + {% endfor %} +
+ {% else %} +
+ No learning modules +
+ {% endif %} +{% endif %} \ No newline at end of file diff --git a/yaksh/templates/yaksh/course_detail.html b/yaksh/templates/yaksh/course_detail.html index f75e362..2caf109 100644 --- a/yaksh/templates/yaksh/course_detail.html +++ b/yaksh/templates/yaksh/course_detail.html @@ -1,383 +1,83 @@ {% extends "manage.html" %} +{% load static %} {% load custom_filters %} {% block title %} Course Details {% endblock title %} -
-{% block pagetitle %} Course Details for {{ course.name|title }} {% endblock %} -
- {% block script %} - - - - + + + + {% endblock %} {% block css %} - + {% endblock %} + +
+{% block pagetitle %}

{{ course.name|title }}

{% endblock %} +
+ {% block content %} -
- -