From 7b63547fc03ef0df23ae8c4bb61e3da41500149b Mon Sep 17 00:00:00 2001
From: Adrian Lang <lang@cosmocode.de>
Date: Fri, 19 Feb 2010 14:58:22 +0100
Subject: [PATCH] =?UTF-8?q?Rewrite=20mediamanager=20options=E2=80=99=20Jav?=
=?UTF-8?q?aScript,=20new=20icons?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
lib/images/link_break.png | Bin 657 -> 0 bytes
lib/images/link_go.png | Bin 655 -> 0 bytes
lib/images/magifier_zoom_out.png | Bin 657 -> 0 bytes
lib/images/magnifier_zoom_in.png | Bin 680 -> 0 bytes
lib/images/media_align_center.png | Bin 0 -> 294 bytes
lib/images/media_align_left.png | Bin 0 -> 312 bytes
lib/images/media_align_noalign.png | Bin 0 -> 269 bytes
lib/images/media_align_right.png | Bin 0 -> 312 bytes
.../{image_link.png => media_link_direct.png} | Bin
.../{link.png => media_link_displaylnk.png} | Bin
.../{image_info.png => media_link_lnk.png} | Bin
.../{image.png => media_link_nolnk.png} | Bin
lib/images/media_size_large.png | Bin 0 -> 153 bytes
lib/images/media_size_medium.png | Bin 0 -> 296 bytes
lib/images/media_size_original.png | Bin 0 -> 312 bytes
lib/images/media_size_small.png | Bin 0 -> 305 bytes
lib/images/text_align_center.png | Bin 234 -> 0 bytes
lib/images/text_align_left.png | Bin 209 -> 0 bytes
lib/images/text_align_right.png | Bin 209 -> 0 bytes
lib/scripts/media.js | 227 +++++-------------
lib/tpl/default/_mediaoptions.css | 92 +++++++
lib/tpl/default/media.css | 93 -------
lib/tpl/default/style.ini | 1 +
23 files changed, 155 insertions(+), 258 deletions(-)
delete mode 100644 lib/images/link_break.png
delete mode 100644 lib/images/link_go.png
delete mode 100644 lib/images/magifier_zoom_out.png
delete mode 100644 lib/images/magnifier_zoom_in.png
create mode 100644 lib/images/media_align_center.png
create mode 100644 lib/images/media_align_left.png
create mode 100644 lib/images/media_align_noalign.png
create mode 100644 lib/images/media_align_right.png
rename lib/images/{image_link.png => media_link_direct.png} (100%)
rename lib/images/{link.png => media_link_displaylnk.png} (100%)
rename lib/images/{image_info.png => media_link_lnk.png} (100%)
rename lib/images/{image.png => media_link_nolnk.png} (100%)
create mode 100644 lib/images/media_size_large.png
create mode 100644 lib/images/media_size_medium.png
create mode 100644 lib/images/media_size_original.png
create mode 100644 lib/images/media_size_small.png
delete mode 100644 lib/images/text_align_center.png
delete mode 100644 lib/images/text_align_left.png
delete mode 100644 lib/images/text_align_right.png
create mode 100644 lib/tpl/default/_mediaoptions.css
diff --git a/lib/images/link_break.png b/lib/images/link_break.png
deleted file mode 100644
index 523575306d53eaf176b4f9b260f0d36852565596..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 657
zcmV;C0&e|@P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!BS}O-R5;6H
z`2YVu10|S&ss{LU-D3`!@^HRa$6a;Lw!8e5Yo31qiMuu2GOJ$w{I^fr-FXCE;MI0F
ztz_l1CmzjrjJ(_KOmL~arCGV^+0THkyK9N|f?MOQsGLPl@43|6<P7Y(w<dJrgM)az
zU}tB?ot2eU+S=OsZr;3k|7&V$9ww#dUjfPG<m5;I`FBC$AbF5Fkb1ZQMn*<#K0ZEO
z6DLmm|Ki1q|99`+{eSS_!T*hojrTwbs;jFH-Mo482T1(Lkt6>>>Oks2`oIPl8XEc)
z7Z-oHdiCnNh=_=7-rnASQd3j^Pnt9-52PSJKmR|74-yB-uUN6-AxJ$)AIt?^O-)VT
zCr_T74pjKb-rk;L@7}!}=gytu04X?h=n%)+wQD(m;%Y$oCm?ko^&ov<19WwDGt<-4
z-%p!1tt2QYXs4s2<1aTixBr2Gf&W1YfV4h{4-yB-gVcf4gY<z7&;$ZsU*GG!y}j>O
zty=YV-MV%Er%#{$zp$_nY(Pat1(**K2g!rffz*TafelboQ)31?&%n#e>wZc~%9rfy
z?C(JQGdw&z4x}I<Irln{{|O`xk_V{+sR!x9nGQUwZya>UyRt?v{0wJ6^R0W@A*Z8=
z&I?WjSJx&^y7yBz?2M*S<oOAjA*YQ38g4#O4?K}Z&;YCSi}T_q-utZ+dd3XI4{f{k
r0jQB*J>Z18QRLbAs(#0rsh%4F{kwbCf;j=k00000NkvXXu0mjf-HSTy
diff --git a/lib/images/link_go.png b/lib/images/link_go.png
deleted file mode 100644
index ae8cae806e830b35ca5211758454911215fa9824..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 655
zcmV;A0&x9_P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!AxT6*R5;6H
z`2YVu10|SY7#Uz^XUCnDl~vl>+WKzZym|j?YHA+l<m8wGu>_EP7bFIf1E~S2MKQq0
z$cW9y$ER!J#EJi3ym;~d?%lip4<0=Dzp=6LUUhZ#p_?~v{s4&`IdbGbNDW9WNDtfq
zLqkKq;^N{DSFc`u7ZDM$&D-1iPikuF|4EZ3{jaR7{10M-#6WT@R;+jkQVY_9?1HYQ
zrl#+cCr?iI_xI<rx3~YickkZ+=gyt`f9TMm|7+K-{hu+%;$P}~!~Y;PAhjSpa07I8
zbu-h`)89{<HmxKmC}^jnqvJ0(H@E+Rfq`HQVkgWn`ro)Y>VNnQjsGCEAU$vcG=ad^
z*Y|pFZ}0n6t5&^Tw{G44{H3=4a~E0sPhVj2KWVPv|C;ro|5u%!_`hVe|9{s$iGP~f
z8d`7z)YR0NfzCGY^76W$l9KWzJ3IS(_G0t@8_rGpzxM1Du*MaqC;XqVr{w>_<6ZwV
zmb(2nZD;?j+sw#_Gk%kS{sn37+m-*nb4T|7)@^D38#X8YZ`zvvf5xHa|1k?}{;SqA
z{KRQM^lZ)lD^E@Mzw|`!|Aoi8{?9ww0W>7*|MWvm|I?Ow{8y}HxGr7Ez=_j<!0C#A
zJts>4b?z7aYu(NNH*UVw|7iys{wFPV`!8S1a8a_7ft{qJtliA`I)0(^fB9;LGeFI3
pB<BU7lV8hKGyfN@WMDxS2LKQ5iuBL_&V2v?002ovPDHLkV1g>$Rr>${
diff --git a/lib/images/magifier_zoom_out.png b/lib/images/magifier_zoom_out.png
deleted file mode 100644
index 81f28199ac1c979f440f0586e6e0da48672e74a4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 657
zcmV;C0&e|@P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!BS}O-R5;6}
zl5a>8VI0S0!CoiyA}k0DS`b78y(oGU6a>AkUK9~n*^7|=kr7cwRFWv6%Z}9bXJxHq
zv!bQ7t!|lawm;5>vpILy?iOC&HfG!Hc8BBJ-HKqfMb?WCJa0aq=l6SfssL2|4?ho1
zYF_hZS|)5^i5(2(3eSVtLjTwt+viCU4@P*+9|NQ!zmCYHkC8wnWH2cSOj5$smpmL3
zY1}4f$SympsTgoXWWvkj!KP${W<>az96Yfc0&EV^Sqav$1oSUxqGI6Xq{vddRFu7n
z`2LdsHzi;=Dtr$y0$QI$*opyl-<UG8Dv#0vT#Ec|It%H-dCVVefPA11;?CX3ZrhHz
z4V#c!wKi1}u=vvjIw8TW$Ro<FLyGL2$`<9X4?B^*+m2*+8+d&)xYmnE)T~5Fz~oM_
zlRw6P8_9xHWXH!0GRIH;dUH{ptzIsc1dKx*F%U>1%;k%_tFkSWDaJm;MHp-}I<6Z;
z`=uSavTxAsh-+>P#z@O32VYD;@Uw_<1$Q)qo>w&5O)gAWuE2V33*Ucwqps{ny7nxp
zX|aTf%a1~AQ*W?v_D-PC*yD@0=#7-ucnX}S5B~d&FdbXR-#fBe_gkP615I1CPtR;N
z4-*FwcN*ZjSr5aZ75rZZR34vLukCGEW45>LLezQ{#QvpNP(bBYeXX{uZkgF|xEA`o
r)y)eIsC4dIvZ!Ov;+nFL_^*5eZM*&99<oKX00000NkvXXu0mjf(?usy
diff --git a/lib/images/magnifier_zoom_in.png b/lib/images/magnifier_zoom_in.png
deleted file mode 100644
index af4fe07477243b9b2099899d1ef47b8e3fd87b09..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 680
zcmV;Z0$2TsP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!I!Q!9R5;6}
zl3Qq!aTvyjf!76HL|p{CS*&QSh*)&G7|~S})mV*Mv$>FJNMp+(Bt!=q9U!ZZOlw$c
zuAy5i+nTd|<_>NivLu&tYWf+obh7aHN%Hi45`pBR)x`t<o8RyMyf1GNfTI7&uZO|=
zoijX>A#^U98gM4FFC6h~&)aWQw>e5Y84Gj%C?Fa5wL3#v12nvm3<6OafjJt}U((Qj
zn8!nMmXr-qoCO7XcZRS8(x9RlIA>F^1(GoPldw}sc)rpQ>IL9yYf!7MN);5mno3dL
zFr9-f3^@5I0h2d@QBNW#I`RB4IwvonO1T#W1?;?jrZNjp_!1ar;E|a)8g&BH^;Scq
zt%uAgf}pb+yKn5ouFDnCJb}hGpY=s(m>77B`PIn4hUqw48S;@<+#YViwZYT4_>vEC
z?=fr<mm^Q0GDWDVpY`9k;~*JW|1k!hst)^Pd%$bokMn)UaX?y$&7v}t2}@IX0;MrT
z^xNm)3Z-+iv#`z?%gNpcQ*31jyAEPg^ZLR&xUUa#?hg1#%|r-Re*%urDZFE1^28t?
z^kIi&JIb5ZVQXV)w&z?$Nx?(9+2`T3X<WpmE+-}FaAd{p_H2vX8f=p)y%uFNLgsGR
z9=AXx+z@_rYE8*+f`!sAspLLu-KHKT>Jc<3Fn+HA3jXTwUklhgJ-d<Hab~T0==vde
zv{ymYuE3%MY#uZeb7j0$YQ@Q7NNbi|S+s!7oukW_+&Z#!Wx*x>YkmNL^YBTW!uzZM
O0000<MNUMnLSTa76f-UW
diff --git a/lib/images/media_align_center.png b/lib/images/media_align_center.png
new file mode 100644
index 0000000000000000000000000000000000000000..3db90fc17e12cc56de55b491b5c845b91a291532
GIT binary patch
literal 294
zcmV+>0oneEP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy$Vo&&RCwBA{Qv(y10{fofkHsB0W2`a
zj2Scj|NHlk;qTwS41fOof#cu5e}nO_U%%k=&!0aTX3w6@h++T`FjC|KWFS>MA8W{-
zEO22Y$^Z~})EUc&>;;|HjsNkw;M%ooaQ}G#`6o`CVEFOl2bd3{b%0{KcI{&L{{1@`
zQ$H5aLD>4+|H(FBV}uSP%<0H91CrCR89-{9#!LtA-@k|32D2H4K>-J&xw*M91M%g{
smmn$|>Jof7`|H=Q2wMj{Hv$A005OA@!koO7c>n+a07*qoM6N<$f@}SN8vp<R
literal 0
HcmV?d00001
diff --git a/lib/images/media_align_left.png b/lib/images/media_align_left.png
new file mode 100644
index 0000000000000000000000000000000000000000..cebbb1a9ab330b3009cd5c2fecdb0fb075f6d2c7
GIT binary patch
literal 312
zcmV-80muG{P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy+DSw~RCwCNQ%MSgKoIN>ekXa3If*aO
z&v^9#iD$ncc+L|%c@)K6r$bGc5MnR^g)|gY4?|Z?HNzr8Tk1d?Yx4lhkRS+TnkJg(
znZ|L{KtBwF=55<*9)=;m4&bdBJRMvQr;n4)>c*buNm-Uu6a^`z2%>QuKb)WeE_@Wj
z*UsKy{bJL$ZRz`-fU2q}NfKT>VXdMl;;$L3<={Auc7QE3O+&~dO;g@?3%>6Q6ae#H
z>>i5XUDxTpu4{cK&-0xfxUMTuG0IRuZvf>i%NAks-+$v>fB^uJ=FxDxZ*{5w0000<
KMNUMnLSTXl@qH@*
literal 0
HcmV?d00001
diff --git a/lib/images/media_align_noalign.png b/lib/images/media_align_noalign.png
new file mode 100644
index 0000000000000000000000000000000000000000..74f34e5f1c015d1bdbf1b8fba25d7166dfd9495b
GIT binary patch
literal 269
zcmV+o0rLKdP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUyuSrBfRCwCVQp*X$FbuUr=jl2<Wrge$
z@B-b$=k8$0)rR>0DNo>@(o%2=6$nWnzxOPOx7OH*O>EGH0WLjR*R|DJS<acfl)_R<
z<fvnelso4r7ea8n<D)ZpDY#G9L!?`M@UH-ln%{x`=@vdop69uR5NP_=T4s!4Qp%IJ
zuq;c%zWXhJ(R)u3tjKW#T5F0*sUIl7AK_qyg9+?i4eEX0sb|}^a}*4(@hQLnXz!Qt
T6H~4q00000NkvXXu0mjf>CAIG
literal 0
HcmV?d00001
diff --git a/lib/images/media_align_right.png b/lib/images/media_align_right.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f54a4a499db6c5579e59d45df9dfc944e85a2fc
GIT binary patch
literal 312
zcmV-80muG{P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy+DSw~RCwB~lT8YPKn#VG@n2C~y7C6?
zTJQ?)djYpzMo%DaTJPZndZ4DffTb<1(2juzlQ7JD^O9i^A)7E{8P*55?}fH)#rJ)R
zqKG`tBdlH5)ivZej^<t0G4`{q2M>a#X@r@{7(;oUQ<h~k3<F=x@#77r+f@k&1Y0`u
zLAGiy9@KR$X_`_H1gd$S`6m;XW#PX)sH#fv?l_Lsc@Rv~qz8WUVc#wkMWOvql0;`9
z3`3;=5%Sd+?1B2e-+2z6qby4S2`E;r(+LXX<2dd^VEviy0t^6#2VB7<2e=Rb0000<
KMNUMnLSTZPHGeMv
literal 0
HcmV?d00001
diff --git a/lib/images/image_link.png b/lib/images/media_link_direct.png
similarity index 100%
rename from lib/images/image_link.png
rename to lib/images/media_link_direct.png
diff --git a/lib/images/link.png b/lib/images/media_link_displaylnk.png
similarity index 100%
rename from lib/images/link.png
rename to lib/images/media_link_displaylnk.png
diff --git a/lib/images/image_info.png b/lib/images/media_link_lnk.png
similarity index 100%
rename from lib/images/image_info.png
rename to lib/images/media_link_lnk.png
diff --git a/lib/images/image.png b/lib/images/media_link_nolnk.png
similarity index 100%
rename from lib/images/image.png
rename to lib/images/media_link_nolnk.png
diff --git a/lib/images/media_size_large.png b/lib/images/media_size_large.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2fb548d92320a2a5207d8ef6ac54765c014bf33
GIT binary patch
literal 153
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5XtUX;ELn>}1{rUgjo>{e_v(f25lW)MBz`uGEf|!!raz5$*
yzrSQ2w;Qj7X@efypW{u|6GRR8D)Lx33>fw^^Us@{`*;D+7zR&QKbLh*2~7Yo=rKzG
literal 0
HcmV?d00001
diff --git a/lib/images/media_size_medium.png b/lib/images/media_size_medium.png
new file mode 100644
index 0000000000000000000000000000000000000000..b33157256423439e3f1cff01e02d7606bd934ae6
GIT binary patch
literal 296
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5XPI<aGhE&{2`t$$4J+o><XQR^rrsNLeRl6Bh-VIo%E%5%}
zqI(h@=N)b)>i@qV)BA?WQKd|SkK4KP;~_aFwl!|s1ZH!mIo{07nB`cby26HeN^eqw
z&=j_t1^nIG4u3YkNNm;?bLfhhz!Tc^DO^~(clAXkT@hcIcS&v$PE2l(V^_2oO=0_Z
zpLrvv$t#C@T+OHUGM{8z94Hy@6vf;7JwT)P&G+v|mblC)KD}_;c_mZL`K?LGIgRbQ
rvKon=`&Msck?UgYVV)<=$i&0YoNdI`bLngv&{qteu6{1-oD!M<(!OtQ
literal 0
HcmV?d00001
diff --git a/lib/images/media_size_original.png b/lib/images/media_size_original.png
new file mode 100644
index 0000000000000000000000000000000000000000..d179aa2dbe2e180ec31814c1502a5cf5998a0cdd
GIT binary patch
literal 312
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5XZh5*mhE&{2`t$$4J+o><XQR^rrsNLeRflIZImGZC(R0Y*
z5w+$%Qr)maxZ{2^OWeQxoYN9oDjBmHgaqa{N*Qsln#h<Hp%JoK+e2nHqk?bwLaCUE
zCdLYqo1{D5Gj8O((D405;smy>JB7Q`*j9+AImXUx(-m-D_(jJi(Tw|~sRWyZ^W5)p
z{fq|FH3M~}Ci3oJH;okNuSzzVzCdDwl%_#pqsbD6qaAJ$QVMEPQxjh{u%6{kblAg{
zC9tifgg?uI*-YF(q18Y~Q(N(8rRkM`H=dOTij*B17#X4_dbUoGVYdVNlEKr}&t;uc
GLK6Uy5@}Ze
literal 0
HcmV?d00001
diff --git a/lib/images/media_size_small.png b/lib/images/media_size_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..04efe7080fac7dfa27bdc9d9b55a41f6d3751683
GIT binary patch
literal 305
zcmV-10nYx3P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy(@8`@RCwCFlfezbFbqXw!~$FxAO{v;
z1sI_nfsPPn=?HX$u0RI>iQM7R5yH3h4^<MSNRhDg<)*TK-RD+92&N`BrZTqi4G}SW
zb2#GCL7FY(p$Y2V;V~B{Ky!n1=dt^kry!qcV3QG)!BQ|7p#a(3$Z>r&gPcLneB<jB
zL*g|Oq9eo|0jg;a9&=KkGayWDzCaDPp%7ba!55+ALMI~FF{%H>fF>_BsoBCz9_25Q
z05t|c^EjUt9ImSdB(DvQASXV#h2gNe#=rlKUjYUHfE9%c+cHX;00000NkvXXu0mjf
DDE4*8
literal 0
HcmV?d00001
diff --git a/lib/images/text_align_center.png b/lib/images/text_align_center.png
deleted file mode 100644
index 57beb3813973e69f535a822c2f0424fa9f560303..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 234
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^zbpD<_bdI{u9mbgZg
z1m~xflqVLYGB~E>C#5QQ<|d}62BjvZR2H60wE-%s@pN$v(Kw&{=X`^_fnmU^23D6T
z|NkHVz|K?O{7~QE-_Z@zCpI>Iv^P{UFnE&ke;(6i-d4-w%bHR;j1|AyZ#v6S(amDc
zlKy{I(;D%Nuye{ncOLwezxwWez>k>{<_3S*oiFG7{Xgq}=)co{r~lFaH2=T-_xf)+
f9X!fMH*zv8<p^WYIdE|*&>ak(u6{1-oD!M<mAzdh
diff --git a/lib/images/text_align_left.png b/lib/images/text_align_left.png
deleted file mode 100644
index 6c8fcc1165a433617355ac5e182d015b389e9296..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 209
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^zbpD<_bdI{u9mbgZg
z1m~xflqVLYGB~E>C#5QQ<|d}62BjvZR2H60wE-$h_H=O!(Kw&{=X`^_fnmU^23D6T
z|NkHVz|K?O{7~QE-_Z@zCpI>Iv^P`}`P2Tg^~Il~8@dITHCPA-{a3!-)3Cjx%=yXx
z_>8LclV7mqn+PY^{qor&o%8>H%d3``{~Y#6bGV5yoI2touNPXs5@;QRr>mdKI;Vst
E04%Lf&j0`b
diff --git a/lib/images/text_align_right.png b/lib/images/text_align_right.png
deleted file mode 100644
index a1502571c99fb92b1579c3658bcc50c5976b8e7d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 209
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^zbpD<_bdI{u9mbgZg
z1m~xflqVLYGB~E>C#5QQ<|d}62BjvZR2H60wE-$h_H=O!(Kw&{=X`^_fnmU^23D6T
z|NkHVz|K?O{7~QE-_Z@zCpI>Iv^P|9aJcmUe!yIVina{lp#RFZdm6TTlr;aYZ;9)u
zJl|<{@VEV{yZaY@Fz(E|@aw<yI%%PG^&N(d2`P*W!X7^IUsDQq1Fd85boFyt=akR{
E0RJyfCIA2c
diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index 3f0a8fb65..599dbbdfa 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -259,7 +259,7 @@ var media_manager = {
media_manager.popup.style.display = 'inline';
media_manager.popup.style.left = event.pageX + 'px';
media_manager.popup.style.top = event.pageY + 'px';
-
+
// set all buttons to outset
media_manager.outSet('media__linkbtn1');
media_manager.outSet('media__linkbtn2');
@@ -270,7 +270,7 @@ var media_manager = {
media_manager.outSet('media__alignbtn1');
media_manager.outSet('media__alignbtn2');
media_manager.outSet('media__alignbtn3');
-
+
media_manager.outSet('media__sizebtn1');
media_manager.outSet('media__sizebtn2');
media_manager.outSet('media__sizebtn3');
@@ -388,79 +388,44 @@ var media_manager = {
root.appendChild(media_manager.popup);
var headline = document.createElement('h1');
+ headline.innerHTML = LANG.mediatitle;
var headlineimg = document.createElement('img');
- var headtext = document.createElement('span');
- headlineimg.src = '/lib/images/close.png';
+ headlineimg.src = DOKU_BASE + 'lib/images/close.png';
headlineimg.id = 'media__closeimg';
addEvent(headlineimg,'click',function(event){ return media_manager.closePopup(event,this); });
- headline.appendChild(headlineimg);
- headtext.textContent = LANG['mediatitle'];
- headline.appendChild(headtext);
+ headline.insertBefore(headlineimg, headline.firstChild);
media_manager.popup.appendChild(headline);
drag.attach(media_manager.popup,headline);
// link
- var linkp = document.createElement('p');
- var linkl = document.createElement('label');
- var linkbtn1 = document.createElement('button');
- var linkbtn2 = document.createElement('button');
- var linkbtn3 = document.createElement('button');
- var linkbtn4 = document.createElement('button');
- var linkimg1 = document.createElement('img');
- var linkimg2 = document.createElement('img');
- var linkimg3 = document.createElement('img');
- var linkimg4 = document.createElement('img');
+ var linkp = document.createElement('p');
linkp.id = "media__linkstyle";
if (media_manager.display == "2") {
linkp.style.display = "none";
}
+ var linkl = document.createElement('label');
+ linkl.innerHTML = LANG.mediatarget;
linkp.appendChild(linkl);
- linkp.appendChild(linkbtn1);
- linkp.appendChild(linkbtn2);
- linkp.appendChild(linkbtn3);
- linkp.appendChild(linkbtn4);
-
- linkl.innerHTML = LANG['mediatarget'];
-
- linkimg1.src = '/lib/images/image_info.png';
- linkimg2.src = '/lib/images/image_link.png';
- linkimg3.src = '/lib/images/image.png';
- linkimg4.src = '/lib/images/link.png';
-
- linkbtn1.setAttribute('class','button');
- linkbtn1.appendChild(linkimg1);
- linkbtn1.value = '1';
- linkbtn1.id = "media__linkbtn1";
- linkbtn1.title = LANG['medialnk'];
- linkbtn1.style.borderStyle = 'outset';
- addEvent(linkbtn1,'click',function(event){ return media_manager.setlink(event,this); });
-
- linkbtn2.setAttribute('class','button');
- linkbtn2.appendChild(linkimg2);
- linkbtn2.value = '2';
- linkbtn2.id = "media__linkbtn2";
- linkbtn2.title = LANG['mediadirect'];
- linkbtn2.style.borderStyle = 'outset';
- addEvent(linkbtn2,'click',function(event){ return media_manager.setlink(event,this); });
-
- linkbtn3.setAttribute('class','button');
- linkbtn3.appendChild(linkimg3);
- linkbtn3.value = '3';
- linkbtn3.id = "media__linkbtn3";
- linkbtn3.title = LANG['medianolnk'];
- linkbtn3.style.borderStyle = 'outset';
- addEvent(linkbtn3,'click',function(event){ return media_manager.setlink(event,this); });
-
- linkbtn4.setAttribute('class','button');
- linkbtn4.appendChild(linkimg4);
- linkbtn4.value = '4';
- linkbtn4.id = "media__linkbtn4";
- linkbtn4.title = LANG['mediadisplaylnk'];
- linkbtn4.style.borderStyle = 'outset';
- addEvent(linkbtn4,'click',function(event){ return media_manager.setlink(event,this); });
+
+ var linkbtns = ['lnk', 'direct', 'nolnk', 'displaylnk'];
+ for (var i = 0 ; i < linkbtns.length ; ++i) {
+ var linkbtn = document.createElement('button');
+ linkbtn.className = 'button';
+ linkbtn.value = i + 1;
+ linkbtn.id = "media__linkbtn" + (i + 1);
+ linkbtn.title = LANG['media' + linkbtns[i]];
+ linkbtn.style.borderStyle = 'outset';
+ addEvent(linkbtn,'click',function(event){ return media_manager.setlink(event,this); });
+
+ var linkimg = document.createElement('img');
+ linkimg.src = DOKU_BASE + 'lib/images/media_link_' + linkbtns[i] + '.png';
+
+ linkbtn.appendChild(linkimg);
+ linkp.appendChild(linkbtn);
+ }
media_manager.popup.appendChild(linkp);
@@ -468,63 +433,30 @@ var media_manager = {
var alignp = document.createElement('p');
var alignl = document.createElement('label');
- var alignbtn0 = document.createElement('button');
- var alignbtn1 = document.createElement('button');
- var alignbtn2 = document.createElement('button');
- var alignbtn3 = document.createElement('button');
- var alignimg0 = document.createElement('img');
- var alignimg1 = document.createElement('img');
- var alignimg2 = document.createElement('img');
- var alignimg3 = document.createElement('img');
+
alignp.appendChild(alignl);
alignp.id = 'media__align';
if (media_manager.display == "2") {
alignp.style.display = "none";
}
-
- alignp.appendChild(alignbtn0);
- alignp.appendChild(alignbtn1);
- alignp.appendChild(alignbtn2);
- alignp.appendChild(alignbtn3);
-
alignl.innerHTML = LANG['mediaalign'];
- alignimg0.src = '/lib/images/text_align_left.png';
- alignimg1.src = '/lib/images/text_align_left.png';
- alignimg2.src = '/lib/images/text_align_center.png';
- alignimg3.src = '/lib/images/text_align_right.png';
-
- alignbtn0.id = "media__alignbtn0";
- alignbtn0.value = '0';
- alignbtn0.title = LANG['medianoalign'];
- alignbtn0.setAttribute('class','button');
- alignbtn0.appendChild(alignimg0);
- alignbtn0.style.borderStyle = 'outset';
- addEvent(alignbtn0,'click',function(event){ return media_manager.setalign(event,this); });
-
- alignbtn1.id = "media__alignbtn1";
- alignbtn1.value = '1';
- alignbtn1.title = LANG['medialeft'];
- alignbtn1.setAttribute('class','button');
- alignbtn1.appendChild(alignimg1);
- alignbtn1.style.borderStyle = 'outset';
- addEvent(alignbtn1,'click',function(event){ return media_manager.setalign(event,this); });
-
- alignbtn2.value = '2';
- alignbtn2.id = "media__alignbtn2";
- alignbtn2.title = LANG['mediacenter'];
- alignbtn2.setAttribute('class','button');
- alignbtn2.appendChild(alignimg2);
- alignbtn2.style.borderStyle = 'outset';
- addEvent(alignbtn2,'click',function(event){ return media_manager.setalign(event,this); });
-
- alignbtn3.value = '3';
- alignbtn3.id = "media__alignbtn3";
- alignbtn3.title = LANG['mediaright'];
- alignbtn3.setAttribute('class','button');
- alignbtn3.appendChild(alignimg3);
- alignbtn3.style.borderStyle = 'outset';
- addEvent(alignbtn3,'click',function(event){ return media_manager.setalign(event,this); });
+ var alignbtns = ['noalign', 'left', 'center', 'right'];
+ for (var n = 0 ; n < alignbtns.length ; ++n) {
+ var alignbtn = document.createElement('button');
+ var alignimg = document.createElement('img');
+ alignimg.src = DOKU_BASE + 'lib/images/media_align_' + alignbtns[n] + '.png';
+
+ alignbtn.id = "media__alignbtn" + n;
+ alignbtn.value = n;
+ alignbtn.title = LANG['media' + alignbtns[n]];
+ alignbtn.className = 'button';
+ alignbtn.appendChild(alignimg);
+ alignbtn.style.borderStyle = 'outset';
+ addEvent(alignbtn,'click',function(event){ return media_manager.setalign(event,this); });
+
+ alignp.appendChild(alignbtn);
+ }
media_manager.popup.appendChild(alignp);
@@ -532,63 +464,30 @@ var media_manager = {
var sizep = document.createElement('p');
var sizel = document.createElement('label');
- var sizebtn1 = document.createElement('button');
- var sizebtn2 = document.createElement('button');
- var sizebtn3 = document.createElement('button');
- var sizebtn4 = document.createElement('button');
- var sizeimg1 = document.createElement('img');
- var sizeimg2 = document.createElement('img');
- var sizeimg3 = document.createElement('img');
- var sizeimg4 = document.createElement('img');
+
sizep.id = 'media__size';
if (media_manager.display == "2") {
sizep.style.display = "none";
}
-
sizep.appendChild(sizel);
- sizep.appendChild(sizebtn1);
- sizep.appendChild(sizebtn2);
- sizep.appendChild(sizebtn3);
- sizep.appendChild(sizebtn4);
-
sizel.innerHTML = LANG['mediasize'];
- sizeimg1.src = '/lib/images/magifier_zoom_out.png';
- sizeimg2.src = '/lib/images/magnifier.png';
- sizeimg3.src = '/lib/images/magnifier_zoom_in.png';
- sizeimg4.src = '/lib/images/magnifier_zoom_in.png';
-
- sizebtn1.setAttribute('class','button');
- sizebtn1.appendChild(sizeimg1);
- sizebtn1.value = '1';
- sizebtn1.id = 'media__sizebtn1';
- sizebtn1.title = LANG['mediasmall'];
- sizebtn1.style.borderStyle = 'outset';
- addEvent(sizebtn1,'click',function(event){ return media_manager.setsize(event,this); });
-
- sizebtn2.setAttribute('class','button');
- sizebtn2.appendChild(sizeimg2);
- sizebtn2.value = '2';
- sizebtn2.id = 'media__sizebtn2';
- sizebtn2.title = LANG['mediamedium'];
- sizebtn2.style.borderStyle = 'outset';
- addEvent(sizebtn2,'click',function(event){ return media_manager.setsize(event,this); });
-
- sizebtn3.setAttribute('class','button');
- sizebtn3.appendChild(sizeimg3);
- sizebtn3.value = '3';
- sizebtn3.id = 'media__sizebtn3';
- sizebtn3.title = LANG['medialarge'];
- sizebtn3.style.borderStyle = 'outset';
- addEvent(sizebtn3,'click',function(event){ return media_manager.setsize(event,this); });
-
- sizebtn4.setAttribute('class','button');
- sizebtn4.appendChild(sizeimg4);
- sizebtn4.value = '4';
- sizebtn4.id = 'media__sizebtn4';
- sizebtn4.title = LANG['mediaextralarge'];
- sizebtn4.style.borderStyle = 'outset';
- addEvent(sizebtn4,'click',function(event){ return media_manager.setsize(event,this); });
+ var sizebtns = ['small', 'medium', 'large', 'original'];
+ for (var size = 0 ; size < sizebtns.length ; ++size) {
+ var sizebtn = document.createElement('button');
+ var sizeimg = document.createElement('img');
+
+ sizep.appendChild(sizebtn);
+ sizeimg.src = DOKU_BASE + 'lib/images/media_size_' + sizebtns[size] + '.png';
+
+ sizebtn.className = 'button';
+ sizebtn.appendChild(sizeimg);
+ sizebtn.value = size + 1;
+ sizebtn.id = 'media__sizebtn' + (size + 1);
+ sizebtn.title = LANG['media' + sizebtns[size]];
+ sizebtn.style.borderStyle = 'outset';
+ addEvent(sizebtn,'click',function(event){ return media_manager.setsize(event,this); });
+ }
media_manager.popup.appendChild(sizep);
@@ -891,9 +790,9 @@ var media_manager = {
if (cb.value) {
DokuCookie.setValue('size',cb.value);
media_manager.size = cb.value;
- media_manager.outSet("media__sizebtn1");
- media_manager.outSet("media__sizebtn2");
- media_manager.outSet("media__sizebtn3");
+ for (var i = 1 ; i <= 4 ; ++i) {
+ media_manager.outSet("media__sizebtn" + i);
+ }
media_manager.inSet("media__sizebtn"+cb.value);
} else {
DokuCookie.setValue('size','');
@@ -910,5 +809,3 @@ addInitEvent(function(){
media_manager.initpopup();
media_manager.initFlashUpload();
});
-
-// style nach linkwiz
diff --git a/lib/tpl/default/_mediaoptions.css b/lib/tpl/default/_mediaoptions.css
new file mode 100644
index 000000000..7ac489929
--- /dev/null
+++ b/lib/tpl/default/_mediaoptions.css
@@ -0,0 +1,92 @@
+/* --- popup --- */
+
+#media__popup {
+ background-color:__background__;
+ display:none;
+ border: 1px solid __border__;
+ position: absolute;
+ width:270px;
+}
+
+#media__popup h1 {
+ text-align:center;
+ font-weight:normal;
+ background-color: __background_alt__;
+ height: 16px;
+ margin-bottom: 5px;
+ font-size:12px;
+ border-bottom: 0;
+}
+
+#media__popup p {
+ display:block;
+ line-height:14pt;
+ margin:0.5em;
+}
+
+#media_nolink {
+ padding:4px 0;
+}
+
+#media__popup label {
+ float:left;
+ width:9em;
+}
+
+#media__popup .button {
+ margin-left:auto;
+ margin-right:auto;
+}
+
+#media__popup .btnlbl {
+ text-align:center;
+}
+
+#media__popup .btnlbl input {
+ margin:0 1em;
+}
+
+#media__closeimg {
+ float:right;
+}
+
+/* --- display options --- */
+
+#media__linkopts label,
+#media__nolnk {
+ width: 80px;
+ float: left;
+ margin-left: 10px;
+}
+
+#media__linkopts label{
+ line-height: 20px;
+}
+
+#media__nolnk,
+#media__linkopts label.long{
+ margin-bottom: 8px;
+ line-height: 12px;
+}
+
+#media__linkopts label.long{
+ width: 150px;
+ float: none;
+}
+
+#media__linkopts br {
+ clear: both;
+}
+
+#media__linkopts select {
+ width: 60px;
+ margin-left: 10px;
+}
+
+#media__linkopts input.edit {
+ width:50px;
+ margin-left:10px;
+}
+#media__linkopts #media__title {
+ width:150px;
+}
diff --git a/lib/tpl/default/media.css b/lib/tpl/default/media.css
index 0bd70db3c..2831c984f 100644
--- a/lib/tpl/default/media.css
+++ b/lib/tpl/default/media.css
@@ -89,99 +89,6 @@ it's dirty, so any "real" fixes are welcome */
clear: left;
}
-/* --- popup --- */
-
-#media__popup {
- background-color:__background__;
- display:none;
- border: 1px solid __border__;
- position: absolute;
- width:270px;
-}
-
-#media__popup h1 {
- text-align:center;
- font-weight:normal;
- background-color: __background_alt__;
- height: 16px;
- margin-bottom: 5px;
- font-size:12px;
- border-bottom: 0;
-}
-
-#media__popup p {
- display:block;
- line-height:14pt;
- margin:0.5em;
-}
-
-#media_nolink {
- padding:4px 0;
-}
-
-#media__popup label {
- float:left;
- width:9em;
-}
-
-#media__popup .button {
- margin-left:auto;
- margin-right:auto;
-}
-
-#media__popup .btnlbl {
- text-align:center;
-}
-
-#media__popup .btnlbl input {
- margin:0 1em;
-}
-
-#media__closeimg {
- float:right;
-}
-
-/* --- display options --- */
-
-#media__linkopts label,
-#media__nolnk {
- width: 80px;
- float: left;
- margin-left: 10px;
-}
-
-#media__linkopts label{
- line-height: 20px;
-}
-
-#media__nolnk,
-#media__linkopts label.long{
- margin-bottom: 8px;
- line-height: 12px;
-}
-
-#media__linkopts label.long{
- width: 150px;
- float: none;
-}
-
-#media__linkopts br {
- clear: both;
-}
-
-#media__linkopts select {
- width: 60px;
- margin-left: 10px;
-}
-
-#media__linkopts input.edit {
- width:50px;
- margin-left:10px;
-}
-#media__linkopts #media__title {
- width:150px;
-}
-
/* --- file list --- */
#media__content img.load {
diff --git a/lib/tpl/default/style.ini b/lib/tpl/default/style.ini
index 84d04e743..c5b2c31a5 100644
--- a/lib/tpl/default/style.ini
+++ b/lib/tpl/default/style.ini
@@ -11,6 +11,7 @@ design.css = screen
style.css = screen
media.css = screen
+_mediaoptions.css = screen
_admin.css = screen
_linkwiz.css = screen
_subscription.css = screen
--
GitLab