aboutsummaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-08-04 00:01:51 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-08-04 00:01:51 +0000
commitc5919df5f3697e0f8968e2b8f49cd15c1e0aa412 (patch)
treee4e6047286cd5144e6048e6c1921e9b9027f499c /templates
parente8b39b094116e8b50cf12fe56b9c6a04f05683e5 (diff)
downloadikiwiki-c5919df5f3697e0f8968e2b8f49cd15c1e0aa412.tar
ikiwiki-c5919df5f3697e0f8968e2b8f49cd15c1e0aa412.tar.gz
* Make aggregator save permalinks and author name to pages as metadata.
* Add permalink and author support to meta plugin, affecting RSS feeds and blog pages. * Change titlepage() to encode utf-8 alnum characters. This is necessary to avoid UTF-8 creeping into filenames in urls. (There are still some other ways that it can get in.)
Diffstat (limited to 'templates')
-rw-r--r--templates/aggregatepost.tmpl13
-rw-r--r--templates/inlinepage.tmpl6
-rw-r--r--templates/rssitem.tmpl9
-rw-r--r--templates/rsspage.tmpl3
4 files changed, 20 insertions, 11 deletions
diff --git a/templates/aggregatepost.tmpl b/templates/aggregatepost.tmpl
index 689a23341..50c09fff8 100644
--- a/templates/aggregatepost.tmpl
+++ b/templates/aggregatepost.tmpl
@@ -1,15 +1,12 @@
<TMPL_VAR CONTENT>
-<p>
-<i>
-From <a href="<TMPL_VAR URL>"><TMPL_VAR NAME></a>
-<TMPL_IF NAME="LINK">
-; <a href="<TMPL_VAR LINK>">permalink</a>
-</TMPL_IF>
-</i>
-</p>
+<br/>
<TMPL_LOOP NAME="TAGS">
[[tag <TMPL_VAR TAG>]]
</TMPL_LOOP>
<TMPL_IF NAME="TITLE">
[[meta title="<TMPL_VAR NAME="TITLE" ESCAPE=HTML>"]]
</TMPL_IF>
+<TMPL_IF NAME="PERMALINK">
+[[meta permalink="<TMPL_VAR NAME="PERMALINK" ESCAPE=HTML>"]]
+</TMPL_IF>
+[[meta author="<TMPL_VAR NAME="NAME" ESCAPE=HTML>"]]
diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl
index c2ddff867..6840f3681 100644
--- a/templates/inlinepage.tmpl
+++ b/templates/inlinepage.tmpl
@@ -5,6 +5,12 @@
<span class="pageinfo">
Posted <TMPL_VAR CTIME>
+<TMPL_IF NAME="AUTHOR">
+by <TMPL_VAR NAME=AUTHOR>
+</TMPL_IF>
+<TMPL_IF NAME="PERMALINK">
+(<a href="<TMPL_VAR NAME=PERMALINK>">permalink</a>)
+</TMPL_IF>
</span>
<span class="tags">
diff --git a/templates/rssitem.tmpl b/templates/rssitem.tmpl
index 421600591..c7e587e1c 100644
--- a/templates/rssitem.tmpl
+++ b/templates/rssitem.tmpl
@@ -1,10 +1,15 @@
<item>
+ <TMPL_IF NAME="AUTHOR">
+ <title><TMPL_VAR AUTHOR ESCAPE=HTML>: <TMPL_VAR TITLE ESCAPE=HTML></title>
+ <dc:creator><TMPL_VAR AUTHOR ESCAPE=HTML></dc:creator>
+ <TMPL_ELSE>
<title><TMPL_VAR TITLE ESCAPE=HTML></title>
+ </TMPL_IF>
<guid><TMPL_VAR URL></guid>
- <link><TMPL_VAR URL></link>
+ <link><TMPL_VAR PERMALINK></link>
<TMPL_IF NAME="CATEGORIES">
<TMPL_LOOP NAME="CATEGORIES">
- <category><TMPL_VAR NAME=CATEGORY></category>
+ <category><TMPL_VAR CATEGORY></category>
</TMPL_LOOP>
</TMPL_IF>
<pubDate><TMPL_VAR PUBDATE></pubDate>
diff --git a/templates/rsspage.tmpl b/templates/rsspage.tmpl
index e7676ebbd..d78f94edf 100644
--- a/templates/rsspage.tmpl
+++ b/templates/rsspage.tmpl
@@ -1,5 +1,6 @@
<?xml version="1.0"?>
-<rss version="2.0">
+<rss version="2.0"
+ xmlns:dc="http://purl.org/dc/elements/1.1/">
<channel>
<title><TMPL_VAR TITLE ESCAPE=HTML></title>
<link><TMPL_VAR PAGEURL></link>