[PATCHv2 6/8] gitweb: Highlight matched part of project description when searching projects
- From
Jakub Narebski <jnareb@gmail.com>
- Date
- Feb 15, 2012, 20:38 UTC
- Message-ID
- <1329338332-30358-7-git-send-email-jnareb@gmail.com>
- In-Reply-To
- <1329338332-30358-1-git-send-email-jnareb@gmail.com>
Use esc_html_match_hl() from previous commit to mark match in the _whole_ description when searching projects.
Currently, with this commit, when searching projects there is always shown full description of a project, and not a shortened one (like for ordinary projects list view), even if the match is on project name and not project description.
Showing full description when there is match on it is useful to avoid situation where match is in shortened, invisible part... well, perhaps that could be solved (showing shortened description), but it would require much more complicated code.
Signed-off-by: Jakub Narebski <jnareb@gmail.com> --- The part about showing match using shortened description no longer applies after the following patch... though it is an RFC for now, that is why it is not mentioned in the commit message.
NOTE that we are actually always showing full description, so having full description in "title" attribute to show on mouseover over shortened title is no longer necessary, and should probably be fixed... that is unless the next patch that highlights matches in shortened description is accepted.
No changes from previous version (but see paragraph above about possible changes).
gitweb/gitweb.perl | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 5596701..a109ebb 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -5408,7 +5408,10 @@ sub git_project_list_rows { "</td>\n" . "<td>" . $cgi->a({-href => href(project=>$pr->{'path'}, action=>"summary"), -class => "list", -title => $pr->{'descr_long'}}, - esc_html($pr->{'descr'})) . "</td>\n" . + $search_regexp + ? esc_html_match_hl($pr->{'descr_long'}, $search_regexp) + : esc_html($pr->{'descr'})) . + "</td>\n" . "<td><i>" . chop_and_escape_str($pr->{'owner'}, 15) . "</i></td>\n"; print "<td class=\"". age_class($pr->{'age'}) . "\">" . (defined $pr->{'age_string'} ? $pr->{'age_string'} : "No commits") . "</td>\n" .
-- 1.7.9