Bug 80169: JavaScript-enhanced keyword editing - Patch by Teemu Mannermaa <wicked@etlicon.fi> r=justdave a=LpSolit

9 files changed, 125 insertions, 6 deletions

diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index af7285cac..883db1893 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -31,7 +31,7 @@
 [% PROCESS global/header.html.tmpl
   title = title
   style_urls = [ 'skins/standard/create_attachment.css' ]
-  javascript_urls = [ "js/attachment.js" ]
+  javascript_urls = [ "js/attachment.js", "js/util.js", "js/keyword-chooser.js" ]
 %]
 
 <script type="text/javascript">
@@ -486,7 +486,7 @@ function handleWantsAttachment(wants_attachment) {
           </strong>
         </td>
         <td colspan="3">
-          <input name="keywords" size="60" value="[% keywords FILTER html %]"> (optional)
+          <input id="keywords" name="keywords" size="60" value="[% keywords FILTER html %]" onfocus="this.chooser.open();"> (optional)
         </td>
       </tr>
     [% END %]
@@ -575,6 +575,12 @@ 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 17f057ca0..dbdf24432 100644
--- a/template/en/default/bug/create/created.html.tmpl
+++ b/template/en/default/bug/create/created.html.tmpl
@@ -37,6 +37,7 @@
 
 [% PROCESS global/header.html.tmpl
   title = "$terms.Bug $id Submitted"
+  javascript_urls = [ "js/util.js", "js/keyword-chooser.js" ]
 %]
 
 [% header_done = 1 %]
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 215595e5a..619c594e1 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -204,7 +204,8 @@
                     <b><a href="describekeywords.cgi"><u>K</u>eywords</a></b></label>:
                 </td>
                 [% PROCESS input inputname => "keywords" size => 60 colspan => 2
-                                 value => bug.keywords.join(', ') %]
+                                 value => bug.keywords.join(', ')
+                                 onfocus => "this.chooser.open()" %]
               </tr>
             [% END %]
 
@@ -542,6 +543,12 @@
 
 </form>
 
+[% IF use_keywords %]
+  [% PROCESS "bug/keyword-chooser.html.tmpl"
+    sel_keywords = bug.keywords.split(', ')
+  %]
+[% END %]
+
 [%############################################################################%]
 [%# Block for the first table in the "Details" section                       #%]
 [%############################################################################%]
@@ -826,7 +833,8 @@
     [% IF bug.check_can_change_field(inputname, 0, 1) %]
        <input id="[% inputname %]" name="[% inputname %]"
               value="[% val FILTER html %]"[% " size=\"$size\"" IF size %]
-              [% " maxlength=\"$maxlength\"" IF maxlength %]>
+              [% " maxlength=\"$maxlength\"" IF maxlength %]
+              [% " onfocus=\"$onfocus\"" IF onfocus %]>
     [% ELSE %]
        <input type="hidden" name="[% inputname %]" id="[% inputname %]"
               value="[% val FILTER html %]">
@@ -843,6 +851,7 @@
   [% colspan = 0 %]
   [% size = 0 %]
   [% value = undef %]
+  [% onfocus = undef %]
 [% END %]
 
 [%############################################################################%]
diff --git a/template/en/default/bug/keyword-chooser.html.tmpl b/template/en/default/bug/keyword-chooser.html.tmpl
new file mode 100644
index 000000000..a3d5d1b55
--- /dev/null
+++ b/template/en/default/bug/keyword-chooser.html.tmpl
@@ -0,0 +1,91 @@
+<!-- 1.0@bugzilla.org -->
+[%# ***** BEGIN LICENSE BLOCK *****
+  # Version: MPL 1.1/GPL 2.0/LGPL 2.1
+  #
+  # 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 Keyword Picker.
+  #
+  # The Initial Developer of the Original Code is America Online, Inc.
+  # Portions created by the Initial Developer are Copyright (C) 2004
+  # Mozilla Foundation. All Rights Reserved.
+  #
+  # Contributor(s):
+  #   Christopher A. Aillon <christopher@aillon.com> (Original Author)
+  #
+  # Alternatively, the contents of this file may be used under the terms of
+  # either the GNU General Public License Version 2 or later (the "GPL"), or
+  # the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+  # in which case the provisions of the GPL or the LGPL are applicable instead
+  # of those above. If you wish to allow use of your version of this file only
+  # under the terms of either the GPL or the LGPL, and not to allow others to
+  # use your version of this file under the terms of the MPL, indicate your
+  # decision by deleting the provisions above and replace them with the notice
+  # and other provisions required by the GPL or the LGPL. If you do not delete
+  # the provisions above, a recipient may use your version of this file under
+  # the terms of any one of the MPL, the GPL or the LGPL.
+  #
+  # ***** END LICENSE BLOCK *****
+  #%]
+
+[%############################################################################%]
+[%# Keyword Picker                                                           #%]
+[%############################################################################%]
+[%#                                                                          #%]
+[%# If you edit this file, you might also need to edit js/keyword-chooser.js #%]
+[%#                                                                          #%]
+[%############################################################################%]
+
+<div id="keyword-chooser" style="display: none">
+  <table>
+    <tr>
+      <td valign="top">
+        Available&nbsp;Keywords:<br>
+        <select id="keyword-list" size="5" multiple>
+        [% FOREACH kwd = valid_keywords %]
+          [% UNLESS sel_keywords && lsearch(sel_keywords, kwd) != -1 %]
+           <option value="[% kwd FILTER html %]">[% kwd FILTER html %]</option>
+          [% END %]
+        [% END %]
+        </select>
+      </td>
+      <td valign="middle">
+        <button onclick="document.getElementById('keyword-chooser').chooserElement.chooser.choose(); return false;">-></button><br>
+        <button onclick="document.getElementById('keyword-chooser').chooserElement.chooser.unchoose(); return false;"><-</button>
+      </td>
+      <td valign="top">
+        Bug&nbsp;Keywords:<br>
+        <select id="bug-keyword-list" size="5" multiple>
+        [% FOREACH kwd = valid_keywords %]
+          [% IF sel_keywords && lsearch(sel_keywords, kwd) != -1 %]
+           <option value="[% kwd FILTER html %]">[% kwd FILTER html %]</option>
+          [% END %]
+        [% END %]
+        </select>
+      </td>
+      <td valign="middle">
+        <button type="button" onclick="document.getElementById('keyword-chooser').chooserElement.chooser.ok(); return false">OK</button>
+        <br>
+        <button type="button" onclick="document.getElementById('keyword-chooser').chooserElement.chooser.cancel(); return false" style="margin-top:3px;">Cancel</button>
+      </td>
+    </tr>
+  </table>
+</div>
+
+<script type="text/javascript">
+  var validKeywords = new Array();
+
+  [% FOREACH kwd = valid_keywords %]
+    validKeywords[validKeywords.length] = "[% kwd FILTER html %]";
+  [% END %]
+
+  InitializeKeywordChooser(validKeywords);
+</script>
diff --git a/template/en/default/bug/process/header.html.tmpl b/template/en/default/bug/process/header.html.tmpl
index f15648c7d..dd384ad51 100644
--- a/template/en/default/bug/process/header.html.tmpl
+++ b/template/en/default/bug/process/header.html.tmpl
@@ -42,4 +42,6 @@
   [% title = "Change Votes" %]
 [% END %]
 
-[% PROCESS global/header.html.tmpl %]
+[% PROCESS global/header.html.tmpl
+  javascript_urls = [ "js/util.js", "js/keyword-chooser.js" ]
+ %]
diff --git a/template/en/default/bug/show.html.tmpl b/template/en/default/bug/show.html.tmpl
index c652773e8..326c7821f 100644
--- a/template/en/default/bug/show.html.tmpl
+++ b/template/en/default/bug/show.html.tmpl
@@ -40,6 +40,7 @@
                    "bz_component_$bug.component",
                    "bz_bug_$bug.bug_id"
                   ]
+    javascript_urls = [ "js/util.js", "js/keyword-chooser.js" ]
   %]
 [% END %]
 
diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index cc2e060ee..ac579115b 100644
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -315,6 +315,7 @@
   '" colspan=\"$colspan\"" IF colspan',
   '" size=\"$size\"" IF size',
   '" maxlength=\"$maxlength\"" IF maxlength',
+  '" onfocus=\"$onfocus\"" IF onfocus',
   'flag.status',
 ],
 
diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl
index 667ad1b27..668445995 100644
--- a/template/en/default/list/edit-multiple.html.tmpl
+++ b/template/en/default/list/edit-multiple.html.tmpl
@@ -204,7 +204,8 @@
         </label>
       </th>
       <td colspan="3">
-        <input id="keywords" name="keywords" size="32">
+        <input id="keywords" name="keywords" size="32" 
+               onfocus = "this.chooser.open();">
         <select name="keywordaction">
           <option value="add">Add these keywords</option>
           <option value="delete">Delete these keywords</option>
@@ -238,6 +239,12 @@
 
 </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 dfed2f024..823ca2a10 100644
--- a/template/en/default/list/list.html.tmpl
+++ b/template/en/default/list/list.html.tmpl
@@ -49,6 +49,7 @@
   title = title
   style = style
   atomlink = "buglist.cgi?$urlquerypart&title=$title&ctype=atom" 
+  javascript_urls = [ "js/util.js", "js/keyword-chooser.js" ]
 %]
 
 <div class="bz_query_head" align="center">