diff options
| -rw-r--r-- | IkiWiki/Plugin/inline.pm | 8 | ||||
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | doc/bugs/meta_inline.mdwn | 2 | ||||
| -rw-r--r-- | doc/todo/aggregation.mdwn | 3 | ||||
| -rw-r--r-- | templates/inlinepage.tmpl | 2 | ||||
| -rw-r--r-- | templates/inlinepagetitle.tmpl | 2 |
6 files changed, 14 insertions, 7 deletions
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 7bb71a436..b06470bfe 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -83,7 +83,12 @@ sub preprocess_inline (@) { #{{{ ); foreach my $page (@list) { - $template->param(pagelink => htmllink($params{page}, $params{page}, $page)); + # Don't use htmllink because this way the title is separate + # and can be overridden by other plugins. + my $link=htmlpage(bestlink($params{page}, $page)); + $link=abs2rel($link, dirname($params{page})); + $template->param(pageurl => $link); + $template->param(title => $page); $template->param(content => get_inline_content($page, $params{page})) if $params{archive} eq "no"; $template->param(ctime => displaytime($pagectime{$page})); @@ -172,6 +177,7 @@ sub genrss ($@) { #{{{ $template->param( title => $config{wikiname}, + wikiname => $config{wikiname}, pageurl => $url, items => \@items, ); diff --git a/debian/changelog b/debian/changelog index 26b427333..a0989cb74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,8 +20,10 @@ ikiwiki (1.13) UNRELEASED; urgency=low * Avoid outputting duplicate meta info. * Include title metadata on aggregated posts for capitalised and un-munged titles. + * Title metadata of inlined pages now shows up in blogs, although not yet + in their rss feeds. - -- Joey Hess <joeyh@debian.org> Sun, 30 Jul 2006 18:17:28 -0400 + -- Joey Hess <joeyh@debian.org> Sun, 30 Jul 2006 19:22:11 -0400 ikiwiki (1.12) unstable; urgency=low diff --git a/doc/bugs/meta_inline.mdwn b/doc/bugs/meta_inline.mdwn index cd3d5ec2b..9ca32a0e8 100644 --- a/doc/bugs/meta_inline.mdwn +++ b/doc/bugs/meta_inline.mdwn @@ -1,2 +1,4 @@ The meta plugin doesn't affect a page if it's being inlined. Probably setting the title with it should override the title of the blog post. + +[[bugs/done]] diff --git a/doc/todo/aggregation.mdwn b/doc/todo/aggregation.mdwn index 63ee8f13b..65c4208d6 100644 --- a/doc/todo/aggregation.mdwn +++ b/doc/todo/aggregation.mdwn @@ -1,5 +1,2 @@ * Still need to support feed expiry. * Need to store page author metadata and include it in the rss feed. -* Should store the real page title (capitalised) as metadats. - Only problem is titles that contain quotes need to be escaped somehow, - and I'll need to add support for that first. diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl index 0f0c47767..c2ddff867 100644 --- a/templates/inlinepage.tmpl +++ b/templates/inlinepage.tmpl @@ -1,5 +1,5 @@ <div class="inlinepage"> -<span class="header"><TMPL_VAR PAGELINK></span> +<span class="header"><a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a></span> <TMPL_VAR CONTENT> diff --git a/templates/inlinepagetitle.tmpl b/templates/inlinepagetitle.tmpl index 10469f81c..3aa6a2415 100644 --- a/templates/inlinepagetitle.tmpl +++ b/templates/inlinepagetitle.tmpl @@ -1,5 +1,5 @@ <p> -<TMPL_VAR PAGELINK><br /> +<a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a><br /> <i> Posted <TMPL_VAR CTIME> </i> |