urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show author in addition to feedname, if different. 

While here, mollify http://validator.w3.org/feed/ and
s/dcterms:creator/dc:creator/g, which happens to make rss2email see
and do nice things with authors.
master
Amitai Schlair 2013-07-17 16:38:08 -04:00
parent 844710c0da
commit 97d0c09a18
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IkiWiki/Plugin/aggregate.pm
View File

@ -593,6 +593,7 @@ sub aggregate (@) {
feed => $feed, feed => $feed,
copyright => $f->copyright, copyright => $f->copyright,
title => defined $entry->title ? decode_entities($entry->title) : "untitled", title => defined $entry->title ? decode_entities($entry->title) : "untitled",
author => defined $entry->author ? decode_entities($entry->author) : "",
link => $entry->link, link => $entry->link,
content => (defined $c && defined $c->body) ? $c->body : "", content => (defined $c && defined $c->body) ? $c->body : "",
guid => defined $entry->id ? $entry->id : time."_".$feed->{name}, guid => defined $entry->id ? $entry->id : time."_".$feed->{name},
@ -690,6 +691,9 @@ sub write_page ($$$$$) {
} }
$template->param(title => $params{title}) $template->param(title => $params{title})
if defined $params{title} && length($params{title}); if defined $params{title} && length($params{title});
$template->param(author => $params{author})
if defined $params{author} && length($params{author}
&& $params{author} ne $feed->{name});
$template->param(content => wikiescape(htmlabs($params{content}, $template->param(content => wikiescape(htmlabs($params{content},
defined $params{base} ? $params{base} : $feed->{feedurl}))); defined $params{base} ? $params{base} : $feed->{feedurl})));
$template->param(name => $feed->{name}); $template->param(name => $feed->{name});

4
templates/aggregatepost.tmpl
View File

@ -11,5 +11,9 @@
<TMPL_IF COPYRIGHT> <TMPL_IF COPYRIGHT>
[[!meta copyright="<TMPL_VAR COPYRIGHT ESCAPE=HTML>"]] [[!meta copyright="<TMPL_VAR COPYRIGHT ESCAPE=HTML>"]]
</TMPL_IF> </TMPL_IF>
<TMPL_IF AUTHOR>
[[!meta author="<TMPL_VAR NAME ESCAPE=HTML>: <TMPL_VAR AUTHOR ESCAPE=HTML>"]]
<TMPL_ELSE>
[[!meta author="<TMPL_VAR NAME ESCAPE=HTML>"]] [[!meta author="<TMPL_VAR NAME ESCAPE=HTML>"]]
</TMPL_IF>
[[!meta authorurl="<TMPL_VAR URL ESCAPE=HTML>"]] [[!meta authorurl="<TMPL_VAR URL ESCAPE=HTML>"]]

2
templates/rssitem.tmpl
View File

@ -7,7 +7,7 @@
</TMPL_IF> </TMPL_IF>
<link><TMPL_VAR PERMALINK></link> <link><TMPL_VAR PERMALINK></link>
<TMPL_IF AUTHOR> <TMPL_IF AUTHOR>
<dcterms:creator><TMPL_VAR AUTHOR ESCAPE=HTML></dcterms:creator> <dc:creator><TMPL_VAR AUTHOR ESCAPE=HTML></dc:creator>
</TMPL_IF> </TMPL_IF>
<TMPL_IF CATEGORIES> <TMPL_IF CATEGORIES>
<TMPL_LOOP CATEGORIES> <TMPL_LOOP CATEGORIES>