[PATCH 3/6] gitweb: Mark matched 'ctag' / contents tag (?by_tag=foo)
- From
Jakub Narebski <jnareb@gmail.com>
- Date
- Apr 29, 2011, 17:51 UTC
- Message-ID
- <1304099521-27617-4-git-send-email-jnareb@gmail.com>
- In-Reply-To
- <1304099521-27617-1-git-send-email-jnareb@gmail.com>
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> --- This patch was originally sent to git mailing list as
[PATCH 2/1] gitweb: Mark matched 'ctag' / contents tag (?by_tag=foo) http://thread.gmane.org/gmane.linux.debian.devel.bugs.general/802865/focus=168731
(yes, it was crossposted).
gitweb/gitweb.perl | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 60cb772..e81c27d 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -2653,6 +2653,7 @@ sub git_populate_project_tagcloud { } 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) { @@ -2662,17 +2663,22 @@ sub git_populate_project_tagcloud { $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) { - 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} = - $cgi->a({-href=>href(project=>undef, ctag=>$ctag)}, - esc_html($title, -nbsp=>1)); + $cgi->a({-href=>href(project=>undef, ctag=>$ctag)}, $title); } } return $cloud;
-- 1.7.3