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/static/yaksh/js/lesson.js | 9 +++---- yaksh/templates/yaksh/add_lesson.html | 28 ++++++++++--------- yaksh/templates/yaksh/add_module.html | 51 ++++++++++++++++++++--------------- yaksh/templates/yaksh/show_video.html | 6 ++++- yaksh/views.py | 8 +++--- 5 files changed, 58 insertions(+), 44 deletions(-) (limited to 'yaksh') diff --git a/yaksh/static/yaksh/js/lesson.js b/yaksh/static/yaksh/js/lesson.js index 55d4846..6eaf6c6 100644 --- a/yaksh/static/yaksh/js/lesson.js +++ b/yaksh/static/yaksh/js/lesson.js @@ -32,13 +32,10 @@ $(document).ready(function(){ }); }); - function preview_text(data){ - var preview_div = $("#preview_text_div"); - if (!preview_div.is(":visible")){ - $("#preview_text_div").toggle(); - } + function preview_text(data) { $("#description_body").empty(); - $("#description_body").append(data); + $("#description_body").html(data); + MathJax.Hub.Queue(["Typeset",MathJax.Hub]); } $("#embed").click(function() { 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 %}
diff --git a/yaksh/views.py b/yaksh/views.py index 3adb536..15ebd03 100644 --- a/yaksh/views.py +++ b/yaksh/views.py @@ -3,7 +3,7 @@ import csv from django.http import HttpResponse, JsonResponse, HttpResponseRedirect from django.contrib.auth import login, logout, authenticate from django.shortcuts import render, get_object_or_404, redirect -from django.template import Context, Template +from django.template import Context, Template, loader from django.http import Http404 from django.db.models import Max, Q, F from django.db import models @@ -23,7 +23,7 @@ from django.urls import reverse import json from textwrap import dedent import zipfile -from markdown import Markdown +import markdown try: from StringIO import StringIO as string_io except ImportError: @@ -101,7 +101,9 @@ CSV_FIELDS = ['name', 'username', 'roll_number', 'institute', 'department', def get_html_text(md_text): """Takes markdown text and converts it to html""" - return Markdown().convert(md_text) + return markdown.markdown( + md_text, extensions=['tables', 'fenced_code'] + ) def formfield_callback(field): -- cgit