summaryrefslogtreecommitdiffstats
path: root/template/en
diff options
context:
space:
mode:
authormkanat%bugzilla.org <>2008-09-18 06:48:56 +0200
committermkanat%bugzilla.org <>2008-09-18 06:48:56 +0200
commit427ca00367ae35af9c87d8fe3106926d65c26ec7 (patch)
treeb22d7547ce68c255ef987fa477f10d683dd53c0d /template/en
parent249bd21ac6cc1c9ef0c9f0f8e9b6b90066dd0a02 (diff)
downloadbugzilla-427ca00367ae35af9c87d8fe3106926d65c26ec7.tar.gz
bugzilla-427ca00367ae35af9c87d8fe3106926d65c26ec7.tar.xz
Bug 452734: Remove the keyword chooser, because it's a usability regression
Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=mkanat
Diffstat (limited to 'template/en')
-rw-r--r--template/en/default/attachment/created.html.tmpl2
-rw-r--r--template/en/default/attachment/updated.html.tmpl2
-rw-r--r--template/en/default/bug/create/create.html.tmpl11
-rw-r--r--template/en/default/bug/create/created.html.tmpl2
-rw-r--r--template/en/default/bug/edit.html.tmpl11
-rw-r--r--template/en/default/bug/process/header.html.tmpl2
-rw-r--r--template/en/default/bug/show.html.tmpl2
-rw-r--r--template/en/default/filterexceptions.pl1
-rw-r--r--template/en/default/list/edit-multiple.html.tmpl9
-rw-r--r--template/en/default/list/list.html.tmpl2
10 files changed, 11 insertions, 33 deletions
diff --git a/template/en/default/attachment/created.html.tmpl b/template/en/default/attachment/created.html.tmpl
index 1f5bdb6ac..faf1b87c0 100644
--- a/template/en/default/attachment/created.html.tmpl
+++ b/template/en/default/attachment/created.html.tmpl
@@ -39,7 +39,7 @@
[% PROCESS global/header.html.tmpl
title = "Attachment $attachment.id added to $terms.Bug $attachment.bug_id"
bodyclasses = bodyclasses
- javascript_urls = [ "js/util.js", "js/keyword-chooser.js", "js/field.js",
+ javascript_urls = [ "js/util.js", "js/field.js",
"js/yui/yahoo-dom-event.js", "js/yui/calendar.js" ]
style_urls = [ "skins/standard/yui/calendar.css", "skins/standard/show_bug.css" ]
doc_section = "bug_page.html"
diff --git a/template/en/default/attachment/updated.html.tmpl b/template/en/default/attachment/updated.html.tmpl
index f7252e5c8..bc22b4666 100644
--- a/template/en/default/attachment/updated.html.tmpl
+++ b/template/en/default/attachment/updated.html.tmpl
@@ -43,7 +43,7 @@
subheader = filtered_desc
header_addl_info = "Last modified: $filtered_timestamp"
bodyclasses = bodyclasses
- javascript_urls = [ "js/util.js", "js/keyword-chooser.js", "js/field.js",
+ javascript_urls = [ "js/util.js", "js/field.js",
"js/yui/yahoo-dom-event.js", "js/yui/calendar.js" ]
style_urls = [ "skins/standard/yui/calendar.css", "skins/standard/show_bug.css" ]
doc_section = "bug_page.html"
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index 9b522f2a7..d9eab0e04 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -32,7 +32,7 @@
title = title
style_urls = [ 'skins/standard/create_attachment.css',
'skins/standard/yui/calendar.css' ]
- javascript_urls = [ "js/attachment.js", "js/util.js", "js/keyword-chooser.js",
+ javascript_urls = [ "js/attachment.js", "js/util.js",
"js/yui/yahoo-dom-event.js", "js/yui/calendar.js",
"js/field.js" ]
%]
@@ -531,7 +531,8 @@ function handleWantsAttachment(wants_attachment) {
<tr>
<th><a href="describekeywords.cgi">Keywords</a>:</th>
<td colspan="3">
- <input id="keywords" name="keywords" size="60" value="[% keywords FILTER html %]" onfocus="this.chooser.open();"> (optional)
+ <input id="keywords" name="keywords" size="60"
+ value="[% keywords FILTER html %]"> (optional)
</td>
</tr>
[% END %]
@@ -600,12 +601,6 @@ function handleWantsAttachment(wants_attachment) {
<input type="hidden" name="form_name" value="enter_bug">
</form>
-[% IF use_keywords %]
- [% PROCESS "bug/keyword-chooser.html.tmpl"
- sel_keywords = keywords.split(', ')
- %]
-[% END %]
-
[%# Links or content with more information about the bug being created. %]
[% Hook.process("end") %]
diff --git a/template/en/default/bug/create/created.html.tmpl b/template/en/default/bug/create/created.html.tmpl
index 1cf2a14f7..6226fdc64 100644
--- a/template/en/default/bug/create/created.html.tmpl
+++ b/template/en/default/bug/create/created.html.tmpl
@@ -36,7 +36,7 @@
[% PROCESS global/header.html.tmpl
title = "$terms.Bug $id Submitted"
- javascript_urls = [ "js/util.js", "js/keyword-chooser.js", "js/field.js",
+ javascript_urls = [ "js/util.js", "js/field.js",
"js/yui/yahoo-dom-event.js", "js/yui/calendar.js" ]
style_urls = [ "skins/standard/yui/calendar.css", "skins/standard/show_bug.css" ]
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 89d5319fa..6d60d8eb9 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -280,12 +280,6 @@
</table>
</form>
-[% IF use_keywords %]
- [% PROCESS "bug/keyword-chooser.html.tmpl"
- sel_keywords = bug.keywords.split(', ')
- %]
-[% END %]
-
[%############################################################################%]
[%# Block for the Title (alias and short desc) #%]
[%############################################################################%]
@@ -631,8 +625,7 @@
<b><a href="describekeywords.cgi"><u>K</u>eywords</a></b></label>:
</td>
[% PROCESS input inputname => "keywords" size => 40 colspan => 2
- value => bug.keywords.join(', ')
- onfocus => "this.chooser.open()" %]
+ value => bug.keywords.join(', ') %]
</tr>
[% END %]
[% END %]
@@ -1097,7 +1090,6 @@
<input id="[% inputname %]" name="[% inputname %]"
value="[% val FILTER html %]"[% " size=\"$size\"" IF size %]
[% " maxlength=\"$maxlength\"" IF maxlength %]
- [% " onfocus=\"$onfocus\"" IF onfocus %]
[% " spellcheck=\"$spellcheck\"" IF spellcheck %]>
[% ELSE %]
[% IF size && val.length > size %]
@@ -1116,7 +1108,6 @@
[% colspan = 0 %]
[% size = 0 %]
[% value = undef %]
- [% onfocus = undef %]
[% spellcheck = undef %]
[% END %]
diff --git a/template/en/default/bug/process/header.html.tmpl b/template/en/default/bug/process/header.html.tmpl
index 5472aa7dd..4aecfc1b8 100644
--- a/template/en/default/bug/process/header.html.tmpl
+++ b/template/en/default/bug/process/header.html.tmpl
@@ -42,7 +42,7 @@
[% END %]
[% PROCESS global/header.html.tmpl
- javascript_urls = [ "js/util.js", "js/keyword-chooser.js", "js/field.js",
+ javascript_urls = [ "js/util.js", "js/field.js",
"js/yui/yahoo-dom-event.js", "js/yui/calendar.js" ]
style_urls = [ "skins/standard/yui/calendar.css", "skins/standard/show_bug.css" ]
doc_section = "bug_page.html"
diff --git a/template/en/default/bug/show.html.tmpl b/template/en/default/bug/show.html.tmpl
index 373cfa327..cf6127413 100644
--- a/template/en/default/bug/show.html.tmpl
+++ b/template/en/default/bug/show.html.tmpl
@@ -44,7 +44,7 @@
subheader = filtered_desc
header_addl_info = "Last modified: $filtered_timestamp"
bodyclasses = bodyclasses
- javascript_urls = [ "js/util.js", "js/keyword-chooser.js", "js/field.js",
+ javascript_urls = [ "js/util.js", "js/field.js",
"js/yui/yahoo-dom-event.js", "js/yui/calendar.js" ]
style_urls = [ "skins/standard/yui/calendar.css", "skins/standard/show_bug.css" ]
doc_section = "bug_page.html"
diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index 9ac1b4339..2509ff5c2 100644
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -301,7 +301,6 @@
'" colspan=\"$colspan\"" IF colspan',
'" size=\"$size\"" IF size',
'" maxlength=\"$maxlength\"" IF maxlength',
- '" onfocus=\"$onfocus\"" IF onfocus',
'flag.status',
'" spellcheck=\"$spellcheck\"" IF spellcheck',
],
diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl
index 238763e06..190628fa9 100644
--- a/template/en/default/list/edit-multiple.html.tmpl
+++ b/template/en/default/list/edit-multiple.html.tmpl
@@ -220,8 +220,7 @@
</label>
</th>
<td colspan="3">
- <input id="keywords" name="keywords" size="32"
- onfocus = "this.chooser.open();">
+ <input id="keywords" name="keywords" size="32">
<select name="keywordaction">
<option value="add">Add these keywords</option>
<option value="delete">Delete these keywords</option>
@@ -257,12 +256,6 @@
</table>
-[% IF use_keywords %]
- [% PROCESS "bug/keyword-chooser.html.tmpl"
- sel_keywords = keywords.split(', ')
- %]
-[% END %]
-
<b><label for="comment">Additional Comments:</label></b><br>
[% INCLUDE global/textarea.html.tmpl
name = 'comment'
diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl
index 37fd0a638..8d67e6c41 100644
--- a/template/en/default/list/list.html.tmpl
+++ b/template/en/default/list/list.html.tmpl
@@ -46,7 +46,7 @@
title = title
style = style
atomlink = "buglist.cgi?$urlquerypart&title=$title&ctype=atom"
- javascript_urls = [ "js/util.js", "js/keyword-chooser.js", "js/field.js",
+ javascript_urls = [ "js/util.js", "js/field.js",
"js/yui/yahoo-dom-event.js", "js/yui/calendar.js" ]
style_urls = [ "skins/standard/buglist.css", "skins/standard/yui/calendar.css" ]
doc_section = "query.html#list"