X-Git-Url: https://git.chrismorgan.info/gitweb/blobdiff_plain/662457e5a80e8f1037547efc535d6e888a7d5a74..275dee3e37fdf9589a23b0825772bcdfc1b183ce:/gitweb.cgi
diff --git a/gitweb.cgi b/gitweb.cgi
index ea06c90..d78c4f5 100755
--- a/gitweb.cgi
+++ b/gitweb.cgi
@@ -1862,7 +1862,7 @@ sub esc_html_hl_regions {
$out .= esc_html(substr($str, $pos, $begin - $pos), %opts)
if ($begin - $pos > 0);
- $out .= $cgi->span({-class => $css_class}, $escaped);
+ $out .= "$escaped";
$pos = $end;
}
@@ -1892,7 +1892,7 @@ sub esc_html_match_hl {
my @matches = matchpos_list($str, $regexp);
return esc_html($str) unless @matches;
- return esc_html_hl_regions($str, 'match', @matches);
+ return esc_html_hl_regions($str, undef, @matches);
}
@@ -1924,7 +1924,7 @@ sub esc_html_match_hl_chopped {
push @filtered, $m;
}
- return esc_html_hl_regions($chopped . $tail, 'match', @filtered);
+ return esc_html_hl_regions($chopped . $tail, undef, @filtered);
}
## ----------------------------------------------------------------------
@@ -3032,7 +3032,7 @@ sub git_populate_project_tagcloud {
$title =~ s/^/ /g;
$title =~ s/$/ /g;
if (defined $matched && $matched eq $ctag) {
- $title = qq($title);
+ $title = qq($title);
}
$cloud->add($title, href(project=>undef, ctag=>$ctag),
$ctags_lc{$ctag}->{count});
@@ -3042,7 +3042,7 @@ sub git_populate_project_tagcloud {
foreach my $ctag (keys %ctags_lc) {
my $title = esc_html($ctags_lc{$ctag}->{topname}, -nbsp=>1);
if (defined $matched && $matched eq $ctag) {
- $title = qq($title);
+ $title = qq($title);
}
$cloud->{$ctag}{count} = $ctags_lc{$ctag}->{count};
$cloud->{$ctag}{ctag} =
@@ -4086,11 +4086,11 @@ sub print_feed_meta {
} else {
printf(''."\n",
- esc_attr($site_name),
+ esc_attr(to_utf8($site_name)),
esc_attr(href(project=>undef, action=>"project_index")));
printf(''."\n",
- esc_attr($site_name),
+ esc_attr(to_utf8($site_name)),
esc_attr(href(project=>undef, action=>"opml")));
}
}
@@ -4123,19 +4123,24 @@ sub print_nav_breadcrumbs_path {
print $cgi->a({-href => href(project => undef,
project_filter => $dirprefix,
action => "project_list")},
- esc_html($part)) . " / ";
+ esc_html($part)) . "/";
}
}
sub print_nav_breadcrumbs {
my %opts = @_;
+ my $sep = to_utf8("  âºÂ ");
+ my $first = 1;
for my $crumb (@extra_breadcrumbs, [ $home_link_str => $home_link ]) {
- print $cgi->a({-href => esc_url($crumb->[1])}, $crumb->[0]) . " / ";
+ print $sep unless $first;
+ $first = 0;
+ print $cgi->a({-href => esc_url($crumb->[1])}, $crumb->[0]);
}
if (defined $project) {
my @dirname = split '/', $project;
my $projectbasename = pop @dirname;
+ print $sep;
print_nav_breadcrumbs_path(@dirname);
print $cgi->a({-href => href(action=>"summary")}, esc_html($projectbasename));
if (defined $action) {
@@ -4144,13 +4149,14 @@ sub print_nav_breadcrumbs {
$action_print = $cgi->a({-href => href(action=>$action)},
$action);
}
- print " / $action_print";
+ print "$sep$action_print";
}
if (defined $opts{-action_extra}) {
- print " / $opts{-action_extra}";
+ print "$sep$opts{-action_extra}";
}
print "\n";
} elsif (defined $project_filter) {
+ print $sep;
print_nav_breadcrumbs_path(split '/', $project_filter);
}
}
@@ -4249,7 +4255,7 @@ sub git_end_subhead_html {
}
sub git_footer_html {
- my $feed_class = 'rss_logo';
+ my $feed_class = 'feed_logo';
print "