From 1409c13e3060c87dcde031e8ca5d41f43daf1c31 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jerome@riseup.net>
Date: Sat, 21 Dec 2013 23:48:10 -0500
Subject: [PATCH] Overlay a small icon on video thumbnails

---
 .../e5f78ecf-9f31-4904-b596-a2b6916eb0de/values  |   2 +-
 web/img/video-icon.png                           | Bin 0 -> 1158 bytes
 web/js/011-display.js                            |   5 ++++-
 3 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 web/img/video-icon.png

diff --git a/.be/ea1b0351-d083-41d9-b39b-55ff97bf0b25/bugs/e5f78ecf-9f31-4904-b596-a2b6916eb0de/values b/.be/ea1b0351-d083-41d9-b39b-55ff97bf0b25/bugs/e5f78ecf-9f31-4904-b596-a2b6916eb0de/values
index 6d8a23e..a324dda 100644
--- a/.be/ea1b0351-d083-41d9-b39b-55ff97bf0b25/bugs/e5f78ecf-9f31-4904-b596-a2b6916eb0de/values
+++ b/.be/ea1b0351-d083-41d9-b39b-55ff97bf0b25/bugs/e5f78ecf-9f31-4904-b596-a2b6916eb0de/values
@@ -26,7 +26,7 @@
 
 
 
-    "status": "open", 
+    "status": "fixed", 
 
 
 
diff --git a/web/img/video-icon.png b/web/img/video-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..48fc7858c00213b2cae6b46b863c50b0436dbab5
GIT binary patch
literal 1158
zcmeAS@N?(olHy`uVBq!ia0vp^(?FPm4M^HB7CvHNVDa^IaSW-r_4f8@Zxwf$10Ul<
z?Tv0em~^sP^|6!Ej+{dc9ZeIGXDFz!pOk+fzu<p^ct7($!A9FEp-J9nLO&`gKbhfO
zAZ)5=5P7pBaPj54p_VuHzSOOj6Dpedt8RfrO;7tr@6fN_EI;Hm?3mX7f1c&QZYKY9
zy}Q^a%WCnd)~gO}@{9S-*CTm)edMYRPyUWGVLXpn%uMvsbpEGl#!BU-1PM+)Szoq(
z2gm94E1GPU9N_e^es6s4#Ha7+wbOhKeVU@j`n2!U8`Y(et2j>eo(f@ci;z1PmKTzk
zIpuNDVXZ}8zjNN5T@cy5;aENAm7o8A@(Qkex_+YYbm=fHC3B^sw|{b;D7zk#`mbsr
zFp+)o<jK8ZtG|Y5el44%GSN`&#3r2$*RrzLZn~x=D7bV=@8ci8Uc7j*{qNtu&y|WE
z>MReHu1V85zbHsa=<4gQ?z3mlUTth_9N(7s!@*^Wp_^u@wV-IAXkujc*?afym3w=8
zpZ|1owU}$5g}M21tGVa61%IwC*>Xbe^yR;yTXyXD5xDv0pFMHw?caUgz5ea|9>Yaj
z>%v{+x;k>rX7`(!nc2;rHLL1I-uC_XZr%E2$batH`*h7O1{)4Y1amh%IBTaEy7&09
zOsUMZ_ao!t{-va*KJEVb^QZs%b?f4Q4)WdSzB}#Mr|Qq^KJC5Y5gxf_@7$V6DxFbl
zuU-E7_3Qd&%a_|<i+X+fwD;ZDUz5_E*Z*33SmOQ;7ndt50;ev`lrod*{Vv^mtUc;=
z_*{wPHaFJ@39H7x)0NqKDn-0jR<jGWC05nc{5gK|<jKTosWU%sZ;R7cS@W^)R96RQ
zlY+GAx<?`|BCaRjy?f`Mot=HYtgLL`{vA6kg1u6=M!k)Sv#&o|sl)$xlhUN6nN@|w
z#l>koKOM4dy%NlL4$tfOvvcp>zs1WhSKiCpUSIL)$w`;(xBtev2<@!?Hg|(f*QqX#
zO+W>w4<0<Yee>qc_3nWti9HvOw(YCAwm0I{mTNbG!LVMbNKYw!`SRuZ;o;%^Prlu`
zx>I<XY{`>`kJd^$dIwvSK848~f3K^fW7GGzLdkQI#r`G2&!(5e$-dNF>Lbx+emC#?
z(T5Kc!(H@TmrOq%BDeBSwRnrFPW>URM_TVPI-Y)GD%szC;b`6N9h(=LE39~Qj{S1}
zwIt0i37_M*jy@@zl0UaF|J&xJ8C@Nx93|B?%-+vqOJl3CpZxH9^3?aIi_*0cKfimw
zCRB7r;h|N#p4)2w?OPe~i%m{+)A3K~`=8o*JhTf5{A%EORYFQM@uy_?&yzCW4Gq4B
zv`*aJU(egywe-UM)QufyPu=A{waq`lC@bVlMBTZV=D5{;TC3w2fq9)S;KA;Ch8O#{
UoR&H7eH~<>r>mdKI;Vst0J)M9=Kufz

literal 0
HcmV?d00001

diff --git a/web/js/011-display.js b/web/js/011-display.js
index 007eb32..7f5db63 100644
--- a/web/js/011-display.js
+++ b/web/js/011-display.js
@@ -97,7 +97,10 @@ $(document).ready(function() {
 			photos = [];
 			for (i = 0; i < currentAlbum.photos.length; ++i) {
 				link = $("<a href=\"#!/" + photoFloat.photoHash(currentAlbum, currentAlbum.photos[i]) + "\"></a>");
-				image = $("<img title=\"" + photoFloat.trimExtension(currentAlbum.photos[i].name) + "\" alt=\"" + photoFloat.trimExtension(currentAlbum.photos[i].name) + "\" src=\"" + photoFloat.photoPath(currentAlbum, currentAlbum.photos[i], 150, true) + "\" height=\"150\" width=\"150\" />");
+			    image = $("<img title=\"" + photoFloat.trimExtension(currentAlbum.photos[i].name) + "\" alt=\"" + photoFloat.trimExtension(currentAlbum.photos[i].name) + "\" src=\"" + photoFloat.photoPath(currentAlbum, currentAlbum.photos[i], 150, true) + "\" height=\"150\" width=\"150\" />");
+				if (currentAlbum.photos[i].mediaType == "video")
+					image.css("background-image", "url(" + image.attr("src") + ")").attr("src", "img/video-icon.png");
+				else
 				image.get(0).photo = currentAlbum.photos[i];
 				link.append(image);
 				photos.push(link);