From bf3e63a75b8fbc9d613ec3fd6289a178731692e4 Mon Sep 17 00:00:00 2001 From: Reed Loden Date: Mon, 5 Jul 2010 02:42:01 -0500 Subject: Bug 455810 - Add autocomplete support to the keywords field * Special thanks to Guy Pyrzak for the original patch [r=mkanat a=mkanat] --- template/en/default/bug/create/create.html.tmpl | 11 +++---- template/en/default/bug/edit.html.tmpl | 9 ++++-- template/en/default/bug/field.html.tmpl | 27 +++++++++++++---- template/en/default/list/edit-multiple.html.tmpl | 25 +++++++++------- template/en/default/search/field.html.tmpl | 35 ++++++++++++++++++---- .../en/default/search/search-advanced.html.tmpl | 2 +- 6 files changed, 77 insertions(+), 32 deletions(-) (limited to 'template') diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl index 0733de02a..fdac893c0 100644 --- a/template/en/default/bug/create/create.html.tmpl +++ b/template/en/default/bug/create/create.html.tmpl @@ -630,14 +630,11 @@ TUI_hide_default('expert_fields'); [% IF user.in_group('editbugs', product.id) %] [% IF use_keywords %] - [% INCLUDE "bug/field-label.html.tmpl" - field = bug_fields.keywords editable = 1 - desc_url = "describekeywords.cgi" + [% INCLUDE bug/field.html.tmpl + bug = default, field = bug_fields.keywords, editable = 1, + value = keywords, desc_url = "describekeywords.cgi", + value_span = 2 %] - - (optional) - [% END %] diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index 0ef3cba8f..5520e7699 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -591,8 +591,13 @@ : - [% PROCESS input inputname => "keywords" size => 40 colspan => 2 - value => bug.keywords.join(', ') %] + + [% INCLUDE bug/field.html.tmpl + bug = bug, field = bug_fields.keywords, value = bug.keywords + editable = bug.check_can_change_field("keywords", 0, 1), + no_tds = 1 + %] + [% END %] [% END %] diff --git a/template/en/default/bug/field.html.tmpl b/template/en/default/bug/field.html.tmpl index 97d38661c..2417ce39b 100644 --- a/template/en/default/bug/field.html.tmpl +++ b/template/en/default/bug/field.html.tmpl @@ -18,6 +18,8 @@ # Contributor(s): Myk Melez # Max Kanat-Alexander # Elliotte Martin + # Guy Pyrzak + # Reed Loden #%] [%# INTERFACE: @@ -165,22 +167,35 @@ [% FOREACH url = value %]
  • [% url FILTER html %] - [% IF editable %] - - [% END %] +
    • [% END %] [% '' IF value.size %] - [% IF editable && Param('use_see_also') %] + [% IF Param('use_see_also') %]
    [% END %] + [% CASE constants.FIELD_TYPE_KEYWORDS %] +
    + +
    +
    + [% END %] [% ELSIF field.type == constants.FIELD_TYPE_TEXTAREA %]
    [% value FILTER wrap_comment(60) diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl index 619afe8dd..87eb0c7d4 100644 --- a/template/en/default/list/edit-multiple.html.tmpl +++ b/template/en/default/list/edit-multiple.html.tmpl @@ -19,6 +19,7 @@ # Max Kanat-Alexander # Frédéric Buclin # Guy Pyrzak + # Reed Loden #%] [% PROCESS global/variables.none.tmpl %] @@ -173,7 +174,7 @@ id => "assigned_to" name => "assigned_to" value => dontchange - size => 32 + size => 40 %] @@ -188,7 +189,7 @@ id => "qa_contact" name => "qa_contact" value => dontchange - size => 32 + size => 40 %] @@ -200,7 +201,7 @@ - + + [% INCLUDE bug/field.html.tmpl + field = bug_fields.keywords, editable = 1, value = keywords + no_tds = 1 + %] + + + [% CASE constants.FIELD_TYPE_KEYWORDS %] + [% INCLUDE "bug/field-label.html.tmpl" + field = field + tag_name = "span" + editable = 1 + %] + [% INCLUDE "search/type-select.html.tmpl" + name = field.name _ "_type", + types = types, + selected = type_selected + %] +
    + +
    +
    + [% CASE constants.FIELD_TYPE_DATETIME %] [% INCLUDE "bug/field-label.html.tmpl" field = field @@ -113,5 +139,4 @@ [% END %]
    - [% END %] - \ No newline at end of file + [% END %] diff --git a/template/en/default/search/search-advanced.html.tmpl b/template/en/default/search/search-advanced.html.tmpl index 1e0cc9251..fa9819c35 100644 --- a/template/en/default/search/search-advanced.html.tmpl +++ b/template/en/default/search/search-advanced.html.tmpl @@ -38,7 +38,7 @@ var queryform = "queryform" title = "Search for $terms.bugs" onload = "doOnSelectProduct(0); enableHelp();" javascript = js_data - yui = [ 'calendar' ] + yui = [ 'autocomplete', 'calendar' ] javascript_urls = [ "js/productform.js", "js/util.js", "js/help.js" , "js/TUI.js", "js/field.js"] style_urls = [ "skins/standard/help.css" , "skins/standard/search_form.css" ] -- cgit v1.2.3-24-g4f1b