From 72f0e11f3f8692c524a51556f05c9c55631ad449 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 19 May 2006 19:59:59 +0200
Subject: [PATCH] link to media manager

This patch add a link to the media manager when no JavaScript is available.
Users can upload and browse for pictures now without the need for JavaScript
only inserting has to be done manually then.

darcs-hash:20060519175959-7ad00-5ee77fd00d20bef9a36eee632a1c5897097ba4a8.gz
---
 inc/html.php                  |   3 ++-
 lib/images/fileicons/bz2.png  | Bin 0 -> 769 bytes
 lib/images/fileicons/conf.png | Bin 688 -> 694 bytes
 lib/images/fileicons/deb.png  | Bin 698 -> 715 bytes
 lib/images/fileicons/file.png | Bin 440 -> 453 bytes
 lib/scripts/edit.js           |   3 +++
 6 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 lib/images/fileicons/bz2.png

diff --git a/inc/html.php b/inc/html.php
index 5dbfcd921..66648ae0e 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -1047,7 +1047,8 @@ function html_edit($text=null,$include='edit'){ //FIXME: include needed?
 
    <div class="toolbar">
       <div id="draft__status"><?php if($INFO['draft']) echo $lang['draftdate'].' '.date($conf['dformat']);?></div>
-      <div id="tool__bar"></div>
+      <div id="tool__bar"><a href="<?php echo DOKU_BASE?>/lib/exe/mediamanager.php?ns=<?php echo $INFO['namespace']?>"
+      target="_blank"><?php echo $lang['mediaselect'] ?></a></div>
 
       <?php if($wr){?>
       <script type="text/javascript" charset="utf-8">
diff --git a/lib/images/fileicons/bz2.png b/lib/images/fileicons/bz2.png
new file mode 100644
index 0000000000000000000000000000000000000000..fad9098a27c51a756ecdca684e7f1e39cb9d35da
GIT binary patch
literal 769
zcmV+c1OEJpP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3labT3lag+-G2N4000McNliru)&vX^I1X4~st5o80**;U
zK~y-)U6bu=&0!eFKlg9PVUuJTYs^ELLKMX-MQY?95XxRDd+&{!$2LX6D^F1x3y~Be
zL>75Ll;?*{oSk+!HfP6n9(H~Y_t%Tx`JI_>UEO!xUEk|_eXr{_l8A8oX^#q{F0L2g
zdVV>^?j_d;;6Q7$sU%6N#Er+FlpD3mjarQqt%i$%vV}lHd8<q=(B4z`B`G?Qgu_3O
z6}@ln(fj5esc)~C=#-EJEBHq!2U?riclv>VF@j@<_iIUg9)Ly5meV*h$H&**lrmqD
zgcaiuk(j%;udA+pE>mj4hhlDk_wPP4r*SIP(_D%}aR3&sYT?AChy0J2S4gvT=|<x5
zYTQy9zc`8SJ>AT&Z6rRq2Bzh>b>{|6D_dyYybj4=B?O$i`iPkI`iRFrP|W0zGaZ0=
zO>3x~SIyg(cj!;PBb7{5e6WDZ<^#l>33HHEP&N4%fBK&QP|Cib`+kDK%wR=oRMnQv
zkPN;xIM(Z<_~!$eq>tPN+^j?9cY<PJ1c2d@JjrZTSlx!ztwKWII^h)Z=_Ki)w|Ir0
z__00!@}nh&NAe8p+JFi_$6ByLR#+MQz#*2-Whj(BF*`nmtd{^61~Y?vPyD8~cG9?o
zi%3*f;97%`#Kki^RX4StrUeTDxP0vveW?KeW_4``pyk&dtVGw$jtc3IBkRHzw(U4-
zZa$vKvzK{#dcOc*YU*h_o~R^Wn9&Y`tv}k>oZ1b5XB}b@+sV_N=5S}X)~;X8;^t_5
zL&qcMt%PK_($K-C{x%Mse?I;%1cAlc(CyB;_R9Kp)pxKZwHqtL<%Y0@tFsQ`1y1Ne
zg!Z!!Rq`myGx*lQ4??NF4d?Fr2G1G-TLr*h%0;IFdoXV900000NkvXXu0mjfk4|kJ

literal 0
HcmV?d00001

diff --git a/lib/images/fileicons/conf.png b/lib/images/fileicons/conf.png
index 2ac2cf0cc7989f360e23be6fe208913355e78d8c..64b0b23c60df45b3ac813c3033d3c8001bb40322 100644
GIT binary patch
delta 658
zcmV;D0&V@U1-1ntiBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVUZy*e+3N;
zE&|>vlUo1)0z*keK~y-)b&^|4lu;ChpKlK8j22~i)+7%jMhIyQX^~;21VuvRT~`t0
zpD^;Of1sDqRUqO;1T|hb)<sH|869-WG)zfHXr{htX1>E-T{xdQI4)SQ*zEnhYrT7E
z?24zaBJwX~V3;<BX=QS!P8${ge}nzq8o6RDJTH1m?VAHbArTQ77z&B=#<LqBN)Q17
zmKVSBVQz+WDn(sG6K%nc?RyXIT>(Ne*x#*X0W76Z0?DM#)bunxmph5a<Gg&cKx<I4
zx^*B~0NYjwu(`28RrwLTUN5hwrl=~bU}F3^1xA$n!{b>X*B*cfN(r`Ye-n$vNSYc;
z-xoP_un>1@o#L`;?)G(Y=T_HV4{T+l6ny?TM}1u_mSxd?x&@!lhpy{*ym{R044?!=
z<uEZ}`FZ?enWK5-`2Bv?*4BtdqZo$4>aR__CC!XZM(8~sK#5=}Z3i$m@kQo0@@YO+
z#7qSKykDZ&6Q{QR1a6Oqe~UdeXx>6Zff7LpSjx2p7zurncPj<7H6Fn0)@Z6JVq&&}
zmgAMIuVxf}tZsLDt)meUu<Q)r?azG91d4EJpeJn>RuZ%Y4%2(C6eVoW>?lj-%y33X
zq!qt)6JNfY*>8WTtMp@}V~m7jIXCv|*+!IrX=ebz>IBbb4fLeNXr<N?ZnT%8q;y~9
zty(Z04{l#Sr2#yA6qddVCs6{UlM(id?qI`~iKfP$O>`8TugazD)TU$NZou%9FaV~~
su#^kS22;7Pl(v<YhN(1c<px~*2fr6=vlnRe8~^|S07*qoM6N<$f^Lc=B>(^b

delta 652
zcmV;70(1Sg1+WDniBL{Q4GJ0x0000DNk~Le0000F0000G2nGNE0LfM*1d$;ze*_E@
zAQ4uvRg(Y!0zFAYK~yNub&}spRB;f+Klkokbyt(J{H;lv8%p?)tz>D1VG%_Mk^evh
z{uknFe}Qj85EUUr5EKgPODP&wSdf_(=5MhzSJ%DwerI~n)i!cq;J|Rs3}=otHZ}&p
zLLyhUwq0D$;ClXU@8hKF18^&ve`m2<P73%&xY1n8LG_@gpRSHpI=lNcC19t9DvBzI
z!t~Tvp7%cH>7yP-N8TX1FVfY~%8Su8O(Xjvh{D!ZoZ*oXnwy%4Mx%V1T0qgXD^db`
zXB#6Zu)4fVY0*)F!60vkhbb*AW}xpCS?&s*-F;~yb{bg~5ycooEEXf-e_6~-f8%g&
zHi7LW@(Rni-`>K#yDjO488L{!=ZOzgRaW5pK8<JV2!%q#<8ho|26rw+5CxTg+}`xV
zJbe9~V;Mz+!(ry<=UG`<!F65c7FP-8*U&pONn29{QN<T)hdjHHt?S85YL4eHHVMDq
z&yeS=Q&Ck*z;U>ItsE<ue~k)=Dx%<vjWe?r(vOQ-)K?!O7_c~1p2NU+F?A<OSen~C
z>&M)lNjJ||qYA#Uao+vRBpS)VwjiD`e3{*(K5~S%3kAsT-~Zm2%7QBv&Sp~h754~b
z1{j~(pt2;4n~d>nF!tZ1T|ZZiD0s%gX(-#|<+w{c;dA9oKDQeSVh}AjaN`bEJh5?V
zij7rMZ0MheYx~91h(hns<bfH#+Hi8mFwY__VJYR*JN~yZg*{`Zle?b`0^o^-FE+jb
mPi%a#cG|b_#KK4bu=xWo?o}>jFg39N0000<MNUMnLSTZhyDb6$

diff --git a/lib/images/fileicons/deb.png b/lib/images/fileicons/deb.png
index 53a4c0f0c93d4e0a6ddad2d099745d8023e9257b..4ab359e9bbdda85aaa9ffebf423c20faf2df7d88 100644
GIT binary patch
delta 679
zcmV;Y0$BaJ1<M5?iBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVUZy*e+3N;
zEigUMkr)5~0$52zK~y-)ZIaJR6mb~FKi}Qe@)toyn4(~kO05UUiz%eA8fnlE$S6E^
zs6QYO0!c3gT?5G?qT_-^Bt{moU>%e?SY)Axgg_+Am3AH1o%z0Rhndwidtu-^!#tmP
zo@ZV|-n^KaS0|Gt>sqp|7hK!tf6c51!0`2M!~f=4;+v*3qUnriYD4tThSfF4YI0q4
zHEnfpWKvaC2S+9~rwQc)RyrD)>ulr0-VjqoVU~w)Qs^cr+asuMzc+NPiyS1JdpHVO
z52VWuqTL;Yo1*+0xzCU1Zz!y(prE#ana|(pY^ejFv!xELXuGwQB>_4QfAp;j+4Kqk
zsdSp({rx1@Hfc`0<lfWSU9k<o1V%F`&crOeC!;LH+Hs>%s(O0>SUh*0l9_3$jvPnT
zAgU<vF#gu>pcv%>7%O&5Trn^}aq9^pkpckRjU=idfC3tn5(031BY2*YsjtO0HF4;`
zKK7TF<Gg=|gQ0w12?B^Hf2yEr@Wc?wIRLOC9KLvkFE<AHSyN4RdYYx%cPJPiqqw>i
zk=)mP2cCp{fP-NaRo7Y~?Wd_5O0f`+`z?)+(a?GpQC}#kpdc7L8vuGxlK}l>1x2Ym
z)kRUP4^`a~?mYXTteEXZaxgRwU!~M8`El|Dq9AH^+$-SPJU|a>eHQ2D_<H6NORrv2
zn)>JqgUk}tF9BEt+*}8_S$&+qtIe?V=n2W?V`S>*scgQCYS282s)1k+JlE_5SSwT>
zjiGmAzKDOa<HsOy=GxG1z=L?gUmP)b62h~-RZsl??s*1R3|7KGh`+BIc~mXsCpQ29
N002ovPDHLkV1oI=GFJcq

delta 662
zcmV;H0%`rr1-b<xiBL{Q4GJ0x0000DNk~Le0000F0000G2nGNE0LfM*1d$;ze*_E@
z0R_PHlnnp?0!K+iK~yNuU6Rd9R8bg*pK}{4ry|G}r5IFXQo4vXSwRJ3VFlHq55;AR
z{((RU4Bb?;4GN5imJ`*Y!6+dV3o>d^kcGBz5rZT(lG8ZOz32V4xOYr_;c(sq=lQ*#
zP7(mQH<K!rD^x;HC5)2u-(RRie*pAdX?Ijj5|Vf}{7uEOsaQ76&71zrd(D=-3V%(%
zi(b8VUrAE+MiN0)Waely<Hrv1VQs)@?JB1GudzBTuwjjnBv*~h^?O4CVtBwgH35a$
z1;VaQYPv4*{l+au4;<%5?m4yuUMk=uG2)yifD3<(N^u5&xnhxD-Q5&se;3#{{DM1A
zKe5u>AWmgOY48)Lj<hhDIZW8nLc^((08E`d$GZ1pH0;`s<S+>V_p`4F(ui}C^X3=9
zEj>M?+YXXS)c_FA7m&aJB~1nhO2nOyB2jMIj&E&c>*kGYs;i^)_6;Q*bsN`VfSHg$
zazy4xrHNI%89UB*@#ShSe?PZ1QW+Z~f8!=KxhJF>+c2v}jUz`EkSgIAa8BXlcccz?
zu(NND$!s?6NbU){+s<H$A(KF0I3gdA>X5k+=k(bdLe!sVr#5o|NsG{OKNhK&i|1Uz
z(cFKT^*$e$u;jA|Om5j*K<E>=L*}N&$N75tBKem?te^WBLrIO6Y_!=DQ8NfFAXOds
z?}x)g+sou1JfbkYmvYkt_4_)L-3K8g2g#hH(EW$KH|qCf(CthNu%cGt)JZZ5eXtxJ
w$PUL#VUEZGA|Iz0Sv=P$a)jpawh9RN2QU(m2VJctzW@LL07*qoM6N<$f_d~PF#rGn

diff --git a/lib/images/fileicons/file.png b/lib/images/fileicons/file.png
index 6448319511802f025dca762d7ba2cbb7d6857e3d..ff12b7306002211213f9d4a7daabc79670b71c09 100644
GIT binary patch
delta 415
zcmV;Q0bu^P1H}U&iBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVUZy*e+3N;
zD?9vH?-l?60a8gsK~y-)ZIazh12GVU#|M=mK@F4;nh1g>f&>-hg$Le(gd))dq6k0`
zl5qCU@UZsz{!X%PZF#@lnRP(#dwPA>{@9|8hBl_WYW&wG0Ko0lMZnzmxP8;^NbQc)
z&w=_rn7;O=&tK|eXIic{lBDHof1{Gq^Z}xuQvfB90iy4vdhcd&jsiLD0}|<%;j4?K
z0iZyDjRpWSg7laOo(S(oa@p5+&jZi|Ab7Q|IsqX-0v4BNkb(mNJgi?v09sAXi>Pt8
z&$6Z-Bz4LD_ip-rFdHoeB!+PZtggdbFYOLwWq4vU1Vl5~$oa7h=9Y+nb!5%Fi4*|&
z6#Anacq5^mNHBs5fCS5xY6qcK&(LTy08tRi#ZdK^_aXVYfH?Lbk-ci3$t=Z-=LeOI
zO>s^FtIHGZC}5Wr=S;j`Z+#*RNNkYITTS%2rxXwwU_1fP;2%F>i$g~lSZn|Q002ov
JPDHLkV1h;!wD$l2

delta 402
zcmV;D0d4-p1GobriBL{Q4GJ0x0000DNk~Le0000D0000G2nGNE0L`QIIgueTe*_E?
zITs}mGl>8I0YynfK~yNuWs*%!95E1uKX>|Mk+=g#m{Wi_MUcV?*kq9%NC=5bpd2EJ
zk^v@d*Ly6=-JT&WSuVT%e(Krf`_m7<9u}4wEVcD9>VHcE;A(ePSif(N&)y&8{Xzcw
zCjWU0|9%bsdXazb!xvxfY<r!tf6ZhW02yQ>6|7v_8#h<GGcK?14KOz;50GQ4?Gw;3
zaE=gCZi<qJNmV=BxV*kU0nZV_B<rRkFa;ZS=by1lk^nci56qz$fIh^iw{^FiJvDED
zoKy9<KlQNeLQ`Q5X{1HkTCJQ|?u1PfbB!QAB=*swy0j>?m_`sX;7sp0X!es{Z5EXT
z$pvhpGY+LPR60?O4zi3{f0ohDdVhBA8>*)MA~x1Mt!^_#`X%>pT3zjFr1M`dtYm4q
wu0edgeFUJY&@|B^Z8YV*v{tApggyZi@9apDRcy3shX4Qo07*qoM6N<$g32wbi2wiq

diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js
index 48464017e..ada70194d 100644
--- a/lib/scripts/edit.js
+++ b/lib/scripts/edit.js
@@ -128,6 +128,9 @@ function initToolbar(tbid,edid,tb){
     var toolbar = $(tbid);
     if(!toolbar) return;
 
+    //empty the toolbar area:
+    toolbar.innerHTML='';
+
     var cnt = tb.length;
     for(var i=0; i<cnt; i++){
         // create new button
-- 
GitLab