summaryrefslogtreecommitdiff
path: root/yaksh/templates
diff options
context:
space:
mode:
authoradityacp2020-09-30 08:56:36 +0530
committeradityacp2020-09-30 08:56:36 +0530
commit2dcaa3847c4faefd14ee88b9a2370e1d83e747f0 (patch)
treed5e05823f9b6524469a78073e60857841dba07aa /yaksh/templates
parent4ab3353b4a6dc28764c8536e6b089f7feb65f015 (diff)
parented81054c05ff297ea241ce08664e0d2323da115c (diff)
downloadonline_test-2dcaa3847c4faefd14ee88b9a2370e1d83e747f0.tar.gz
online_test-2dcaa3847c4faefd14ee88b9a2370e1d83e747f0.tar.bz2
online_test-2dcaa3847c4faefd14ee88b9a2370e1d83e747f0.zip
Resolve Conflicts
Diffstat (limited to 'yaksh/templates')
-rw-r--r--yaksh/templates/base.html11
-rw-r--r--yaksh/templates/yaksh/add_module.html2
-rw-r--r--yaksh/templates/yaksh/question.html9
3 files changed, 19 insertions, 3 deletions
diff --git a/yaksh/templates/base.html b/yaksh/templates/base.html
index 8bf7fbc..093ccf3 100644
--- a/yaksh/templates/base.html
+++ b/yaksh/templates/base.html
@@ -22,7 +22,9 @@
<link rel="stylesheet" href="{% static 'yaksh/css/ontop.css' %}" type="text/css" />
<link rel="stylesheet" href="{% static 'yaksh/css/plyr.css' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'yaksh/css/simplemde.min.css' %}">
- <link rel="stylesheet" href="{% static 'yaksh/css/toastr.min.css' %}" />">
+ <link rel="stylesheet" href="{% static 'yaksh/css/toastr.min.css' %}" />
+ <!-- https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.12.0/katex.min.css -->
+ <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/katex@0.12.0/dist/katex.min.css" integrity="sha384-AfEj0r4/OFrOo5t7NnNe46zW/tFgW6x/bCJG8FqQCEo3+Aro6EYUG4+cU+KJWu/X" crossorigin="anonymous">
{% block meta %}
@@ -45,6 +47,13 @@
</script>
<script type="text/javascript" src="{% static 'yaksh/js/toastr.min.js' %}">
</script>
+
+ <!-- The loading of KaTeX is deferred to speed up page rendering -->
+ <script defer src="https://cdn.jsdelivr.net/npm/katex@0.12.0/dist/katex.min.js" integrity="sha384-g7c+Jr9ZivxKLnZTDUhnkOnsh30B4H0rpLUpJ4jAIKs4fnJI+sEnkvrMWph2EDg4" crossorigin="anonymous"></script>
+
+ <!-- To automatically render math in text elements, include the auto-render extension: -->
+ <script defer src="https://cdn.jsdelivr.net/npm/katex@0.12.0/dist/contrib/auto-render.min.js" integrity="sha384-mll67QQFJfxn0IYznZYonOWZ644AWYC+Pt2cHqMaRhXVrursRwvLnLaebdGIlYNa" crossorigin="anonymous"
+ onload="renderMathInElement(document.body);"></script>
<script>
new WOW().init();
diff --git a/yaksh/templates/yaksh/add_module.html b/yaksh/templates/yaksh/add_module.html
index 14e7630..aee50c1 100644
--- a/yaksh/templates/yaksh/add_module.html
+++ b/yaksh/templates/yaksh/add_module.html
@@ -11,8 +11,6 @@
</script>
<script type="text/javascript" src="{% static 'yaksh/js/jquery-ui.js' %}">
</script>
-<script type="text/javascript" src="{% static 'yaksh/js/mathjax/MathJax.js' %}?config=TeX-MML-AM_CHTML">
-</script>
{% endblock %}
{% block css %}
diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index 3f7e67e..2dbfeed 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -276,6 +276,15 @@ question_type = "{{ question.type }}";
{% if question.type == "upload" %}
<p>Upload assignment file for the said question<p>
<input type=file id="assignment" name="assignment" multiple="">
+ {% if assignment_files %}
+ <ul class="list-group">
+ {% for as_file in assignment_files %}
+ <li class="list-group-item">
+ <a href="{{as_file.assignmentFile.url}}" target="_blank">{{ as_file.assignmentFile.name|file_title }}</a>
+ </li>
+ {% endfor %}
+ </ul>
+ {% endif %}
{% endif %}
<!-- Arrange type question -->