Merge lp:~sil/udstream/udskarmic into lp:udstream
- udskarmic
- Merge into trunk
Proposed by
Stuart Langridge
Status: | Merged |
---|---|
Merged at revision: | not available |
Proposed branch: | lp:~sil/udstream/udskarmic |
Merge into: | lp:udstream |
Diff against target: | None lines |
To merge this branch: | bzr merge lp:~sil/udstream/udskarmic |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Paul Hummer (community) | Approve | ||
Review via email:
|
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message

Stuart Langridge (sil) wrote : | # |
Revision history for this message

Paul Hummer (rockstar) wrote : | # |
Nice. More of this plz.
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added directory 'images' |
2 | === added file 'images/bg-content.png' |
3 | Binary files images/bg-content.png 1970-01-01 00:00:00 +0000 and images/bg-content.png 2009-05-24 16:49:10 +0000 differ |
4 | === added file 'images/bg-page.png' |
5 | Binary files images/bg-page.png 1970-01-01 00:00:00 +0000 and images/bg-page.png 2009-05-24 16:49:10 +0000 differ |
6 | === added file 'images/cap-bottom.png' |
7 | Binary files images/cap-bottom.png 1970-01-01 00:00:00 +0000 and images/cap-bottom.png 2009-05-24 16:49:10 +0000 differ |
8 | === added file 'images/cap-top.png' |
9 | Binary files images/cap-top.png 1970-01-01 00:00:00 +0000 and images/cap-top.png 2009-05-24 16:49:10 +0000 differ |
10 | === added file 'images/logo.png' |
11 | Binary files images/logo.png 1970-01-01 00:00:00 +0000 and images/logo.png 2009-05-24 16:49:10 +0000 differ |
12 | === modified file 'lifestream.html' |
13 | --- lifestream.html 2008-12-28 03:26:26 +0000 |
14 | +++ lifestream.html 2009-05-24 17:12:20 +0000 |
15 | @@ -3,27 +3,66 @@ |
16 | <head> |
17 | <title>lifestream</title> |
18 | <style type="text/css"> |
19 | -body, td { |
20 | - font-family: sans-serif; |
21 | +body {background: #D3CAAA url(images/bg-page.png) repeat-x;} |
22 | +body, td {font-family: sans-serif; font-size: 11px; line-height:16px;} |
23 | + |
24 | +/* LAYOUT */ |
25 | +div#container {width:876px; margin:0px auto; background: url(images/bg-content.png) repeat-y;} |
26 | +div#wrap1 {background: url(images/cap-top.png) top no-repeat;} |
27 | +div#wrap2 {padding: 20px 10px 30px 10px; background: url(images/cap-bottom.png) bottom no-repeat;} |
28 | +div#footer {text-align:center; font-size:10px; color:#777; margin: 20px 0 10px 0;} |
29 | +div#header {border-bottom: 1px solid #aaa; height:90px; padding: 10px 0 0 10px; margin-bottom:15px; position:relative;} |
30 | +a#keepup2d {display:block; position:absolute; left:100%; margin-left:-220px; top: 30px;height:24px; font-size: 16px; font-weight:bold; color: #444; text-decoration:none; padding: 11px 0 0 32px; background: url(images/clock.png) left center no-repeat;} |
31 | +a#keepup2d:hover {text-decoration:underline;} |
32 | + |
33 | + |
34 | + |
35 | +a img {border:none;} |
36 | +h1 { |
37 | + background: url(images/logo.png); |
38 | + text-indent: -1000em; |
39 | + width: 300px; |
40 | + height: 66px; |
41 | +} |
42 | +table#t {border: #f2edd6 1px solid; margin: 0 20px;} |
43 | +td {padding: 2px; margin: 0px;} |
44 | +tr {padding:2px 0;} |
45 | +td.time {font-weight: bold;} |
46 | +tr.odd {background:#f0f0f0;} |
47 | +tr.flickr td.data {} |
48 | +tr.twitter td.data {} |
49 | +tr.identica td.data {} |
50 | +tr.picasa td.data {} |
51 | +tr.youtube td.data {} |
52 | +td.source {padding: 0 8px 0 24px; background-position: 2px center; background-repeat: no-repeat; cursor:pointer;} |
53 | +tr:hover td {background-color:#F2EDD6; } |
54 | +tr:hover td.source {background-color:#ECDFA6; text-decoration:underline;} |
55 | +td.source { |
56 | + display: none; |
57 | +} |
58 | +p.desc { |
59 | + text-align: center; |
60 | + font-size: 1.3em; |
61 | } |
62 | td { |
63 | padding: 4px; |
64 | margin: 4px; |
65 | } |
66 | -td.time, td.source { |
67 | - color: #aaa; |
68 | - background: white; |
69 | -} |
70 | -tr.flickr td.data { color: white; background: #0c0; } |
71 | -tr.twitter td.data { color: white; background: #933; } |
72 | -tr.identica td.data { color: white; background: #339; } |
73 | -tr.picasa td.data { color: white; background: #8c8; } |
74 | -tr.youtube td.data { color: white; background: #c00; } |
75 | -tr.flickr:hover td { color: white; background: #0d0; } |
76 | -tr.twitter:hover td { color: white; background: #a33; } |
77 | -tr.identica:hover td { color: white; background: #33a; } |
78 | -tr.picasa:hover td { color: white; background: #8d8; } |
79 | -tr.youtube:hover td { color: white; background: #d00; } |
80 | +td.time { |
81 | + padding-left: 20px; |
82 | +} |
83 | +tr.picasa td.time { |
84 | + background: url('data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%10%00%00%00%10%08%06%00%00%00%1F%F3%FFa%00%00%00%04gAMA%00%00%AF%C87%05%8A%E9%00%00%00%19tEXtSoftware%00Adobe%20ImageReadyq%C9e%3C%00%00%03yIDATx%DAdRYl%1BU%14%3D%EF%CD%B3%3D%9E%F1%12%1B%C7M%8Dq%16%96%D6I%DA%26%22H%A5%02%89%F2A%84%08K%C2%22%9AF%A0%B2%08QQ%3E%10%F0U%90%8A(B%AC%02%84J%DA_%A8%F8%02%A1%12%40%A1I%40%A0%B4%0DH(mV%B5%15i%D5%24%B5%89%ED%98%F12%E3%99%F7%86%19%A7%1F%20%8E%F4%EE%C7%D3%5D%CE%3D%F7%90%EC%F4%DF%20%84%60%7DICn5%0F%25Z%C3M%FA%E94%1D%9B%DA%23e%AF%F6%10%DD%90%C4%8D-%8B%E2%96%F4%B7%22%99%F8%99%DC%A6%1B%9Ep%03%A4X%3B%00%0B%0C%D7%40%19%81U%B1%BA%D7%8AR_D%8D~%93%98%9F%DBKW%B3m%90%FD%90%FE%BC%7C%8F%18%9B%3CP%7Ba%F0Q%D8%C1s%20%B1E%80l%D4%B9A%F2P%18%A5%DA%8E%C2%82~%A2x%B6%F2%C6%DCr%C7%2Bk%2F%BE%7D%1FR%89K%A8%D5%00Y%06%11%02%12%B1%3D%9E%B3%9F%1F%C3%F9%D1%83%80%02%B7%09%E5%96%89%B5%0B%F9%DB%97~%BA%FA%037%EC%EB%A9%8F%A0%B2%5C%1A%9A%9Ek%1A%BE%FC%FC%C1A%BE%23%3D%02%5D%AF%27C%92%05%95%18%A1%BF%1E%3D%24%16%8F%0F9%1F%A0%94%13%D9%29%3Ejh%BC%89H%1B%B4%DCh%AE%97RZ%B4eV%EF%EF%7F%D0%DA%7D%E7%170%DC%26%C2%DD%D5%20%DC%A2%F6%F8%5B%9F%8A%EC%EF%29%96%99%CD%3DP%CE%9A%9D%D4%5B%DF%06%BCfCn%203%A1vo%BF%CFc%17aY%E0C%8F%3Fa%17%B4%24%AA%D5P%BD%BF%A3%9C%A4i!%B1%F8%CBs4w%B1%F4%98%7B%85%3AL%81HJ%FE*%BE%3D%D8%EB%B0%BB%C08%05%D3%9D%A9%96-%F0%F2%FE%01%BD%B3c%02%A6%A5%C0vr%5D%F9%2F%8E%0E%B0%EAz%AD%CBI%86m%08%04%D2%FEw%9B%EF%8A%BCjj%26%7C%15%86e%A5%00%A5CA%BC%D1%07%1E%95%F3%B2%DC%9C%C7I%E1%A9%0FsjH%E1R%13%B3L%1E%94L%20%D6%A9~2%BF%2Bv%3C%2B%9B%C1%A0%AAj%84r%1C%E6%87A%BC%EB%18I%1E%40%03%11%20%92%B3%A6%5D%9F%8Fkb%D9%CC%2F%D3%15%D6%E2%3Fvz%5B%E3%E8%C7%13%A5%E1%B8%9F%DD%CB%98%8E%A5%B6%CF%90IL%C1%AAR%3Cb%1D%C1%D77%ECG%90%86a%0B%CE%5C-%C1%5D%13%10J%E3%7BR%0F%0D%27%82%B9%97F%B4%F1L%01-%01%A5%5C%D1%BB%3EB!y%02%3E%A1B%A5%0A%C6*%0Bx%F8%CA%11%14%B9%0E%12h%5CA0%92%81%D2%90!%CD%3DS%EC%14%23%91%2FO%19%1F%B8%9E%F2%10V%E9%B9u%25t2pn%0B%29y%1D%AE%DCaI%A0%12%2F~%2C%CD%A2w%E9%3D%3C%B9%A5%F5%FDZ%AB%EC%83%E0%DE%BE%E4%D3%BF%B1%DE%AD%D7%CD%EF%BA%B9219S%DB%CDTZU%22z%F7%FC_%93%DFW-%8E%7F%83%3A%87%3A%A3%2F%E0%0C%98%09aIQ%A5%FD%FC%CE%40%D7NZ%E6%92%F1%FA%C0%E6%BD%9D%ADl%BAl%88%B0%C5m%E7j%3A%B1a%FE%E7%09%DB%24u%3A%B6%E5%8Dx7%15%0Fm%FDp%B0%CA%94%22%CD%979%E2!%EF%EA%3B%83%9B%FB%BA%93%9E%F1%AA%29Tn%E3%FF%B07%84%0BI%D1%E2Sm%AF%ED%DB%1E%B9%E3%8F%8A%D3%9A%B9%D4t%C7%40a%95%5Dy%E6%EE%D0%B3Vct%5B%B8%B4i%AD(r1Q%97%DBU%87%C0%2F%85%B4t%A8%E7%BB%FBS%FB%DEl%94%133U%94%EB%96%FFG%80%01%00u%D5z%8A%22%FAI%08%00%00%00%00IEND%AEB%60%82') center left no-repeat; |
85 | +} |
86 | +tr.identica td.time { |
87 | + background: url('data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%10%00%00%00%10%08%06%00%00%00%1F%F3%FFa%00%00%00%04gAMA%00%00%AF%C87%05%8A%E9%00%00%00%19tEXtSoftware%00Adobe%20ImageReadyq%C9e%3C%00%00%03%08IDATx%DA%8CRKhTW%18%FE%CE9%F71%AFk%BC%99%60%03fJ%D2%B4%A66%3E%C04%8DiS%FA%C0BvR%08%C5j%17%A9%14%D2EK%AC%1B%C1epe%20%E8F%17%7D%ACf%912M%40%24h_Ij)H%A0T%92%B4%91Jp%26%D1%D1%19MIf%9C%C9%BD%E7%DEs%8EgL%B3%D1%2C%FC%E0%C0%BF%F8%BF%EF%FC%DF%FF%7F%E4%DBK%EF%A0%06A%01%D3%14n%3C%EA%1DY-Y%EF%85R%B9%B6%81%A2%12%E1O%8E%83%0C%95%B4%9A%E31pK%82(%FC%0F%1F%C6fI%88z%23%08%F0M%A1%8A%BD%B1H%14%F1%88%83u%BE%06_%96%8F%B2u%EB3%C7%16%FD%BAm%11OaS%A0E*1%06%85%A6%CE%B6O%F1J%AA%17q%3B%89G%5E%117%97.cn1%D3%A3%A4%F9%03%0CuH%02%2B%94l%90j%83%B0%0F%8F%B4B05%1C%8A%F5w%DF%DC3%88%8E%5D%C7%11%B5%5D%18%2C%82%98%16yqG%B7%1EO%22W%98i4%99%B9f)%FC%AE%5D%A0%F6%22R%80*B%1B%84%F4%7B%1B%EA%DA%D0%DE%DC%87%AD%B0%AF%F5(%B6%3B)%18%01%EF%8B%07%CAL%10%82%84%CD%10%A7%14T0%BFQH%EE%BA%CEK%60%D4%DCR%C02%12%A8O%B4%E8E%87%3BU%CCp%83%85%12%FC%CC2%D6%FF%8CjW%60%3E!4%E4A%09J%E9%0D%13%BA%A5%08%B7%3C%10%93y%DE%85%5B!%BF%7C%17%94K%04o%BF%06C*%2C%11j%FE%B3%FA(%D7%CD%C3%0Al%D3y%86%5C%C8%DE%C0%F2%99%09x%D7r%2F%A8%87%98d%C0%84%DE%E3Y%12Qk%94E%B9%2F%E1g%93u%BB%B6%24%FFw%F7_L%1C%FE%04%A5%F1%9C%B6%F1%B2%ED6%B7%EC%17%C0i%7D%81%0C%A9%B9S%01%AB%23%8A%1EL%3A%ADX%CC%FF%82%DB%F7~%7B%22T%17oBY%16%B00%FC%1D%0A%B3%7F%A3%E7%C4%09t%0F%0DAr%8E)%5D%CF%A7%D3%1FP%A2%0E%1B%FA%86%07M%16o%99%CBf%E0%F1R%5E%CAP%10BRz!%20%09%23%F4g%B3d%9B%15g%1D%27O%C2r6%26%3C08%88%9B%E94B%DF%EF%D4A%92%AF%EA%D6QB*%97%98eO%CB%B2%0A%ADh%E4uP%BA%9D%80%E4yY%7D%CEC%FE%F1%C3%F9y%24R%A9%27%02%B5Z%D4BT%A9%08C%FF%F6%B5%948O%40%B1q%00-Gp5%9A%B4%B06v%07%7C%A1%C2%A8%C2GW%07%06%D8%FB%23%23%A8%DF%BD%1B%D3%A7N%E9n%94%C3%AE%AEI%23%B1%CD%AC%06%81%26%E9T%D5d%A9%CEi(%14~%FD~%09%ED%E9%2C%5C%85%A9%10%F8%B2%BC%BC%3C%F4c%7F%7FC%B2%BD%1D%5E%B1%B8%A2%13%F3%05O%BA%3F%1B%D7%27%0B%10%9Ap%ED%CA%3D%DC%CFWQ%F3%AE%E3%80%07%F7%3D%EC%D1%F3%BC%A5%9F%0D%5Cl%03%AET%2B%95%E1%FC%CCL%9F%FE%FD%9C%3E%E5h%CC%B2%40%F0%9C8%B6!V%CF%81%F1(%F0%D5*%F0%D7%1F%3B%9B%F0X%80%01%00%AE%5BEh%02_%0A%12%00%00%00%00IEND%AEB%60%82') center left no-repeat; |
88 | +} |
89 | +tr.twitter td.time { |
90 | + background: url('data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%10%00%00%00%10%08%06%00%00%00%1F%F3%FFa%00%00%00%04gAMA%00%00%AF%C87%05%8A%E9%00%00%00%19tEXtSoftware%00Adobe%20ImageReadyq%C9e%3C%00%00%03%A2IDATx%DA%24SKl%1BE%18%FEvgv%D7%8F%8D%B3%AE%93%B8I%B0%DD%D04%89%024%A5%E9%23%A9%82%08Q%DF%12%17%08%20(%078%14%A1J%20%A4%82Py%84%0B%07%E0%04H%3C.H%DC%10%A8%85R%09%D1K%1FB%95%40%01%A1%26%A4%24u%9A%A4%0E8%D8%8Ew%ED%5D%BF%D6%EB%DDY%26%20%CDh%B43%F3%7F%DF%FF%7D%DF%AC%F0%EC%F9%0D%0Cno%C3%ED%1A%E9t%2C%7F%F3%CF%B2%88d%1B%C3%E1%94%8B%80%C8%901%19%DAU%BA7%E7K%2F%C1%F5%12%7B%DA%F1%AE%DB%F4%AE%0FFE%84%24%01T%22Br%D1%F4%1F3%3Da8%16%C0%8C%0F%D4%00T%F8%E4%00%02%FEa%E4%B5%1Bv%E0%1DU%25%E1.%D5%C7M%91%8D%26H%F3%9C%2C%0A%9F%13~N%7FYw%BE%5D%91%D4%D1XT%D0%0FD%7C%F9D%CA%7D%D9%E5%C5T%10%B0%60%B9%2F%7C%BD%E9%7D%40%02%0Az%1D%01%05E%80BE%ED%86-%7D%E67%AA%C6~%0D%DF%D0l%3A%1F%09%8Ej%18%1A%94c%E1%9ASZ%D6%993%B4MLe*%F5%27%BEL%5B3MW%80%20K%C84%C2%08*%1ED%CF%87%A9%D7a%B9%E6%EBn%BF%7F%91j%AE%AE%FF%9D3ve%B2%22*Z%E0E%9D%B9Go%19No1k%B5%97%F3%26%20%12%F8%F0%E0%C9%25%98%24%04p%40%94%0D%94%EB%0B%7D%DF%B9%3B%B7%D1%94l.%AE%AFd%C6V%1D%1B%7F%85%02%81%60Ox%B8%C5%7C4%0Au%40%E7v%B4Z%80T%86%9A%BD%0Ak%D7%A3%08E%25%DC%DB%B6%8C%BBiCi4*%3B%C9%A1%E3%A7%82%0Bsk%D3%FC%16%98aBT%24%B8%05%13%AC%C8%D9%AB%DCK%9B%03%D86%9Aj%8A%7F3%9C%25o%E0%D3%7D%1F%C20%5D%A9%CAvo%88%27%1F%19%F9qG%B8v%07%F3%3F%012Cc-%8F%D6%D2%3Ag%2F%01%0E%B7%D3%E4k%C3%E1%B94%81B%16%E9%B9%02~%B8bc%BCk%09%B3i%E3-2%F9%DC%ABM%25%BE%9D%CE5%95cP%3B8%5B%F3%3FF%80ku9%BB%CE%C1%EA%3A%C0%B6%C06%60%E9E%D0%A6%8D%8F~%3B%86%E4%A1%23%B3%84%EE%7F%FE%D4%B5%B2z%B6%1E%8A%C6%E0%7B%80%CF_%02%8F%105%AE%BF%B0%F2%7F!%E3%FBu%DEI%AB%86J%B5%85E%2B%89%C4%D43%D7%DE%3C3%F9%14mW%94X%F1Nc%00%3C%22%F0%88%40(%2Fn%40%B8%FB3%C7b%40%B8%9Bw%C2%BB%12%82P%BB%3B%CA%91%B6%E6%AD%F8%EE%C3%97%0F%9E%1C%FF%24%1A%F4K4%CFh%CF%8E.%F1%26s%1B%D5H%A5%BA%B1d%B9%27%DA%BDb%5E%B7r%FD%D0%B8q%3C%111%1A%CF%0D%3C8x%E9h%B2%F6%DE%EF%F3%DAZ%24%D9%03%C6%18Z%9C%93%8E%8Dt%9C%BB%DFqf%CCV%CC%19AX%DB%B0X%9F%9C%5E%1C%9C%EF%3C%F0%D5%D3%D3%0F%E3%EA%E5%F3%17%C3%C3%FB%5E%E9%8F%B62%E3%7D%09%24%C2%01%AC%DA%3Ew%C8%03%E1%92%A9%ED%F9%BEF%5Cg*X%C2%80%EAJ%5E%5C%98X%CA%FEqf%E2%C8%1E%88N%16c%1D%FA%24Y%7D%FB%02%89%8D%2F%87%87N_x%F2%A1%7B.Um%CF%B1%BDM%C8%B6%0E%1A%93%18%A6B%26%E2%92%87%BA%87%E9%A2a%7Cl%CA%F7!w%FD%7D%B8%91q%C8%DD%13%9AQ%A1%A3%DDJ%7C%D4%2C%97%8EC%8B%FEJ%04dT%EAsu%BC%03%95%F8%88P%9E%BF%27p%D3%FC%2F%3A%3A%3Bo%EB%EB%E4%B4%D3%FBxO%10%26%8D%27%13%D5%07%F6%1E4%03%8A2%1B%90%E9%F7%FCNf%EBO%DD%12%B15%FE%15%60%00%01Z%B9%1B%D5%12%8F%D4%00%00%00%00IEND%AEB%60%82') center left no-repeat; |
91 | +} |
92 | +tr.youtube td.time { |
93 | + background: url('data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%10%00%00%00%10%08%06%00%00%00%1F%F3%FFa%00%00%00%04gAMA%00%00%AF%C87%05%8A%E9%00%00%00%19tEXtSoftware%00Adobe%20ImageReadyq%C9e%3C%00%00%02%96IDATx%DA%7CS%5BK%15Q%14%FEf%CF%ED%9C%F1x%BC%84%D7%0A%2F%0F%D9C%24%12%DDL*L%2C1B0%A9%1Ez%E9A%E8%17%F4%17%EA5%C8%CA%87%9E%A2%2C%A3%97%12%09%0B%B4%7C%88%3C%A2%15%F4bID%D99%12%1E%B5s%C6%9933%7B%B7f%DC%82%A8%B4%86o%F6%9E%99%B5%BF%B5%D6%B7%D6%40%08%01%B2%FB%84F%89p%BF%A3%85%BE%5B%A1D7E%B9!%0F%97%11%A6%A5%FF%3C%E15%A1C%EE%C3%03%D3%5BI5%B9%DE%22%A46%1D%0C%C9%FA%E4s%BF%24%C2%26%F2m%04%A1%0D%CB%B5C%12%1E%92D%FF5%B6%C3%BBa%A9%C3F%E4F%B9%DF%D164%80%AC%3F%B4%AC%8C%9E%DDTN%F4%9E%7C%B3%DB%08%D2%23CFzp%E8%B953%DB%05%15Lp%01f%C6%C0T5T%0D%DC-%80%C5L%CA%95%82%84%81hUT%08%AB%F3X%AA%EA%E6%E0%11V%F89%9Ftg%3E%B6%9A%17%2F%B1%E4%ED%01%94%DC%B9%07mO%03xf%05%DC%E6%D0%FA.%03.q-%3B%10Y%C2b%0E%C1%AF%9Cb%8F%BDo%894%60V2%D0%AD%22%07s_%11%AF%AD%86%91%5DB%B0%9C%85%D05pCE%E2%F8a%F0d%02%82%07%E0t%F9%C5VX8e%A1%16%22%82%05%C7(%D5%0D%C3w_%8D!%F7v%12%AB%2FG%A1%9F%EB%84%DAz%14%B1%DE%1Ep%CEQ%FE%F0%01%8C%B6V(%ED%A7Q9%FC%08z%F3A%CA%CE%5E%EF%C2%E2%A7%CF%96%E7%B8%5C%B1%2C%AA%DD%00%2BI%22%5E_%07%AD8%01%B3%B6%06J%DEF%E1%F1S%C4%CFw%A1%E8%E4%098%13%E3%88w%9F%85%F0%FCHy%96%CB%E5%85%EFy%3C%EA%84%90%23K%C2%09%C7%0D5%04_%5D%85%FDf%1C%82%C8%8D%86z%18%FB%9BH%8Fe%9A%A0%F5%11%D2%18%A5%0F%5D%F3%A3%7FB%D7%E9%04%87RV%0A%D6%D2%0C%85%14g%95%15%D0%3A%CF%40P%26%BC%B0%00%3B5%83%20%B3%18~%8B%C21%9D%A9.%FC%80%BA%C6%20%D2%19%88%EF%3F%00rN%9Cj%83%3F%F7%0D%C1%EF4%CAz.%C0%1B%19Eab%12%BB%AE%F7%C3%04%B5%D2%F3%D4h%0E%A6%EE%0EX%EC%C9%B3%17%C6%EC%97v%9D%D2%8Cz%1D%04%D4nF%9AGeB%A5%99%E0%EEZT%12%12%16%FC%95%BF%10%FB%EA%D2%07%A6%3E%D4h%F9%A6%26%BB%E8%DA%D5%2B%99%D4l%B7%BFfW%98%0B%E9%24%DB%BB%DB%10kn%10%FB%B3%A4%B3%82%A3%E6%AB%AA8%2C%CB%F5y%E0%EA1%D3S%5C%D7.%AF%AE%7C%17%92%FF%13%60%00A%92%1E%0A%9B%FD-%CB%00%00%00%00IEND%AEB%60%82') center left no-repeat; |
94 | +} |
95 | </style> |
96 | <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.2.6/jquery.min.js"></script> |
97 | <script> |
98 | @@ -144,7 +183,7 @@ |
99 | tag_api: [ |
100 | ["http://search.twitter.com/search.json?callback=?&q=%23$TAG", "twittersearch"], |
101 | ["http://api.flickr.com/services/feeds/photos_public.gne?tags=$TAG&lang=en-us&format=json&jsoncallback=?", "flickr"], |
102 | - ["http://pipes.yahoo.com/pipes/pipe.run?_id=qGysIErH3RGVW2OJBRNMsA&_render=json&tag=$TAG&_callback=?", "identicasearch"], |
103 | + ["http://query.yahooapis.com/v1/public/yql?q=select%20*%20from%20rss%20where%20url%3D%22http%3A%2F%2Fidenti.ca%2Ftag%2Fuds%2Frss%22&format=json&callback=?", "identicasearch"], |
104 | ["http://gdata.youtube.com/feeds/videos?alt=json-in-script&vq=$TAG&callback=?", "gdata"], |
105 | ["http://picasaweb.google.com/data/feed/api/all?alt=json-in-script&q=$TAG&callback=?", "gdata"], |
106 | ], |
107 | @@ -157,16 +196,41 @@ |
108 | } |
109 | if (tag) { |
110 | for (var i=0; i<ls.tag_api.length; i++) { |
111 | - $.getJSON(ls.tag_api[i][0].replace("$TAG", tag), |
112 | - ls[ls.tag_api[i][1]]); |
113 | + var api_url = ls.tag_api[i][0].replace("$TAG", tag); |
114 | + var api_callback_function = ls[ls.tag_api[i][1]]; |
115 | + $.getJSON(api_url, |
116 | + // closure to save this api_cb |
117 | + (function(api_cb) { |
118 | + return function(data, textStatus) { |
119 | + api_cb(data,textStatus); |
120 | + ls.postProcess(); |
121 | + } |
122 | + })(api_callback_function) |
123 | + ); |
124 | } |
125 | } |
126 | + setTimeout(function() {ls.init(tag, element)}, 30000); |
127 | + }, |
128 | + postProcess: function() { |
129 | + $(ls.element).find("td:odd").removeClass("odd").removeClass("even").addClass("odd"); |
130 | + $(ls.element).find("td:even").removeClass("odd").removeClass("even").addClass("even"); |
131 | + $(ls.element).linkify(); |
132 | }, |
133 | addItem: function(td, time, src, link, thumbnail) { |
134 | // time should be in ISO 2008-12-11T02:30:43-08:00 format |
135 | + // check this isn't already in here somewhere |
136 | + var foundit = false; |
137 | + $.each($(ls.element).find("tr"), function() { |
138 | + if ($.data(this, "link") == link) { |
139 | + foundit = true; |
140 | + } |
141 | + }); |
142 | + if (foundit) return; |
143 | + |
144 | var tr = document.createElement("tr"); |
145 | $(tr).click(function(){ location.href = link; }); |
146 | $.data(tr, "time", time); |
147 | + $.data(tr, "link", link); |
148 | var timetd = document.createElement("td"); |
149 | timetd.appendChild(document.createTextNode(time.substr(11,5))); |
150 | timetd.className = "time"; |
151 | @@ -202,6 +266,8 @@ |
152 | } |
153 | }); |
154 | if (!found) ls.element.appendChild(tr); |
155 | + $(tr).hide(); |
156 | + $(tr).show("slow"); |
157 | }, |
158 | |
159 | twittersearch: function(data) { |
160 | @@ -214,11 +280,10 @@ |
161 | }); |
162 | }, |
163 | identicasearch: function(data) { |
164 | - $.each(data.value.items, function() { |
165 | + $.each(data.query.results.item, function() { |
166 | var td = document.createElement("td"); |
167 | td.appendChild(document.createTextNode(this.title)); |
168 | - var time = this["dc:date"]; |
169 | - ls.addItem(td, time, "identica", this.link); |
170 | + ls.addItem(td, this.date, "identica", this.link); |
171 | }); |
172 | }, |
173 | flickr: function(data) { |
174 | @@ -267,15 +332,66 @@ |
175 | }, |
176 | }; |
177 | |
178 | +// Define: Linkify plugin |
179 | +(function($){ |
180 | + var url1 = /(^|<|\s)(www\..+?\..+?)(\s|>|$)/g, |
181 | + url2 = /(^|<|\s)(((https?|ftp):\/\/|mailto:).+?)(\s|>|$)/g, |
182 | + linkifyThis = function () { |
183 | + var childNodes = this.childNodes, |
184 | + i = childNodes.length; |
185 | + while(i--) |
186 | + { |
187 | + var n = childNodes[i]; |
188 | + if (n.nodeType == 3) { |
189 | + var html = n.nodeValue; |
190 | + if (html) |
191 | + { |
192 | + html = html.replace(/&/g, '&') |
193 | + .replace(/</g, '<') |
194 | + .replace(/>/g, '>') |
195 | + .replace(url1, '$1<a href="http://$2">$2</a>$3') |
196 | + .replace(url2, '$1<a href="$2">$2</a>$5'); |
197 | + $(n).after(html).remove(); |
198 | + } |
199 | + } |
200 | + else if (n.nodeType == 1 && !/^(a|button|textarea)$/i.test(n.tagName)) { |
201 | + linkifyThis.call(n); |
202 | + } |
203 | + } |
204 | + }; |
205 | + |
206 | + $.fn.linkify = function () { |
207 | + return this.each(linkifyThis); |
208 | + }; |
209 | + |
210 | +})(jQuery); |
211 | + |
212 | /////////////////////////////////////////////////////// |
213 | // Change this tag here to get a lifestream for the tag |
214 | // vvvvvvvvv |
215 | -$(document).ready(function(){ls.init("UDS Jaunty", $("#t")[0])}); |
216 | +$(document).ready(function(){ls.init("UDS Karmic", $("#t")[0])}); |
217 | </script> |
218 | </head> |
219 | <body> |
220 | -<h1>UDS Jaunty lifestream</h1> |
221 | -<table id="t"></table> |
222 | +<div id="container"> |
223 | + |
224 | +<div id="wrap1"><div id="wrap2"> |
225 | + |
226 | +<div id="header"> |
227 | + <h1>UDS Karmic microblogging lifestream</h1> |
228 | + <a id="keepup2d" href="#">Keep up to date!</a> |
229 | +</div><!-- /header --> |
230 | + |
231 | +<p class="desc">Visit <a href="https://wiki.ubuntu.com/UDSKarmic">wiki.ubuntu.com/UDSKarmic</a> |
232 | +for everything you need to know about UDS in Barcelona!</p> |
233 | + |
234 | +<table id="t" cellspacing="0"></table> |
235 | + |
236 | +<div id="footer"> |
237 | + © 2009, Canonical Ltd. Thanks to the Ubuntu website team! |
238 | + |
239 | +</div> <!-- /footer --> |
240 | + |
241 | </body> |
242 | </html> |
243 |
Changes for Karmic: merged in lots of stuff and styles from ubuntu- microblogging demo, tidied up the JS, and added live updating.