gitweb: Mark matched 'ctag' / contents tag (?by_tag=foo)

It might have been hard to discover that current view is limited to
projects with given content tag (ctag), as it was distinquished only
in gitweb URL.  Mark matched contents tag in the tag cloud using
"match" class, for easier discovery.

This commit introduces a bit of further code duplication in
git_populate_project_tagcloud().

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Acked-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 60cb772c5834255acabe5eb61d83787fc91f96a0..e81c27d14ca269f8bd7410e551184d777feb930e 100755 (executable)
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -2653,6 +2653,7 @@ sub git_populate_project_tagcloud {
        }
 
        my $cloud;
        }
 
        my $cloud;

+       my $matched = $cgi->param('by_tag');

        if (eval { require HTML::TagCloud; 1; }) {
                $cloud = HTML::TagCloud->new;
                foreach my $ctag (sort keys %ctags_lc) {
        if (eval { require HTML::TagCloud; 1; }) {
                $cloud = HTML::TagCloud->new;
                foreach my $ctag (sort keys %ctags_lc) {


@@ -2662,17 +2663,22 @@ sub git_populate_project_tagcloud {
                        $title =~ s/ / /g;
                        $title =~ s/^/ /g;
                        $title =~ s/$/ /g;
                        $title =~ s/ / /g;
                        $title =~ s/^/ /g;
                        $title =~ s/$/ /g;

+                       if (defined $matched && $matched eq $ctag) {
+                               $title = qq(<span class="match">$title</span>);
+                       }

                        $cloud->add($title, href(project=>undef, ctag=>$ctag),
                                    $ctags_lc{$ctag}->{count});
                }
        } else {
                $cloud = {};
                foreach my $ctag (keys %ctags_lc) {
                        $cloud->add($title, href(project=>undef, ctag=>$ctag),
                                    $ctags_lc{$ctag}->{count});
                }
        } else {
                $cloud = {};
                foreach my $ctag (keys %ctags_lc) {

-                       my $title = $ctags_lc{$ctag}->{topname};
+                       my $title = esc_html($ctags_lc{$ctag}->{topname}, -nbsp=>1);
+                       if (defined $matched && $matched eq $ctag) {
+                               $title = qq(<span class="match">$title</span>);
+                       }

                        $cloud->{$ctag}{count} = $ctags_lc{$ctag}->{count};
                        $cloud->{$ctag}{ctag} =
                        $cloud->{$ctag}{count} = $ctags_lc{$ctag}->{count};
                        $cloud->{$ctag}{ctag} =

-                               $cgi->a({-href=>href(project=>undef, ctag=>$ctag)},
-                                 esc_html($title, -nbsp=>1));
+                               $cgi->a({-href=>href(project=>undef, ctag=>$ctag)}, $title);

                }
        }
        return $cloud;
                }
        }
        return $cloud;