From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 10 Apr 2009 22:02:03 +0000 (-0400)
Subject: Add missing permalink support to archivepage and titlepage templates.
X-Git-Tag: 3.10~31
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=98ae0fb92ccfcc877eadd0a941beaa9c462d6cd1;p=ikiwiki.git

Add missing permalink support to archivepage and titlepage templates.
---

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>