Bug 135707 - template reorganisation. This makes the new copies of the templates use all the correct names internally. Patch by me, 2xr=myk.

6 files changed, 68 insertions, 8 deletions

diff --git a/template/en/default/global/choose-product.html.tmpl b/template/en/default/global/choose-product.html.tmpl
index 31d9ea7ba..03dd356dd 100644
--- a/template/en/default/global/choose-product.html.tmpl
+++ b/template/en/default/global/choose-product.html.tmpl
@@ -20,7 +20,7 @@
   #%]
 
 [% DEFAULT title = "Choose a Product" %]
-[% INCLUDE global/header %]
+[% INCLUDE global/header.html.tmpl %]
 
 <table>
 
@@ -39,4 +39,4 @@
         
 </table>
 
-[% INCLUDE global/footer %]
+[% INCLUDE global/footer.html.tmpl %]
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index 9f1fe2964..f9261b20f 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -20,7 +20,7 @@
   #%]
 
 [% UNLESS header_done %]
-  [% INCLUDE global/header %]
+  [% INCLUDE global/header.html.tmpl %]
 [% END %]
 
 <tt>
@@ -54,4 +54,4 @@ Variables:
   </pre>
 [% END %]
 
-[% INCLUDE global/footer %]
+[% INCLUDE global/footer.html.tmpl %]
diff --git a/template/en/default/global/footer.html.tmpl b/template/en/default/global/footer.html.tmpl
index 98d525a78..e8978b3a2 100644
--- a/template/en/default/global/footer.html.tmpl
+++ b/template/en/default/global/footer.html.tmpl
@@ -1,4 +1,24 @@
 <!-- 1.0@bugzilla.org -->
+[%# 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):
+  #%]
+
 [% PerformSubsts(Param('footerhtml')) %]
 
 </body>
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index dfb3cc080..bba911ff4 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -1,4 +1,24 @@
 <!-- 1.0@bugzilla.org -->
+[%# 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):
+  #%]
+
 [% DEFAULT
   title = ""
   h1 = title
diff --git a/template/en/default/global/message.html.tmpl b/template/en/default/global/message.html.tmpl
index d0c8281eb..8738def08 100644
--- a/template/en/default/global/message.html.tmpl
+++ b/template/en/default/global/message.html.tmpl
@@ -1,7 +1,27 @@
 <!-- 1.0@bugzilla.org -->
+[%# 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):
+  #%]
+  
 [% DEFAULT title = "Bugzilla Message" %]
 
-[% PROCESS global/header %]
+[% PROCESS global/header.html.tmpl %]
 
 [%# The "header" template automatically displays the contents of a "message"
     variable if it finds one, so it is not necessary to display the message
@@ -14,4 +34,4 @@
   </p>
 [% END %]
 
-[% PROCESS global/footer %]
+[% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index a76ad5fa7..3b0819f53 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -20,7 +20,7 @@
   #%]
 
 [% UNLESS header_done %]
-  [% INCLUDE global/header %]
+  [% INCLUDE global/header.html.tmpl %]
 [% END %]
 
 <table cellpadding="20">
@@ -37,4 +37,4 @@
   Please press <b>Back</b> and try again.
 </p>
 
-[% INCLUDE global/footer %]
+[% INCLUDE global/footer.html.tmpl %]