added rich text functionality for questions

README.md

@@ -5,4 +5,4 @@ requirements:
 - python
 - django
 - sqlite3
-
+- tinymce

tkupek_elearning/elearning/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from tkupek_elearning.elearning.models import Option, Setting, Question, UserAnswer, User, UserAnswerOptions
+from tkupek_elearning.elearning.models import Option, Setting, Question, UserAnswer, User
 
 
 class OptionInline(admin.TabularInline):

tkupek_elearning/elearning/migrations/0022_auto_20160305_1128.py

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.1 on 2016-03-05 11:28
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import tinymce.models
+import tkupek_elearning.elearning.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('elearning', '0021_setting_token'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='question',
+            name='explanation',
+            field=tinymce.models.HTMLField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='last_seen',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='token',
+            field=models.CharField(default=tkupek_elearning.elearning.models.gen_token, max_length=40, null=True, unique=True),
+        ),
+    ]

tkupek_elearning/elearning/migrations/0023_auto_20160305_1158.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.1 on 2016-03-05 11:58
+from __future__ import unicode_literals
+
+from django.db import migrations
+import tinymce.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('elearning', '0022_auto_20160305_1128'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='question',
+            name='text',
+            field=tinymce.models.HTMLField(null=True),
+        ),
+    ]

tkupek_elearning/elearning/models.py

@@ -4,6 +4,7 @@ import hashlib
 import os
 
 from django.db import models
+from tinymce.models import HTMLField
 
 
 def gen_token():
@@ -30,8 +31,8 @@ class Setting(models.Model):
 class Question(models.Model):
     id = models.AutoField(primary_key=True)
     title = models.CharField(max_length=100, null=True)
-    text = models.TextField(null=True)
-    explanation = models.TextField(null=True)
+    text = HTMLField(null=True)
+    explanation = HTMLField(null=True)
 
     def __unicode__(self):
         return self.title

tkupek_elearning/elearning/templates/elearning.html

@@ -35,7 +35,7 @@
     {% for question, options in questions_options.items %}
     <div class="container question" name="question" id="question_{{ question.id }}">
         <h2>{{ question.id }}: {{ question.title }}</h2>
-        <p>{{ question.text }}</p>
+        <p>{{ question.text|safe }}</p>
 
             <ul class="list-group ">
             {% for option in options %}
@@ -59,7 +59,7 @@
 
         <div class="margin10 well well-sm hide" id="explanation_{{ question.id }}">
             <h3>{{ settings.text_answer }}</h3>
-            <p>{{ question.explanation }}</p>
+            <p>{{ question.explanation|safe }}</p>
         </div>
         <div class="margin75"></div>
     </div>

tkupek_elearning/settings.py

@@ -37,7 +37,8 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'tkupek_elearning.elearning'
+    'tkupek_elearning.elearning',
+    'tinymce',
 ]
 
 MIDDLEWARE_CLASSES = [

tkupek_elearning/urls.py

@@ -13,7 +13,7 @@ Including another URLconf
     1. Import the include() function: from django.conf.urls import url, include
     2. Add a URL to urlpatterns:  url(r'^blog/', include('blog.urls'))
 """
-from django.conf.urls import url
+from django.conf.urls import url, include
 from django.contrib import admin
 
 import tkupek_elearning.elearning.views
@@ -23,5 +23,5 @@ urlpatterns = [
     url(r'start', tkupek_elearning.elearning.views.start),
     url(r'api', tkupek_elearning.elearning.views.get_answer),
     url(r'statistic', tkupek_elearning.elearning.views.statistic),
-
+    url(r'^tinymce/', include('tinymce.urls')),
 ]