summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--yaksh/static/yaksh/js/design_course.js10
-rw-r--r--yaksh/templates/yaksh/add_module.html5
-rw-r--r--yaksh/templates/yaksh/course_added_modules.html12
-rw-r--r--yaksh/templates/yaksh/course_detail_options.html18
-rw-r--r--yaksh/templates/yaksh/courses.html8
-rw-r--r--yaksh/templates/yaksh/design_course_session.html8
-rw-r--r--yaksh/views.py1
7 files changed, 34 insertions, 28 deletions
diff --git a/yaksh/static/yaksh/js/design_course.js b/yaksh/static/yaksh/js/design_course.js
index dbff9fd..4e2dc9d 100644
--- a/yaksh/static/yaksh/js/design_course.js
+++ b/yaksh/static/yaksh/js/design_course.js
@@ -20,7 +20,11 @@ $(document).ready(function(){
$(this).append('<input type="hidden" name="ordered_list" value='+order_list+'>');
return true;
});
- var msg = "Check Prerequisite is set to Yes by default \n" +
- "To change, select the Change checkbox and Click Change Prerequisite button \n";
- $("#prereq_msg").attr("title", msg);
+ var completion_msg = "This will check if the previous module is completed " +
+ "before viewing the next module."
+ $("#prereq_msg").attr("title", completion_msg);
+ $("#prereq_msg").tooltip();
+ var completion_msg = "This will check if the previous module is completed " +
+ "before viewing the next module based on quiz passing status."
+ $("#prereq_passing_msg").attr("title", completion_msg);
}); \ No newline at end of file
diff --git a/yaksh/templates/yaksh/add_module.html b/yaksh/templates/yaksh/add_module.html
index edbfaa2..262c009 100644
--- a/yaksh/templates/yaksh/add_module.html
+++ b/yaksh/templates/yaksh/add_module.html
@@ -110,7 +110,7 @@
<!-- Add learning Units -->
{% if status == "design" %}
<div class="container">
-<center><h3><u>Add/Edit Learning Units</h3></u></center>
+<center><h2><u>{{module.name}}</u></h2></center>
{% if course_id %}
<form action="{% url 'yaksh:design_module' module_id course_id %}" method="POST" id="design_course_form">
{% else %}
@@ -161,8 +161,7 @@
<th width="25%" colspan="2">Check Prerequisite
<br>
<a href="#" data-toggle="tooltip" id="prereq_msg">
- <span class="glyphicon glyphicon-question-sign">
- </span> What's This
+ What's This&nbsp;<i class="fa fa-question-circle"></i>
</a>
</th>
</tr>
diff --git a/yaksh/templates/yaksh/course_added_modules.html b/yaksh/templates/yaksh/course_added_modules.html
index 9055340..2d194b9 100644
--- a/yaksh/templates/yaksh/course_added_modules.html
+++ b/yaksh/templates/yaksh/course_added_modules.html
@@ -45,6 +45,7 @@
<br>
{% with module.get_learning_units as units %}
{% if units %}
+ <p><b><u>Lessons/Quizzes/Exercise</u></b><p>
<table class="table table-responsive-sm">
{% for unit in units %}
<tr>
@@ -81,6 +82,17 @@
-------
{% endif %}
</td>
+ <td>
+ {% if unit.type == "quiz" %}
+ {% if unit.quiz.is_exercise %}
+ Exercise
+ {% else %}
+ Quiz
+ {% endif %}
+ {% else %}
+ Lesson
+ {% endif %}
+ </td>
</tr>
{% endfor %}
</table>
diff --git a/yaksh/templates/yaksh/course_detail_options.html b/yaksh/templates/yaksh/course_detail_options.html
index 6f9a711..90662d6 100644
--- a/yaksh/templates/yaksh/course_detail_options.html
+++ b/yaksh/templates/yaksh/course_detail_options.html
@@ -5,28 +5,28 @@
</a>
</li>
<li class="nav-item">
- <a href="{% url 'yaksh:course_students' course.id %}" id="enroll-students" class="nav-link list-group-item {% if is_students %} active {% endif %}" title="View the course requested, rejected and added students" data-placement="top" data-toggle="tooltip">
+ <a href="{% url 'yaksh:course_students' course.id %}" id="enroll-students" class="nav-link list-group-item {% if is_students %} active {% endif %}" title="View the course requested, rejected and enrolled students" data-placement="top" data-toggle="tooltip">
Enroll Students
</a>
</li>
<li class="nav-item">
- <a href="{% url 'yaksh:send_mail' course.id %}" class="nav-link list-group-item {% if is_mail %} active {% endif %}" title="Send mail to course students" data-placement="top" data-toggle="tooltip">
- Send Mail
+ <a class="nav-link list-group-item {% if is_modules %} active {% endif %}" href="{% url 'yaksh:get_course_modules' course.id %}" title="View modules added to the course" data-placement="top" data-toggle="tooltip">
+ Course Modules
</a>
</li>
<li class="nav-item">
- <a href="{% url 'yaksh:course_status' course.id %}" class="nav-link list-group-item {% if is_progress %} active {% endif %}" title="View Students course progress" data-placement="top" data-toggle="tooltip">
- Course Progress
+ <a class="nav-link list-group-item {% if is_design_course %} active {% endif %}" href="{% url 'yaksh:design_course' course.id %}" title="Additional course settings" data-placement="top" data-toggle="tooltip">
+ Design Course
</a>
</li>
<li class="nav-item">
- <a class="nav-link list-group-item {% if is_design_course %} active {% endif %}" href="{% url 'yaksh:design_course' course.id %}" title="Add modules to this course" data-placement="top" data-toggle="tooltip">
- Design Course
+ <a href="{% url 'yaksh:course_status' course.id %}" class="nav-link list-group-item {% if is_progress %} active {% endif %}" title="View Students course progress" data-placement="top" data-toggle="tooltip">
+ Course Progress
</a>
</li>
<li class="nav-item">
- <a class="nav-link list-group-item {% if is_modules %} active {% endif %}" href="{% url 'yaksh:get_course_modules' course.id %}" title="View modules added to the course" data-placement="top" data-toggle="tooltip">
- Course Modules
+ <a href="{% url 'yaksh:send_mail' course.id %}" class="nav-link list-group-item {% if is_mail %} active {% endif %}" title="Send mail to course students" data-placement="top" data-toggle="tooltip">
+ Send Mail
</a>
</li>
<li class="nav-item">
diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html
index bce005f..a590f8e 100644
--- a/yaksh/templates/yaksh/courses.html
+++ b/yaksh/templates/yaksh/courses.html
@@ -8,14 +8,6 @@
</script>
{% endblock %}
-{% block css %}
-<style>
- .test + .tooltip.top > .tooltip-inner {
- padding: 15px;
- font-size: 12px;
- }
-</style>
-{% endblock %}
{% block content %}
<div class="container-fluid">
<div class="container">
diff --git a/yaksh/templates/yaksh/design_course_session.html b/yaksh/templates/yaksh/design_course_session.html
index a15f4b1..88ecc16 100644
--- a/yaksh/templates/yaksh/design_course_session.html
+++ b/yaksh/templates/yaksh/design_course_session.html
@@ -68,16 +68,14 @@
<th width="25%" colspan="2">Check Prerequisite Completion
<br>
<a href="#" data-toggle="tooltip" id="prereq_msg">
- <span class="glyphicon glyphicon-question-sign">
- </span> What's This
+ What's This&nbsp;<i class="fa fa-question-circle"></i>
</a>
</th>
<th width="25%" colspan="2">Check Prerequisite Passing
<br>
<a href="#" data-toggle="tooltip" id="prereq_passing_msg">
- <span class="glyphicon glyphicon-question-sign">
- </span> What's This
- </a>
+ What's This&nbsp;<i class="fa fa-question-circle"></i>
+ </a>
</th>
</tr>
<tr>
diff --git a/yaksh/views.py b/yaksh/views.py
index 9e81b2d..835e98a 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -2688,6 +2688,7 @@ def design_module(request, module_id, course_id=None):
context['status'] = 'design'
context['module_id'] = module_id
context['course_id'] = course_id
+ context['module'] = learning_module
return my_render_to_response(request, 'yaksh/add_module.html', context)
generated by cgit (git 2.34.1) at 2024-12-21 05:18:08 +0000