diff --git a/mozilla/webtools/bugzilla/template/default/admin/common/confirmdelete.atml b/mozilla/webtools/bugzilla/template/default/admin/common/confirmdelete.atml
index fd335fdbbd2..9b5b973537e 100644
--- a/mozilla/webtools/bugzilla/template/default/admin/common/confirmdelete.atml
+++ b/mozilla/webtools/bugzilla/template/default/admin/common/confirmdelete.atml
@@ -1,3 +1,24 @@
+[%# 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): Terry Weissman <terry@mozilla.org>
+  #                 Matthew Tuck <matty@chariot.net.au>
+  #%]
+
 [% valuetype = valuetype FILTER html %]
 [% valuetypeicap = valuetypeicap FILTER html %]
 [% name = name FILTER html %]
diff --git a/mozilla/webtools/bugzilla/template/default/admin/common/create.atml b/mozilla/webtools/bugzilla/template/default/admin/common/create.atml
index 0ba7623511b..4ddd7baae2e 100644
--- a/mozilla/webtools/bugzilla/template/default/admin/common/create.atml
+++ b/mozilla/webtools/bugzilla/template/default/admin/common/create.atml
@@ -1,3 +1,25 @@
+[%# 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): Terry Weissman <terry@mozilla.org>
+  #                 Myk Melez <myk@mozilla.org>
+  #                 Matthew Tuck <matty@chariot.net.au>
+  #%]
+
 [% valuetype = valuetype FILTER html %]
 [% valuetypeicap = valuetypeicap FILTER html %]
 
@@ -6,8 +28,8 @@
   h1 = "Create $valuetypeicap"
 %]
 
-<form method=post action=[% thiscgi %]>
-  <table border=0 cellpadding=4 cellspacing=0>
+<form method="post" action="[% thiscgi %]">
+  <table border="0" cellpadding="4" cellspacing="0">
 
     [% INCLUDE admin/common/nameanddesc %]
     [% IF resttemplate != '' %] [% INCLUDE $resttemplate %] [% END %]
@@ -16,8 +38,8 @@
 
   <hr>
 
-  <input type=submit value="Add">
-  <input type=hidden name="action" value="new">
+  <input type="submit" value="Add">
+  <input type="hidden" name="action" value="new">
 
 </form>
 
diff --git a/mozilla/webtools/bugzilla/template/default/admin/common/edit.atml b/mozilla/webtools/bugzilla/template/default/admin/common/edit.atml
index a38a6f59a23..fb392edeb1d 100644
--- a/mozilla/webtools/bugzilla/template/default/admin/common/edit.atml
+++ b/mozilla/webtools/bugzilla/template/default/admin/common/edit.atml
@@ -1,3 +1,25 @@
+[%# 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): Terry Weissman <terry@mozilla.org>
+  #                 Myk Melez <myk@mozilla.org>
+  #                 Matthew Tuck <matty@chariot.net.au>
+  #%]
+
 [% valuetype = valuetype FILTER html %]
 [% valuetypeicap = valuetypeicap FILTER html %]
 [% name = name FILTER html %]
@@ -8,16 +30,16 @@
   h1 = "Edit $valuetypeicap $name"
 %]
 
-<form method=post action=[% thiscgi %]>
-  <table border=0 cellpadding=4 cellspacing=0>
+<form method="post" action="[% thiscgi %]">
+  <table border="0" cellpadding="4" cellspacing="0">
 
-    <input type=hidden name=id value=[% id %]>
+    <input type="hidden" name="id" value="[% id %]">
 
     [% INCLUDE admin/common/nameanddesc %]
 
     <tr>
       <th align="right">Is Active?</th>
-      <td><input type="checkbox" name="isactive" value="1" [% isactive ? 'checked' : '' %]>
+      <td><input type="checkbox" name="isactive" value="1"[% isactive ? ' checked' : '' %]>
     </tr>
 
     [% IF resttemplate != '' %] [% INCLUDE $resttemplate %] [% END %]
@@ -31,8 +53,8 @@
 
   <hr>
 
-  <input type=submit value="Update">
-  <input type=hidden name="action" value="update">
+  <input type="submit" value="Update">
+  <input type="hidden" name="action" value="update">
 
 </form>
 
diff --git a/mozilla/webtools/bugzilla/template/default/admin/common/list.atml b/mozilla/webtools/bugzilla/template/default/admin/common/list.atml
index 8cae358b426..15fea124b63 100644
--- a/mozilla/webtools/bugzilla/template/default/admin/common/list.atml
+++ b/mozilla/webtools/bugzilla/template/default/admin/common/list.atml
@@ -1,3 +1,25 @@
+[%# 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): Terry Weissman <terry@mozilla.org>
+  #                 Myk Melez <myk@mozilla.org>
+  #                 Matthew Tuck <matty@chariot.net.au>
+  #%]
+
 [% valuetype = valuetype FILTER html %]
 [% valuetypeicap = valuetypeicap FILTER html %]
 
@@ -8,7 +30,7 @@
   message = message
 %]
 
-<table border=1 cellpadding=4 cellspacing=0>
+<table border="1" cellpadding="4" cellspacing="0">
   <tr bgcolor="#6666FF">
     <th align="left">Edit [% valuetype %] ...</th>
     <th align="left">Description</th>
@@ -28,13 +50,13 @@
       [% ELSE %]
         <td valign="top">[% value.description FILTER html %]</td>
       [% END %]
-      <td valign="top align="right">[% value.bugcount == 0 ? 'none' : value.bugcount %]</td>
+      <td valign="top" align="right">[% value.bugcount == 0 ? 'none' : value.bugcount %]</td>
       <th valign="top"><a href="[% thiscgi %]?action=delete&id=[% value.id %]">Delete</a></th>
     </tr>
   [% END %]
 
   <tr>
-    <td valign="top" colspan=3>Add a new [% valuetype %]</td>
+    <td valign="top" colspan="3">Add a new [% valuetype %]</td>
     <td><a href="[% thiscgi %]?action=add">Add</td>
   </tr>
 
diff --git a/mozilla/webtools/bugzilla/template/default/admin/common/nameanddesc b/mozilla/webtools/bugzilla/template/default/admin/common/nameanddesc
index 06c5ceccb95..c24a88e6b67 100644
--- a/mozilla/webtools/bugzilla/template/default/admin/common/nameanddesc
+++ b/mozilla/webtools/bugzilla/template/default/admin/common/nameanddesc
@@ -1,16 +1,37 @@
+[%# 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): Terry Weissman <terry@mozilla.org>
+  #                 Matthew Tuck <matty@chariot.net.au>
+  #%]
+
     <tr>
       <th align="right">Name:</th>
-      <td><input size=64 maxlength=[% maxnamesize %] name="name" value="[% name %]"></td>
+      <td><input size="64" maxlength=[% maxnamesize %] name="name" value="[% name %]"></td>
     </tr>
 
     <tr>
       <th align="right">Description:</th>
-      <td><textarea rows=4 cols=64 wrap=virtual name="description">[% description %]</textarea></td>
+      <td><textarea rows="4" cols="64" wrap=virtual name="description">[% description %]</textarea></td>
     </tr>
 
     [% IF usesortkeys %]
       <tr>
         <th align="right">Sortkey:</th>
-        <td><input size=4 maxlength=4 name="sortkey" value="[% sortkey %]"></td>
+        <td><input size="4" maxlength="4" name="sortkey" value="[% sortkey %]"></td>
       </tr>
     [% END %]
diff --git a/mozilla/webtools/bugzilla/template/default/admin/resolutions/create.atml b/mozilla/webtools/bugzilla/template/default/admin/resolutions/create.atml
index 5f9faf7a432..3b02e33a718 100644
--- a/mozilla/webtools/bugzilla/template/default/admin/resolutions/create.atml
+++ b/mozilla/webtools/bugzilla/template/default/admin/resolutions/create.atml
@@ -1,3 +1,23 @@
+[%# 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): Matthew Tuck <matty@chariot.net.au>
+  #%]
+
 [% INCLUDE admin/common/create.atml
   resttemplate = 'admin/resolutions/rest'
 %]
diff --git a/mozilla/webtools/bugzilla/template/default/admin/resolutions/edit.atml b/mozilla/webtools/bugzilla/template/default/admin/resolutions/edit.atml
index f12183f27f0..541e5464a91 100644
--- a/mozilla/webtools/bugzilla/template/default/admin/resolutions/edit.atml
+++ b/mozilla/webtools/bugzilla/template/default/admin/resolutions/edit.atml
@@ -1,3 +1,23 @@
+[%# 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): Matthew Tuck <matty@chariot.net.au>
+  #%]
+
 [% INCLUDE admin/common/edit.atml
   resttemplate = 'admin/resolutions/rest'
 %]
diff --git a/mozilla/webtools/bugzilla/template/default/admin/resolutions/list.atml b/mozilla/webtools/bugzilla/template/default/admin/resolutions/list.atml
index 2a3e65466da..ecd786f4bcd 100644
--- a/mozilla/webtools/bugzilla/template/default/admin/resolutions/list.atml
+++ b/mozilla/webtools/bugzilla/template/default/admin/resolutions/list.atml
@@ -1,2 +1,22 @@
+[%# 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): Matthew Tuck <matty@chariot.net.au>
+  #%]
+
 [% INCLUDE admin/common/list.atml
 %]
diff --git a/mozilla/webtools/bugzilla/template/default/admin/resolutions/rest b/mozilla/webtools/bugzilla/template/default/admin/resolutions/rest
index f132ae4a3ba..8a7c9608281 100644
--- a/mozilla/webtools/bugzilla/template/default/admin/resolutions/rest
+++ b/mozilla/webtools/bugzilla/template/default/admin/resolutions/rest
@@ -1,3 +1,23 @@
+[%# 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): Matthew Tuck <matty@chariot.net.au>
+  #%]
+
 <tr>
   <th align="right">Resolution Type:</th>
   <td>&nbsp</td>