summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradityacp2017-09-28 14:03:25 +0530
committeradityacp2017-09-28 14:03:25 +0530
commit63df5e6368d68d011e5feb8f0ae25a692c0b9269 (patch)
treee0f6e6ba46880675d42d9e4ba8d45b578e419311
parent347cfa08bf8c0200fb088ac374bc9c58a66d9673 (diff)
downloadonline_test-63df5e6368d68d011e5feb8f0ae25a692c0b9269.tar.gz
online_test-63df5e6368d68d011e5feb8f0ae25a692c0b9269.tar.bz2
online_test-63df5e6368d68d011e5feb8f0ae25a692c0b9269.zip
Add new js text editor for sending emails
-rw-r--r--yaksh/static/yaksh/js/course.js9
-rw-r--r--yaksh/templates/yaksh/course_detail.html4
2 files changed, 6 insertions, 7 deletions
diff --git a/yaksh/static/yaksh/js/course.js b/yaksh/static/yaksh/js/course.js
index 8fb2773..6807cf4 100644
--- a/yaksh/static/yaksh/js/course.js
+++ b/yaksh/static/yaksh/js/course.js
@@ -37,10 +37,11 @@ $(".reject").change( function(){
});
$(function() {
- $('textarea#email_body').froalaEditor({
- heightMin: 200,
- heightMax: 200
- })
+ tinymce.init({
+ selector: 'textarea#email_body',
+ max_height: 200,
+ height: 200
+ });
});
$("#send_mail").click(function(){
diff --git a/yaksh/templates/yaksh/course_detail.html b/yaksh/templates/yaksh/course_detail.html
index bcada42..d8aeb2e 100644
--- a/yaksh/templates/yaksh/course_detail.html
+++ b/yaksh/templates/yaksh/course_detail.html
@@ -6,13 +6,11 @@
{% block script %}
<script language="JavaScript" type="text/javascript" src="{{ URL_ROOT }}/static/yaksh/js/course.js"></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/froala-editor/2.5.1/js/froala_editor.min.js"></script>
+<script type="text/javascript" src="{{ URL_ROOT }}/static/yaksh/js/tinymce/js/tinymce/tinymce.min.js"></script>
<script src="https://code.jquery.com/ui/1.9.1/jquery-ui.js"></script>
{% endblock %}
{% block css %}
<link rel="stylesheet" href="https://code.jquery.com/ui/1.9.1/themes/base/jquery-ui.css">
-<link href="https://cdnjs.cloudflare.com/ajax/libs/froala-editor/2.5.1/css/froala_editor.min.css" rel="stylesheet" type="text/css" />
-<link href="https://cdnjs.cloudflare.com/ajax/libs/froala-editor/2.5.1/css/froala_style.min.css" rel="stylesheet" type="text/css" />
{% endblock %}
{% block content %}
<br/>