From 1ba6ed1980237d2ffa10b9f89bf4652584cb5b0e Mon Sep 17 00:00:00 2001
From: tkupek <mail@tkupek.eu>
Date: Sat, 5 Mar 2016 13:14:33 +0100
Subject: [PATCH] added rich text functionality for questions

---
 README.md                                     |   2 +-
 db.sqlite3                                    | Bin 107520 -> 137216 bytes
 tkupek_elearning/elearning/admin.py           |   2 +-
 .../migrations/0022_auto_20160305_1128.py     |  32 ++++++++++++++++++
 .../migrations/0023_auto_20160305_1158.py     |  21 ++++++++++++
 tkupek_elearning/elearning/models.py          |   5 +--
 .../elearning/templates/elearning.html        |   4 +--
 tkupek_elearning/settings.py                  |   3 +-
 tkupek_elearning/urls.py                      |   4 +--
 9 files changed, 64 insertions(+), 9 deletions(-)
 create mode 100644 tkupek_elearning/elearning/migrations/0022_auto_20160305_1128.py
 create mode 100644 tkupek_elearning/elearning/migrations/0023_auto_20160305_1158.py

diff --git a/README.md b/README.md
index 6b70009..54b6b09 100644
--- a/README.md
+++ b/README.md
@@ -5,4 +5,4 @@ requirements:
 - python
 - django
 - sqlite3
-
+- tinymce
\ No newline at end of file
diff --git a/db.sqlite3 b/db.sqlite3
index 9c08e693dafc36e105c9780b380d8a3faadc83ef..14df51fac4272fa000f4acb40f89dbcbe0fb502c 100644
GIT binary patch
delta 2853
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
TJOuemqiO1932u^EuTK02dLjZ=

delta 1974
zcmZWq3s6*L6u#&GFWiNFxyS+vxK|?qU6$Pie32sy6($cQA+-cu-7Bn%i|#|HVM-QE
zL8YZT@mD(ba+=CsdZ)cTn5@|zG}AOrTIn?Th%qS5#>vUCZ0!G$Mjh|YJ^%gB`OdlL
zeCOPMx4o;`Hk=sEG)WxCc_(f}*Z6?7NGEXxzn}!VOTynC@_8^$<T&M9Z0Dy1I4wG>
zM_15UY`~4!i97LW{3UkbS8)_a6%)S;$p@3CWpErW<kDz_iHq(u>`^|OY|bb#BU}ic
zjc$K)+nP<@=72loZSx1G%Lc8KJ;WtrjCXUXDI(4Xsa0|Z{9b?ans87GXymB2P}EMu
zOv}NJTL4?aQjo<-QBG^8&(pE=lkqnU>sE9<pX0)&N%Z+)BNZ$4RMhLJcp#aIdl|Nj
zr(z+d;vU9BDI8wRTX6}B%R;C|X$n;$S>*GS_*NHC?Wint_>>L9VWf;cmYp;;2_K_Q
z-2M0;{1?82FW^!9GyVymz{e;j?_=fr9X4Lab2~Y1CvqYQJ7p8!p*+<81|&KP64URq
z$ZHQ}$gX}f?pjhvGW)>}DRRx>47uh<qda!EP2PAhlYG|?#vH3SL+aSv>h_P5HbV?a
z9U-x{p}IQ1t4b2m^YbB6M=JNgbSR_&vSf=QkllO0CLj1CT^@{><le|6a$*l;DA%6?
z4J(=>k7UA2Nc50T=D`%zG7rk|%looY8A-Gi9DV~gV2qBUBj`<9%_amt(Cq7AJC%jP
zGMvCQT3qtuALY%e3E0GX+6AZ6?wC_xFDkH?hz`dB$Gina4qLH(j${6u<#etZ?{>)t
zKgyF=@0}^s1KsDk<P&@I<U@ON4-X|;<-}`C`R?_7i^#xCFv~|T8)WnK^GfHn=g^=A
zy~0Nx?bH8n(u0#M(W03A;=g9~v<CUmpa**RZhha}n~)+>)(oGh2R-l%I(#`nqb6*I
zeZY4GcckA06_Y(d2&%(d;B#QCl&eQ;!3yMp1(H?6TKEDnZH0P#9o4G*YB)Ns;E1>o
zQc2SaFsWCYK%l0T)HGNPFYrCm`{Rj<;2`^_fkplEVbFv6SvBZT3JvDE!EgnKkKiY8
z1?9E`lZwgkDK>KFh>!}RoWg&so=b&H%wE1&70cla5V;$?Dqj!Ec%q!DHoyZ&<;$pI
za2uRRi`>^=w_NH7yIX^yfO|tgTHg{99b`=@<dDwUFv~z=)kW<|0=Kj`lNcEXB9xH6
z0$9XMOZ&_kYKjyLRNgQZlg*1DN=|lxo7rmyv;wtnuiH1_TEwdJF;mq*QX-3Ld3GUl
zok7-?QgXg_K|RaAGL{3FhiZ~!fh*){1bpO3187yF2v6N0Q{6uU)=>(x;Q0x57epYc
z^7lY1jukWKW$IT2ph3jf1&dVP4)0BH@PPv=DF;?~66jbK;czfWE=`3DVqXCQ`N{}Z
za&a5fs(c>QW3}r=(D8Jb64Zpna2>0B2JLTJPuuSNJ9sN%yqU>K1I!m`4G;BJXa&v@
zSsJz60d+FyOQr^YND7FK;sS9=`~Y>yjV)uDb0ozGBjn6fs3jw_AVp2n!P|%(N4H)i
zPk`epuYo)~$iwTCyGx#Hd~m#h?oDF3x79-%Y1LB55D%@0ovACBJ2AJz=zBbvv5pND
zVrRM+KBQDMPU*YfAaJw09~rRR9>__iU>GICTcIYK`mEYrYNWU)?|RyGJFbYFu|cZZ
z`#7`%iG*N3>t*AsEfc4QDu!Vf?O7*mK~Il0nzl<jSKaFlN&evamT>4XnlE!#Ui)n&
zDE_gTDAoZyPZEqs<l_fgBy!3IQ%RK(%@yK9EdePIl+T{eB5xT{etNm&6|36(A-6B&
zVG+fxQlKS%fP9&ba)o%TS@PRN*+1qbejUmtHaZxD=ump1KAHW<J35pHA~~Z&sVF`~
z{??)LjCgFr2FV|4^|EiGJsj{zeyixA*427c%us`RRK?a&J?dj?y8&ez<3sCxfiQIx
zeQv+sMrm!2rJ^oO{}N2;J6cTwm)lda%Y19uPV%+^6_QhSn$)ibl*LF}8|wkkj5i2I
nI2gf0c!+-WeE_vI<Pv4%_iPl4f-uPh6#XFcm{^?@HirKL*Yhl^

diff --git a/tkupek_elearning/elearning/admin.py b/tkupek_elearning/elearning/admin.py
index 5adec31..ea46478 100644
--- a/tkupek_elearning/elearning/admin.py
+++ b/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):
diff --git a/tkupek_elearning/elearning/migrations/0022_auto_20160305_1128.py b/tkupek_elearning/elearning/migrations/0022_auto_20160305_1128.py
new file mode 100644
index 0000000..8729e43
--- /dev/null
+++ b/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),
+        ),
+    ]
diff --git a/tkupek_elearning/elearning/migrations/0023_auto_20160305_1158.py b/tkupek_elearning/elearning/migrations/0023_auto_20160305_1158.py
new file mode 100644
index 0000000..157a16a
--- /dev/null
+++ b/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),
+        ),
+    ]
diff --git a/tkupek_elearning/elearning/models.py b/tkupek_elearning/elearning/models.py
index 43c2eab..6a3469f 100644
--- a/tkupek_elearning/elearning/models.py
+++ b/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
diff --git a/tkupek_elearning/elearning/templates/elearning.html b/tkupek_elearning/elearning/templates/elearning.html
index 6802d0f..67b8913 100644
--- a/tkupek_elearning/elearning/templates/elearning.html
+++ b/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>
diff --git a/tkupek_elearning/settings.py b/tkupek_elearning/settings.py
index a3cb137..381b514 100644
--- a/tkupek_elearning/settings.py
+++ b/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 = [
diff --git a/tkupek_elearning/urls.py b/tkupek_elearning/urls.py
index 646d63b..71391f1 100644
--- a/tkupek_elearning/urls.py
+++ b/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')),
 ]