Chris Morgan
›
Git
›
gitweb
› commitdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
patch
|
inline
| side by side (parent:
15c0202
)
commit
grep
author
committer
pickaxe
?
search:
re
Search highlighting <mark>, diff recolouring
author
Chris Morgan
<me@chrismorgan.info>
Sat, 8 Jan 2022 07:16:55 +0000
committer
Chris Morgan
<me@chrismorgan.info>
Sat, 8 Jan 2022 07:16:55 +0000
gitweb.cgi
patch
|
blob
|
history
static/gitweb.css
patch
|
blob
|
history
diff --git
a/gitweb.cgi
b/gitweb.cgi
index 1aba48a08b115007d5bcafb3c66c248253580e5e..91047b0e0ba37560264572f5f43ca4d0e8ea89ec 100755
(executable)
--- 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 .= esc_html(substr($str, $pos, $begin - $pos), %opts)
if ($begin - $pos > 0);
- $out .=
$cgi->span({-class => $css_class}, $escaped)
;
+ $out .=
"<mark class=\"$css_class\">$escaped</mark>"
;
$pos = $end;
}
$pos = $end;
}
@@
-1892,7
+1892,7
@@
sub esc_html_match_hl {
my @matches = matchpos_list($str, $regexp);
return esc_html($str) unless @matches;
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;
}
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 =~ s/^/ /g;
$title =~ s/$/ /g;
if (defined $matched && $matched eq $ctag) {
- $title = qq(<
span class="match">$title</span
>);
+ $title = qq(<
mark>$title</mark
>);
}
$cloud->add($title, href(project=>undef, ctag=>$ctag),
$ctags_lc{$ctag}->{count});
}
$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) {
foreach my $ctag (keys %ctags_lc) {
my $title = esc_html($ctags_lc{$ctag}->{topname}, -nbsp=>1);
if (defined $matched && $matched eq $ctag) {
- $title = qq(<
span class="match">$title</span
>);
+ $title = qq(<
mark>$title</mark
>);
}
$cloud->{$ctag}{count} = $ctags_lc{$ctag}->{count};
$cloud->{$ctag}{ctag} =
}
$cloud->{$ctag}{count} = $ctags_lc{$ctag}->{count};
$cloud->{$ctag}{ctag} =
@@
-6323,7
+6323,7
@@
sub git_search_changes {
print $cgi->a({-href => href(action=>"blob", hash_base=>$co{'id'},
hash=>$set{'to_id'}, file_name=>$set{'to_file'}),
-class => "list"},
print $cgi->a({-href => href(action=>"blob", hash_base=>$co{'id'},
hash=>$set{'to_id'}, file_name=>$set{'to_file'}),
-class => "list"},
- "<
span class=\"match\">" . esc_path($set{'file'}) . "</span
>") .
+ "<
mark>" . esc_path($set{'file'}) . "</mark
>") .
"<br/>\n";
}
}
"<br/>\n";
}
}
@@
-6398,9
+6398,9
@@
sub git_search_files {
$ltext = untabify($ltext);
if ($ltext =~ m/^(.*)($search_regexp)(.*)$/i) {
$ltext = esc_html($1, -nbsp=>1);
$ltext = untabify($ltext);
if ($ltext =~ m/^(.*)($search_regexp)(.*)$/i) {
$ltext = esc_html($1, -nbsp=>1);
- $ltext .= '<
span class="match"
>';
+ $ltext .= '<
mark
>';
$ltext .= esc_html($2, -nbsp=>1);
$ltext .= esc_html($2, -nbsp=>1);
- $ltext .= '</
span
>';
+ $ltext .= '</
mark
>';
$ltext .= esc_html($3, -nbsp=>1);
} else {
$ltext = esc_html($ltext, -nbsp=>1);
$ltext .= esc_html($3, -nbsp=>1);
} else {
$ltext = esc_html($ltext, -nbsp=>1);
@@
-6465,7
+6465,7
@@
sub git_search_grep_body {
$match = esc_html($match);
$trail = esc_html($trail);
$match = esc_html($match);
$trail = esc_html($trail);
- print "$lead<
span class=\"match\">$match</span
>$trail<br />";
+ print "$lead<
mark>$match</mark
>$trail<br />";
}
}
print "</td>\n" .
}
}
print "</td>\n" .
diff --git
a/static/gitweb.css
b/static/gitweb.css
index b3bf60b5dddf7c730cdd5d882987de5340d2b71b..5560823953ef439a7cb2265a1c19b841b994ecf5 100644
(file)
--- a/
static/gitweb.css
+++ b/
static/gitweb.css
@@
-472,28
+472,28
@@
div.diff a.hash:hover {
div.diff.to_file a.path,
div.diff.to_file {
div.diff.to_file a.path,
div.diff.to_file {
- color: #0
0700
0;
+ color: #0
6
0;
}
div.diff.add {
}
div.diff.add {
-
color: #008800
;
+
background-color: #dfd
;
}
}
-div.diff.add
span.marked
{
- background-color: #a
affa
a;
+div.diff.add
mark
{
+ background-color: #a
f
a;
}
div.diff.from_file a.path,
div.diff.from_file {
}
div.diff.from_file a.path,
div.diff.from_file {
- color: #
aa00
00;
+ color: #
9
00;
}
div.diff.rem {
}
div.diff.rem {
-
color: #cc0000
;
+
background-color: #fdd
;
}
}
-div.diff.rem
span.marked
{
- background-color: #f
faa
aa;
+div.diff.rem
mark
{
+ background-color: #faa;
}
div.diff.chunk_header a,
}
div.diff.chunk_header a,
@@
-643,10
+643,6
@@
span.refs span.head {
border-color: #ccffcc #00cc33 #00cc33 #ccffcc;
}
border-color: #ccffcc #00cc33 #00cc33 #ccffcc;
}
-span.match {
- color: #e00000;
-}
-
div.binary {
font-style: italic;
}
div.binary {
font-style: italic;
}