From 94266c521b3e388b41f3dd6f74948a9ec71997d5 Mon Sep 17 00:00:00 2001 From: "myk%mozilla.org" <> Date: Wed, 3 Sep 2003 09:03:30 +0000 Subject: Fix for bug 145588: adds full-text search option for more accurate finding of individual bugs via words that appear in their descriptions/comments/summaries. r=bbaetz a=myk --- .../en/default/bug/create/create-guided.html.tmpl | 25 +---- template/en/default/filterexceptions.pl | 9 ++ template/en/default/global/messages.html.tmpl | 4 + template/en/default/list/list.html.tmpl | 1 + template/en/default/list/table.html.tmpl | 20 ++-- .../en/default/search/boolean-charts.html.tmpl | 3 +- .../en/default/search/search-advanced.html.tmpl | 11 +++ .../en/default/search/search-specific.html.tmpl | 101 +++++++++++++++++++++ template/en/default/search/search.html.tmpl | 11 +++ template/en/default/search/tabs.html.tmpl | 58 ++++++++++++ 10 files changed, 216 insertions(+), 27 deletions(-) create mode 100644 template/en/default/search/search-specific.html.tmpl create mode 100644 template/en/default/search/tabs.html.tmpl (limited to 'template/en') diff --git a/template/en/default/bug/create/create-guided.html.tmpl b/template/en/default/bug/create/create-guided.html.tmpl index 0d8217ade..fb5828fe8 100644 --- a/template/en/default/bug/create/create-guided.html.tmpl +++ b/template/en/default/bug/create/create-guided.html.tmpl @@ -152,26 +152,11 @@ function PutDescription() { For example: pop3 mail or copy paste.

- - - - - -
- - + + + + +
diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl index 34fc99380..a1f0a89f2 100644 --- a/template/en/default/filterexceptions.pl +++ b/template/en/default/filterexceptions.pl @@ -95,6 +95,15 @@ 'button_name', # ], +'search/search-specific.html.tmpl' => [ + 's', +], + +'search/tabs.html.tmpl' => [ + 'tab.name', + 'tab.description', +], + 'request/queue.html.tmpl' => [ 'column_headers.$group_field', 'column_headers.$column', diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl index 6cba576c3..e8aa8047f 100644 --- a/template/en/default/global/messages.html.tmpl +++ b/template/en/default/global/messages.html.tmpl @@ -59,6 +59,10 @@ [% link = "Go back to the query page." %] OK, the [% namedcmd FILTER html %] query is gone. + [% ELSIF message_tag == "buglist_sorted_by_relevance" %] + Bugs on this list are sorted by relevance, with the most relevant bugs + at the top. Only the 200 most relevant bugs are shown. + [% ELSIF message_tag == "change_columns" %] [% title = "Change columns" %] Resubmitting your query with new columns... diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl index 35a80d08a..f02d92904 100644 --- a/template/en/default/list/list.html.tmpl +++ b/template/en/default/list/list.html.tmpl @@ -28,6 +28,7 @@ [% DEFAULT title = "$terms.Bug List" %] [% style_urls = [ "css/buglist.css" ] %] [% qorder = order FILTER url_quote IF order %] +[% message = "buglist_sorted_by_relevance" IF sorted_by_relevance %] [%############################################################################%] diff --git a/template/en/default/list/table.html.tmpl b/template/en/default/list/table.html.tmpl index 32016390a..99be51257 100644 --- a/template/en/default/list/table.html.tmpl +++ b/template/en/default/list/table.html.tmpl @@ -85,8 +85,12 @@   [% END %] - ID + [% IF sorted_by_relevance %] + ID + [% ELSE %] + ID + [% END %] [% IF splitheader %] @@ -119,10 +123,14 @@ [% BLOCK columnheader %] - - [%- abbrev.$id.title || field_descs.$id || column.title -%] + [% IF sorted_by_relevance %] + [%- abbrev.$id.title || field_descs.$id || column.title -%] + [% ELSE %] + + [%- abbrev.$id.title || field_descs.$id || column.title -%] + [% END %] [% END %] diff --git a/template/en/default/search/boolean-charts.html.tmpl b/template/en/default/search/boolean-charts.html.tmpl index 3987352dc..2d73ae4d7 100644 --- a/template/en/default/search/boolean-charts.html.tmpl +++ b/template/en/default/search/boolean-charts.html.tmpl @@ -40,7 +40,8 @@ { name => "changedafter", description => "changed after" }, { name => "changedfrom", description => "changed from" }, { name => "changedto", description => "changed to" }, - { name => "changedby", description => "changed by" } ] %] + { name => "changedby", description => "changed by" }, + { name => "matches", description => "matches" } ] %]

diff --git a/template/en/default/search/search-advanced.html.tmpl b/template/en/default/search/search-advanced.html.tmpl index a5fa51d7d..42207a122 100644 --- a/template/en/default/search/search-advanced.html.tmpl +++ b/template/en/default/search/search-advanced.html.tmpl @@ -32,9 +32,20 @@ [% PROCESS global/header.html.tmpl title = "Search for $terms.bugs" + h1 = "" onload = "selectProduct(document.forms['queryform']);initHelp();" + style = "td.selected_tab { + border-width: 2px 2px 0px; + border-style: solid; + } + td.unselected_tab, td.spacer { + border-width: 0px 0px 2px 0px; + border-style: solid; + }" %] +[% PROCESS search/tabs.html.tmpl %] + [% button_name = "Search" %] [%# The decent help requires Javascript %] diff --git a/template/en/default/search/search-specific.html.tmpl b/template/en/default/search/search-specific.html.tmpl new file mode 100644 index 000000000..72f86fb13 --- /dev/null +++ b/template/en/default/search/search-specific.html.tmpl @@ -0,0 +1,101 @@ + +[%# The contents of this file are subject to the Mozilla Public + # License Version 1.1 (the "License"); you may not use this file + # except in compliance with the License. You may obtain a copy of + # the License at http://www.mozilla.org/MPL/ + # + # Software distributed under the License is distributed on an "AS + # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + # implied. See the License for the specific language governing + # rights and limitations under the License. + # + # The Original Code is the Bugzilla Bug Tracking System. + # + # The Initial Developer of the Original Code is Netscape Communications + # Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All + # Rights Reserved. + # + # Contributor(s): Myk Melez + #%] + +[% PROCESS global/header.html.tmpl + title = "Find a Specific Bug" + h1 = "" + style = "td.selected_tab { + border-width: 2px 2px 0px; + border-style: solid; + } + td.unselected_tab, td.spacer { + border-width: 0px 0px 2px 0px; + border-style: solid; + }" +%] + +[% PROCESS search/tabs.html.tmpl %] + +

+Find a specific bug by entering words that describe it. Bugzilla will search +bug summaries, descriptions, and comments for those words and return a list +of matching bugs sorted by relevance. +

+ +

+For example, if the bug you are looking for is a browser crash when you go +to a secure web site with an embedded Flash animation, you might search for +"crash secure SSL flash". +

+ +
+ + + + + + + + + + + + + + + + + + + + + +[% PROCESS global/footer.html.tmpl %] + diff --git a/template/en/default/search/search.html.tmpl b/template/en/default/search/search.html.tmpl index a5fa51d7d..42207a122 100644 --- a/template/en/default/search/search.html.tmpl +++ b/template/en/default/search/search.html.tmpl @@ -32,9 +32,20 @@ [% PROCESS global/header.html.tmpl title = "Search for $terms.bugs" + h1 = "" onload = "selectProduct(document.forms['queryform']);initHelp();" + style = "td.selected_tab { + border-width: 2px 2px 0px; + border-style: solid; + } + td.unselected_tab, td.spacer { + border-width: 0px 0px 2px 0px; + border-style: solid; + }" %] +[% PROCESS search/tabs.html.tmpl %] + [% button_name = "Search" %] [%# The decent help requires Javascript %] diff --git a/template/en/default/search/tabs.html.tmpl b/template/en/default/search/tabs.html.tmpl new file mode 100644 index 000000000..f6c14c0e6 --- /dev/null +++ b/template/en/default/search/tabs.html.tmpl @@ -0,0 +1,58 @@ + +[%# The contents of this file are subject to the Mozilla Public + # License Version 1.1 (the "License"); you may not use this file + # except in compliance with the License. You may obtain a copy of + # the License at http://www.mozilla.org/MPL/ + # + # Software distributed under the License is distributed on an "AS + # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + # implied. See the License for the specific language governing + # rights and limitations under the License. + # + # The Original Code is the Bugzilla Bug Tracking System. + # + # The Initial Developer of the Original Code is Netscape Communications + # Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All + # Rights Reserved. + # + # Contributor(s): Gervase Markham + # Myk Melez + #%] + +[%# INTERFACE: + # tabs: List of hashes. May not be empty. Each hash has two members: + # name: string. Name of the tab and the format it represents. + # description: string. Description of the tab (used in tab title). + #%] + +[% tabs = [ { name => '__DEFAULT__', description => "Advanced Search" }, + { name => 'specific', description => "Find a Specific Bug" } ] %] + +[% current_tab = query_format || format || "__DEFAULT__" %] + +
+
+ + + +
+ + + +
+ + + +
+ +
+ + + + [% FOREACH tab = tabs %] + [% IF tab.name == current_tab %] + + [% ELSE %] + + [% END %] + [% END %] + + + +
  + [% tab.description %] + + + [% tab.description %] + +  
+ -- cgit v1.2.3-24-g4f1b