From 2cd5a971d3cf9708b43a523a339212cb9220cef3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Aleksander=20=C5=81ukasz?=
<aleksander.lukasz@nowoczesnapolska.org.pl>
Date: Wed, 7 May 2014 10:17:01 +0200
Subject: [PATCH] Editor: improved links
---
apps/wiki/locale/pl/LC_MESSAGES/djangojs.mo | Bin 5889 -> 5987 bytes
apps/wiki/locale/pl/LC_MESSAGES/djangojs.po | 9 +++++++++
apps/wiki/static/wiki/editor | 2 +-
apps/wiki/templates/wiki/bootstrap.html | 3 +++
apps/wiki/views.py | 1 +
redakcja/context_processors.py | 1 +
6 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/apps/wiki/locale/pl/LC_MESSAGES/djangojs.mo b/apps/wiki/locale/pl/LC_MESSAGES/djangojs.mo
index 90c808b4953db0b87f514803337d47a0b6aa8498..1d165c91e00b9ba3d6c31d0160a708885eef3df5 100644
GIT binary patch
delta 1934
zcmXxldrZw?9LMoTms8>(qFmBRNrobl$UT)xB;_)f9qo)<j!SBD$-!dAA7*F9AO30B
zTxwX^jBHG%xz6pM<~q!VKZH&GX!HJ@^LTc?zt{8o{hr_R`#zU*&i=HIX}-7p!%i5=
za$*?qDa05bHimPcoR2W3KVHCo*owOK7#;Wm<FNx%unS``A<~$Un1zFI6*_ST4#xx7
zORs96GK33F*c;n%D89lG*ol2Grf1**lZ1RsItL|?jY?=1hG8D^F-086#gwBGT7~MT
z1~t%n9HOB%P|*lmQ5`%*jr1kD@H1+Jj;P@EWK{c1)QAe~^$LvPd>v{g_MrMZgMIP5
z^*S<g(=IjDFR2W`_x8qbt6FIUy-^*+pkADe>NpFPK#sj%h|!#{Kyo<hG3o^L?lp
zYeUV%L-grF2NgZ=0pswSHH`Jh<UAg=L}jQ1yr=~B<3>D$8u?Egj1gp|c8REjCZPtH
zhw6U?>V4Ht=AXfuIxZ-Y!>Epq+4Hl=@|#Qcyan~*o5;J&ZPd&>Ms@fG)&2{rzaOXs
z{@}SDv|-rV3zvCF-tWu&D}i@h&;ws_0(N2sCb1DxumaPu4z-(`kUmWtYL`DpCDeu5
zwBfu}FHYq!3a4TcuC><>p%OUdqrz;PE2soot#_>tkX+0&)W|-dHse=&J(79Wl*d^!
zkXxo0HB+lmFRDZr?#2W>jcVs>rJ^-?VlR9_24Vi9MjFM!rD7r~fkITmWyr^@;h-6;
zM$N!p)C-TIX6Ov6{Z&-ETgb<>2lbiPR03;-8tES#h!JcAZMt~WZk=My$1=_<P-}h>
z^;`?;1#Q-+sHNyY7k1-x98Tv-a3v1Z_kRZ!C2$1wbv$kxL^FJKFd8*O#i$waaL^Cb
z9!$hjsON8>61Zc}AEBOmVb8y#68?p1*NtI%VI=8LH%=r;lZ<MRjp{fT^$S;oTC-AQ
zGY3iu#|&a3F`iI+6^&FIPKEIV$|R1{Y(3lRTw*KbnCE{Mo)ABlS}~Dt@3>GuA1aId
zPDj%01;LZRafYpHNoErh2=X&y2$j+xrVy7B^NDo-Hb-pLOloPw{}MuFA)%?LAhdnw
z5&z3LD!D`^G1Xqw&eYWCXL2#2?^+h2qA46r6!<$Gv8DQdn?-0#sc53-1Zu%AkgAi3
zWrVhyR$iqjNMO(AP}g@Og_zR3Jfa{p#JjQiWYo0~N9B6Acb&&y<Xr36?%BMh*3;bR
wJQ%LqsRI^<I(BWY^4zQU*AChlS5sYcuilhYd3Jf-Ubkz@R?l{K<p#I;2ZcPc2mk;8
delta 1852
zcmX}sZ%oZm9LMp~rLN+V{@oOHX~HNfi4>yzNiHIfY<6eY3M<tESJN(A6l=?NXN;k!
zF@MJ$voU`*4>D#p=FbCd7F*94wrn2o{&Y{y?)kmW@BDuEobUObbMIj8;oRUr!q}6B
zvW+^G`qE)c5D!Lkp#+@9B;Wyz$4=Cva~Ok{a2j64Z0tuje#4pQ9A``l=AaA9F$1e{
zyrycTkw!-=PQcTcj(s=-pW;OPf_%aJ#8~``3Lusn1r(2CF$MKJoeMFTnW%trP~%jf
z7P=MFwA4l#T45(@fD5RV_M!*xqE`6M_Wwe?9~~E2Q7Y>FY)rx;R3@rW<2B<X3|Ko*
z3ptI6N_DU8xNm)iiu^U|iyu%E4xtA8gG!}F(esHo88eXB%mQmMuHwENm8lL?2D<G1
zc?{|ceKb<>mbD)Xx&MsX8aMl*0P;}*RNx-0M6LK9PQe$b_r9V6`i+SgN3<G012ta}
zvIbM;BL5noiVj8SL$=k_+WSV-gaKqM(~4U0anwL(Q1ADmCcJ@tQN}z*?YW<qWh-jJ
zlc;&RF%K_KBLDd`KGLB*o4`iS#{$%;-HD84T2QCC0~N?k)Zu)9ns@+b;dji!R65mP
z!bJgikz|@(r~sO*2ZFY72#LY8qgHeZb?CZn|07h2Us;Eck8zN1Whe<X(G>Jx9%f=S
z>b)k^7PQ&>b4aWvc#DQs`UGd=dsG10I7J+b+QVcnTKOE*M2k?F@uJ?_j!JPY@-fZU
zcGQZ`q84}&lkpC6wt}XghEC<6^#^X@K8k~(J+480aR+LG25Spy3yz=%uV5)YM+N9)
z7EP4NMFA9|er+YF=MQm)dfw7dYKBpni07g|pjkK_SD^;*qXO8AdVjy|KY<GLlzrZV
z+LG(Y$K2*ZOr{_8{ZFXzhH&zB8sBJeX#bZyTKQBRM7^j|Le;@iA<mIfz_r-67h9{X
z%3wt(DkgJU6|MEu)%J-8SK78WR2q|2W^YDN230mwS5OyFm94o{m5mY1I;^3trRIiu
zV%&AhXys5xi-X1nDvL8)sY*#Xb+pW*p?{}^)Frl42T=dz`uE#J)lX^>RYj?rLtPV^
z?sRY7Mr%1$e@`k(@aRJHJ5ec&Fmk$dQdBA<j2zLWwDlXvrWS>dIoFN}e~P>22z9x9
k;bB)>boglE>M@}=DS-rUoxi2tSMT#Q?DIGIcJB6>f49+^mjD0&
diff --git a/apps/wiki/locale/pl/LC_MESSAGES/djangojs.po b/apps/wiki/locale/pl/LC_MESSAGES/djangojs.po
index 7a2acd6a..2fefc73e 100644
--- a/apps/wiki/locale/pl/LC_MESSAGES/djangojs.po
+++ b/apps/wiki/locale/pl/LC_MESSAGES/djangojs.po
@@ -376,3 +376,12 @@ msgstr "Wstaw template %s"
msgid "Switch to"
msgstr "ZamieÅ na"
+
+msgid "change"
+msgstr "zmieÅ"
+
+msgid "remove"
+msgstr "usuÅ"
+
+msgid "Remove link"
+msgstr "UsuÅ link"
\ No newline at end of file
diff --git a/apps/wiki/static/wiki/editor b/apps/wiki/static/wiki/editor
index 7868dda5..d6011e09 160000
--- a/apps/wiki/static/wiki/editor
+++ b/apps/wiki/static/wiki/editor
@@ -1 +1 @@
-Subproject commit 7868dda583569339a88ef875d50fd88f85241547
+Subproject commit d6011e09fc76ad45e40d2930d0af160797fc9daa
diff --git a/apps/wiki/templates/wiki/bootstrap.html b/apps/wiki/templates/wiki/bootstrap.html
index d0fe48a1..c5be80de 100644
--- a/apps/wiki/templates/wiki/bootstrap.html
+++ b/apps/wiki/templates/wiki/bootstrap.html
@@ -287,6 +287,9 @@
documentHistoryUrl: function(id) { return '/editor/history/' + id + '/'},
documentDiffUrl: function(id) { return '/editor/diff/' + id + '/'; },
documentRestoreUrl: function(id) { return '/editor/revert/' + id + '/'},
+ documentAttachmentUrl: function(attachmentName) {
+ return '{{MEDIA_URL}}{{IMAGE_DIR}}{{slug}}/' + attachmentName;
+ },
documentSaveForm: {
fields: [
diff --git a/apps/wiki/views.py b/apps/wiki/views.py
index c75bf3a6..827a4838 100644
--- a/apps/wiki/views.py
+++ b/apps/wiki/views.py
@@ -100,6 +100,7 @@ def editor(request, slug, chunk=None, template_name='wiki/bootstrap.html'):
},
'tags': list(save_form.fields['stage_completed'].choices),
'can_pubmark': request.user.has_perm('catalogue.can_pubmark'),
+ 'slug': chunk.book.slug
})
diff --git a/redakcja/context_processors.py b/redakcja/context_processors.py
index 1c268cd6..aec6df71 100644
--- a/redakcja/context_processors.py
+++ b/redakcja/context_processors.py
@@ -15,6 +15,7 @@ def settings(request):
return {
'MEDIA_URL': settings.MEDIA_URL,
'STATIC_URL': settings.STATIC_URL,
+ 'IMAGE_DIR': settings.IMAGE_DIR,
'DEBUG': settings.DEBUG,
'RAVEN_CONFIG': getattr(settings, 'RAVEN_CONFIG'),
'APP_VERSION': VERSION,
--
2.20.1