From 31f07672c4f44527f5345ce10e15a0e2f5abf082 Mon Sep 17 00:00:00 2001 From: Marcin Kurczewski Date: Tue, 22 Oct 2013 23:40:36 +0200 Subject: [PATCH] Improved #33 --- public_html/media/css/post-small.css | 13 +++++++++++-- public_html/media/css/upload.css | 3 ++- public_html/media/img/thumb-overlay-swf.png | Bin 0 -> 1951 bytes public_html/media/img/thumb-swf.png | Bin 1820 -> 0 bytes public_html/media/img/thumb-upload.png | Bin 688 -> 0 bytes src/Controllers/PostController.php | 7 ++++--- 6 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 public_html/media/img/thumb-overlay-swf.png delete mode 100644 public_html/media/img/thumb-swf.png delete mode 100644 public_html/media/img/thumb-upload.png diff --git a/public_html/media/css/post-small.css b/public_html/media/css/post-small.css index 4f6aa8ad..abfa714a 100644 --- a/public_html/media/css/post-small.css +++ b/public_html/media/css/post-small.css @@ -6,8 +6,17 @@ display: inline-block; } .post-type-flash { - border-color: #dd5; - box-shadow: 0.25em 0.25em #eeb, 0.1em 0.1em 0.5em 0.1em rgba(238,238,187,0.5); + border-color: red; +} +.post-type-flash:after { + position: absolute; + right: 0; + top: 0; + width: 150px; + height: 150px; + content: ' '; + background: url('../img/thumb-overlay-swf.png'); + pointer-events: none; } .post:focus, diff --git a/public_html/media/css/upload.css b/public_html/media/css/upload.css index edf04c09..fdcf7a0f 100644 --- a/public_html/media/css/upload.css +++ b/public_html/media/css/upload.css @@ -30,7 +30,8 @@ width: 100px; height: 100px; line-height: 100px; - background-image: url('../img/thumb-upload.png'); + background-image: url('../img/thumb.png'); + background-size: 100px 100px; border: 1px solid black; vertical-align: middle; text-align: center; diff --git a/public_html/media/img/thumb-overlay-swf.png b/public_html/media/img/thumb-overlay-swf.png new file mode 100644 index 0000000000000000000000000000000000000000..dc3de9f81dc63d32909d6d913e51f88cfb1ca870 GIT binary patch literal 1951 zcmds&*;i9p7RGOgKot_GD3ll(189{@AtVZ6mOzM+K`=m52*^ChOhll-D~NSLMHyri zQ5(TX5ef&O!6HyCA}WJKNii8@jx>ZhF(lBp>#ZO9ALz68KEL(tv%jak*E+fGt`w94 zMgaf-6xEsR0kh;k`JEhmpD$>*4`WZby^B2nG~L`QIVTHiM3M*P1iz>d<}(#<%g#e@lYt z{8u{lM%%z$#Z?8iz9~$k}mmcL`yQm%M zV@`Y}9?0eBvhI(C(L?BfN`tX4YGs{h8{m+aVJTeNBVsPpVL{bsuU`+oS*&a6+YsnP z0#}V&=f=(EHNl~Rhq{QcpGni6AZwK63pSH~lDU@{J?jOQw)-#3nB#@7{lK-yYmeW_ zmUy0sR8up>Vy6~bJ=6K8RC|*1`PZRV=63Be1bJV~fuOAMtZ@iZB^pFwv5DTZtURdf z1D>gmoywNgGK8RrboP=If?g)&&SSB2FYlcCpo8QV6P)WPesx><*EK}t*TPIHG|;P2 zyY*5unvpU*aS;8!f>W^{y&AFmces=jt-vLdRhEv9s-hEuIJqupbZY6`Sq%C#gZ`0@ zM!WC`8T-*qkJIRk+IlSiLCMaUgjLElTbYHOC)+geY(u**qRsn4;~vrTS?>4X6GrHw z$3VU4_bK6r=d6;^5?@e~C6VF&riZcqYvk1jpx>1e~%e$-}2@EN-qN~|ksUZJQUEH468n-PKwCio^ zH7C2Z{3VFVnY%^lz_5@dkZm>GesUg6w`B{Hz!bhs}VRV^jek`)l3&DfsJGA*m;wg=K1FIQuiUAn&fPEt1dhQpZ1icPY`qm zX(5lrzREbZ{1k$Yvofc@Kv0p(kxDF9oWH3-v(88rtif&hFY;eN(0i@?9UO;VKrmDc zO6a(lknja!&d=SgL_99~NCls0gjxa@<^}!o5qAfz5ciVp`7$6g)pH$a*5YNV-%AVL zbgH{jD5ou*^liQLITLKBe6q%GiX7IpDwJ;-(n=5n$RUbdA3*84<4#cQb+dN&O*XWzjypWpThpi`%1=0+E8jKvpuh{xVdX*_6SE>x?xfr z8z0)nE8OYsC${1z0;rgHSXUQr*zT(Ml`mK8Nqa}K3^>xlny2F3$v4TD^!Qp;U)4+X zsD=LrLGY6t2=AP_{HF5WH}FTLpX}(99C9u>loXs83Io97OwEi;aYlIj8N3+@PaqL3 n3~+c74yXLcHTS;^F>xW0VX6Pykh!@>gh0D!FofPWm>xgB^jB!hi9c#)HlMH~FLKTcI;-mi#jGwf$ZERcGOu+L zJu6&>h4_8N(CoxYb{=9$*FgRRtLG6WsVjT+DBQ!Z&n$6{>59Io*cgXUj1i+FzS*o+ z8~zx`dRlq1pleacv!x|3l1p0U>E!%Y`46PbR{6*dnmA)?s>PCX?$;G}^NNBl^(XY} zt=z5G^+czmK}^DESmyCOZIaluYKBfzc}*5ID%nHC=z z%MF*Ujl^`d$K=*qR}}hVQ88EeIz^Az*tY1xru{iGl~|-!2K0GXVGhQ3Hx+OoFiZz> zm+u;Y=nFcn?vZl)!I3Lrc?fN9D@qwtcMLSu9&w@)h6Ny1{e_k9FB0}kY6M-MqywWsrkcDAN6L`x&^dDKjb&H-;TMI3&uS?&N0~scB-?)9-;p!=$oG1WOPp zLPPj7+Sn1}+a>7y)}&0k0ew~gW2r@U$K0pixSm*|@Dy{&W=r?3BeSUK6R$4^JVif( zF?syC%vf&n+F-@~rfItMC5C`*A;6XRISp7ugtFYq@yh9%_76D0EX8z%5V!gY#Hx&{ zj3g0vy4)x=H0$4NLK*C!zRcJzck`mVQ+zhMW(Zhtm<5 z`F%iKIOGUdXQrO&Z+y7c-*M@CrG|{g`w3*A{(zAQWTqQA6gL9@ zdQLSYuI;s$u?k~0t9a~cRH-?`D1P1B44-*yt6Z*tf&3RKK8qtF?B&g*Wi-XHoa#WxG#Io0{{joM(dqjraK(}sSL9T;vw3p{<5 zWncQqGF4z?q2sqGJm5OZ&{Qb?V0e;yPF*nQ`!!bY;864!y{E-EtzUh{D|h-ruZb#G z_b~+7|I?)Ux@_>!Qui%Rr%MON7Zkh-(0jk7WxjcejOAM8{b}^^iipkZMVK50$#25* z^>S?)_gT}IBxfN!d}8@D)R2?$-2w7=--?=Y{BMh-Q%$gk`kM} zEn$osu5-C_J2G`!wTeth-?Pd(xovjJohU+3)Ux-z9<_wMC>Xz)0Agr9F^OG#N-={r z@yN5SHQ-hwC~j%LL564d93QO4NCL%}gNMArTFwP>{w z6m9KGcA#sUOU0MMj&ijF;t!X^xHzUW>;BBG6S7lC8k9tZ&mciPtpg7yvjz{l{Oo_A zf1&`NY@=7TJ^b=2(bI6Tw@JS4aKD*WdNx@l7C09BA4)GIbL02?Ku@MTn*O>@q$Ni+*xRUm6cBmOfGk$=f z+KDyoJVd*&jRo*s@WZP<=zxf+Z}5=j2pV&}IYas>Oqs6!OnMkI0(+JbAvFMnJYjw8 z1o9XX1ENq^YilgZ#uACbB9UF2YB~Q?IG;d|iA??fg|U|AlhOh}aP@F$bqdY+54_V!Z diff --git a/public_html/media/img/thumb-upload.png b/public_html/media/img/thumb-upload.png deleted file mode 100644 index dbc3d48cc760eefc199b4d947b459315e5f7ae4e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 688 zcmeAS@N?(olHy`uVBq!ia0vp^DImp0*}aIAngIhZYQ(tfJU$Mba4!+xOMlo<)mf@0hfzKw;lyqO?sDq zQc#fP;3aR}nVRWme)(T=VAkE-Z~D02bhDa6=C_;w4TAapo|zJCt^IV-?1@E}&$v~- zNL{pN%ccM;D@l#Hy)ULT+NGRIkk(3F#68jIW{X?o3&%w|+ZF`KSP5wO@m>`<{&T9x z^P8bl8g`0KSupeFlmnGBr#y&^oYG<`Ic3Rq?JA!~;ub|ApA=QIVh%dmC8b=nVvG=QN%#3yrO$B_(9%>hw$xQ#JP|PqoA~q9i4;B-JXpC>2OC7#SEE>lzy98kmI`npl}wSeY7V o8yHy`7-TNH7lNW8H$NpatrE8eiQj3!)WpEx>FVdQ&MBb@0JD$_ApigX diff --git a/src/Controllers/PostController.php b/src/Controllers/PostController.php index 60795e5d..5897fc9c 100644 --- a/src/Controllers/PostController.php +++ b/src/Controllers/PostController.php @@ -596,11 +596,8 @@ class PostController if (file_exists($tmpPath)) $srcImage = imagecreatefrompng($tmpPath); } - if (!$srcImage) - $path = $this->config->main->mediaPath . DS . 'img' . DS . 'thumb-swf.png'; break; default: - $path = $this->config->main->mediaPath . DS . 'img' . DS . 'thumb.png'; break; } @@ -622,6 +619,10 @@ class PostController imagedestroy($srcImage); imagedestroy($dstImage); } + else + { + $path = $this->config->main->mediaPath . DS . 'img' . DS . 'thumb.png'; + } } if (!is_readable($path)) throw new SimpleException('Thumbnail file is not readable');