aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-04-10 18:02:03 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-04-10 18:02:03 -0400
commit98ae0fb92ccfcc877eadd0a941beaa9c462d6cd1 (patch)
tree9302de0f1c1280266fd08f701a20cc6b4d4860eb
parent808cba50d2c907d70578a0f1b66a2cadfacaecd8 (diff)
downloadikiwiki-98ae0fb92ccfcc877eadd0a941beaa9c462d6cd1.tar
ikiwiki-98ae0fb92ccfcc877eadd0a941beaa9c462d6cd1.tar.gz
Add missing permalink support to archivepage and titlepage templates.
-rw-r--r--debian/changelog1
-rw-r--r--templates/archivepage.tmpl4
-rw-r--r--templates/titlepage.tmpl8
3 files changed, 12 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index bbc7e6f13..d9dcc95e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ ikiwiki (3.10) UNRELEASED; urgency=low
- Petr Ročkai fixed rcs_recentchanges.
- Sven M. Hallberg merged the above and added missing features.
* Add missing newline to Confirm Password prompt.
+ * Add missing permalink support to archivepage and titlepage templates.
-- Joey Hess <joeyh@debian.org> Sat, 04 Apr 2009 17:47:36 -0400
diff --git a/templates/archivepage.tmpl b/templates/archivepage.tmpl
index 6bc789dfb..63f716544 100644
--- a/templates/archivepage.tmpl
+++ b/templates/archivepage.tmpl
@@ -1,5 +1,9 @@
<p>
+<TMPL_IF NAME="PERMALINK">
+<a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a>
+<TMPL_ELSE>
<a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a><br />
+</TMPL_IF>
<i>
Posted <TMPL_VAR CTIME>
</i>
diff --git a/templates/titlepage.tmpl b/templates/titlepage.tmpl
index f5cd5bc53..8a11e693e 100644
--- a/templates/titlepage.tmpl
+++ b/templates/titlepage.tmpl
@@ -1 +1,7 @@
-<p><a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a></p>
+<p>
+<TMPL_IF NAME="PERMALINK">
+<a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a>
+<TMPL_ELSE>
+<a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a>
+</TMPL_IF>
+</p>