diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-09-10 04:19:46 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-09-10 04:19:46 +0000 |
| commit | 68c67a5f41a1c6a6535389a6cbff170a4be70ca9 (patch) | |
| tree | b56a34034c0a2a595a732423cd5839e397db9cef | |
| parent | 1705e6246ece4d75541f7feb42abef512ba3a3be (diff) | |
| download | ikiwiki-68c67a5f41a1c6a6535389a6cbff170a4be70ca9.tar ikiwiki-68c67a5f41a1c6a6535389a6cbff170a4be70ca9.tar.gz | |
* If an inlined page has a permalink, link the page title to that.
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | templates/inlinepage.tmpl | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index b61e82a7f..46a1c3f62 100644 --- 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. + * 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 diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl index 8210874ef..3657a17e6 100644 --- a/templates/inlinepage.tmpl +++ b/templates/inlinepage.tmpl @@ -9,15 +9,16 @@ </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> +</TMPL_IF> </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"> |