-[% INCLUDE global/footer %]
+[% INCLUDE global/footer.html.tmpl %]
diff --git a/template/en/default/bug/choose-xml.html.tmpl b/template/en/default/bug/choose-xml.html.tmpl
index 4456534f5..65d579679 100644
--- a/template/en/default/bug/choose-xml.html.tmpl
+++ b/template/en/default/bug/choose-xml.html.tmpl
@@ -19,7 +19,7 @@
# Contributor(s): Gervase Markham
#%]
-[% INCLUDE global/header
+[% INCLUDE global/header.html.tmpl
title = "Display bugs as XML"
%]
@@ -44,4 +44,4 @@
-[% INCLUDE global/footer %]
+[% INCLUDE global/footer.html.tmpl %]
diff --git a/template/en/default/bug/choose.html.tmpl b/template/en/default/bug/choose.html.tmpl
index b776ff255..f6c08adb6 100644
--- a/template/en/default/bug/choose.html.tmpl
+++ b/template/en/default/bug/choose.html.tmpl
@@ -20,7 +20,7 @@
#%]
[% UNLESS header_done %]
- [% INCLUDE global/header
+ [% INCLUDE global/header.html.tmpl
title = "Search by bug number"
%]
[% END %]
@@ -33,4 +33,4 @@
-[% INCLUDE global/footer %]
+[% INCLUDE global/footer.html.tmpl %]
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index cb82c8401..46995305c 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -20,7 +20,7 @@
# Ville Skyttä
#%]
-[% INCLUDE global/header
+[% INCLUDE global/header.html.tmpl
title = "Enter Bug"
h2 = "This page lets you enter a new bug into Bugzilla."
%]
@@ -230,7 +230,7 @@
-[% INCLUDE global/footer %]
+[% INCLUDE global/footer.html.tmpl %]
[%############################################################################%]
[%# Block for SELECT fields #%]
diff --git a/template/en/default/bug/create/created.html.tmpl b/template/en/default/bug/create/created.html.tmpl
index 9eba2edf5..431e478d1 100644
--- a/template/en/default/bug/create/created.html.tmpl
+++ b/template/en/default/bug/create/created.html.tmpl
@@ -19,7 +19,7 @@
# Contributor(s): Gervase Markham
#%]
-[% INCLUDE global/header
+[% INCLUDE global/header.html.tmpl
title = "Bug $bug_id Submitted"
%]
@@ -42,6 +42,6 @@
Attach a file to this bug.
-[% INCLUDE show/navigate.html.tmpl %]
+[% INCLUDE bug/navigate.html.tmpl %]
-[% INCLUDE global/footer %]
+[% INCLUDE global/footer.html.tmpl %]
diff --git a/template/en/default/bug/create/make-template.html.tmpl b/template/en/default/bug/create/make-template.html.tmpl
index c5e017529..844a0bc35 100644
--- a/template/en/default/bug/create/make-template.html.tmpl
+++ b/template/en/default/bug/create/make-template.html.tmpl
@@ -19,7 +19,7 @@
# Contributor(s): Gervase Markham
#%]
-[% INCLUDE global/header
+[% INCLUDE global/header.html.tmpl
title = "Bookmarks are your friend"
h1 = "Template constructed"
%]
@@ -30,4 +30,4 @@ going to the bookmark will bring up the enter bug page with the fields
initialized as you've requested.
-[% INCLUDE global/footer %]
+[% INCLUDE global/footer.html.tmpl %]
diff --git a/template/en/default/bug/dependency-graph.html.tmpl b/template/en/default/bug/dependency-graph.html.tmpl
index fff5f1b4d..631e49e5f 100644
--- a/template/en/default/bug/dependency-graph.html.tmpl
+++ b/template/en/default/bug/dependency-graph.html.tmpl
@@ -40,7 +40,7 @@
%]
[% END %]
-[% INCLUDE global/header %]
+[% INCLUDE global/header.html.tmpl %]
Green circles represent open bugs.
@@ -95,4 +95,4 @@
-[% INCLUDE global/footer %]
+[% INCLUDE 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 fb6163b24..bf8aa2d64 100644
--- a/template/en/default/bug/dependency-tree.html.tmpl
+++ b/template/en/default/bug/dependency-tree.html.tmpl
@@ -21,7 +21,7 @@
# Myk Melez
#%]
-[% PROCESS global/header
+[% PROCESS global/header.html.tmpl
title = "Dependency tree for Bug $bugid"
h1 = "Dependency tree for bug $bugid"
style = "strike { background-color: #d9d9d9; color: #000000; }"
@@ -73,7 +73,7 @@
[% PROCESS depthControlToolbar %]
-[% PROCESS global/footer %]
+[% PROCESS global/footer.html.tmpl %]
[%###########################################################################%]
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 9b77c23a2..b7b0d6995 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -21,7 +21,7 @@
[% filtered_desc = bug.short_desc FILTER html %]
[% UNLESS header_done %]
- [% INCLUDE global/header
+ [% INCLUDE global/header.html.tmpl
title = "Bug $bug.bug_id - $bug.short_desc"
h1 = "Bugzilla Bug $bug.bug_id"
h2 = filtered_desc
@@ -29,7 +29,7 @@
%]
[% END %]
-[% PROCESS show/navigate.html.tmpl %]
+[% PROCESS bug/navigate.html.tmpl %]
@@ -250,7 +250,7 @@
[%# *** Attachments *** %]
- [% INCLUDE attachment/list.atml
+ [% INCLUDE attachment/list.html.tmpl
attachments = bug.attachments
bugid = bug.bug_id %]
@@ -491,17 +491,17 @@
-[% PROCESS show/comments.tmpl
+[% PROCESS bug/comments.html.tmpl
comments = bug.comments
%]
-[% PROCESS show/navigate.html.tmpl %]
+[% PROCESS bug/navigate.html.tmpl %]
-[% INCLUDE global/footer %]
+[% INCLUDE global/footer.html.tmpl %]
[%############################################################################%]
diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl
index 8313323aa..970af35ea 100644
--- a/template/en/default/bug/show-multiple.html.tmpl
+++ b/template/en/default/bug/show-multiple.html.tmpl
@@ -20,7 +20,7 @@
# Gervase Markham
#%]
-[% INCLUDE global/header
+[% INCLUDE global/header.html.tmpl
title = "Full Text Bug Listing"
%]
@@ -137,7 +137,7 @@
- [% PROCESS show/comments.tmpl
+ [% PROCESS bug/comments.html.tmpl
comments = bug.comments %]
diff --git a/template/en/default/bug/votes/delete-all.html.tmpl b/template/en/default/bug/votes/delete-all.html.tmpl
index 9a63f75af..78224e6ec 100644
--- a/template/en/default/bug/votes/delete-all.html.tmpl
+++ b/template/en/default/bug/votes/delete-all.html.tmpl
@@ -19,7 +19,7 @@
# Contributor(s): Gervase Markham
#%]
-[% INCLUDE global/header
+[% INCLUDE global/header.html.tmpl
title = "Remove your votes?"
%]
@@ -43,4 +43,4 @@
-[% INCLUDE global/footer %]
+[% INCLUDE global/footer.html.tmpl %]
diff --git a/template/en/default/bug/votes/list-for-bug.html.tmpl b/template/en/default/bug/votes/list-for-bug.html.tmpl
index a9bcaf5c8..44554f0ca 100644
--- a/template/en/default/bug/votes/list-for-bug.html.tmpl
+++ b/template/en/default/bug/votes/list-for-bug.html.tmpl
@@ -19,7 +19,7 @@
# Contributor(s): Gervase Markham
#%]
-[% INCLUDE global/header
+[% INCLUDE global/header.html.tmpl
title = "Show Votes"
h2 = "Bug $bug_id"
%]
@@ -46,4 +46,4 @@
Total votes: [% total %]
-[% INCLUDE global/footer %]
+[% INCLUDE global/footer.html.tmpl %]
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 96d9ad84a..e8850fc94 100644
--- a/template/en/default/bug/votes/list-for-user.html.tmpl
+++ b/template/en/default/bug/votes/list-for-user.html.tmpl
@@ -19,7 +19,7 @@
# Contributor(s): Gervase Markham
#%]
-[% INCLUDE global/header
+[% INCLUDE global/header.html.tmpl
title = "Show Votes"
h2 = user.name
%]
@@ -127,4 +127,4 @@
Help with voting.
-[% INCLUDE global/footer %]
+[% INCLUDE global/footer.html.tmpl %]
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 %]
@@ -39,4 +39,4 @@
-[% 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 %]
@@ -54,4 +54,4 @@ Variables:
[% 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 @@
+[%# 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')) %]