* If an inlined page has a permalink, link the page title to that.

diff --git a/debian/changelog b/debian/changelog
index b61e82a7f82c0eb07b5138c5c4d9957cbcb8ccb0..46a1c3f620fee6d74b88bf026c661b39844677e3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,8 +22,9 @@ ikiwiki (1.27) UNRELEASED; urgency=low
   * Link debian/changelog and debian/news to NEWS and CHANGELOG.
   * Support hyperestradier version 1.4.2, which adds a new required phraseform
     setting.
   * Link debian/changelog and debian/news to NEWS and CHANGELOG.
   * Support hyperestradier version 1.4.2, which adds a new required phraseform
     setting.

+  * If an inlined page has a permalink, link the page title to that.

 
 

- -- Joey Hess <joeyh@debian.org>  Sat,  9 Sep 2006 18:56:10 -0400
+ -- Joey Hess <joeyh@debian.org>  Sat,  9 Sep 2006 23:56:48 -0400

 
 ikiwiki (1.26) unstable; urgency=low
 
 
 ikiwiki (1.26) unstable; urgency=low
 

diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl
index 8210874ef11716126dc0ca3e87f7e1cd1b9bb1ba..3657a17e606f549acd403f3a4702658d514248b0 100644 (file)
--- a/templates/inlinepage.tmpl
+++ b/templates/inlinepage.tmpl
@@ -9,15 +9,16 @@
 </span>
 </TMPL_IF>
 <span class="header">
 </span>
 </TMPL_IF>
 <span class="header">

+<TMPL_IF NAME="PERMALINK">
+<a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a>
+<TMPL_ELSE>

 <a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a>
 <a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a>

+</TMPL_IF>

 </span>
 <TMPL_VAR CONTENT>
 
 <span class="pageinfo">
 Posted <TMPL_VAR CTIME>
 </span>
 <TMPL_VAR CONTENT>
 
 <span class="pageinfo">
 Posted <TMPL_VAR CTIME>

-<TMPL_IF NAME="PERMALINK">
-(<a rel="bookmark" href="<TMPL_VAR NAME=PERMALINK>">permalink</a>)
-</TMPL_IF>

 </span>
 
 <span class="tags">
 </span>
 
 <span class="tags">