From: Giuseppe Bilotta Date: Fri, 19 Jun 2009 18:21:10 GMT Subject: [PATCHv2] gitweb: gravatar support Message-ID: <1245435670-5688-1-git-send-email-giuseppe.bilotta@gmail.com> Introduce gravatar support by adding the appropriate img tag next to author and committer in commit, shortlog and log view. The feature is disabled by default, and depends on Digest::MD5, which is available in most Perl installations. Signed-off-by: Giuseppe Bilotta --- gitweb/gitweb.css | 4 ++++ gitweb/gitweb.perl | 51 ++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 48 insertions(+), 7 deletions(-) Changes from the previous version include gravatar use in history view, CSS use and the possibility to override the feature on a per-project basis. diff --git a/gitweb/gitweb.css b/gitweb/gitweb.css index a01eac8..ca716e6 100644 --- a/gitweb/gitweb.css +++ b/gitweb/gitweb.css @@ -28,6 +28,10 @@ img.logo { border-width: 0px; } +img.gravatar { + vertical-align:middle; +} + div.page_header { height: 25px; padding: 8px; diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 1e7e2d8..c06356b 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -365,6 +365,21 @@ our %feature = ( 'sub' => \&feature_patches, 'override' => 0, 'default' => [16]}, + + # Gravatar support. When this feature is enabled, views such as + # shortlog or commit will display the gravatar associated with + # the email of the committer(s) and/or author(s). Please note that + # the feature depends on Digest::MD5. + + # To enable system wide have in $GITWEB_CONFIG + # $feature{'gravatar'}{'default'} = [1]; + # To have project specific config enable override in $GITWEB_CONFIG + # $feature{'gravatar'}{'override'} = 1; + # and in project config gitweb.gravatar = 0|1; + 'gravatar' => { + 'sub' => sub { feature_bool('gravatar', @_) }, + 'override' => 0, + 'default' => [0]}, ); sub gitweb_get_feature { @@ -814,6 +829,10 @@ $git_dir = "$projectroot/$project" if $project; our @snapshot_fmts = gitweb_get_feature('snapshot'); @snapshot_fmts = filter_snapshot_fmts(@snapshot_fmts); +# check if gravatars are enabled and dependencies are satisfied +our $git_gravatar_enabled = gitweb_check_feature('gravatar') && + (eval { use Digest::MD5 qw(md5_hex); 1; }); + # dispatch if (!defined $action) { if (defined $hash) { @@ -3214,11 +3233,26 @@ sub git_print_header_div { "\n\n"; } +# insert a gravatar for the given $email at the given $size if the feature +# is enabled +sub git_get_gravatar { + if ($git_gravatar_enabled) { + my ($email, $size, $whitespace) = @_; + $whitespace = 0 unless defined($whitespace); + $size = 32 if (!defined($size) || $size <= 0); + return "" . ($whitespace ? " " : ""); + } else { + return ""; + } +} + sub git_print_authorship { my $co = shift; my %ad = parse_date($co->{'author_epoch'}, $co->{'author_tz'}); print "
" . + git_get_gravatar($co->{'author_email'}, 16, 1) . esc_html($co->{'author_name'}) . " [$ad{'rfc2822'}"; if ($ad{'hour_local'} < 6) { @@ -4145,7 +4179,7 @@ sub git_shortlog_body { my $author = chop_and_escape_str($co{'author_name'}, 10); # git_summary() used print "$co{'age_string'}\n" . print "$co{'age_string_date'}\n" . - "" . $author . "\n" . + "" . git_get_gravatar($co{'author_email'}, 16, 1) . "" . $author . "\n" . ""; print format_subject_html($co{'title'}, $co{'title_short'}, href(action=>"commit", hash=>$commit), $ref); @@ -4196,7 +4230,7 @@ sub git_history_body { # shortlog uses chop_str($co{'author_name'}, 10) my $author = chop_and_escape_str($co{'author_name'}, 15, 3); print "$co{'age_string_date'}\n" . - "" . $author . "\n" . + "" . git_get_gravatar($co{'author_email'}, 16, 1) . "" . $author . "\n" . ""; # originally git_history used chop_str($co{'title'}, 50) print format_subject_html($co{'title'}, $co{'title_short'}, @@ -4352,7 +4386,7 @@ sub git_search_grep_body { $alternate ^= 1; my $author = chop_and_escape_str($co{'author_name'}, 15, 5); print "$co{'age_string_date'}\n" . - "" . $author . "\n" . + "" . git_get_gravatar($co{'author_email'}, 16, 1) . "" . $author . "\n" . "" . $cgi->a({-href => href(action=>"commit", hash=>$co{'id'}), -class => "list subject"}, @@ -5095,8 +5129,9 @@ sub git_log { $cgi->a({-href => href(action=>"tree", hash=>$commit, hash_base=>$commit)}, "tree") . "
\n" . "
\n" . - "" . esc_html($co{'author_name'}) . " [$ad{'rfc2822'}]
\n" . - "\n"; + "" . esc_html($co{'author_name'}) . " [$ad{'rfc2822'}] " . + git_get_gravatar($co{'author_email'}, 16) . + "
\n\n"; print "
\n"; git_print_log($co{'comment'}, -final_empty_line=> 1); @@ -5183,7 +5218,8 @@ sub git_commit { } print "
\n" . "\n"; - print "\n". + print "". + "\n" . "" . "" . "\n"; - print "\n"; + print "". + "\n"; print "\n"; -- 1.6.3.rc1.192.gdbfcb
author" . esc_html($co{'author'}) . "
author" . esc_html($co{'author'}) . "" .git_get_gravatar($co{'author_email'}) . "
$ad{'rfc2822'}"; if ($ad{'hour_local'} < 6) { @@ -5195,7 +5231,8 @@ sub git_commit { } print "
committer" . esc_html($co{'committer'}) . "
committer" . esc_html($co{'committer'}) . "" .git_get_gravatar($co{'committer_email'}) . "
$cd{'rfc2822'}" . sprintf(" (%02d:%02d %s)", $cd{'hour_local'}, $cd{'minute_local'}, $cd{'tz_local'}) . "