[PATCH 1/2] Bug 6298 : Add avatar picture of comment author in OPAC
Use Libravatar::URL to pull the avatar picture for comment authors if we have an email address for them. Signed-off-by: Francois Marier <francois@debian.org> --- koha-tmpl/opac-tmpl/prog/en/css/opac.css | 3 +++ koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 3 +++ opac/opac-detail.pl | 10 ++++++++++ 3 files changed, 16 insertions(+), 0 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css index aa295c9..a1e1663 100644 --- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css @@ -1873,6 +1873,9 @@ a#MARCview, a#MARCviewPop, a#ISBDview, a#Normalview, a#Fullhistory, a#Briefhisto #comments .yours { background-color : #effed5; } +.commentline .avatar { + float : right; +} #comments #addcomment { margin : 0 -1em -1em -1em; padding : .3em 1em; diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt index c063bb3..cfd23d0 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt @@ -675,6 +675,9 @@ YAHOO.util.Event.onContentReady("furtherm", function () { [% ELSE %] <div class="commentline"> [% IF ( ShowReviewer ) %] + [% IF ( review.avatarurl ) %] + <img class="avatar" src="[% review.avatarurl %]" height="80" width="80"/> + [% END %] <h5> Comment by [% review.title %] diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl index 3e4c76c..cf63a17 100755 --- a/opac/opac-detail.pl +++ b/opac/opac-detail.pl @@ -295,6 +295,13 @@ $template->param( ocoins => GetCOinSBiblio($biblionumber), ); +my $libravatar_available = 0; + +eval 'use Libravatar::URL'; +if (! $@) { + $libravatar_available = 1; +} + my $reviews = getreviews( $biblionumber, 1 ); my $loggedincommenter; foreach ( @$reviews ) { @@ -303,6 +310,9 @@ foreach ( @$reviews ) { $_->{title} = $borrowerData->{'title'}; $_->{surname} = $borrowerData->{'surname'}; $_->{firstname} = $borrowerData->{'firstname'}; + if ($libravatar_available and $borrowerData->{'email'}) { + $_->{avatarurl} = libravatar_url(email => $borrowerData->{'email'}, https => $ENV{HTTPS}); + } $_->{userid} = $borrowerData->{'userid'}; $_->{cardnumber} = $borrowerData->{'cardnumber'}; $_->{datereviewed} = format_date($_->{datereviewed}); -- 1.7.4.4
Add smaller Libravatar-based images to the recent comments page. Signed-off-by: Francois Marier <francois@debian.org> --- koha-tmpl/opac-tmpl/prog/en/css/opac.css | 1 + .../opac-tmpl/prog/en/modules/opac-showreviews.tt | 6 +++++- opac/opac-showreviews.pl | 11 +++++++++++ 3 files changed, 17 insertions(+), 1 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css index a1e1663..b8a531f 100644 --- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css @@ -1875,6 +1875,7 @@ a#MARCview, a#MARCviewPop, a#ISBDview, a#Normalview, a#Fullhistory, a#Briefhisto } .commentline .avatar { float : right; + padding-left : .5em; } #comments #addcomment { margin : 0 -1em -1em -1em; diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tt index e64fcae..2839460 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tt @@ -46,7 +46,11 @@ $(document).ready(function(){ [% END %] [% IF ( review.copyrightdate ) %]<span class="results_summary"><span class="label">Date:</span>[% review.copyrightdate %]</span>[% END %]</p> - <p class="commentline[% IF ( review.your_comment ) %] yours[% END %]">[% review.review |html %] + <p class="commentline[% IF ( review.your_comment ) %] yours[% END %]"> + [% IF ( review.avatarurl ) %] + <img class="avatar" src="[% review.avatarurl %]" height="40" width="40"/> + [% END %] + [% review.review |html %] <span style="font-size:87%;font-color:#CCC;">Added [% review.datereviewed %] [% IF ( review.your_comment ) %] by <strong>you</strong>[% ELSE %] [% IF ( ShowReviewer ) %] by [% review.firstname %] [% review.surname %][% END %][% END %]</span></p> diff --git a/opac/opac-showreviews.pl b/opac/opac-showreviews.pl index f1e0b53..fbce8a2 100755 --- a/opac/opac-showreviews.pl +++ b/opac/opac-showreviews.pl @@ -65,6 +65,13 @@ if($format eq "rss"){ ); } +my $libravatar_available = 0; + +eval 'use Libravatar::URL'; +if (! $@) { + $libravatar_available = 1; +} + my $reviews = getallreviews(1,$offset,$results_per_page); my $marcflavour = C4::Context->preference("marcflavour"); my $hits = numberofreviews(); @@ -92,6 +99,10 @@ for my $result (@$reviews){ $result->{timestamp} = $bib->{'timestamp'}; $result->{firstname} = $borr->{'firstname'}; $result->{surname} = $borr->{'surname'}; + if ($libravatar_available and $borr->{'email'}) { + $result->{avatarurl} = libravatar_url(email => $borr->{'email'}, size => 40, https => $ENV{HTTPS}); + } + if ($result->{borrowernumber} eq $borrowernumber) { $result->{your_comment} = 1; } -- 1.7.4.4
participants (1)
-
Francois Marier