* Title metadata of inlined pages now shows up in blogs, although not yet
in their rss feeds.master
parent
ecd74fbe5d
commit
908e004b4c
|
@ -83,7 +83,12 @@ sub preprocess_inline (@) { #{{{
|
||||||
);
|
);
|
||||||
|
|
||||||
foreach my $page (@list) {
|
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}))
|
$template->param(content => get_inline_content($page, $params{page}))
|
||||||
if $params{archive} eq "no";
|
if $params{archive} eq "no";
|
||||||
$template->param(ctime => displaytime($pagectime{$page}));
|
$template->param(ctime => displaytime($pagectime{$page}));
|
||||||
|
@ -172,6 +177,7 @@ sub genrss ($@) { #{{{
|
||||||
|
|
||||||
$template->param(
|
$template->param(
|
||||||
title => $config{wikiname},
|
title => $config{wikiname},
|
||||||
|
wikiname => $config{wikiname},
|
||||||
pageurl => $url,
|
pageurl => $url,
|
||||||
items => \@items,
|
items => \@items,
|
||||||
);
|
);
|
||||||
|
|
|
@ -20,8 +20,10 @@ ikiwiki (1.13) UNRELEASED; urgency=low
|
||||||
* Avoid outputting duplicate meta info.
|
* Avoid outputting duplicate meta info.
|
||||||
* Include title metadata on aggregated posts for capitalised and un-munged
|
* Include title metadata on aggregated posts for capitalised and un-munged
|
||||||
titles.
|
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
|
ikiwiki (1.12) unstable; urgency=low
|
||||||
|
|
||||||
|
|
|
@ -1,2 +1,4 @@
|
||||||
The meta plugin doesn't affect a page if it's being inlined. Probably
|
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.
|
setting the title with it should override the title of the blog post.
|
||||||
|
|
||||||
|
[[bugs/done]]
|
||||||
|
|
|
@ -1,5 +1,2 @@
|
||||||
* Still need to support feed expiry.
|
* Still need to support feed expiry.
|
||||||
* Need to store page author metadata and include it in the rss feed.
|
* 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.
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<div class="inlinepage">
|
<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>
|
<TMPL_VAR CONTENT>
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<p>
|
<p>
|
||||||
<TMPL_VAR PAGELINK><br />
|
<a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a><br />
|
||||||
<i>
|
<i>
|
||||||
Posted <TMPL_VAR CTIME>
|
Posted <TMPL_VAR CTIME>
|
||||||
</i>
|
</i>
|
||||||
|
|
Loading…
Reference in New Issue