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 <redacted>
Acked-by: Petr Baudis <redacted>
Signed-off-by: Junio C Hamano <redacted>

diff --git a/gitweb.perl b/gitweb.perl
index 6d013f1070543e10a658f8247c265bd7256a32d5741a5d404cfcb4e6a738cc75..bf5e64135c4084ebaa0971b0e826ac0590a6084ca0a2629f8fed420458d72f2b 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -2662,6 +2662,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) {


@@ -2671,17 +2672,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;