From 7089218234f372577f6efd65e857d18223f71bc5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Aleksander=20=C5=81ukasz?=
 <aleksander.lukasz@nowoczesnapolska.org.pl>
Date: Thu, 29 May 2014 09:45:51 +0200
Subject: [PATCH] Editor update: gutter comments

---
 apps/wiki/locale/pl/LC_MESSAGES/djangojs.mo | Bin 5987 -> 6173 bytes
 apps/wiki/locale/pl/LC_MESSAGES/djangojs.po |  17 ++++++++++++++++-
 apps/wiki/static/wiki/editor                |   2 +-
 apps/wiki/templates/wiki/bootstrap.html     |   3 +--
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/apps/wiki/locale/pl/LC_MESSAGES/djangojs.mo b/apps/wiki/locale/pl/LC_MESSAGES/djangojs.mo
index 1d165c91e00b9ba3d6c31d0160a708885eef3df5..6725666e80079626ed6a784d8e241b1bddaed921 100644
GIT binary patch
delta 2171
zcmYk-Z%mbC7{~F;0|<1$|B4CdQwo?Oph9J$h(aF!mneyav&o|%at_IHIDB!KS~@ou
z+gY<-u$*LDZEU*JmUC`ShqdfQ(VA`Ac;lPW7q(oRG}6Amb8a@Do$LAB&)@sHuls)B
zep!D-Y-C#cC&spiC?Imu%wjl}!H(@orr9(c#VMGRWu{AoI1%S#AuhsV3}GHdun14#
zEF8pK970}Yzu;VTb(cnv6Qei>GqULfJyZuva0XUlK5oF5(Z@-68uk1+<Yxoy^xPmS
z(QhyvuOdIY&Q1yZfO#6~Fb%!vPgDh-pc0w+LTcm{s28k5RUm{OHlaq|<IaDIs?=Ag
zkzRA>Z=(iq4^^SRQ18nl>&Ys0ff`tf8cDS?gwr|R;f`CKQPc=}ou^UH_n{IvkLn<S
zO5}>W{vA%`_zp5g`vYTY{7qvWj-g7ohWe`_>ruyzsQa36HXd;HVim`qp(^$hDuD;6
z1pdQz43LE?5XKkr1nR#2T<WikE^$I5y@~4J4ywaPNVRMfl}I{S=|w?Q2OjEt5wd)&
z)E!s3>(xjOR*S08R@8g<pzd#-ME&)G4>+Mjj^f1$W@k{VxPl3nAyguJQTMmwQap^y
z@Cz))->@8?qE>wwFC}-YM|IqQ`YM`HiJgei&}!~OewJXTReKB7@sC)7_i;W3sT)lz
zM_sQ)X3d&ViTTb$&Mwr*dr%`jgIct4cRqHRhUVmk^B$^$e^4dPWM0%!4tlr%=V3kS
zJ|8t@-R`&#8N6LURUm;2@ir=f$EbwIkYCKQm{66r09BF_REL$Q(rrdPup3pv{iypp
zkr&u8=f|iD44_8*HO|DVsKxm+GOPB``7bu;`_JYsy|@|m-~m(z-Ol5vDLRWDUcyy4
zj7oGe!=z~?s03D_KI=Nv^&!;rzoRPk4Efn?F6QgTavCq;Ce#Z$PzglcaSZj~NACD@
z=a;C&2T}Kbi<+{Vs1CkI25BSi`eW4lpQ6@S1~1h@v>*)@eRA8*{#D{NVmYA)wAB*D
z$yO>EHD4!c+&NW5TT=?#jT_?=Cg#OFcShgETf`<}F`?zWo>)ojB<2xXAzCe3@=E>r
z?d|6d*1GmCtS71nO>!Bbtucjd)l|I4!4_hfJE>Z0LdG}!>03H}fB~X`&}Z>3p_*<W
z#<vO@Az}rw+MQGxRa5<4eur2@R1(RhpvfsEHWOMYT83$ambaF+{`b}q`Y_iJ%#XcE
zXw!crZEq0GgjQ$~p-*KSv4hZL^SLHJhgYzg;D4(vAeQK39N*N=k6+9j$%u4x_~CeO
zR^uH1kRSD}E{PXyZR_&(B`-#662E4x45W8P!Yzqlus@I($SqIHZfKA2Wc0|v`0$jr
z!kt}5Zk;st;h_(QPI*y3?4_>1f4HY6v101UK=!tl&PaEg-_nz~HoY<}z=IEG9sM62
CFUk`D

delta 2000
zcmYk-Z)jCz9Ki9XySdFjQ)ja+bGo^?oSA>7YtH|gPTkg@wOl2xAd!M1f|+mBuBnLV
z3z3UpkS~S`W{Jx6h3Evufuk}h?aeg*U?Es9QVZ>c;P-p)Gw|X5&gVJjp7WgF^PJzg
zci+_8latp+<n9Ty_lVKNABhl>`27Gjv_ttJjKFVkICi67UBo=RjAht|)%XZYaBM*c
z<FOu}!wxLOwKxVh<6v*qMQ0QTj^GgN#TW259EbOCC>9UQTo5XePng2S1RBtU7GN$m
zBA?LAhFro5G@%Z3oG;LcZpBefwTq53>_!K;gwFH|mgAr34D$wMk5{4R*P%077LT`M
zG5a5(E3p9`Z$A#hL(!AS%tNob)K};{i#OvJ|3*E_84N)OC`NBwg$`VgCNL*{--Jc%
zuS9YVpGMc=tL$$=SF8tJi61fPfj&B3a0^TEuV^mMqmKPD^bxh834Deo@D+Z7+t8Wc
z$LBGhtURv*O=t!>!A5lamFWFC3t4|A8#Z#lM7E;??TY&ckjEdsi~A?g8=pq*70#k7
za}gczcl7)_=y?C22|UDu&u|XYwib?ZkzN?a`kTNF4tT*`oQC(X7Aq-)YHY_TxDl=9
zBgmMc2d(m7(S#nMMLU4IdgBRfUc^~gi66$}+t38|Ch4%+;TW1gcl3Pp2PBv93p%q~
zXffW6#|v0zm%KDui+mMY(3N^0z0qnc$MrZCzd_GScGK~h{2UM5K_(IYM`t>S2R8vL
z&;**$gxio$_<)To*om&dm*@?5qARo?J^wg*-WlW*db1|OH9DDRh0gRLj>LQl!J;ce
zt952{DYmiSjz06l=yfO18}vjkp^u^u%keSJ#W4(Sf~#<(@BdmlCa?p29e2kQikQ9w
z)SxTWg09FKHvT|uzzW=pUVjQr;9T7Q3BB%e-2WR*_yKy}W6br21*Ahi6e3B6D)fW~
zbl}D4FI+SF%vzCR&a~Ir))Lc+sf6d-oT&w8V?LQSgYE3tZ-^GY9Xl(qG1Zz^lC->R
zlZX~#sXMfC!k-b_n}k22R)qCmMVQ*t?X{<N=Ec4bZXq#^U>4ye!q%E4H2DbLVP`qv
z3up81!kX=G^XW|P-@yd&2H_gE6W09_qQAXNXE9Mn%!&ssY1h=>*S82?(t09O0xo_H
zv5ep~$kcHTTHn^P|CI{}%hTpVTa@W#Uq-vH5bqL}u2p1f&XTGBIrM$cs)?C|6=gL|
z^k9Fpu1iz@<zG)-Eoe(O4QxoHcMkqKk**m!F(=hg^l|!j(UwH|^Wy0_slz3mPXKxp
BqRjvR

diff --git a/apps/wiki/locale/pl/LC_MESSAGES/djangojs.po b/apps/wiki/locale/pl/LC_MESSAGES/djangojs.po
index 2fefc73e..2581dc0e 100644
--- a/apps/wiki/locale/pl/LC_MESSAGES/djangojs.po
+++ b/apps/wiki/locale/pl/LC_MESSAGES/djangojs.po
@@ -384,4 +384,19 @@ msgid "remove"
 msgstr "usuń"
 
 msgid "Remove link"
-msgstr "Usuń link"
\ No newline at end of file
+msgstr "Usuń link"
+
+msgid "edit"
+msgstr "edytuj"
+
+msgid "Delete"
+msgstr "Usuń"
+
+msgid "Respond"
+msgstr "Odpowiedz"
+
+msgid "Comment"
+msgstr "Skomentuj"
+
+msgid "Delete this comment?"
+msgstr "Usunąć ten komentarz?"
diff --git a/apps/wiki/static/wiki/editor b/apps/wiki/static/wiki/editor
index bc66ee34..0c57fd82 160000
--- a/apps/wiki/static/wiki/editor
+++ b/apps/wiki/static/wiki/editor
@@ -1 +1 @@
-Subproject commit bc66ee34b72b64bbf916a055bf2742ffc7da08c2
+Subproject commit 0c57fd826a58a217f499b5084c837fb8ef3f6d4f
diff --git a/apps/wiki/templates/wiki/bootstrap.html b/apps/wiki/templates/wiki/bootstrap.html
index 211ffb19..abb41c00 100644
--- a/apps/wiki/templates/wiki/bootstrap.html
+++ b/apps/wiki/templates/wiki/bootstrap.html
@@ -280,8 +280,7 @@
                         {actionName: 'core.link'}
                     ],
                     
-                    ['core.template'],
-                    ['core.comment'],
+                    ['core.template']
                 ],
                 
                 documentSaveUrl: function(id) { return '/editor/text/' + id + '/'; },
-- 
2.20.1