From 769dc7d5461a004b042dfff4628cf8eb61d4b9b7 Mon Sep 17 00:00:00 2001 From: Vincent Zanotti Date: Fri, 18 Jan 2008 19:00:08 +0100 Subject: [PATCH] Integrates external readers to the rss feeds and the iCal calendars. Signed-off-by: Vincent Zanotti --- ChangeLog | 1 + htdocs/images/goodies/README | 7 +++ htdocs/images/goodies/add-google-calendar.gif | Bin 0 -> 1690 bytes htdocs/images/goodies/add-google.gif | Bin 0 -> 1531 bytes htdocs/images/goodies/add-netvibes.gif | Bin 0 -> 1531 bytes htdocs/images/goodies/add-yahoo.gif | Bin 0 -> 719 bytes htdocs/javascript/xorg.js | 67 ++++++++++++++++++++++++++ templates/admin/wiki.tpl | 1 + templates/carnet/index.tpl | 2 +- templates/carnet/mescontacts.tpl | 2 +- templates/carnet/panel.tpl | 2 +- templates/events/index.tpl | 2 +- templates/platal/filrss.tpl | 4 +- 13 files changed, 82 insertions(+), 6 deletions(-) create mode 100644 htdocs/images/goodies/README create mode 100644 htdocs/images/goodies/add-google-calendar.gif create mode 100644 htdocs/images/goodies/add-google.gif create mode 100644 htdocs/images/goodies/add-netvibes.gif create mode 100644 htdocs/images/goodies/add-yahoo.gif diff --git a/ChangeLog b/ChangeLog index 78aa29a..c644723 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ New: - New PlProfiler tool -FRU * Goodies: + - Integration of goodies/external tools with local rss/iCal -VZA - iGoogle gadgets for latest events and directory search -VZA Bug/Wish: diff --git a/htdocs/images/goodies/README b/htdocs/images/goodies/README new file mode 100644 index 0000000..ae70e85 --- /dev/null +++ b/htdocs/images/goodies/README @@ -0,0 +1,7 @@ +Those images have been fetched from external servers. They are *not* covered by Plat/al's GPL license. +Please check with image owners for more information on copyrights and utilization limitations. + +add-google.gif: http://gmodules.com/ig/images/plus_google.gif +add-google-calendar.gif: http://www.google.com/calendar/images/ext/gc_button1.gif +add-netvibes.gif: http://www.netvibes.com/img/add2netvibes.gif +add-yahoo: http://us.i1.yimg.com/us.yimg.com/i/us/my/addtomyyahoo4.gif diff --git a/htdocs/images/goodies/add-google-calendar.gif b/htdocs/images/goodies/add-google-calendar.gif new file mode 100644 index 0000000000000000000000000000000000000000..78849483ba8493c7140c394d7065d1aeb319e212 GIT binary patch literal 1690 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 literal 0 HcmV?d00001 diff --git a/htdocs/images/goodies/add-netvibes.gif b/htdocs/images/goodies/add-netvibes.gif new file mode 100644 index 0000000000000000000000000000000000000000..61595860f3d1958f9df701a17c3dc9682840e53f GIT binary patch literal 1531 zcmVNk%w1VOszZ0QUd@|NsC0|NqR)%&MxYU$!nXpf%|6|5&px{r>;*_y35u z{&}wcMQ*tK{r>v=|N8s=_xk_y`2Xtj|K;!hlD+xdawR* zss3uE{)C>;XQTdEoBm(6FJ87THKH^%p*2f#x;|*OELpB1Qmgs=|M>a*^!fkx_xtqr z`tkJo=<@&T@A&5M|KRNZHps4^3>)3)8zl!;_=nq@5$f)#M}SN*6Y64|GCxw zuFn6x%jT`l|GLTLsLTGQ$^W0l{;jk^AzwA+ce{)Dvtg0%jC zv;LB*)pxD_b*uhur~YQ5{$rv3UY`D2oc>(3E?l%PTeL4zurN-pF=2zlNUJhFrZYXJ zGd`s=IixgEcD+nhAaG?e^mC|Kjcc=j`_2?f>NL`RD8Q;q3q4 z?El^B|KaHL;pg<<=JVL+|JLUJ-Q@Do%Z9kyVw7^)&IBD{9=CIHHw8Z1G!{V~S;hMt!nZo|7z2BI?{+Gc1 zlD_|;w%d!j|BJc)in;!axc-W`{+_eio3Yt`vi^Lp{*R{9g{R+%qSA(-(1V@OeVWc* zo&I!^%2Ag7U9>J-v@Tb(Fj%rLQ?W2purFwc#ZRs=Pp&Xyg~Um$F-fa3MXEAIsWL*T zGDD~`Kc_Q5rZZT4z&xciJESu?q%&4}zc{2cIioZ=qcb?8H8-O)G@>;$p)^Wyx=C=l zNN~9?krywI7%h$%EsPjEWwJVDv?zucD1{j`V6q~A8X|ofC|0f-OsM+$`uqF){QUg= z{r&#_{{R2~A^8LW00000EC2ui09ybN000R800jsfNU)&6g9sBUT*#0i00I9ZN}Ncs zqQ#3CGiuzJQNRF*{|bm4Ns^<5BO)S5j37djkiQ*2{_EC;PoF*!_w3;ljoZd* zf4nik@doaQb#~O%G4fAYj(EftpsBDSSQ=hdVql55V!;9z$#f}}5T*r-GDrRyU@?XT z22?*KXLB>JB0V?QHe$N*#z?GsL^$04dC}m(i#i+{G5BR@f{POWq_ptBL&27azS1!9 z(CN&He+qc9!9S^3kbo*MB%p%=q(ldiHE{S*ksokevyl(%O!3bMH%wvz4#$Wg#tZqB z@{b)^M5KiZ{|M7cL=@cjPX)F}M8y|Cn1PEFC!BzR6BAfK1{Neh;NU;hXk$+xfJ6jH zAopxD%|?gZ0n0xo+`vc^ICOEv6(~#*L=QHk_>UzmIAMVVFy{0R7+Oe_LIpyYQ3VsC zgtCMI4S)c}7ijbp8AQ;`5yu>YL?nnDa>UWbMvyR2O9Lk85kesh7!#2x$o$X&16@4u z4+37qa7#oEaKVKGI;?O(k)K@H@X9|c?BalOvnVo(0z3@TivmYFLryq!Xke@c<%~ne zGaHGM!yio~fe#*wj9>#EHpo-V0|-cyLoN}Wf&mf{rGP;UP|&hW7z>2uQR65+!^PQ35~|QGx**0rk%eFUdfF3^?+ h4JEDg(o82k0009-E%nq?S8esxSZA&E)>{Vz06QT;MCkwk literal 0 HcmV?d00001 diff --git a/htdocs/images/goodies/add-yahoo.gif b/htdocs/images/goodies/add-yahoo.gif new file mode 100644 index 0000000000000000000000000000000000000000..b6f80471dba12e586220e9d37f3d1f4ad99653fe GIT binary patch literal 719 zcmZ?wbhEHbjAjsIxXJ(oGwv$J!{mMw8{abCr5|3)P+7@r9V30Zvp{~sIY zfAbgp|Noy?ZPv<_EB};L|2uku-|2QqNy+~YAOC0@{p+20<;oS!m}mc=KKpn5#=ni5 z|K=6{^$I+5=FH5QGrxTK^0&S@EiJ9CuI|;VSO3$}B#f5+|Mm@NAjooxf#OdVRuKjb z1|5(|AU`p%{XfuO;GrYce_~0|$&^KQy(>z*)<&(rv8HVH-;M~#yb5dC_ z3#V|PIH&RoRs~);PX0hand!1UJgV%n?1Dj(Qu`&vM41!=r33{f14U$~PZ#Z(emZD& zJx9~Lro=@-{G6ODyuvGar|ECv|`n!(LH zM|4UTY~p0zuC-v7>(6Nm4(u#aa8Z$%px_|NcG-+$!-Myi8Z`u1qBdMeT-d-B^eXQvT6e&4qtK(s^=wjFAqQqoI@~D4ZRH~H!K90! zfqSXUgQ&)|DZWBGSTBin+`f=6?$*K3SQ66|7JkojWkD#z;+DW!&kj%FdB8c*+*07Q z%cO;VESb)k$|kIOocz46`aCAIN*FiHWGU#lu+XU^MbRSX#DT={)71f%GF%&ZQaFz% zD6P(wewEwA9b{6R=Jh6(olQ|JcW)(Ax3b4Xi#xB&zis4nys_Ck$AM|b6mFFzEFUsd zXZ}p7`jo?TVBg-~-(NmHecX2czQ3mNvtHakzkh$7phkzng9a9{j0cSzYAYTz@fb<4 HFjxZsRKyhx literal 0 HcmV?d00001 diff --git a/htdocs/javascript/xorg.js b/htdocs/javascript/xorg.js index db3a502..0e5f5d0 100644 --- a/htdocs/javascript/xorg.js +++ b/htdocs/javascript/xorg.js @@ -155,6 +155,70 @@ function popWin(theNode,w,h) { } // }}} +// {{{ function goodiesPopup() + +function goodiesPopup(node) { + if (node.href.indexOf('ical') > -1) { + __goodies_popup(node, __goodies_ical_sites, 'Calendrier iCal'); + } else if (node.href.indexOf('rss') > -1 && (node.href.indexOf('xml') > -1 || node.href.indexOf('hash'))) { + __goodies_popup(node, __goodies_rss_sites, 'Fil rss'); + } +} + +var __goodies_ical_sites = [ + {'url_prefix': '', + 'img': 'images/icons/calendar_view_day.gif', + 'title': 'Calendrier iCal'}, + {'url_prefix': 'http://www.google.com/calendar/render?cid=', + 'img': 'images/goodies/add-google-calendar.gif', + 'title': 'Ajouter à Google Calendar'} +]; +var __goodies_rss_sites = [ + {'url_prefix': '', + 'img': 'images/icons/feed.gif', + 'title': 'Fil rss'}, + {'url_prefix': 'http://fusion.google.com/add?feedurl=', + 'img': 'images/goodies/add-google.gif', + 'alt': 'Add to Google', + 'title': 'Ajouter à iGoogle/Google Reader'}, + {'url_prefix': 'http://www.netvibes.com/subscribe.php?url=', + 'img': 'images/goodies/add-netvibes.gif', + 'title': 'Ajouter à Netvibes'}, + {'url_prefix': 'http://add.my.yahoo.com/content?.intl=fr&url=', + 'img': 'images/goodies/add-yahoo.gif', + 'alt': 'Add to My Yahoo!', + 'title': 'Ajouter à My Yahoo!'} +]; + +function __goodies_popupText(url, sites) { + var text = '
'; + for (var site in sites) { + var s_alt = (sites[site]["alt"] ? sites[site]["alt"] : ""); + var s_img = sites[site]["img"]; + var s_title = (sites[site]["title"] ? sites[site]["title"] : ""); + var s_url = (sites[site]["url_prefix"].length > 0 ? sites[site]["url_prefix"] + escape(url) : url); + + text += '' + s_alt + '
'; + } + text += 'Plus de bonus ...
' + return text; +} + +function __goodies_popup(node, sites, default_title) { + var mouseover_cb = function() { + var rss_text = __goodies_popupText(node.href, sites); + var rss_title = (node.title ? node.title : default_title); + return overlib(rss_text, CAPTION, rss_title, CLOSETEXT, 'Fermer', DELAY, 800, STICKY, WIDTH, 150); + } + var mouseout_cb = function() { + nd(); + } + + node.onmouseover = mouseover_cb; + node.onmouseout = mouseout_cb; +} + +// }}} // {{{ function auto_links() function auto_links() { @@ -183,6 +247,9 @@ function auto_links_nodes(nodes) { if (node.href.indexOf('http') < 0) { node.href = 'http://' + fqdn + '/' + node.href; } + if (node.nodeName.toLowerCase() == 'a') { + goodiesPopup(node); + } } if(node.className == 'popup2') { node.onclick = function () { popWin(this,840,600); return false; }; diff --git a/templates/admin/wiki.tpl b/templates/admin/wiki.tpl index 592e38b..c8257f3 100644 --- a/templates/admin/wiki.tpl +++ b/templates/admin/wiki.tpl @@ -68,6 +68,7 @@ {/literal}

+ {icon name=feed title='fil rss'} {icon name=magnifier} Voir les changements récents

diff --git a/templates/carnet/index.tpl b/templates/carnet/index.tpl index 81efe67..b16445f 100644 --- a/templates/carnet/index.tpl +++ b/templates/carnet/index.tpl @@ -54,7 +54,7 @@ {if $smarty.session.core_rss_hash} - + {icon name=feed title='fil rss'} {else} diff --git a/templates/carnet/mescontacts.tpl b/templates/carnet/mescontacts.tpl index d722ac3..65c9ef9 100644 --- a/templates/carnet/mescontacts.tpl +++ b/templates/carnet/mescontacts.tpl @@ -72,7 +72,7 @@ Pour récupérer ta liste de contacts dans un PDF imprimable :