Add missing permalink support to archivepage and titlepage templates.

diff --git a/debian/changelog b/debian/changelog
index bbc7e6f136df7c661740e4c34a84e27d168757f6..d9dcc95e6f4a3628db05d3a6771d4dcf401a6ea0 100644 (file)
--- 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.
     - 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
 
 
  -- Joey Hess <joeyh@debian.org>  Sat, 04 Apr 2009 17:47:36 -0400
 

diff --git a/templates/archivepage.tmpl b/templates/archivepage.tmpl
index 6bc789dfb29cfe241055ac51c4c392df6a6a50a4..63f7165449070ad01dddd5b7d8bffd3550a0e16f 100644 (file)
--- a/templates/archivepage.tmpl
+++ b/templates/archivepage.tmpl
@@ -1,5 +1,9 @@
 <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><br />
 <a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a><br />

+</TMPL_IF>

 <i>
 Posted <TMPL_VAR CTIME>
 </i>
 <i>
 Posted <TMPL_VAR CTIME>
 </i>

diff --git a/templates/titlepage.tmpl b/templates/titlepage.tmpl
index f5cd5bc53e69de301886902e25428cd2ab2c9b94..8a11e693ebfe08602a003f01bda55ff8dec316bf 100644 (file)
--- 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>