From 8007fa364ce894a879f72d72c104e7fe49e7154f Mon Sep 17 00:00:00 2001 From: adityacp Date: Mon, 30 Mar 2020 16:03:02 +0530 Subject: Change templates, js, views - Show module name in design module page - Fix tooltip in design course and design module page - Change order of sidebar menu in course detail page --- yaksh/static/yaksh/js/design_course.js | 10 +++++++--- yaksh/templates/yaksh/add_module.html | 5 ++--- yaksh/templates/yaksh/course_added_modules.html | 12 ++++++++++++ yaksh/templates/yaksh/course_detail_options.html | 18 +++++++++--------- yaksh/templates/yaksh/courses.html | 8 -------- yaksh/templates/yaksh/design_course_session.html | 8 +++----- yaksh/views.py | 1 + 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(''); 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 @@ {% if status == "design" %}
-

Add/Edit Learning Units

+

{{module.name}}

{% if course_id %}
{% else %} @@ -161,8 +161,7 @@ Check Prerequisite
- - What's This + What's This  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 @@
{% with module.get_learning_units as units %} {% if units %} +

Lessons/Quizzes/Exercise

{% for unit in units %} @@ -81,6 +82,17 @@ ------- {% endif %} + {% endfor %}
+ {% if unit.type == "quiz" %} + {% if unit.quiz.is_exercise %} + Exercise + {% else %} + Quiz + {% endif %} + {% else %} + Lesson + {% endif %} +
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 @@

  • - + Enroll Students
  • - - Send Mail + + Course Modules
  • - - Course Progress + + Design Course
  • - - Design Course + + Course Progress
  • - - Course Modules + + Send Mail
  • 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 @@ {% endblock %} -{% block css %} - -{% endblock %} {% block content %}
    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 @@ Check Prerequisite Completion
    - - What's This + What's This  Check Prerequisite Passing
    - - What's This - + What's This  + 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) -- cgit