diff options
| author | Jasper Van der Jeugt <jaspervdj@gmail.com> | 2011-03-01 14:50:41 +0100 |
|---|---|---|
| committer | Jasper Van der Jeugt <jaspervdj@gmail.com> | 2011-03-01 14:50:41 +0100 |
| commit | 90b25105830d6e4b0943ab55f9317bd142533acf (patch) | |
| tree | 6eefb80a8a84724e70539dd8fa449530f7b17fe0 /data | |
| parent | 8ef5a3ed0307be5d34a9564d02af3ed494f8e228 (diff) | |
| parent | 8b727b994d482d593046f9b01a5c40b97c166d62 (diff) | |
| download | hakyll-90b25105830d6e4b0943ab55f9317bd142533acf.tar.gz | |
Merge branch 'hakyll3'
Conflicts:
hakyll.cabal
src/Text/Hakyll/Tags.hs
Diffstat (limited to 'data')
| -rw-r--r-- | data/templates/atom-item.xml | 10 | ||||
| -rw-r--r-- | data/templates/atom.xml | 14 | ||||
| -rw-r--r-- | data/templates/rss-item.xml | 10 | ||||
| -rw-r--r-- | data/templates/rss.xml | 12 |
4 files changed, 23 insertions, 23 deletions
diff --git a/data/templates/atom-item.xml b/data/templates/atom-item.xml index 10d9b79..e9185f2 100644 --- a/data/templates/atom-item.xml +++ b/data/templates/atom-item.xml @@ -1,7 +1,7 @@ <entry> - <title>$title</title> - <link href="$absolute/$url" /> - <id>$absolute/$url</id> - <updated>$timestamp</updated> - <summary type="html"><![CDATA[$description]]></summary> + <title>$title$</title> + <link href="$root$$url$" /> + <id>$root$$url$</id> + <updated>$timestamp$</updated> + <summary type="html"><![CDATA[$description$]]></summary> </entry> diff --git a/data/templates/atom.xml b/data/templates/atom.xml index a0b30ef..5a7c0cf 100644 --- a/data/templates/atom.xml +++ b/data/templates/atom.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <feed xmlns="http://www.w3.org/2005/Atom"> - <title>$title</title> - <link href="$absolute/$url" rel="self" /> - <link href="$absolute" /> - <id>$absolute/$url</id> + <title>$title$</title> + <link href="$root$$url$" rel="self" /> + <link href="$root$" /> + <id>$root$$url$</id> <author> - <name>$authorName</name> + <name>$authorName$</name> </author> - <updated>$timestamp</updated> - $body + <updated>$timestamp$</updated> + $body$ </feed> diff --git a/data/templates/rss-item.xml b/data/templates/rss-item.xml index e04864e..f8f9fcf 100644 --- a/data/templates/rss-item.xml +++ b/data/templates/rss-item.xml @@ -1,7 +1,7 @@ <item> - <title>$title</title> - <link>$absolute/$url</link> - <description><![CDATA[$description]]></description> - <pubDate>$timestamp</pubDate> - <guid>$absolute/$url</guid> + <title>$title$</title> + <link>$root$$url$</link> + <description><![CDATA[$description$]]></description> + <pubDate>$timestamp$</pubDate> + <guid>$root$$url$</guid> </item> diff --git a/data/templates/rss.xml b/data/templates/rss.xml index bbdfc7e..d2f3915 100644 --- a/data/templates/rss.xml +++ b/data/templates/rss.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"> <channel> - <title>$title</title> - <link>$absolute</link> - <description><![CDATA[$description]]></description> - <atom:link href="$absolute/$url" rel="self" + <title>$title$</title> + <link>$root$</link> + <description><![CDATA[$description$]]></description> + <atom:link href="$root$$url$" rel="self" type="application/rss+xml" /> - <lastBuildDate>$timestamp</lastBuildDate> - $body + <lastBuildDate>$timestamp$</lastBuildDate> + $body$ </channel> </rss> |