From: lpsolit%gmail.com <>
Date: Wed, 12 Jul 2006 19:21:36 +0000 (+0000)
Subject: Bug 317694: All buttons in forms must have an id - Patches by André Batosti <batosti... 
X-Git-Tag: bugzilla-2.23.3~274
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2362793369156ae7c9c63c50a07ac2c79a9df7fa;p=thirdparty%2Fbugzilla.git

Bug 317694: All buttons in forms must have an id - Patches by André Batosti <batosti@async.com.br> r=ghendricks a=myk
---

diff --git a/template/en/default/account/auth/login-small.html.tmpl b/template/en/default/account/auth/login-small.html.tmpl
index bf8e867ff5..621f65ff04 100644
--- a/template/en/default/account/auth/login-small.html.tmpl
+++ b/template/en/default/account/auth/login-small.html.tmpl
@@ -74,7 +74,8 @@
     [% END %]
 
     <tr>
-      <td><input type="submit" name="GoAheadAndLogIn" value="Login"></td>
+      <td><input type="submit" name="GoAheadAndLogIn" value="Login"
+                 id="log_in"></td>
 
       [%# For now, password change requests only apply to the DB
         # verification method #%]
diff --git a/template/en/default/account/auth/login.html.tmpl b/template/en/default/account/auth/login.html.tmpl
index adbae970a5..56d0612d6b 100644
--- a/template/en/default/account/auth/login.html.tmpl
+++ b/template/en/default/account/auth/login.html.tmpl
@@ -87,7 +87,7 @@
   [% PROCESS "global/hidden-fields.html.tmpl"
      exclude="^Bugzilla_(login|password|restrictlogin)$" %]
 
-  <input type="submit" name="GoAheadAndLogIn" value="Log in">
+  <input type="submit" name="GoAheadAndLogIn" value="Log in" id="log_in">
   
   <p>
     (Note: you should make sure cookies are enabled for this site. 
@@ -118,7 +118,7 @@
       enter your login name below and submit a request
       to change your password.<br>
       <input size="35" name="loginname">
-      <input type="submit" value="Submit Request">
+      <input type="submit" id="request" value="Submit Request">
     </form>
   [% END %]
 
diff --git a/template/en/default/account/create.html.tmpl b/template/en/default/account/create.html.tmpl
index 8ffe6470cc..052a2b7fee 100644
--- a/template/en/default/account/create.html.tmpl
+++ b/template/en/default/account/create.html.tmpl
@@ -69,7 +69,7 @@ Create a new [% terms.Bugzilla %] account
     </tr>
   </table>
   <br>
-  <input type="submit" value="Create Account">
+  <input type="submit" id="create" value="Create Account">
 </form>
 
 [% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/account/email/confirm.html.tmpl b/template/en/default/account/email/confirm.html.tmpl
index 232d8b3b77..5bf79f0581 100644
--- a/template/en/default/account/email/confirm.html.tmpl
+++ b/template/en/default/account/email/confirm.html.tmpl
@@ -40,7 +40,7 @@
     </tr>
     <tr>
       <th align="right">&nbsp;</th>
-      <td><input type="submit" value="Submit"></td>
+      <td><input type="submit" id="confirm" value="Submit"></td>
     </tr>
   </table>
 </form>
diff --git a/template/en/default/account/exists.html.tmpl b/template/en/default/account/exists.html.tmpl
index 57baa13bb4..0685485cf9 100644
--- a/template/en/default/account/exists.html.tmpl
+++ b/template/en/default/account/exists.html.tmpl
@@ -34,7 +34,8 @@
   <input type="hidden" name="loginname" value="[% login FILTER html %]">
   A [% terms.Bugzilla %] account for <tt>[% login FILTER html %]</tt> already exists. If you
   are the account holder and have forgotten your password,
-  <input type="submit" value="submit a request to change it">.
+  <input type="submit" id="request" 
+         value="submit a request to change it">.
 </form>
 
 [% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/account/password/set-forgotten-password.html.tmpl b/template/en/default/account/password/set-forgotten-password.html.tmpl
index 147bc4bfa2..89d3dd01e4 100644
--- a/template/en/default/account/password/set-forgotten-password.html.tmpl
+++ b/template/en/default/account/password/set-forgotten-password.html.tmpl
@@ -47,7 +47,7 @@
     <tr>
       <th align="right">&nbsp;</th>
       <td>
-        <input type="submit" value="Submit">
+        <input type="submit" id="update" value="Submit">
       </td>
     </tr>
   </table>
diff --git a/template/en/default/account/prefs/prefs.html.tmpl b/template/en/default/account/prefs/prefs.html.tmpl
index 9cb66f7bd7..bb33bd6e83 100644
--- a/template/en/default/account/prefs/prefs.html.tmpl
+++ b/template/en/default/account/prefs/prefs.html.tmpl
@@ -96,7 +96,7 @@
         <tr>
           <td width="150">&nbsp;</td>
           <td>
-            <input type="submit" value="Submit Changes">
+            <input type="submit" id="update" value="Submit Changes">
           </td>
         </tr>
       </table>
diff --git a/template/en/default/admin/components/confirm-delete.html.tmpl b/template/en/default/admin/components/confirm-delete.html.tmpl
index a0387352bf..4c94813fd4 100644
--- a/template/en/default/admin/components/confirm-delete.html.tmpl
+++ b/template/en/default/admin/components/confirm-delete.html.tmpl
@@ -146,7 +146,7 @@
   <p>Do you really want to delete this component?<p>
   
   <form method="post" action="editcomponents.cgi">
-  <input type="submit" value="Yes, delete">
+  <input type="submit" id="delete" value="Yes, delete">
   <input type="hidden" name="action" value="delete">
   <input type="hidden" name="product" value="[% product.name FILTER html %]">
   <input type="hidden" name="component" value="[% comp.name FILTER html %]">
diff --git a/template/en/default/admin/components/create.html.tmpl b/template/en/default/admin/components/create.html.tmpl
index fa4c05c141..83c28ab85f 100644
--- a/template/en/default/admin/components/create.html.tmpl
+++ b/template/en/default/admin/components/create.html.tmpl
@@ -78,7 +78,7 @@
 [% END %]
   </table>
   <hr>
-  <input type="submit" value="Add">
+  <input type="submit" id="create" value="Add">
   <input type="hidden" name="action" value="new">
   <input type="hidden" name='open_name' value='All Open'>
   <input type="hidden" name='nonopen_name' value='All Closed'>
diff --git a/template/en/default/admin/components/edit.html.tmpl b/template/en/default/admin/components/edit.html.tmpl
index 22b7295dd0..9392cfd69c 100644
--- a/template/en/default/admin/components/edit.html.tmpl
+++ b/template/en/default/admin/components/edit.html.tmpl
@@ -100,7 +100,7 @@
    <input type="hidden" name="action" value="update">
    <input type="hidden" name="componentold" value="[% comp.name FILTER html %]">
    <input type="hidden" name="product" value="[% product.name FILTER html %]">
-   <input type="submit" value="Update"> or <a 
+   <input type="submit" value="Update" id="update"> or <a 
         href="editcomponents.cgi?action=del&amp;product=
         [%- product.name FILTER url_quote %]&amp;component=
         [%- comp.name FILTER url_quote %]">Delete</a> this component.
diff --git a/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl b/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl
index 31deb547f4..317f1f4b36 100644
--- a/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl
+++ b/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl
@@ -107,7 +107,7 @@
   <p>Do you really want to delete this value?</p>
 
   <form method="post" action="editvalues.cgi">
-    <input type="submit" value="Yes, delete">
+    <input type="submit" value="Yes, delete" id="delete">
     <input type="hidden" name="action" value="delete">
     <input type="hidden" name="field" value="[% field FILTER html %]">
     <input type="hidden" name="value" value="[% value FILTER html %]">
diff --git a/template/en/default/admin/fieldvalues/create.html.tmpl b/template/en/default/admin/fieldvalues/create.html.tmpl
index a23c8ddb2c..c0d3644164 100644
--- a/template/en/default/admin/fieldvalues/create.html.tmpl
+++ b/template/en/default/admin/fieldvalues/create.html.tmpl
@@ -39,7 +39,7 @@
                  value=""></td>
     </tr>
   </table>
-  <input type="submit" value="Add">
+  <input type="submit" id="create" value="Add">
   <input type="hidden" name="action" value="new">
   <input type="hidden" name='field' value="[% field FILTER html %]">
 
diff --git a/template/en/default/admin/fieldvalues/edit.html.tmpl b/template/en/default/admin/fieldvalues/edit.html.tmpl
index 58de8611b1..c798bb3a92 100644
--- a/template/en/default/admin/fieldvalues/edit.html.tmpl
+++ b/template/en/default/admin/fieldvalues/edit.html.tmpl
@@ -48,7 +48,7 @@
   <input type="hidden" name="sortkeyold" value="[% sortkey FILTER html %]">
   <input type="hidden" name="action" value="update">
   <input type="hidden" name="field" value="[% field FILTER html %]">
-  <input type="submit" value="Update">
+  <input type="submit" id="update" value="Update">
 
 </form>
 
diff --git a/template/en/default/admin/flag-type/edit.html.tmpl b/template/en/default/admin/flag-type/edit.html.tmpl
index 483a5d2de7..7f88c62bc1 100644
--- a/template/en/default/admin/flag-type/edit.html.tmpl
+++ b/template/en/default/admin/flag-type/edit.html.tmpl
@@ -209,7 +209,7 @@
     <tr>
       <th></th>
       <td>
-        <input type="submit" value="
+        <input type="submit" id="save" value="
           [%- IF (last_action == "enter" || last_action == "copy") %]Create
           [%- ELSE %]Save Changes
           [%- END %]">
diff --git a/template/en/default/admin/groups/create.html.tmpl b/template/en/default/admin/groups/create.html.tmpl
index 8da00a7994..a82acf6ce1 100644
--- a/template/en/default/admin/groups/create.html.tmpl
+++ b/template/en/default/admin/groups/create.html.tmpl
@@ -47,7 +47,7 @@
   <input type="checkbox" name="insertnew" value="1"
     [% IF Param("makeproductgroups") %] checked[% END %]>
     Insert new group into all existing products.<p>
-  <input type="submit" value="Add">
+  <input type="submit" id="create" value="Add">
   <input type="hidden" name="action" value="new">
 </form>
 
diff --git a/template/en/default/admin/groups/delete.html.tmpl b/template/en/default/admin/groups/delete.html.tmpl
index d0f66f2ad4..cca19981bc 100644
--- a/template/en/default/admin/groups/delete.html.tmpl
+++ b/template/en/default/admin/groups/delete.html.tmpl
@@ -100,7 +100,7 @@
           indicated problems first before you can proceed.</b></p>
   [% END %]
 
-  <p><input type="submit" value="Yes, delete">
+  <p><input type="submit" id="delete" value="Yes, delete">
   <input type="hidden" name="action" value="delete">
   <input type="hidden" name="group" value="[% gid FILTER html %]">
 </form>
diff --git a/template/en/default/admin/groups/edit.html.tmpl b/template/en/default/admin/groups/edit.html.tmpl
index 610d3102ef..51aba7ffe1 100644
--- a/template/en/default/admin/groups/edit.html.tmpl
+++ b/template/en/default/admin/groups/edit.html.tmpl
@@ -170,7 +170,7 @@
     [% END %]
   </table>
   
-  <input type="submit" value="Save Changes">
+  <input type="submit" id="update" value="Save Changes">
   <br>
   <dl>
     [% IF usevisibility %]
diff --git a/template/en/default/admin/keywords/confirm-delete.html.tmpl b/template/en/default/admin/keywords/confirm-delete.html.tmpl
index cfe8bf75f8..bb29437efe 100755
--- a/template/en/default/admin/keywords/confirm-delete.html.tmpl
+++ b/template/en/default/admin/keywords/confirm-delete.html.tmpl
@@ -46,7 +46,8 @@
   <input type="hidden" name="id" value="[% keyword_id %]">
   <input type="hidden" name="action" value="delete">
   <input type="hidden" name="reallydelete" value="1">
-  <input type="submit" value="Yes, really delete the keyword">
+  <input type="submit" id="delete"
+         value="Yes, really delete the keyword">
 </form>
 
 <p><a href="editkeywords.cgi">Edit other keywords</a>.</p>
diff --git a/template/en/default/admin/keywords/create.html.tmpl b/template/en/default/admin/keywords/create.html.tmpl
index 3f9f5aecfc..103aa03b29 100755
--- a/template/en/default/admin/keywords/create.html.tmpl
+++ b/template/en/default/admin/keywords/create.html.tmpl
@@ -49,7 +49,7 @@
   </table>
   <hr>
   <input type="hidden" name="id" value="-1">
-  <input type="submit" value="Add">
+  <input type="submit" id="create" value="Add">
   <input type="hidden" name="action" value="new">
 </form>
 
diff --git a/template/en/default/admin/keywords/edit.html.tmpl b/template/en/default/admin/keywords/edit.html.tmpl
index 74cef3d55c..b6b5fc932d 100755
--- a/template/en/default/admin/keywords/edit.html.tmpl
+++ b/template/en/default/admin/keywords/edit.html.tmpl
@@ -64,7 +64,7 @@
     </tr>
   </table>
 
-  <input type="submit" value="Update">
+  <input type="submit" id="update" value="Update">
   <input type="hidden" name="action" value="update">
   <input type="hidden" name="id" value="[% keyword_id %]">
 </form>
diff --git a/template/en/default/admin/milestones/confirm-delete.html.tmpl b/template/en/default/admin/milestones/confirm-delete.html.tmpl
index 6a7900e72d..1667af3b74 100644
--- a/template/en/default/admin/milestones/confirm-delete.html.tmpl
+++ b/template/en/default/admin/milestones/confirm-delete.html.tmpl
@@ -86,7 +86,7 @@
 <p>Do you really want to delete this milestone?<p>
 
 <form method="post" action="editmilestones.cgi">
-  <input type="submit" value="Yes, delete">
+  <input type="submit" id="delete" value="Yes, delete">
   <input type="hidden" name="action" value="delete">
   <input type="hidden" name="product" value="[% product.name FILTER html %]">
   <input type="hidden" name="milestone" value="[% milestone.name FILTER html %]">
diff --git a/template/en/default/admin/milestones/create.html.tmpl b/template/en/default/admin/milestones/create.html.tmpl
index 99a7f833ae..8dd23e3de8 100644
--- a/template/en/default/admin/milestones/create.html.tmpl
+++ b/template/en/default/admin/milestones/create.html.tmpl
@@ -46,7 +46,7 @@
                  value=""></td>
     </tr>
   </table>
-  <input type="submit" value="Add">
+  <input type="submit" id="create" value="Add">
   <input type="hidden" name="action" value="new">
   <input type="hidden" name='product' value="[% product.name FILTER html %]">
 
diff --git a/template/en/default/admin/milestones/edit.html.tmpl b/template/en/default/admin/milestones/edit.html.tmpl
index 1fdea30e09..f216166b1d 100644
--- a/template/en/default/admin/milestones/edit.html.tmpl
+++ b/template/en/default/admin/milestones/edit.html.tmpl
@@ -54,7 +54,7 @@
   <input type="hidden" name="milestoneold" value="[% milestone.name FILTER html %]">
   <input type="hidden" name="action" value="update">
   <input type="hidden" name="product" value="[% product.name FILTER html %]">
-  <input type="submit" value="Update">
+  <input type="submit" id="update" value="Update">
 
 </form>
 
diff --git a/template/en/default/admin/products/confirm-delete.html.tmpl b/template/en/default/admin/products/confirm-delete.html.tmpl
index 55fb49fb09..e59dd8707d 100644
--- a/template/en/default/admin/products/confirm-delete.html.tmpl
+++ b/template/en/default/admin/products/confirm-delete.html.tmpl
@@ -260,7 +260,7 @@
   <p>Do you really want to delete this product?<p>
 
   <form method="post" action="editproducts.cgi">
-    <input type="submit" value="Yes, delete">
+    <input type="submit" id="delete" value="Yes, delete">
     <input type="hidden" name="action" value="delete">
     <input type="hidden" name="product" value="[% product.name FILTER html %]">
     <input type="hidden" name="classification"
diff --git a/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl b/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl
index 6d0bfe3bb5..e21567624a 100644
--- a/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl
+++ b/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl
@@ -48,7 +48,7 @@ be removed.[% END %]
      return to the previous page.
   <p>
     <input type="hidden" name="confirmed" value="confirmed">
-    <input type="submit" value="Continue">
+    <input type="submit" id="update" value="Continue">
   </p>
 
 </form>
diff --git a/template/en/default/admin/settings/edit.html.tmpl b/template/en/default/admin/settings/edit.html.tmpl
index b5377a2410..68c8577b0b 100644
--- a/template/en/default/admin/settings/edit.html.tmpl
+++ b/template/en/default/admin/settings/edit.html.tmpl
@@ -89,7 +89,7 @@ page, and the Default Value will automatically apply to everyone.
       <tr>
         <td width="150"></td>
         <td>
-          <input type="submit" value="Submit Changes">
+          <input type="submit" id="update" value="Submit Changes">
         </td>
       </tr>
     </table>
diff --git a/template/en/default/admin/users/confirm-delete.html.tmpl b/template/en/default/admin/users/confirm-delete.html.tmpl
index 53abd5937e..6b7bdcf10d 100644
--- a/template/en/default/admin/users/confirm-delete.html.tmpl
+++ b/template/en/default/admin/users/confirm-delete.html.tmpl
@@ -424,7 +424,7 @@
 
   <form method="post" action="editusers.cgi">
     <p>
-      <input type="submit" value="Yes, delete" />
+      <input type="submit" id="delete" value="Yes, delete"/>
       <input type="hidden" name="action" value="delete" />
       <input type="hidden" name="userid" value="[% otheruser.id %]" />
       [% INCLUDE listselectionhiddenfields %]
diff --git a/template/en/default/admin/users/create.html.tmpl b/template/en/default/admin/users/create.html.tmpl
index 42aefbdb70..4cef3884a8 100644
--- a/template/en/default/admin/users/create.html.tmpl
+++ b/template/en/default/admin/users/create.html.tmpl
@@ -39,7 +39,7 @@
   %]
 </table>
 <p>
-  <input type="submit" value="Add" />
+  <input type="submit" id="add" value="Add"/>
   <input type="hidden" name="action" value="new" />
   [% INCLUDE listselectionhiddenfields %]
 </p>
diff --git a/template/en/default/admin/users/edit.html.tmpl b/template/en/default/admin/users/edit.html.tmpl
index dee1284066..f92492472c 100644
--- a/template/en/default/admin/users/edit.html.tmpl
+++ b/template/en/default/admin/users/edit.html.tmpl
@@ -101,7 +101,7 @@
 </table>
 
 <p>
-  <input type="submit" value="Update" />
+  <input type="submit" id="update" value="Update" />
   <input type="hidden" name="userid" value="[% otheruser.id %]" />
   <input type="hidden" name="action" value="update" />
   [% INCLUDE listselectionhiddenfields %]
@@ -128,7 +128,7 @@
 [% IF Param('allowuserdeletion') && editusers %]
   <form method="post" action="editusers.cgi">
   <p>
-    <input type="submit" value="Delete User" />
+    <input type="submit" id="delete" value="Delete User" />
     <input type="hidden" name="action" value="del" />
     <input type="hidden" name="userid" value="[% otheruser.id %]" />
     [% INCLUDE listselectionhiddenfields %]
diff --git a/template/en/default/admin/users/search.html.tmpl b/template/en/default/admin/users/search.html.tmpl
index 68208f7563..ae37bd10d8 100644
--- a/template/en/default/admin/users/search.html.tmpl
+++ b/template/en/default/admin/users/search.html.tmpl
@@ -50,7 +50,7 @@
   <option value="notregexp">not (case-insensitive regexp)</option>
   <option value="exact">exact (find this user)</option>
 </select>
-<input type="submit" value="Search" /></p>
+<input type="submit" id="search" value="Search" /></p>
 
 [% IF restrictablegroups.size %]
   <p><input type="checkbox" name="grouprestrict" value="1" id="grouprestrict" />
diff --git a/template/en/default/admin/versions/confirm-delete.html.tmpl b/template/en/default/admin/versions/confirm-delete.html.tmpl
index a3e8f8d620..feef860351 100644
--- a/template/en/default/admin/versions/confirm-delete.html.tmpl
+++ b/template/en/default/admin/versions/confirm-delete.html.tmpl
@@ -88,7 +88,7 @@
   <p>Do you really want to delete this version?<p>
   
   <form method="post" action="editversions.cgi">
-    <input type="submit" value="Yes, delete">
+    <input type="submit" id="delete" value="Yes, delete">
     <input type="hidden" name="action" value="delete">
     <input type="hidden" name="product" value="[% product.name FILTER html %]">
     <input type="hidden" name="version" value="[% version.name FILTER html %]">
diff --git a/template/en/default/admin/versions/create.html.tmpl b/template/en/default/admin/versions/create.html.tmpl
index 614996300c..44d43cab4e 100644
--- a/template/en/default/admin/versions/create.html.tmpl
+++ b/template/en/default/admin/versions/create.html.tmpl
@@ -40,7 +40,7 @@
                  value=""></td>
     </tr>
   </table>
-  <input type="submit" value="Add">
+  <input type="submit" id="create" value="Add">
   <input type="hidden" name="action" value="new">
   <input type="hidden" name='product' value="[% product.name FILTER html %]">
 
diff --git a/template/en/default/admin/versions/edit.html.tmpl b/template/en/default/admin/versions/edit.html.tmpl
index eff3d92ad9..7f0de26775 100644
--- a/template/en/default/admin/versions/edit.html.tmpl
+++ b/template/en/default/admin/versions/edit.html.tmpl
@@ -48,7 +48,7 @@
   <input type="hidden" name="versionold" value="[% version.name FILTER html %]">
   <input type="hidden" name="action" value="update">
   <input type="hidden" name="product" value="[% product.name FILTER html %]">
-  <input type="submit" value="Update">
+  <input type="submit" id="update" value="Update">
 
 </form>
 
diff --git a/template/en/default/attachment/choose.html.tmpl b/template/en/default/attachment/choose.html.tmpl
index 2f7b86f19e..306efea591 100644
--- a/template/en/default/attachment/choose.html.tmpl
+++ b/template/en/default/attachment/choose.html.tmpl
@@ -29,15 +29,15 @@
 <form name="choose-id" method="get" action="attachment.cgi">
   <p>Access an attachment by entering its ID into the form below:</p>
   <p>Attachment ID: <input name="id" size="6">
-  <button name="action" value="edit">&nbsp;Edit&nbsp;</button>
-  <button name="action" value="view">View</button>
+  <button name="action" value="edit" id="edit">&nbsp;Edit&nbsp;</button>
+  <button name="action" value="view" id="view">View</button>
   </p>
 </form>
 
 <form method="get" action="show_bug.cgi">
   <p>Or, access it from the list of attachments in its associated [% terms.bug %] report:</p>
   <p>[% terms.Bug %] ID: <input name="id" size="6">
-  <input type="submit" name="action" value="View">
+  <input type="submit" name="action" value="View" id="action">
   </p>
 </form>
 
diff --git a/template/en/default/attachment/confirm-delete.html.tmpl b/template/en/default/attachment/confirm-delete.html.tmpl
index c79607ba2b..ac8178eded 100644
--- a/template/en/default/attachment/confirm-delete.html.tmpl
+++ b/template/en/default/attachment/confirm-delete.html.tmpl
@@ -77,7 +77,7 @@
   <label for="reason">Reason of the deletion:</label>
   <input type="text" id="reason" name="reason" value="" size="80" maxlength="200">
   <p>
-  <input type="submit" value="Yes, delete">
+  <input type="submit" value="Yes, delete" id="delete">
   <input type="hidden" name="action" value="delete">
   <input type="hidden" name="id" value="[% a.id FILTER html %]">
   <input type="hidden" name="token" value="[% token FILTER html %]">
diff --git a/template/en/default/attachment/create.html.tmpl b/template/en/default/attachment/create.html.tmpl
index 180fc5c49e..043e1226a3 100644
--- a/template/en/default/attachment/create.html.tmpl
+++ b/template/en/default/attachment/create.html.tmpl
@@ -104,7 +104,7 @@
     [% END %]
     <tr>
       <th>&nbsp;</th>
-      <td><input type="submit" value="Submit"></td>
+      <td><input type="submit" id="create" value="Submit"></td>
     </tr>
   </table>
 
diff --git a/template/en/default/attachment/diff-header.html.tmpl b/template/en/default/attachment/diff-header.html.tmpl
index 45bf202a9a..3f2eed68d7 100644
--- a/template/en/default/attachment/diff-header.html.tmpl
+++ b/template/en/default/attachment/diff-header.html.tmpl
@@ -257,7 +257,7 @@ tbody.file pre:empty {
       [% END %]
       </select>
       and this patch
-      <input type="submit" value="Diff">
+      <input type="submit" id="diff" value="Diff">
       <input type="hidden" name="action" value="interdiff">
       <input type="hidden" name="newid" value="[% attachid %]">
       <input type="hidden" name="headers" value="[% headers FILTER html %]">
diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl
index 6dfc8b0996..51b941ca5c 100644
--- a/template/en/default/attachment/edit.html.tmpl
+++ b/template/en/default/attachment/edit.html.tmpl
@@ -268,7 +268,7 @@
             %]<br>
         </div>
 
-        <input type="submit" value="Submit"><br><br>
+        <input type="submit" value="Submit" id="update"><br><br>
         <strong>Actions:</strong>
         <a href="attachment.cgi?id=[% attachment.id %]">View</a>
         [% IF attachment.ispatch && patchviewerinstalled %]
diff --git a/template/en/default/bug/choose.html.tmpl b/template/en/default/bug/choose.html.tmpl
index c3c2c59b56..65b260bb46 100644
--- a/template/en/default/bug/choose.html.tmpl
+++ b/template/en/default/bug/choose.html.tmpl
@@ -29,7 +29,7 @@
   <p>
     You may find a single [% terms.bug %] by entering its [% terms.bug %] id here:
     <input name="id" size="6">
-    <input type="submit" value="Show Me This [% terms.Bug %]">
+    <input type="submit" id="show" value="Show Me This [% terms.Bug %]">
   </p>
 </form>
 
diff --git a/template/en/default/bug/create/confirm-create-dupe.html.tmpl b/template/en/default/bug/create/confirm-create-dupe.html.tmpl
index ef3d1ff23b..47d2ae916a 100644
--- a/template/en/default/bug/create/confirm-create-dupe.html.tmpl
+++ b/template/en/default/bug/create/confirm-create-dupe.html.tmpl
@@ -48,7 +48,7 @@ FILTER bug_link(bugid) FILTER none %].</font></p>
     [% PROCESS "global/hidden-fields.html.tmpl"
                exclude="^(Bugzilla_login|Bugzilla_password|ignore_token)$" %]
     <input type="hidden" name="ignore_token" value="[% bugid FILTER html %]">
-    <input type="submit" value="File [% terms.bug %] again">
+    <input type="submit" value="File [% terms.bug %] again" id="file_bug_again">
   </form>
 [% END %]
 
diff --git a/template/en/default/bug/create/create-guided.html.tmpl b/template/en/default/bug/create/create-guided.html.tmpl
index 9b1cf39fe4..ec74d43215 100644
--- a/template/en/default/bug/create/create-guided.html.tmpl
+++ b/template/en/default/bug/create/create-guided.html.tmpl
@@ -157,7 +157,7 @@ function PutDescription() {
     <input type="hidden" name="chfieldto" value="Now">
     <input type="hidden" name="chfield" value="[Bug creation]">
     <input type="text" name="content" size="40">
-    <input type="submit" value="Search">
+    <input type="submit" id="search" value="Search">
   </form>
 
 <p>
@@ -503,7 +503,7 @@ function PutDescription() {
 <h3>Step 3 of 3 - submit the [% terms.bug %] report</h3>
 
 <p>
-  <input type="submit" value="    Submit [% terms.Bug %] Report    "
+  <input type="submit" id="report" value="    Submit [% terms.Bug %] Report    "
    onclick="if (this.form.comment.value == '')
    { alert('Please enter some details about this [% terms.bug %].');
      this.form.comment.focus();
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index 38656b8130..1749813e37 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -456,12 +456,12 @@ function handleWantsAttachment(wants_attachment) {
   <tr>
     <td></td>
     <td colspan="3">
-      <input type="submit" value="    Commit    "
+      <input type="submit" id="commit" value="    Commit    "
              onclick="if (this.form.short_desc.value == '')
              { alert('Please enter a summary sentence for this [% terms.bug %].');
                return false; } return true;">
       &nbsp;&nbsp;&nbsp;&nbsp;
-      <input type="submit" name="maketemplate"
+      <input type="submit" name="maketemplate" id="maketemplate"
              value="Remember values as bookmarkable template">
     </td>
   </tr>
diff --git a/template/en/default/bug/dependency-graph.html.tmpl b/template/en/default/bug/dependency-graph.html.tmpl
index 4db034ea2f..48ca456c92 100644
--- a/template/en/default/bug/dependency-graph.html.tmpl
+++ b/template/en/default/bug/dependency-graph.html.tmpl
@@ -104,7 +104,7 @@
       </td>
     </tr>
   </table>
-  <input type="submit" value="Change Parameters">
+  <input type="submit" id="change" value="Change Parameters">
 </form>
 
 [% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/bug/dependency-tree.html.tmpl b/template/en/default/bug/dependency-tree.html.tmpl
index 5c54f6fe1a..b9f2cde399 100644
--- a/template/en/default/bug/dependency-tree.html.tmpl
+++ b/template/en/default/bug/dependency-tree.html.tmpl
@@ -171,7 +171,7 @@
        <input name="maxdepth" type="hidden" value="[% maxdepth %]">
      [% END %]
      <input type="hidden" name="hide_resolved" value="[% hide_resolved ? 0 : 1 %]">
-     <input type="submit" 
+     <input type="submit" id="toggle_visibility"
             value="[% IF hide_resolved %]Show[% ELSE %]Hide[% END %] Resolved">
    </form>
    </td>
@@ -188,7 +188,8 @@
    <form method="get" action="showdependencytree.cgi"
          style="display: inline; margin: 0px;">
      [%# set to one form %]
-     <input type="submit" value="&nbsp;1&nbsp;" 
+     <input type="submit" id="change_maxdepth"
+       value="&nbsp;1&nbsp;" 
        [% "disabled" IF realdepth < 2 || maxdepth == 1 %]>
      <input name="id" type="hidden" value="[% bugid %]">
      <input name="maxdepth" type="hidden" value="1">
@@ -207,7 +208,7 @@
                        : ( maxdepth ? maxdepth - 1 : realdepth - 1 )
      %]">
      <input name="hide_resolved" type="hidden" value="[% hide_resolved %]">
-     <input type="submit" value="&nbsp;&lt;&nbsp;" 
+     <input type="submit" id="decrase_depth" value="&nbsp;&lt;&nbsp;"
        [% "disabled" IF realdepth < 2 || ( maxdepth && maxdepth < 2 ) %]>
    </form>
    </td>
@@ -223,7 +224,8 @@
      <input name="id" type="hidden" value="[% bugid %]">
      <input name="hide_resolved" type="hidden" value="[% hide_resolved %]">
      <noscript>
-       <input type="submit" value="Change" [% "disabled" IF realdepth < 2 %]>
+       <input type="submit" id="change_depth" value="Change"
+              [% "disabled" IF realdepth < 2 %]>
      </noscript>
    </form>
    </td>
@@ -238,7 +240,7 @@
        <input name="maxdepth" type="hidden" value="[% maxdepth + 1 %]">
      [% END %]
      <input name="hide_resolved" type="hidden" value="[% hide_resolved %]">
-     <input type="submit" value="&nbsp;&gt;&nbsp;" 
+     <input type="submit" id="increase_depth" value="&nbsp;&gt;&nbsp;" 
         [% "disabled" IF realdepth < 2 || !maxdepth || maxdepth >= realdepth %]
     %]>
    </form>
@@ -250,7 +252,8 @@
      [%# Unlimited button %]
      <input name="id" type="hidden" value="[% bugid %]">
      <input name="hide_resolved" type="hidden" value="[% hide_resolved %]">
-     <input type="submit" value="&nbsp;Unlimited&nbsp;"
+     <input type="submit" id="remove_limit"
+       value="&nbsp;Unlimited&nbsp;"
        [% "disabled" IF maxdepth == 0 || maxdepth == realdepth %]>
    </form>
    </td>
diff --git a/template/en/default/bug/knob.html.tmpl b/template/en/default/bug/knob.html.tmpl
index 9f9e73f41a..38a4898fec 100644
--- a/template/en/default/bug/knob.html.tmpl
+++ b/template/en/default/bug/knob.html.tmpl
@@ -154,7 +154,7 @@
     [% END %]
   [% END %]
 
-  <input type="submit" value="Commit">
+  <input type="submit" value="Commit" id="commit">
   <p>
     <font size="+1">
       <b>
@@ -173,7 +173,7 @@
 
     [% IF bug.user.canmove %]
       &nbsp; <font size="+1"><b> | </b></font> &nbsp;
-      <input type="submit" name="action"
+      <input type="submit" name="action" id="action"
              value="[% Param("move-button-text") %]">
     [% END %]
   </p>
diff --git a/template/en/default/bug/process/confirm-duplicate.html.tmpl b/template/en/default/bug/process/confirm-duplicate.html.tmpl
index 815b3d43ce..4703af4267 100644
--- a/template/en/default/bug/process/confirm-duplicate.html.tmpl
+++ b/template/en/default/bug/process/confirm-duplicate.html.tmpl
@@ -68,7 +68,7 @@
   <a href="show_bug.cgi?id=[% duplicate_bug_id %]">Throw away my changes,
     and revisit [% terms.bug %] [%+ duplicate_bug_id %]</a>
 <p>
-  <input type="submit" value="Submit">
+  <input type="submit" id="process" value="Submit">
 </p>
 
 </form>
diff --git a/template/en/default/bug/process/midair.html.tmpl b/template/en/default/bug/process/midair.html.tmpl
index aa587a4ca2..620744bf7d 100644
--- a/template/en/default/bug/process/midair.html.tmpl
+++ b/template/en/default/bug/process/midair.html.tmpl
@@ -77,7 +77,7 @@ You have the following choices:
   <li>
     <form method="post" action="process_bug.cgi">
       [% PROCESS "global/hidden-fields.html.tmpl" exclude="^Bugzilla_(login|password)$" %]
-      <input type="submit" value="Submit my changes anyway">
+      <input type="submit" id="process" value="Submit my changes anyway">
         This will cause all of the above changes to be overwritten
         [% ", except for the added comment(s)" IF comments.size > start_at %].
     </form>
diff --git a/template/en/default/bug/process/verify-new-product.html.tmpl b/template/en/default/bug/process/verify-new-product.html.tmpl
index 7e21f88ae7..3b185993b0 100644
--- a/template/en/default/bug/process/verify-new-product.html.tmpl
+++ b/template/en/default/bug/process/verify-new-product.html.tmpl
@@ -101,7 +101,7 @@
   </p>
 [% END %]
 
-<input type="submit" value="Commit">
+<input type="submit" id="change_product" value="Commit">
 
 </form>
 <hr>
diff --git a/template/en/default/bug/summarize-time.html.tmpl b/template/en/default/bug/summarize-time.html.tmpl
index bf48501538..8090aa3196 100644
--- a/template/en/default/bug/summarize-time.html.tmpl
+++ b/template/en/default/bug/summarize-time.html.tmpl
@@ -268,7 +268,7 @@
   <input type="text" name="end_date" size="11" id="end_date"
   align="right" value ="[% end_date FILTER html %]" maxlength="10">
 </td><td align="right">
-  <input type="submit" value="Summarize">
+  <input type="submit" id="summarize" value="Summarize">
 </td></tr>
 <tr>
 <td>&nbsp;</td><td colspan="4">
diff --git a/template/en/default/bug/votes/delete-all.html.tmpl b/template/en/default/bug/votes/delete-all.html.tmpl
index 4c1173d543..ffede1db12 100644
--- a/template/en/default/bug/votes/delete-all.html.tmpl
+++ b/template/en/default/bug/votes/delete-all.html.tmpl
@@ -45,7 +45,7 @@
     No, go back and review my votes
   </p>
   <p>
-    <input type="submit" value="Submit">
+    <input type="submit" id="vote" value="Submit">
   </p>
 </form>
 
diff --git a/template/en/default/bug/votes/list-for-user.html.tmpl b/template/en/default/bug/votes/list-for-user.html.tmpl
index 85d25f9a29..7801b2a4a3 100644
--- a/template/en/default/bug/votes/list-for-user.html.tmpl
+++ b/template/en/default/bug/votes/list-for-user.html.tmpl
@@ -146,7 +146,7 @@
     </table>
 
     [% IF canedit %]
-      <input type="submit" value="Change My Votes">
+      <input type="submit" value="Change My Votes" id="change">
       <br>
       <br>
       To change your votes,
diff --git a/template/en/default/global/common-links.html.tmpl b/template/en/default/global/common-links.html.tmpl
index 8770276767..8040e48ff8 100644
--- a/template/en/default/global/common-links.html.tmpl
+++ b/template/en/default/global/common-links.html.tmpl
@@ -30,7 +30,7 @@
                   { alert('Please enter one or more search terms first.');
                     return false; } return true;">
     <input class="txt" type="text" name="quicksearch">
-    <input class="btn" type="submit" value="Find">
+    <input class="btn" type="submit" value="Find" id="find">
   </form> |
 
   <a href="report.cgi">Reports</a>
diff --git a/template/en/default/global/confirm-user-match.html.tmpl b/template/en/default/global/confirm-user-match.html.tmpl
index 17a812c216..607ce47835 100644
--- a/template/en/default/global/confirm-user-match.html.tmpl
+++ b/template/en/default/global/confirm-user-match.html.tmpl
@@ -150,7 +150,7 @@
   [% PROCESS "global/hidden-fields.html.tmpl" exclude="^Bugzilla_(login|password)$" %]
 
   <p>
-    <input type="submit" value="Continue">
+    <input type="submit" id="continue" value="Continue">
   </p>
 
   </form>
diff --git a/template/en/default/global/per-bug-queries.html.tmpl b/template/en/default/global/per-bug-queries.html.tmpl
index a7a6785323..9c0fc114de 100644
--- a/template/en/default/global/per-bug-queries.html.tmpl
+++ b/template/en/default/global/per-bug-queries.html.tmpl
@@ -22,7 +22,7 @@
         <input type="hidden" name="cmdtype" value="doit">
         <input type="hidden" name="remtype" value="asnamed">
         <input type="hidden" name="add_bugids" value="1">
-        <input type="submit" value="Add"> [% terms.bugs %]
+        <input type="submit" value="Add" id="add"> [% terms.bugs %]
         <input type="text" name="bug_ids" size="8" maxlength="80"> to
         [% foundq = 0 %]
         [% FOREACH q = user.queries %]
diff --git a/template/en/default/list/change-columns.html.tmpl b/template/en/default/list/change-columns.html.tmpl
index 7158460019..9b610fe0ca 100644
--- a/template/en/default/list/change-columns.html.tmpl
+++ b/template/en/default/list/change-columns.html.tmpl
@@ -64,14 +64,15 @@
   </p>
 
   <p>
-    <input type="submit" value="Change Columns">
+    <input type="submit" id="change" value="Change Columns">
   </p>
 </form>
 
 <form action="colchange.cgi">
   <input type="hidden" name="rememberedquery" value="[% buffer FILTER html %]">
   <input type="hidden" name="resetit" value="1">
-  <input type="submit" value="Reset to [% terms.Bugzilla %] default">
+  <input type="submit" id="reset" 
+         value="Reset to [% terms.Bugzilla %] default">
 </form>
 
 [% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl
index e6fed24155..687888b247 100644
--- a/template/en/default/list/edit-multiple.html.tmpl
+++ b/template/en/default/list/edit-multiple.html.tmpl
@@ -350,10 +350,10 @@
   Reassign [% terms.bugs %] to default assignee of selected component
 </label><br>
 
-<input type="submit" value="Commit">
+<input type="submit" id="commit" value="Commit">
 
 [% IF Param('move-enabled') && user.is_mover %]
-  <input type="submit" name="action" value="[% Param('move-button-text') %]">
+  <input type="submit" name="action" id="action" value="[% Param('move-button-text') %]">
 [% END %]
 
 [%############################################################################%]
diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl
index 803396cd0f..cf7215ea31 100644
--- a/template/en/default/list/list.html.tmpl
+++ b/template/en/default/list/list.html.tmpl
@@ -143,7 +143,7 @@
             <input type="hidden" name="id" value="[% id FILTER html %]">
           [% END %]
           <input type="hidden" name="format" value="multiple">
-          <input type="submit" value="Long Format">
+          <input type="submit" id="long_format" value="Long Format">
         </form>
         <form method="post" action="show_bug.cgi">
             <input type="hidden" name="ctype" value="xml">
@@ -151,13 +151,13 @@
             <input type="hidden" name="id" value="[% id FILTER html %]">
           [% END %]
             <input type="hidden" name="excludefield" value="attachmentdata">
-            <input type="submit" value="XML">
+            <input type="submit" value="XML" id="xml">
         </form>
 
         [% IF UserInGroup(Param('timetrackinggroup')) %]
           <form method="post" action="summarize_time.cgi">
             <input type="hidden" name="id" value="[% buglist_joined FILTER html %]">
-            <input type="submit" value="Time Summary">
+            <input type="submit" id="timesummary" value="Time Summary">
           </form>
         [% END %]
       </td>
@@ -213,7 +213,7 @@
       
       <td valign="middle">
         <form method="get" action="buglist.cgi">
-          <input type="submit" value="Remember search"> as 
+          <input type="submit" id="remember" value="Remember search"> as 
           <input type="hidden" name="newquery" 
                  value="[% urlquerypart FILTER html %][% "&order=$qorder" FILTER html IF order %]">
           <input type="hidden" name="cmdtype" value="doit">
diff --git a/template/en/default/list/quips.html.tmpl b/template/en/default/list/quips.html.tmpl
index 92570777ed..5bbbaecc31 100644
--- a/template/en/default/list/quips.html.tmpl
+++ b/template/en/default/list/quips.html.tmpl
@@ -76,7 +76,7 @@
     <input type="hidden" name="action" value="add">
     <input size="80" name="quip">
     <p>
-      <input type="submit" value="Add This Quip">
+      <input type="submit" id="add" value="Add This Quip">
     </p>
   </form>
 [% ELSE %]
@@ -148,7 +148,7 @@
                       +'value="Check All" onclick="SetCheckboxes(true);">');
         //--></script>
 
-      <input type="submit" value="Update">
+      <input type="submit" id="update" value="Update">
     </form>
     <br>
   [% END %]
diff --git a/template/en/default/pages/linkify.html.tmpl b/template/en/default/pages/linkify.html.tmpl
index 48b1932530..af0a86ba83 100644
--- a/template/en/default/pages/linkify.html.tmpl
+++ b/template/en/default/pages/linkify.html.tmpl
@@ -37,7 +37,7 @@
   %]
   <br>
   <input type="hidden" name="id" value="linked.html">
-  <input value="Linkify" type="submit">
+  <input type="submit" id="linkify" value="Linkify">
 </form>
 
 [% INCLUDE global/footer.html.tmpl %]
diff --git a/template/en/default/pages/quicksearch.html.tmpl b/template/en/default/pages/quicksearch.html.tmpl
index 73a0172eee..b8d412d5e8 100644
--- a/template/en/default/pages/quicksearch.html.tmpl
+++ b/template/en/default/pages/quicksearch.html.tmpl
@@ -40,7 +40,7 @@
                 { alert('Please enter one or more search terms first.');
                   return false; } return true;">
   <input type="text" size="40" name="quicksearch">
-  <input type="submit" value="Find">
+  <input type="submit" value="Find" id="find">
 </form>
 
 <h2>Getting Started</h2>
diff --git a/template/en/default/pages/quicksearchhack.html.tmpl b/template/en/default/pages/quicksearchhack.html.tmpl
index 22913ec422..47a0eacd3b 100644
--- a/template/en/default/pages/quicksearchhack.html.tmpl
+++ b/template/en/default/pages/quicksearchhack.html.tmpl
@@ -32,8 +32,8 @@
                 { alert('Please enter one or more search terms first.');
                   return false; } return true;">
   <input type="text" size="40" name="quicksearch">
-  <input type="submit" value="Find">
-  <input type="submit" name="load" value="Load Search Form">
+  <input type="submit" value="Find" id="find">
+  <input type="submit" name="load" value="Load Search Form" id="load">
 </form>
 
 <p>
diff --git a/template/en/default/reports/create-chart.html.tmpl b/template/en/default/reports/create-chart.html.tmpl
index c02e8db049..f2daeb06a5 100644
--- a/template/en/default/reports/create-chart.html.tmpl
+++ b/template/en/default/reports/create-chart.html.tmpl
@@ -87,7 +87,8 @@ function subcatSelected() {
                                    
         <td>
           <noscript>
-            <input type="submit" name="action-assemble" value="Update --&gt;">
+            <input type="submit" name="action-assemble" value="Update --&gt;"
+                   id="action-assemble">
           </noscript>
         </td>
         
@@ -97,7 +98,8 @@ function subcatSelected() {
                                    
         <td>
           <noscript>
-            <input type="submit" name="action-assemble" value="Update --&gt;">
+            <input type="submit" name="action-assemble" value="Update --&gt;"
+                   id="action-assemble">
           </noscript>
         </td>
         
@@ -116,7 +118,8 @@ function subcatSelected() {
         </td>
 
         <td align="center" valign="middle"> 
-          <input type="submit" name="action-add" value="Add To List"><br>
+          <input type="submit" name="action-add" value="Add To List"
+                 id="action-add"><br>
         </td>
       </tr>
     [% END %]
@@ -225,9 +228,9 @@ function subcatSelected() {
       <tr>
         <td valign="bottom" style="text-align: center;">
           <input type="submit" name="action-sum" value="Sum" 
-                 style="width: 5em;"><br>
+                 style="width: 5em;" id="action-sum"><br>
           <input type="submit" name="action-remove" value="Remove"
-                 style="width: 5em;">
+                 style="width: 5em;" id="action-remove">
         </td>
 
         <td style="text-align: right; vertical-align: bottom;">
@@ -247,7 +250,8 @@ function subcatSelected() {
         </td>
 
         <td style="text-align: right" valign="bottom">
-          <input type="submit" name="action-wrap" value="Chart This List">
+          <input type="submit" name="action-wrap" value="Chart This List"
+                 id="action-wrap">
         </td>
       </tr>
     </table>
diff --git a/template/en/default/reports/duplicates.html.tmpl b/template/en/default/reports/duplicates.html.tmpl
index 897bbf17f9..72f79e2554 100644
--- a/template/en/default/reports/duplicates.html.tmpl
+++ b/template/en/default/reports/duplicates.html.tmpl
@@ -120,13 +120,14 @@
 
   </table>
 
-  <input type="submit" value="Change">
+  <input type="submit" id="change" value="Change">
 </form>
 
 <form method="post" action="buglist.cgi">
   <input type="hidden" name="bug_id" value="[% bug_ids_string %]">
   <input type="hidden" name="order" value="Reuse same sort as last time">
-  Or just give this to me as a <input type="submit" value="[% terms.bug %] list">.
+  Or just give this to me as a <input type="submit" id="list" 
+                                value="[% terms.bug %] list">.
   (Note: the order may not be the same.)
 </form>
 
diff --git a/template/en/default/reports/series.html.tmpl b/template/en/default/reports/series.html.tmpl
index d758080702..1d1caf5d4e 100644
--- a/template/en/default/reports/series.html.tmpl
+++ b/template/en/default/reports/series.html.tmpl
@@ -47,7 +47,8 @@
                                        onchange => "catSelected()" } %]
         <td>
           <noscript>
-            <input type="submit" name="action-edit" value="Update --&gt;">
+            <input type="submit" name="action-edit" value="Update --&gt;"
+                   id="action-edit">
           </noscript>
         </td>
         
@@ -89,7 +90,7 @@
       </td>
       <td></td>
       <td>
-        <input type="submit" name="submit-button" 
+        <input type="submit" name="submit-button" id="submit-button"
                value="[% button_name FILTER html %]">
       </td>
     </tr>
diff --git a/template/en/default/request/queue.html.tmpl b/template/en/default/request/queue.html.tmpl
index 573e95bfa6..cf679d092b 100644
--- a/template/en/default/request/queue.html.tmpl
+++ b/template/en/default/request/queue.html.tmpl
@@ -101,7 +101,7 @@
           } %]
         [% PROCESS "global/select-menu.html.tmpl" name="group" options=groups default=cgi.param('group') %]
       </td>
-      <td><input type="submit" value="Filter"></td>
+      <td><input type="submit" id="filter" value="Filter"></td>
     </tr>
   </table>
 
diff --git a/template/en/default/search/boolean-charts.html.tmpl b/template/en/default/search/boolean-charts.html.tmpl
index c1557b6cb5..6f63f64bb3 100644
--- a/template/en/default/search/boolean-charts.html.tmpl
+++ b/template/en/default/search/boolean-charts.html.tmpl
@@ -100,8 +100,9 @@
       [% ELSE %]
         <td>
           [% newor = colnum + 1 %]
-          <input type="submit" value="Or" 
-                 name="cmd-add[% "${chartnum}-${rownum}-${newor}" %]" [% jsmagic %]>
+          <input type="submit" value="Or" [% jsmagic %]
+                 name="cmd-add[% "${chartnum}-${rownum}-${newor}" %]"
+                 id="cmd-add[% "${chartnum}-${rownum}-${newor}" %]">
         </td>
       [% END %]
       
@@ -116,11 +117,13 @@
     <tr>
       <td>
         [% newand = rownum + 1; newchart = chartnum + 1 %]
-        <input type="submit" value="And" 
-               name="cmd-add[% "${chartnum}-${newand}-0" %]" [% jsmagic %]> 
+        <input type="submit" value="And" [% jsmagic %]
+               name="cmd-add[% "${chartnum}-${newand}-0" %]"
+               id="cmd-add[% "${chartnum}-${newand}-0" %]">
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-        <input type="submit" value="Add another boolean chart" 
-               name="cmd-add[% newchart %]-0-0" [% jsmagic %]>
+        <input type="submit" value="Add another boolean chart" [% jsmagic %]
+               name="cmd-add[% newchart %]-0-0"
+               id="cmd-add[% newchart %]-0-0">
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
       </td>
     </tr>   
diff --git a/template/en/default/search/form.html.tmpl b/template/en/default/search/form.html.tmpl
index 879625d02c..ee85675863 100644
--- a/template/en/default/search/form.html.tmpl
+++ b/template/en/default/search/form.html.tmpl
@@ -145,7 +145,8 @@ function doOnSelectProduct(selectmode) {
     </td>
     <td>
       [% IF button_name %]
-        <input type="submit" value="[% button_name FILTER html %]">
+        <input type="submit" id="[% button_name FILTER html %]"
+               value="[% button_name FILTER html %]">
       [% END %]
     </td>
   </tr>
diff --git a/template/en/default/search/knob.html.tmpl b/template/en/default/search/knob.html.tmpl
index 833e37f558..4076837474 100644
--- a/template/en/default/search/knob.html.tmpl
+++ b/template/en/default/search/knob.html.tmpl
@@ -54,7 +54,8 @@
 </p>
 
 <p>  
-  <input type="submit" value="[% button_name FILTER html %]">
+  <input type="submit" id="[% button_name FILTER html %]"
+         value="[% button_name FILTER html %]">
   [% IF known_name %]
     <input type="hidden" name="query_based_on" 
            value="[% known_name FILTER html %]">
diff --git a/template/en/default/search/search-report-graph.html.tmpl b/template/en/default/search/search-report-graph.html.tmpl
index 276fe75600..cfc585d8fb 100644
--- a/template/en/default/search/search-report-graph.html.tmpl
+++ b/template/en/default/search/search-report-graph.html.tmpl
@@ -129,7 +129,8 @@ var queryform = "reportform"
 [% PROCESS search/form.html.tmpl %]
 
 <br>
-<input type="submit" value="[% button_name FILTER html %]">
+<input type="submit" id="[% button_name FILTER html %]"
+       value="[% button_name FILTER html %]">
 <input type="hidden" name="action" value="wrap">
 <hr>
 
diff --git a/template/en/default/search/search-report-table.html.tmpl b/template/en/default/search/search-report-table.html.tmpl
index 1894fa795b..b7e54a35e3 100644
--- a/template/en/default/search/search-report-table.html.tmpl
+++ b/template/en/default/search/search-report-table.html.tmpl
@@ -81,7 +81,8 @@ var queryform = "reportform"
 [% PROCESS search/form.html.tmpl %]
 
 <br>
-<input type="submit" value="[% button_name FILTER html %]">
+<input type="submit" id="[% button_name FILTER html %]"
+       value="[% button_name FILTER html %]">
 <input type="hidden" name="format" value="table">
 <input type="hidden" name="action" value="wrap">
 <hr>
diff --git a/template/en/default/search/search-specific.html.tmpl b/template/en/default/search/search-specific.html.tmpl
index dcc87130e1..8288b76e3e 100644
--- a/template/en/default/search/search-specific.html.tmpl
+++ b/template/en/default/search/search-specific.html.tmpl
@@ -110,7 +110,7 @@ for "crash secure SSL flash".
   <tr>
     <td></td>
     <td>
-      <input type="submit" value="Search">
+      <input type="submit" id="search" value="Search">
     </td>
   </tr>
 </table>
diff --git a/template/en/default/whine/schedule.html.tmpl b/template/en/default/whine/schedule.html.tmpl
index 4f94b4d711..a320ec1437 100644
--- a/template/en/default/whine/schedule.html.tmpl
+++ b/template/en/default/whine/schedule.html.tmpl
@@ -80,7 +80,7 @@
 [%# This hidden submit button must be here to set default behavior when
     the user presses return on a form input field #%]
 <input type="submit" value="Update / Commit" name="commit"
-       style="visibility: hidden">
+       style="visibility: hidden" id="commit">
 <input type="hidden" name="update" value="1">
 
 [% FOREACH event = events %]
@@ -93,7 +93,8 @@
     </th>
     <td align="right">
       <input type="submit" value="Remove Event"
-             name="remove_event_[% event.key %]">
+             name="remove_event_[% event.key %]"
+             id="remove_event_[% event.key %]">
     </td>
   </tr>
 
@@ -133,7 +134,8 @@
       <td align="left" bgcolor="#FFEEEE">
         Not scheduled to run<br>
         <input type="submit" value="Add a new schedule"
-               name="add_schedule_[% event.key %]">
+               name="add_schedule_[% event.key %]"
+               id="add_schedule_[% event.key %]">
       </td>
     </tr>
 
@@ -190,7 +192,8 @@
               </td>
               <td align="left">
                 <input type="submit" value="Remove"
-                       name="remove_schedule_[% schedule.id %]">
+                       name="remove_schedule_[% schedule.id %]"
+                       id="remove_schedule_[% schedule.id %]">
               </td>
             </tr>
           [% END %]
@@ -198,7 +201,8 @@
         <tr>
           <td>
             <input type="submit" value="Add a new schedule"
-                   name="add_schedule_[% event.key %]">
+                   name="add_schedule_[% event.key %]"
+                   id="add_schedule_[% event.key %]">
           </td>
         </tr>
 
@@ -218,10 +222,12 @@
       </td>
       <td align="left" colspan="1">
         No queries <br>
-        <input type="submit" value="Add a new query" name="add_query_[% event.key %]">
+        <input type="submit" value="Add a new query"
+               name="add_query_[% event.key %]"
+               id="add_query_[% event.key %]">
       </td>
       <td align="right" valign="bottom">
-        <input type="submit" value="Update / Commit" name="commit">
+        <input type="submit" value="Update / Commit" name="commit" id="update">
       </td>
     </tr>
 
@@ -271,7 +277,8 @@
               </td>
               <td align="right">
                 <input type="submit" value="Remove"
-                       name="remove_query_[% query.id %]">
+                       name="remove_query_[% query.id %]"
+                       id="remove_query_[% query.id %]">
               </td>
             </tr>
 
@@ -280,7 +287,8 @@
           <tr>
             <td colspan="3">
               <input type="submit" value="Add a new query"
-                     name="add_query_[% event.key %]">
+                     name="add_query_[% event.key %]"
+                     id="add_query_[% event.key %]">
             </td>
           </tr>
 
@@ -288,7 +296,7 @@
 
       </td>
       <td align="right" valign="bottom">
-        <input type="submit" value="Update / Commit" name="commit">
+        <input type="submit" value="Update / Commit" name="commit" id="update">
       </td>
     </tr>
 
@@ -299,7 +307,7 @@
 [% END %]
 
 <p align="left">
-  <input type="submit" value="Add a new event" name="add_event">
+  <input type="submit" value="Add a new event" name="add_event" id="add_event">
 </p>
 
 </form>