summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-10-26 13:39:10 +0200
committerJonas Smedegaard <dr@jones.dk>2010-10-26 13:39:10 +0200
commit680fe9bd26f48e7ea336b691b7573c0d9ad7a5d4 (patch)
treee0ecb94b89a1fc6616492a1a0553a041ef08e3d4
parent46aa403879a43b0b9d9c12dcab74b20baef3f2c7 (diff)
Move feed aggregation to activities page.
-rw-r--r--activities.mdwn21
-rw-r--r--farbar.mdwn12
2 files changed, 26 insertions, 7 deletions
diff --git a/activities.mdwn b/activities.mdwn
new file mode 100644
index 0000000..40f3d31
--- /dev/null
+++ b/activities.mdwn
@@ -0,0 +1,21 @@
+# Activities
+
+## Tweets
+
+Latest micro-blogging entries:
+
+[[!inline pages="internal(feeds/*/english/*) or internal(feeds/*/C/*)" archive=yes show="10" template=titlepage]]
+
+[[!aggregate name="identi.ca (english)" dir="feeds/identi.ca/english"
+feedurl="http://identi.ca/jonass/rss"
+url="http://identi.ca/jonass" updateinterval="1"]]
+
+## Music
+
+Latest played music:
+
+[[!inline pages="internal(feeds/last.fm/C/*)" archive=yes show="10" template=titlepage]]
+
+[[!aggregate name="last.fm" dir="feeds/last.fm/C"
+feedurl="http://ws.audioscrobbler.com/1.0/user/JonasSmedegaard/recenttracks.rss"
+url="http://www.last.fm/user/JonasSmedegaard" updateinterval="1"]]
diff --git a/farbar.mdwn b/farbar.mdwn
index 61b1fe5..107dbeb 100644
--- a/farbar.mdwn
+++ b/farbar.mdwn
@@ -1,13 +1,11 @@
[[!if test="destpage(index*)" then="""
## Timeline
-[[!inline pages="internal(feeds/*/english/*) or internal(feeds/*/C/*)" archive=yes show="10" template=titlepage]]
+### Tweets
-[[!aggregate name="tweets" dir="feeds/identi.ca/english"
-feedurl="http://identi.ca/jonass/rss"
-url="http://identi.ca/jonass" updateinterval="1"]]
+[[!inline pages="internal(feeds/identi.ca/english/*)" archive=yes show="3" template=titlepage]]
-[[!aggregate name="music" dir="feeds/last.fm/C"
-feedurl="http://ws.audioscrobbler.com/1.0/user/JonasSmedegaard/recenttracks.rss"
-url="http://www.last.fm/user/JonasSmedegaard" updateinterval="1"]]
+### Music
+
+[[!inline pages="internal(feeds/last.fm/C/*)" archive=yes show="3" template=titlepage]]
"""]]