From a12ec8dea07e38c55593109c3afaab13a29e499d Mon Sep 17 00:00:00 2001
From: "gerv%gerv.net" <>
Date: Sat, 20 Apr 2002 05:37:42 +0000
Subject: [PATCH] Bug 135707 - template reorganisation. This makes the new
 copies of the templates use all the correct names internally. Patch by me,
 2xr=myk.

---
 template/en/default/account/create.html.tmpl  |  4 ++--
 template/en/default/account/created.html.tmpl |  4 ++--
 .../default/account/email/confirm.html.tmpl   |  4 ++--
 template/en/default/account/exists.html.tmpl  |  4 ++--
 .../password/set-forgotten-password.html.tmpl |  4 ++--
 .../en/default/account/prefs/prefs.html.tmpl  |  6 ++---
 .../admin/attachstatus/create.html.tmpl       |  4 ++--
 .../admin/attachstatus/delete.html.tmpl       |  4 ++--
 .../default/admin/attachstatus/edit.html.tmpl |  4 ++--
 .../default/admin/attachstatus/list.html.tmpl |  4 ++--
 .../en/default/attachment/create.html.tmpl    |  4 ++--
 .../en/default/attachment/created.html.tmpl   |  4 ++--
 template/en/default/attachment/edit.html.tmpl |  4 ++--
 .../attachment/show-multiple.html.tmpl        |  4 ++--
 .../en/default/attachment/updated.html.tmpl   |  4 ++--
 .../en/default/bug/activity/show.html.tmpl    |  6 ++---
 template/en/default/bug/choose-xml.html.tmpl  |  4 ++--
 template/en/default/bug/choose.html.tmpl      |  4 ++--
 .../en/default/bug/create/create.html.tmpl    |  4 ++--
 .../en/default/bug/create/created.html.tmpl   |  6 ++---
 .../bug/create/make-template.html.tmpl        |  4 ++--
 .../en/default/bug/dependency-graph.html.tmpl |  4 ++--
 .../en/default/bug/dependency-tree.html.tmpl  |  4 ++--
 template/en/default/bug/edit.html.tmpl        | 12 +++++-----
 .../en/default/bug/show-multiple.html.tmpl    |  4 ++--
 .../en/default/bug/votes/delete-all.html.tmpl |  4 ++--
 .../default/bug/votes/list-for-bug.html.tmpl  |  4 ++--
 .../default/bug/votes/list-for-user.html.tmpl |  4 ++--
 .../default/global/choose-product.html.tmpl   |  4 ++--
 .../en/default/global/code-error.html.tmpl    |  4 ++--
 template/en/default/global/footer.html.tmpl   | 20 ++++++++++++++++
 template/en/default/global/header.html.tmpl   | 20 ++++++++++++++++
 template/en/default/global/message.html.tmpl  | 24 +++++++++++++++++--
 .../en/default/global/user-error.html.tmpl    |  4 ++--
 template/en/default/index.html.tmpl           |  4 ++--
 .../en/default/list/change-columns.html.tmpl  |  4 ++--
 .../en/default/list/list-simple.html.tmpl     |  2 +-
 template/en/default/list/list.html.tmpl       |  8 +++----
 template/en/default/list/quips.html.tmpl      |  4 ++--
 .../en/default/reports/components.html.tmpl   |  4 ++--
 .../en/default/reports/duplicates.html.tmpl   |  4 ++--
 .../en/default/reports/keywords.html.tmpl     |  4 ++--
 .../default/search/search-advanced.html.tmpl  |  4 ++--
 template/en/default/search/search.html.tmpl   |  4 ++--
 44 files changed, 152 insertions(+), 92 deletions(-)

diff --git a/template/en/default/account/create.html.tmpl b/template/en/default/account/create.html.tmpl
index e39d6ff5e8..fd1a5edfe3 100644
--- a/template/en/default/account/create.html.tmpl
+++ b/template/en/default/account/create.html.tmpl
@@ -19,7 +19,7 @@
   # Contributor(s): Gervase Markham <gerv@gerv.net>
   #%]
 
-[% INCLUDE global/header 
+[% INCLUDE global/header.html.tmpl 
   title = "Create a new Bugzilla account"
 %]
 
@@ -55,4 +55,4 @@
   <input type="submit" value="Create Account">
 </form>
 
-[% INCLUDE global/footer %] 
+[% INCLUDE global/footer.html.tmpl %] 
diff --git a/template/en/default/account/created.html.tmpl b/template/en/default/account/created.html.tmpl
index 46bc82ad2d..2a59eb60a0 100644
--- a/template/en/default/account/created.html.tmpl
+++ b/template/en/default/account/created.html.tmpl
@@ -19,7 +19,7 @@
   # Contributor(s): Gervase Markham <gerv@gerv.net>
   #%]
 
-[% INCLUDE global/header 
+[% INCLUDE global/header.html.tmpl 
   title = "Account Created"
 %]
 
@@ -35,4 +35,4 @@
   <a href="query.cgi?GoAheadAndLogIn=1">log in here</a>.
 </p>
 
-[% INCLUDE global/footer %] 
+[% INCLUDE 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 4d4102968d..0773df6b1d 100644
--- a/template/en/default/account/email/confirm.html.tmpl
+++ b/template/en/default/account/email/confirm.html.tmpl
@@ -19,7 +19,7 @@
   # Contributor(s):     John Vandenberg <zeroj@null.net>
   #%]
 
-[% INCLUDE global/header %]
+[% INCLUDE global/header.html.tmpl %]
 
 
 <p>
@@ -41,4 +41,4 @@
   </table>
 </form>
 
-[% INCLUDE global/footer %]
+[% INCLUDE global/footer.html.tmpl %]
diff --git a/template/en/default/account/exists.html.tmpl b/template/en/default/account/exists.html.tmpl
index a4357a5a0a..2553763f23 100644
--- a/template/en/default/account/exists.html.tmpl
+++ b/template/en/default/account/exists.html.tmpl
@@ -19,7 +19,7 @@
   # Contributor(s): Gervase Markham <gerv@gerv.net>
   #%]
 
-[% INCLUDE global/header 
+[% INCLUDE global/header.html.tmpl 
   title = "Account Exists"
 %]
 
@@ -31,4 +31,4 @@
   <input type="submit" value="submit a request to change it" />.
 </form>
 
-[% INCLUDE global/footer %]
+[% INCLUDE 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 a8ad930eee..675db62d16 100644
--- a/template/en/default/account/password/set-forgotten-password.html.tmpl
+++ b/template/en/default/account/password/set-forgotten-password.html.tmpl
@@ -19,7 +19,7 @@
   # Contributor(s): Gervase Markham <gerv@gerv.net>
   #%]
 
-[% INCLUDE global/header %]
+[% INCLUDE global/header.html.tmpl %]
 
 <p>
   To change your password, enter a new password twice:
@@ -52,4 +52,4 @@
   </table>
 </form>
 
-[% INCLUDE global/footer %]
+[% INCLUDE global/footer.html.tmpl %]
diff --git a/template/en/default/account/prefs/prefs.html.tmpl b/template/en/default/account/prefs/prefs.html.tmpl
index 5d9fc6eb35..9c103661b1 100644
--- a/template/en/default/account/prefs/prefs.html.tmpl
+++ b/template/en/default/account/prefs/prefs.html.tmpl
@@ -36,7 +36,7 @@
   #%]
 
 [% filtered_login = login FILTER html %]
-[% INCLUDE global/header
+[% INCLUDE global/header.html.tmpl
    title = "User Preferences"
    h2 = filtered_login
    style = "td.selected_tab {
@@ -90,7 +90,7 @@
 <form method="post">
   <input type="hidden" name="tab" value="[% current_tab.name %]">
 
-  [% INCLUDE "prefs/${current_tab.name}.tmpl" IF current_tab.name.defined %]
+  [% INCLUDE "account/prefs/${current_tab.name}.html.tmpl" IF current_tab.name.defined %]
 
   [% IF current_tab.saveable %]
     <input type="hidden" name="dosave" value="1">
@@ -107,7 +107,7 @@
   
 </form>
 
-[% INCLUDE global/footer %]
+[% INCLUDE global/footer.html.tmpl %]
 
     
     
diff --git a/template/en/default/admin/attachstatus/create.html.tmpl b/template/en/default/admin/attachstatus/create.html.tmpl
index 7354b38524..1837645ee6 100644
--- a/template/en/default/admin/attachstatus/create.html.tmpl
+++ b/template/en/default/admin/attachstatus/create.html.tmpl
@@ -19,7 +19,7 @@
   # Contributor(s): Myk Melez <myk@mozilla.org>
   #%]
 
-[% INCLUDE global/header 
+[% INCLUDE global/header.html.tmpl 
   title = "Create Attachment Status"
   style = "
     th { text-align: right; vertical-align: top; }
@@ -74,4 +74,4 @@
   </table>
 </form>
 
-[% INCLUDE global/footer %]
+[% INCLUDE global/footer.html.tmpl %]
diff --git a/template/en/default/admin/attachstatus/delete.html.tmpl b/template/en/default/admin/attachstatus/delete.html.tmpl
index dc50052b91..81b2057586 100644
--- a/template/en/default/admin/attachstatus/delete.html.tmpl
+++ b/template/en/default/admin/attachstatus/delete.html.tmpl
@@ -23,7 +23,7 @@
 [%# Filter off the name here to be used multiple times below %]
 [% name = name FILTER html %]
 
-[% INCLUDE global/header 
+[% INCLUDE global/header.html.tmpl 
   title = "Confirm Delete of Attachment Status '$name'" 
 %]
 
@@ -52,4 +52,4 @@
    </tr>
 </table>
 
-[% INCLUDE global/footer %]
+[% INCLUDE global/footer.html.tmpl %]
diff --git a/template/en/default/admin/attachstatus/edit.html.tmpl b/template/en/default/admin/attachstatus/edit.html.tmpl
index 1186d76376..9bdfa1a5e4 100644
--- a/template/en/default/admin/attachstatus/edit.html.tmpl
+++ b/template/en/default/admin/attachstatus/edit.html.tmpl
@@ -19,7 +19,7 @@
   # Contributor(s): Myk Melez <myk@mozilla.org>
   #%]
 
-[% INCLUDE global/header 
+[% INCLUDE global/header.html.tmpl 
   title = "Edit Attachment Status"
   style = "
     th { text-align: right; vertical-align: top; }
@@ -70,4 +70,4 @@
   </table>
 </form>
 
-[% INCLUDE global/footer %]
+[% INCLUDE global/footer.html.tmpl %]
diff --git a/template/en/default/admin/attachstatus/list.html.tmpl b/template/en/default/admin/attachstatus/list.html.tmpl
index 551ab182a9..1bb4126b90 100644
--- a/template/en/default/admin/attachstatus/list.html.tmpl
+++ b/template/en/default/admin/attachstatus/list.html.tmpl
@@ -19,7 +19,7 @@
   # Contributor(s): Myk Melez <myk@mozilla.org>
   #%]
 
-[% INCLUDE global/header 
+[% INCLUDE global/header.html.tmpl 
   title = 'Administer Attachment Statuses'
   message = message
   style = "
@@ -86,4 +86,4 @@
   }
 </script>
 
-[% INCLUDE global/footer %]
+[% INCLUDE global/footer.html.tmpl %]
diff --git a/template/en/default/attachment/create.html.tmpl b/template/en/default/attachment/create.html.tmpl
index 44533512e4..fd0b67d9da 100644
--- a/template/en/default/attachment/create.html.tmpl
+++ b/template/en/default/attachment/create.html.tmpl
@@ -24,7 +24,7 @@
 [% h1 = BLOCK %]Create New Attachment for <a href="show_bug.cgi?id=[% bugid %]">Bug #[% bugid %]</a>[% END %]
 [% h2 = BLOCK %][% bugsummary FILTER html %][% END %]
 
-[% INCLUDE global/header 
+[% INCLUDE global/header.html.tmpl 
   title = title
   h1 = h1
   h2 = h2
@@ -124,7 +124,7 @@
   //-->
 </script>
 
-[% INCLUDE global/footer %]
+[% INCLUDE global/footer.html.tmpl %]
 
 
 
diff --git a/template/en/default/attachment/created.html.tmpl b/template/en/default/attachment/created.html.tmpl
index c46afe06b1..466b7da5fc 100644
--- a/template/en/default/attachment/created.html.tmpl
+++ b/template/en/default/attachment/created.html.tmpl
@@ -19,7 +19,7 @@
   # Contributor(s): Myk Melez <myk@mozilla.org>
   #%]
 
-[% INCLUDE global/header 
+[% INCLUDE global/header.html.tmpl 
   title = "Changes Submitted"
   style = "th { text-align: left; }"
 %]
@@ -53,4 +53,4 @@
 <a href="attachment.cgi?bugid=[% bugid %]&action=enter">Create Another Attachment to Bug #[% bugid %]</a>
 </p>
 
-[% INCLUDE global/footer %]
+[% INCLUDE global/footer.html.tmpl %]
diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl
index 1d06bfb6f4..0f08cd2aff 100644
--- a/template/en/default/attachment/edit.html.tmpl
+++ b/template/en/default/attachment/edit.html.tmpl
@@ -24,7 +24,7 @@
 [% h1 = BLOCK %]Edit Attachment #[% attachid %] for <a href="show_bug.cgi?id=[% bugid %]">Bug #[% bugid %]</a>[% END %]
 [% h2 = BLOCK %][% bugsummary FILTER html %][% END %]
 
-[% INCLUDE global/header 
+[% INCLUDE global/header.html.tmpl 
   title = title
   h1 = h1
   h2 = h2
@@ -223,4 +223,4 @@
 
 <br>
 
-[% INCLUDE global/footer %]
+[% INCLUDE global/footer.html.tmpl %]
diff --git a/template/en/default/attachment/show-multiple.html.tmpl b/template/en/default/attachment/show-multiple.html.tmpl
index 88c92b9699..7fc7d60ab0 100644
--- a/template/en/default/attachment/show-multiple.html.tmpl
+++ b/template/en/default/attachment/show-multiple.html.tmpl
@@ -20,7 +20,7 @@
   #%]
 
 [% filtered_summary = bugsummary FILTER html %]
-[% INCLUDE global/header 
+[% INCLUDE global/header.html.tmpl 
   title = "View All Attachments for Bug #$bugid"
   h1 = "View All Attachments for <a href=\"show_bug.cgi?id=$bugid\">Bug #$bugid</a>"
   h2 = filtered_summary
@@ -95,4 +95,4 @@
 
 [% END %]
 
-[% INCLUDE global/footer %]
+[% INCLUDE global/footer.html.tmpl %]
diff --git a/template/en/default/attachment/updated.html.tmpl b/template/en/default/attachment/updated.html.tmpl
index e245957474..eec9c6f3a8 100644
--- a/template/en/default/attachment/updated.html.tmpl
+++ b/template/en/default/attachment/updated.html.tmpl
@@ -20,7 +20,7 @@
   #                 Gervase Markham <gerv@gerv.net>
   #%]
 
-[% INCLUDE global/header 
+[% INCLUDE global/header.html.tmpl 
   title = "Changes Submitted"
   style = "th { text-align: left; }"
 %]
@@ -43,4 +43,4 @@
   </tr>
 </table>
 
-[% INCLUDE global/footer %]
+[% INCLUDE global/footer.html.tmpl %]
diff --git a/template/en/default/bug/activity/show.html.tmpl b/template/en/default/bug/activity/show.html.tmpl
index 387ba6d6c6..d3ca1ac0b3 100644
--- a/template/en/default/bug/activity/show.html.tmpl
+++ b/template/en/default/bug/activity/show.html.tmpl
@@ -26,7 +26,7 @@
   # activity.html.tmpl template fulfilled.
   #%]
  
-[% INCLUDE global/header 
+[% INCLUDE global/header.html.tmpl 
   title = "Changes made to bug $bug_id"
   h1 = "Activity log"
   h2 = "Bug <a href='show_bug.cgi?id=$bug_id'>$bug_id</a>"
@@ -34,10 +34,10 @@
 
 <br>
 
-[% INCLUDE show/activity.html.tmpl %]
+[% INCLUDE bug/activity/table.html.tmpl %]
 
 <p>
   <a href="show_bug.cgi?id=[% bug_id %]">Back to bug [% bug_id %]</a>
 </p>
 
-[% 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 4456534f5b..65d5796790 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 <gerv@gerv.net>
   #%]
 
-[% INCLUDE global/header 
+[% INCLUDE global/header.html.tmpl 
    title = "Display bugs as XML"
  %]
 
@@ -44,4 +44,4 @@
   </table>
 </form>
 
-[% 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 b776ff255e..f6c08adb60 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 @@
   </p>
 </form>
 
-[% 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 cb82c8401a..46995305c0 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ä <ville.skytta@iki.fi>
   #%]
 
-[% 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 @@
   <input type="hidden" name="form_name" value="enter_bug">
 </form>
 
-[% 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 9eba2edf52..431e478d1e 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 <gerv@gerv.net>
   #%]
 
-[% INCLUDE global/header 
+[% INCLUDE global/header.html.tmpl 
   title = "Bug $bug_id Submitted"
 %]
 
@@ -42,6 +42,6 @@
   Attach a file to this bug</a>.
 </p>
 
-[% 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 c5e0175291..844a0bc355 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 <gerv@gerv.net>
   #%]
 
-[% 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.
 </p>
 
-[% 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 fff5f1b4d3..631e49e5f5 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 %]
 
 <p>
   Green circles represent open bugs.
@@ -95,4 +95,4 @@
   <input type="submit" value="Change Parameters">
 </form>
 
-[% 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 fb6163b241..bf8aa2d64a 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 <myk@mozilla.org>
   #%]
 
-[% PROCESS global/header 
+[% PROCESS global/header.html.tmpl 
    title = "Dependency tree for Bug $bugid"
    h1    = "Dependency tree for bug <a href=\"show_bug.cgi?id=$bugid\">$bugid</a>"
    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 9b77c23a24..b7b0d69958 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 %]
 
 <hr>
 
@@ -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 @@
 </table>
 <hr>
 
-[% PROCESS show/comments.tmpl 
+[% PROCESS bug/comments.html.tmpl 
    comments = bug.comments 
  %]
   
 <hr>
 
-[% PROCESS show/navigate.html.tmpl %]
+[% PROCESS bug/navigate.html.tmpl %]
 
 <br>
 
-[% 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 8313323aaa..970af35ea4 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 <gerv@gerv.net>
   #%]
 
-[% INCLUDE global/header 
+[% INCLUDE global/header.html.tmpl 
   title = "Full Text Bug Listing"
 %]
 
@@ -137,7 +137,7 @@
     </tr>
   </table>
 
-  [% PROCESS show/comments.tmpl 
+  [% PROCESS bug/comments.html.tmpl 
      comments = bug.comments %]
   
   <hr>
diff --git a/template/en/default/bug/votes/delete-all.html.tmpl b/template/en/default/bug/votes/delete-all.html.tmpl
index 9a63f75afb..78224e6eca 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 <gerv@gerv.net>
   #%]
 
-[% INCLUDE global/header
+[% INCLUDE global/header.html.tmpl
            title = "Remove your votes?"
  %]
 
@@ -43,4 +43,4 @@
   </p>
 </form>
 
-[% 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 a9bcaf5c81..44554f0ca9 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 <gerv@gerv.net>
   #%]
 
-[% INCLUDE global/header
+[% INCLUDE global/header.html.tmpl
            title = "Show Votes"
            h2 = "Bug <a href='show_bug.cgi?id=$bug_id'>$bug_id</a>"
  %]
@@ -46,4 +46,4 @@
 
 <p>Total votes: [% total %]</p>
 
-[% 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 96d9ad84aa..e8850fc946 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 <gerv@gerv.net>
   #%]
 
-[% INCLUDE global/header
+[% INCLUDE global/header.html.tmpl
            title = "Show Votes"
            h2 = user.name
  %]
@@ -127,4 +127,4 @@
   <a href="votehelp.html">Help with voting</a>.
 </p>
 
-[% 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 31d9ea7bad..03dd356ddb 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 9f1fe29643..f9261b20fe 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 98d525a788..e8978b3a2f 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 dfb3cc0801..bba911ff4f 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 d0c8281eb5..8738def080 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 a76ad5fa77..3b0819f531 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 %]
diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl
index 40117297cb..118e04339a 100644
--- a/template/en/default/index.html.tmpl
+++ b/template/en/default/index.html.tmpl
@@ -21,7 +21,7 @@
   #                 Jacob Steenhagen <jake@acutex.net>
   #%]
 
-[% INCLUDE global/header
+[% INCLUDE global/header.html.tmpl
   title = 'Bugzilla Main Page'
 %]
 
@@ -85,4 +85,4 @@ document.forms['f'].id.focus();
 //-->
 </script>
 
-[% INCLUDE global/footer %]
+[% INCLUDE global/footer.html.tmpl %]
diff --git a/template/en/default/list/change-columns.html.tmpl b/template/en/default/list/change-columns.html.tmpl
index d3b008c49e..e67b347b6d 100644
--- a/template/en/default/list/change-columns.html.tmpl
+++ b/template/en/default/list/change-columns.html.tmpl
@@ -19,7 +19,7 @@
   # Contributor(s): Dave Lawrence <dkl@redhat.com>
   #%]
 
-[% INCLUDE global/header
+[% INCLUDE global/header.html.tmpl
   title = "Change Columns"
 %]
 
@@ -47,5 +47,5 @@ on submit.  (Cookies are required.)
 </form>
 </p>
 
-[% INCLUDE global/footer %]
+[% INCLUDE global/footer.html.tmpl %]
 
diff --git a/template/en/default/list/list-simple.html.tmpl b/template/en/default/list/list-simple.html.tmpl
index 883b278d7f..3dd6656d2c 100644
--- a/template/en/default/list/list-simple.html.tmpl
+++ b/template/en/default/list/list-simple.html.tmpl
@@ -39,7 +39,7 @@
   </head>
 
   <body>
-    [% PROCESS buglist/table.tmpl %]
+    [% PROCESS list/table.html.tmpl %]
   </body>
 
 </html>
diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl
index 150ac2c540..1665d7a1e3 100644
--- a/template/en/default/list/list.html.tmpl
+++ b/template/en/default/list/list.html.tmpl
@@ -31,7 +31,7 @@
 [%# Page Header                                                              #%]
 [%############################################################################%]
 
-[% PROCESS global/header
+[% PROCESS global/header.html.tmpl
   title = title
   style = style
 %]
@@ -82,7 +82,7 @@
 [%############################################################################%]
 
 [% FLUSH %]
-[% PROCESS buglist/table.tmpl %]
+[% PROCESS list/table.html.tmpl %]
 
 [%############################################################################%]
 [%# Succeeding Status Line                                                   #%]
@@ -113,7 +113,7 @@
 
 [% IF dotweak %]
 
-  [% PROCESS "buglist/change-form.tmpl" %]
+  [% PROCESS "list/edit-multiple.html.tmpl" %]
   
   </form>
 
@@ -157,5 +157,5 @@
 [%# Page Footer                                                              #%]
 [%############################################################################%]
 
-[% PROCESS global/footer %]
+[% PROCESS global/footer.html.tmpl %]
 
diff --git a/template/en/default/list/quips.html.tmpl b/template/en/default/list/quips.html.tmpl
index d055576500..d7d2a04d64 100644
--- a/template/en/default/list/quips.html.tmpl
+++ b/template/en/default/list/quips.html.tmpl
@@ -19,7 +19,7 @@
   # Contributor(s): Gervase Markham <gerv@gerv.net>
   #%]
 
-[% INCLUDE global/header
+[% INCLUDE global/header.html.tmpl
            title = "Bugzilla Quip System"
            h1 = "Add your own clever headline"
  %]
@@ -62,4 +62,4 @@
   </p>
 [% END %]
 
-[% INCLUDE global/footer %]
+[% INCLUDE global/footer.html.tmpl %]
diff --git a/template/en/default/reports/components.html.tmpl b/template/en/default/reports/components.html.tmpl
index c9dacca109..0241d39097 100644
--- a/template/en/default/reports/components.html.tmpl
+++ b/template/en/default/reports/components.html.tmpl
@@ -20,7 +20,7 @@
   #%]
 
 [% filtered_product = product FILTER html %]
-[% INCLUDE global/header 
+[% INCLUDE global/header.html.tmpl 
   title = "Components for $product"
   h2 = filtered_product %]
 
@@ -53,7 +53,7 @@
   </table>
 [% END %]
 
-[% INCLUDE global/footer %]
+[% INCLUDE global/footer.html.tmpl %]
 
 [%############################################################################%]
 [%# BLOCK for components                                                      %]
diff --git a/template/en/default/reports/duplicates.html.tmpl b/template/en/default/reports/duplicates.html.tmpl
index 1d2e1cbb85..f442bd54fe 100644
--- a/template/en/default/reports/duplicates.html.tmpl
+++ b/template/en/default/reports/duplicates.html.tmpl
@@ -48,7 +48,7 @@
   [% title = "Most Frequently Reported Bugs" %]
 [% END%]
 
-[% INCLUDE global/header %]
+[% INCLUDE global/header.html.tmpl %]
 
 <p>
   <a href="#explanation">What is this data?</a>
@@ -273,4 +273,4 @@
   </ul>
 </ul>
 
-[% INCLUDE global/footer %]
+[% INCLUDE global/footer.html.tmpl %]
diff --git a/template/en/default/reports/keywords.html.tmpl b/template/en/default/reports/keywords.html.tmpl
index 1769df85db..17d623e4e7 100644
--- a/template/en/default/reports/keywords.html.tmpl
+++ b/template/en/default/reports/keywords.html.tmpl
@@ -27,7 +27,7 @@
   # caneditkeywords: boolean. True if this user can edit keywords
  %]
  
-[% INCLUDE global/header 
+[% INCLUDE global/header.html.tmpl 
   title = "Bugzilla Keyword Descriptions"
 %]
 
@@ -72,4 +72,4 @@
   </p>
 [% END %]
 
-[% INCLUDE global/footer %]
+[% INCLUDE global/footer.html.tmpl %]
diff --git a/template/en/default/search/search-advanced.html.tmpl b/template/en/default/search/search-advanced.html.tmpl
index 3079ea0068..6523dffd12 100644
--- a/template/en/default/search/search-advanced.html.tmpl
+++ b/template/en/default/search/search-advanced.html.tmpl
@@ -21,7 +21,7 @@
   #                 Gervase Markham <gerv@gerv.net>
   #%]
 
-[% INCLUDE global/header 
+[% INCLUDE global/header.html.tmpl 
   title = "Search for bugs"
   extra = " onLoad=\"selectProduct(document.forms['queryform']);\""
 %]
@@ -839,7 +839,7 @@ function selectProduct(f) {
 
 </FORM>
 
-[% INCLUDE global/footer %]
+[% INCLUDE global/footer.html.tmpl %]
 
 [%############################################################################%]
 [%# Block for SELECT fields                                                  #%]
diff --git a/template/en/default/search/search.html.tmpl b/template/en/default/search/search.html.tmpl
index 3079ea0068..6523dffd12 100644
--- a/template/en/default/search/search.html.tmpl
+++ b/template/en/default/search/search.html.tmpl
@@ -21,7 +21,7 @@
   #                 Gervase Markham <gerv@gerv.net>
   #%]
 
-[% INCLUDE global/header 
+[% INCLUDE global/header.html.tmpl 
   title = "Search for bugs"
   extra = " onLoad=\"selectProduct(document.forms['queryform']);\""
 %]
@@ -839,7 +839,7 @@ function selectProduct(f) {
 
 </FORM>
 
-[% INCLUDE global/footer %]
+[% INCLUDE global/footer.html.tmpl %]
 
 [%############################################################################%]
 [%# Block for SELECT fields                                                  #%]
-- 
2.47.2