From d95ee90d7f346871a256172bd65e274056a3635d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Aleksander=20=C5=81ukasz?=
 <aleksander.lukasz@nowoczesnapolska.org.pl>
Date: Thu, 14 Aug 2014 16:29:00 +0200
Subject: [PATCH] Editor update - edumed exercises

---
 apps/wiki/locale/pl/LC_MESSAGES/djangojs.mo | Bin 6379 -> 7660 bytes
 apps/wiki/locale/pl/LC_MESSAGES/djangojs.po |  75 ++++++++++++++++++++
 apps/wiki/static/wiki/editor                |   2 +-
 apps/wiki/templates/wiki/bootstrap.html     |   8 +++
 4 files changed, 84 insertions(+), 1 deletion(-)

diff --git a/apps/wiki/locale/pl/LC_MESSAGES/djangojs.mo b/apps/wiki/locale/pl/LC_MESSAGES/djangojs.mo
index 9a81bcc9b106dc0bccb908c1d5b7d6d0bd1a78a3..45254a34c051af035747a364ae57b5d1ea2bf3d1 100644
GIT binary patch
delta 3552
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
R7FT5QA8l*vqW1RJ{s+{Z91#Ej

delta 2327
zcmXxl4@}f$9LMp802A*x^x}Y1PR>C7Nh+3q2$Y~OO)35rYJj3p0WlU_iL|=)$3|^V
z*E3sYwQ99x)Y4d^zgA0UmQ5Ggaw}JBvoUg7ty(jy_vh~M*?sTzJU^b_^E|)r^Zbrq
z$|p;sr~OI04W*sPCh`)Ec?3(Q@I_fR)fhjP;dES!$=HhOvIRrfjrll?nfNBo#Uq%3
zXE7C%QsVdf@p5CLCX32!{t!kFR^m)tgI>G?HPHa3;}Fimoj3zW@Jjp;efR@voO8&>
zT;NOhCr^t{?8PM7eoSG0lSze@m^rAG7oi5KLS>{5wV+;9CWcW1>_uhd1q|Z>R3^T1
z*UzK+C$JhG-lU^45JKHI57U|7R8Uds>QMs^Vj4c++<|<|bIyHu1?{(8`>69I>Op>V
zPN2s56=Mq_of<zKwU8i2)uDijQn?hBvenK;yq<O|DupkiGV`iykD>Y>#EtkFW?><t
z%PLgnHlP-8FKPk9*n>M#$-nmWZ!QGU$LQ)<h+0rN>Pc%+1Gb|k973{d9z`u|Cu*Fh
zP!o)}>-$luA9L-G-QSNOYc<Dw<X;&$#RUyKfx6*$)WH9s7LrJ(R}zc~pw7tqY@i%R
zEo2ha|4%H%i?|3EaC1Ix#s&B|>TP%zd1iAWN=18i8nu8ksMqE^YK0l3L#I0zxnx$N
zUcYsy1+-xS-iLh5^L*vv0aX8!sD3{q$H4rDTBwJ#%BbH}f~ZV{Q5jf>I?ZM7dNXQ^
z?sPtcnqV&~<!_)SdJDt&Ip*Lbs-K7b(H4eK<1az3M@=OavSsQ~so9K$xDD0uCDh7C
zkg?1dD&=3GGV~2<;-63{y@2YU5{PFsfa;%vy1&@D0;lNxZ=j+lUypoD7hgKHQDpng
zGtPb3Nc$bsR(V;i?#n<;knb$T7TOi4t=ofP`~bDk?~x(QA2@~ijfbn!kLvIwU%K%%
zRLZ_Y`kFJSU%rbt2ZQ`kdsvQIK(%YvA|KP_+P%&QYT@^z`ftam_HGvyO|Touo_XDM
z_yje<G1Q?ONA2Y)<YkDJwS2d`y0WI<3-zfZmJ(X%LSiFPLKG2Agi2NXx#NvBP)sOw
z+9#EHL>sY84a$6?B39$6@jBvKLW^r9))P82w-XHn>x>nhC;gAnD_BkFA$7Q8^Vh^G
z@x$Y)W;K;XM6<h~EL=wDRl8L5nk{jSm3S+01CdBvMX2Z?s_5KoAXX82i^>Qc-q^lt
zPd5=a68eXua$6j86W&6EU0W<Cw0}CB>xeu;zaf=`wo_Zl5s8&jXFY1~SGcwgZa#78
z;bWKe8s-pJ6E_q5R>VrJQ|RQX=zuOJt|8{ynrUC#BF}8w<ms~Go{-J<wxss;o0|T9
zeGhg;><Mqcp7oa4qSS--uharN-xsuPzTBjS&W=9&v~N>Vq;oK0i_;z){U|Ln!A?v+
zH~QU-yAy3oAZ(uqJZ5t<3T-6go+8GpKK$^Z?H#6hTX)Cd_e|rKyZW}acZUbM+9N%O
z_Lx;&1ChS|u6Em-x!CT{JZg7kmDuB1+4kS8ys344TO*&2_7B<WU}tiqvu7Y;zYV@T
T`s~c*38TNwDoC)Q(DDBP(!b{j

diff --git a/apps/wiki/locale/pl/LC_MESSAGES/djangojs.po b/apps/wiki/locale/pl/LC_MESSAGES/djangojs.po
index 6f7f393e..16d331db 100644
--- a/apps/wiki/locale/pl/LC_MESSAGES/djangojs.po
+++ b/apps/wiki/locale/pl/LC_MESSAGES/djangojs.po
@@ -409,3 +409,78 @@ msgstr "Metadane dokumentu"
 
 msgid "Close"
 msgstr "Zamknij"
+
+msgid "Exercise"
+msgstr "Zadanie"
+
+msgid "Insert exercise"
+msgstr "Wstaw zadanie"
+
+msgid "Single Choice"
+msgstr "Wybór jednokrotny"
+
+msgid "Multiple Choice"
+msgstr "Wybór wielokrotny"
+
+msgid "Gaps"
+msgstr "Luki"
+
+msgid "Replace"
+msgstr "Zastąp"
+
+msgid "Order"
+msgstr "Uporządkuj"
+
+msgid "True or False"
+msgstr "Prawda lub fałsz"
+
+msgid "True"
+msgstr "Prawda"
+
+msgid "False"
+msgstr "Fałsz"
+
+msgid "Mark to replace"
+msgstr "Oznacz do zastąpienia"
+
+msgid "Edit replace mark"
+msgstr "Edytuj zastąpienie"
+
+msgid "Remove replace mark"
+msgstr "Usuń zastąpienie"
+
+msgid "Create a gap"
+msgstr "Stwórz lukę"
+
+msgid "Remove a gap"
+msgstr "Usuń lukę"
+
+msgid "Description goes here"
+msgstr "Tu wpisz polecenie"
+
+msgid "Removing exercise"
+msgstr "Usuwanie zadania"
+
+msgid "Do you really want to remove this exercise?"
+msgstr "Czy na pewno chcesz usunąć to zadanie?"
+
+msgid "Yes"
+msgstr "Tak"
+
+msgid "No, don't do anything!"
+msgstr "Nie, nic nie rób!"
+
+msgid "Edit text to replace with"
+msgstr "Edytuj tekst zastępujący"
+
+msgid "Initial"
+msgstr "Inicjalnie"
+
+msgid "Solution"
+msgstr "Rozwiązanie"
+
+msgid "Change solution"
+msgstr "Zmień rozwiązanie"
+
+msgid "First item"
+msgstr "Pierwszy element"
\ No newline at end of file
diff --git a/apps/wiki/static/wiki/editor b/apps/wiki/static/wiki/editor
index c8101069..8411d228 160000
--- a/apps/wiki/static/wiki/editor
+++ b/apps/wiki/static/wiki/editor
@@ -1 +1 @@
-Subproject commit c8101069e6de3c7eeb44e97e391c9fa4b9db0872
+Subproject commit 8411d228c0928c0a2d6c280a2f39adacc972ee13
diff --git a/apps/wiki/templates/wiki/bootstrap.html b/apps/wiki/templates/wiki/bootstrap.html
index cbf0232a..03f8d4ce 100644
--- a/apps/wiki/templates/wiki/bootstrap.html
+++ b/apps/wiki/templates/wiki/bootstrap.html
@@ -329,6 +329,14 @@
                     
                     ['core.template'],
                     ['core.showMetadataEditor'],
+                    [
+                        'core.insertOrderExercise',
+                        'core.insertChoiceSingleExercise',
+                        'core.insertChoiceMultiExercise',
+                        'core.insertChoiceTrueOrFalseExercise',
+                        'core.insertGapsExercise',
+                        'core.insertReplaceExercise'
+                    ]
                 ],
                 
                 documentSaveUrl: function(id) { return '/editor/text/' + id + '/'; },
-- 
2.20.1