summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancois Marier <francois@debian.org>2011-03-05 20:33:07 +1300
committerFrancois Marier <francois@debian.org>2011-03-30 20:59:17 +1300
commit7723e94218a8c526fc8d869086c05dd382268649 (patch)
tree8a4e96e7a2768a642e92f5a12d4182c039264562
parent3e5197c9671e01c73bdd0c281f56a61b67995c22 (diff)
comments: add avatar picture of comment author
Use Libravatar::URL to pull the avatar picture for the comment author if we have an email address for him/her.
-rwxr-xr-x[-rw-r--r--]IkiWiki/Plugin/comments.pm17
-rw-r--r--doc/style.css3
-rw-r--r--templates/comment.tmpl5
3 files changed, 25 insertions, 0 deletions
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 8d46ed579..00ab1c8bd 100644..100755
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -167,6 +167,7 @@ sub preprocess {
my $commentip;
my $commentauthor;
my $commentauthorurl;
+ my $commentauthoravatar;
my $commentopenid;
if (defined $params{username}) {
$commentuser = $params{username};
@@ -187,6 +188,16 @@ sub preprocess {
$commentauthor = $commentuser;
}
+
+ eval 'use Libravatar::URL';
+
+ if (! $@) {
+ my $email = IkiWiki::userinfo_get($commentuser, 'email');
+
+ if (defined $email) {
+ $commentauthoravatar = libravatar_url(email => $email);
+ }
+ }
}
else {
if (defined $params{ip}) {
@@ -200,6 +211,7 @@ sub preprocess {
$commentstate{$page}{commentip} = $commentip;
$commentstate{$page}{commentauthor} = $commentauthor;
$commentstate{$page}{commentauthorurl} = $commentauthorurl;
+ $commentstate{$page}{commentauthoravatar} = $commentauthoravatar;
if (! defined $pagestate{$page}{meta}{author}) {
$pagestate{$page}{meta}{author} = $commentauthor;
}
@@ -874,6 +886,11 @@ sub pagetemplate (@) {
$commentstate{$page}{commentauthorurl});
}
+ if ($template->query(name => 'commentauthoravatar')) {
+ $template->param(commentauthoravatar =>
+ $commentstate{$page}{commentauthoravatar});
+ }
+
if ($template->query(name => 'removeurl') &&
IkiWiki::Plugin::remove->can("check_canremove") &&
length $config{cgiurl}) {
diff --git a/doc/style.css b/doc/style.css
index fa413cf24..fcf39be6a 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -247,6 +247,9 @@ span.color {
.comment-subject {
font-weight: bold;
}
+.comment-avatar {
+ float: right;
+}
.comment {
border: 1px solid #aaa;
padding: 3px;
diff --git a/templates/comment.tmpl b/templates/comment.tmpl
index c2ee5a371..c16ca7c81 100644
--- a/templates/comment.tmpl
+++ b/templates/comment.tmpl
@@ -1,6 +1,10 @@
<TMPL_IF HTML5><article class="comment" id="<TMPL_VAR COMMENTID>">
<TMPL_ELSE><div class="comment" id="<TMPL_VAR COMMENTID>"></TMPL_IF>
+<TMPL_IF COMMENTAUTHORAVATAR><div class="comment-avatar">
+<img src="<TMPL_VAR COMMENTAUTHORAVATAR>" alt="" />
+</div></TMPL_IF>
+
<TMPL_IF HTML5><header class="comment-subject"><TMPL_ELSE><div class="comment-subject"></TMPL_IF>
<TMPL_IF PERMALINK>
<a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a>
@@ -58,4 +62,5 @@ Comment by
<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
</TMPL_IF>
+<div style="clear: both"></div>
<TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF>