From 2200e510c933a1b3926d568a61bbf77a95e513fd Mon Sep 17 00:00:00 2001 From: x2003bruneau Date: Wed, 26 Jul 2006 14:32:34 +0000 Subject: [PATCH] icalicon -> calendar_view_day rssact -> feed_add Avoid to create a new line juste for ical or rss icons git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@666 839d8a87-29fc-0310-9880-83ba4fa771e5 --- htdocs.net/.htaccess | 2 +- htdocs.net/css/xnet.css | 1 + htdocs/.htaccess | 2 +- htdocs/images/icalicon.gif | Bin 460 -> 0 bytes htdocs/images/icons/calendar_view_day.gif | Bin 0 -> 1333 bytes htdocs/images/icons/feed_add.gif | Bin 0 -> 1375 bytes htdocs/images/rssact.gif | Bin 1473 -> 0 bytes templates/carnet/index.tpl | 18 +++++++++--------- templates/carnet/mescontacts.tpl | 18 ++++++++++++------ templates/login.tpl | 18 +++++++++--------- 10 files changed, 33 insertions(+), 26 deletions(-) delete mode 100644 htdocs/images/icalicon.gif create mode 100644 htdocs/images/icons/calendar_view_day.gif create mode 100644 htdocs/images/icons/feed_add.gif delete mode 100644 htdocs/images/rssact.gif diff --git a/htdocs.net/.htaccess b/htdocs.net/.htaccess index c5457d6..8baf1b3 100644 --- a/htdocs.net/.htaccess +++ b/htdocs.net/.htaccess @@ -1,7 +1,7 @@ Options +FollowSymLinks RewriteEngine on -RewriteBase /~x2001corpet +RewriteBase /~x2003bruneau # Rewrite URLs of the form 'index.php?q=x': RewriteCond %{REQUEST_FILENAME} !-f diff --git a/htdocs.net/css/xnet.css b/htdocs.net/css/xnet.css index 68f1ed8..df71e41 100644 --- a/htdocs.net/css/xnet.css +++ b/htdocs.net/css/xnet.css @@ -120,6 +120,7 @@ td#search { } td#body { + vertical-align: top; padding-left: 1em; padding-bottom: 1em; } diff --git a/htdocs/.htaccess b/htdocs/.htaccess index 54469c6..b72936d 100644 --- a/htdocs/.htaccess +++ b/htdocs/.htaccess @@ -1,7 +1,7 @@ Options +FollowSymLinks RewriteEngine on -RewriteBase /~x2001corpet +RewriteBase /~x2003bruneau # wiki diff --git a/htdocs/images/icalicon.gif b/htdocs/images/icalicon.gif deleted file mode 100644 index 01cc8cde5643d5bde115b93b1df9b4ab09bd6c0c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 460 zcmV;-0WWu*R zA|To{;`rtuyi9T0hycGS0MQzu;I={CRLA_q((&4%@T!sIqX5nvQNwz1(vT3cMPcM` z5XLhAcnbigJ(1h00Lvc$JOh~eoe!`EEWKn=8rc${kdjxRSVpwT*S# z0Z+_xx=IqNRbnYoQl5pbltCRRC?EqBVi7P+Z-G!>O#~$@G7kwQ0v-<_92y`aB{~cx zF^DCKPmBW+j|c;aFHR5;8zmn*B?l0zqk^SYr>VH4ZY3Bbk2Sx#PNt|Vs*?h`BO?oA zV-3fPb1HT>19~M65*s!WVJs;rEF~!yZyzT(ILTIFV-Eu@6k|R#Il>4JGfEVA@P?W_ zFT5UjSm>b%3>qj5c#r`Cfrmo_V0chvkzqrGT?T*{8B$7z03lMUT*3l#>`Y4e~rj$T3qw{23ROl3?$9*wDNv6~hE)y43PEOK7HYO?*m!L{`l(pE=O1f>G8mYi@0qSY*1^K z8w^G1UXnbsdGViD0mTM**=)qx-0zPTJA)DeSe(e}95>lz@Tkc>247`q7Wt3{hp6Bf zVl=?boImGB%pooxH(4-v)Z~=GGof)~uZ-9e$&XD$&?1Kxonzr>2sOY+#)fDHIbnAY zHyaH=UnJ}hfVUo?Xk|lpF$(bTK0r0Gp>x#$R1O13Z5z7vvxTNus#cjZ#p9^gBd&wpLY=f5wb9BTk_Bs9&;6nv34)&=mlwOO1Q-8=*%&(C3~f8(`C zp#g>kJOGOW0K=sKLvsMP-vS(b1hDfd09gibz6-F<_rHeOtirxpe{gbQlnJuoG2FN? z{;A0+CQ1iG;ez?!O>8)Z4h6tJMPFkk#wix>MfWR=5?-dK*)ZeA2P2^)ZoJjw=_q7% z8?*7?fbB`#mzcdVH``S1a2)IDX=uZ1>+2Iu!~%b7VQ<1gGz(5=#o@}`7NYp>y%XKt zr@9Vq+ad0MAS^EJs;D6LBzlM@Z~A$W7eJCI&Viw zSpp}HzP2`cG4JsYiCWty7k0>A_3EUO*k>E9X`8V;E9$Ms9=pip;_~g)?Xt%;kiKp$ db>d3q%DZ0tfSuFh7XR$LtIqC8-z0J9{sGq?Gc^DJ literal 0 HcmV?d00001 diff --git a/htdocs/images/icons/feed_add.gif b/htdocs/images/icons/feed_add.gif new file mode 100644 index 0000000000000000000000000000000000000000..cb1e280c53d62caf9b41fcb169c0b09337f1427a GIT binary patch literal 1375 zcmd6nL5Le=6o6l1mdtk3CT-Vl61JMn!a8VDr!Cb<6Kb-l&1`oM)3T+p2btL{cr_ik$FYRCjgNV+yQU-Tv(;mtk0}AG_hk#N&6iuO&J+2hwiI({P8D&8%UOf2t z|9`&!y*Ka8d;ibmrjGFmIRF882vkr6w5v^1K~umwG&>F4+`t-OjaQ`rwrkj`qNUoz zp+&gS>=@V((n_#yOLbeR*%CI%P|+0ChJ>bsmV#BlMj9I;HWjqVP_drII&b6|Yzjs# zjW!8oV8_I^g$iKD;*_9S7f^z#6cFpIP~~ct#4AB;<|X29<&j7p&=L_hJ6#)pAn66P z1Z+33Z6MXOuuDc8H#)f4MKg^?8r6Q0|JP;gSC0!|2F7~7Pi32fNPjo zhvyw;DbG2aqWqSw>cmH+Tu|g9VKO16&7RB>HVE&Sci5yn=Wvtq`NBMXw?&vM_lgT; zve_gXzF4XhNCRjxy`XBu$^9weIBfuV649ptj_d_^YJE$0rUI~b9bjZ)OUDKQo<0p= zAKcPCI?->6YtMS+jf14oL|nc}fPo)-y+;!O-YWo)jb87!tG(XiYb3`#fL6J1PCMWC zCEo4?z`yOC;+*KtA<#U3POAPJ-z)bUKrO%ltOx+7w*gGQ3-HN(fah)i?7jmaZU>l6 zfSZ5t*L0fIe=nSs7Z>I@=#dP$ zUnP?8ta?r_X|c#uxv(!5Ilys;`dMRir9T|-{#2V`mX`OR$%~`I>~~D?LhjO@XTlE}vUKVavyXqh)y)iku>BC5 rZ_Al+U*xi<_-5<=Mc=laY+Gy{{pQ1KF=>Mdm|uHFcF%Ex9!UNHxBp88 literal 0 HcmV?d00001 diff --git a/htdocs/images/rssact.gif b/htdocs/images/rssact.gif deleted file mode 100644 index 00f1192f910f7dd38d9349a6ed7ce5851a62aab3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1473 zcmb_b`%lwX6u+4w)ny_>sW{YSo1~(dk2?}&QrtjcaqZF5 zWQb_vHN4hNQNvV>SwUR_+ET!)#tf%1+RTmNBNbXEuV1|T-0$D8lQiF+o^w9u^ZA@_ zQ$E?aX6@%kNI01wD$2A^nf53{R;Hq>t4rc{Nu>6`6W&l(8M(CfPRpGLa+uHNP{I>!2^qd4QOCV<(w)bM+nZPG7|c*7MT!SNcal5V1Xi+ zf=l=ar(pnip&dp;Ev$qepowYN0ZtGMg`?8_-gnNOhx(93gQr7zuq? zi%e)QnetV;w<>BUR5oi@QN5bc%5}{X)q^bd3!C$@g zhOD!uzKiBQ`^qo+O?>##mFl>nBOmZp3pbXm|GnF(o7D)oFijIsZrVXTP*X zEFSEhiZ#og)>6Y*)x@>)Y2FUA^|!Fn@GPHougC26XSr*OCpYXrHkNe9^8K?*3({S| zkh}RAjZf|s7Vj90+&w3w7U zw=<^OPg$Z0xr08~uj@a%Z7=*_9M9iOHY>%AA6RN(B$$Tc88LYoqj3cmYsHW~@xknn+PsNNRrhn_JD>W0EbbZ8@67k58tnc1df(Z7XxN(W z=)3h^plkJ1`H~GYoLS + {if $smarty.session.core_rss_hash} + + {icon name=feed title='fil rss'} + + {else} + + {icon name=feed_add title='Activer mon fil rss'} + + {/if} Notifications @@ -63,15 +72,6 @@
Affichage de tous les évenements de camarades/promos - {if $smarty.session.core_rss_hash} -
- {icon name=feed title='fil rss'} -
- {else} -
- fil rss -
- {/if}
diff --git a/templates/carnet/mescontacts.tpl b/templates/carnet/mescontacts.tpl index 04d9653..e8bdbfe 100644 --- a/templates/carnet/mescontacts.tpl +++ b/templates/carnet/mescontacts.tpl @@ -54,12 +54,18 @@ Pour r [tri par noms] -

- Tu peux récupérer un calendrier iCal avec l'anniversaire de tes contacts. -

-
- fichier ical -
+ + + + + +
+ Tu peux récupérer un calendrier iCal avec l'anniversaire de tes contacts. + + + {icon name=calendar_view_day title='Anniversaires'} + +
{if $trombi} diff --git a/templates/login.tpl b/templates/login.tpl index 27e4931..8558878 100644 --- a/templates/login.tpl +++ b/templates/login.tpl @@ -112,6 +112,15 @@ Bienvenue {$smarty.session.prenom} @@ -143,15 +152,6 @@ Bienvenue {$smarty.session.prenom}

Proposer une information événementielle

- {if $smarty.session.core_rss_hash} -
- {icon name=feed title='fil rss'} -
- {else} -
- fil rss -
- {/if} {/if} {* vim:set et sw=2 sts=2 sws=2: *} -- 2.1.4
+ {if $smarty.session.core_rss_hash} + + {icon name=feed title='fil rss'} + + {else} + + {icon name=feed_add title='Activer mon fil rss'} + + {/if} Sommaire des informations événementielles