summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgerv%gerv.net <>2002-04-20 07:37:42 +0200
committergerv%gerv.net <>2002-04-20 07:37:42 +0200
commita12ec8dea07e38c55593109c3afaab13a29e499d (patch)
tree81a16829b715d7d4cf2a640f3aca88b633d71f75
parent07466db53c0990b4cf9ccdedb08c1a075c18446e (diff)
downloadbugzilla-a12ec8dea07e38c55593109c3afaab13a29e499d.tar.gz
bugzilla-a12ec8dea07e38c55593109c3afaab13a29e499d.tar.xz
Bug 135707 - template reorganisation. This makes the new copies of the templates use all the correct names internally. Patch by me, 2xr=myk.
-rw-r--r--template/en/default/account/create.html.tmpl4
-rw-r--r--template/en/default/account/created.html.tmpl4
-rw-r--r--template/en/default/account/email/confirm.html.tmpl4
-rw-r--r--template/en/default/account/exists.html.tmpl4
-rw-r--r--template/en/default/account/password/set-forgotten-password.html.tmpl4
-rw-r--r--template/en/default/account/prefs/prefs.html.tmpl6
-rw-r--r--template/en/default/admin/attachstatus/create.html.tmpl4
-rw-r--r--template/en/default/admin/attachstatus/delete.html.tmpl4
-rw-r--r--template/en/default/admin/attachstatus/edit.html.tmpl4
-rw-r--r--template/en/default/admin/attachstatus/list.html.tmpl4
-rw-r--r--template/en/default/attachment/create.html.tmpl4
-rw-r--r--template/en/default/attachment/created.html.tmpl4
-rw-r--r--template/en/default/attachment/edit.html.tmpl4
-rw-r--r--template/en/default/attachment/show-multiple.html.tmpl4
-rw-r--r--template/en/default/attachment/updated.html.tmpl4
-rw-r--r--template/en/default/bug/activity/show.html.tmpl6
-rw-r--r--template/en/default/bug/choose-xml.html.tmpl4
-rw-r--r--template/en/default/bug/choose.html.tmpl4
-rw-r--r--template/en/default/bug/create/create.html.tmpl4
-rw-r--r--template/en/default/bug/create/created.html.tmpl6
-rw-r--r--template/en/default/bug/create/make-template.html.tmpl4
-rw-r--r--template/en/default/bug/dependency-graph.html.tmpl4
-rw-r--r--template/en/default/bug/dependency-tree.html.tmpl4
-rw-r--r--template/en/default/bug/edit.html.tmpl12
-rw-r--r--template/en/default/bug/show-multiple.html.tmpl4
-rw-r--r--template/en/default/bug/votes/delete-all.html.tmpl4
-rw-r--r--template/en/default/bug/votes/list-for-bug.html.tmpl4
-rw-r--r--template/en/default/bug/votes/list-for-user.html.tmpl4
-rw-r--r--template/en/default/global/choose-product.html.tmpl4
-rw-r--r--template/en/default/global/code-error.html.tmpl4
-rw-r--r--template/en/default/global/footer.html.tmpl20
-rw-r--r--template/en/default/global/header.html.tmpl20
-rw-r--r--template/en/default/global/message.html.tmpl24
-rw-r--r--template/en/default/global/user-error.html.tmpl4
-rw-r--r--template/en/default/index.html.tmpl4
-rw-r--r--template/en/default/list/change-columns.html.tmpl4
-rw-r--r--template/en/default/list/list-simple.html.tmpl2
-rw-r--r--template/en/default/list/list.html.tmpl8
-rw-r--r--template/en/default/list/quips.html.tmpl4
-rw-r--r--template/en/default/reports/components.html.tmpl4
-rw-r--r--template/en/default/reports/duplicates.html.tmpl4
-rw-r--r--template/en/default/reports/keywords.html.tmpl4
-rw-r--r--template/en/default/search/search-advanced.html.tmpl4
-rw-r--r--template/en/default/search/search.html.tmpl4
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 e39d6ff5e..fd1a5edfe 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 46bc82ad2..2a59eb60a 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 4d4102968..0773df6b1 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 a4357a5a0..2553763f2 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 a8ad930ee..675db62d1 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 5d9fc6eb3..9c103661b 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 7354b3852..1837645ee 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 dc50052b9..81b205758 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 1186d7637..9bdfa1a5e 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 551ab182a..1bb4126b9 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 44533512e..fd0b67d9d 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 c46afe06b..466b7da5f 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 1d06bfb6f..0f08cd2af 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 88c92b969..7fc7d60ab 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 e24595747..eec9c6f3a 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 387ba6d6c..d3ca1ac0b 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 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 <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 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 @@
</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 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ä <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 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 <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 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 <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 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 %]
<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 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 <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 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 %]
<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 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 <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 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 <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 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 <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 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 <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 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 %]
diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl
index 40117297c..118e04339 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 d3b008c49..e67b347b6 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 883b278d7..3dd6656d2 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 150ac2c54..1665d7a1e 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 d05557650..d7d2a04d6 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 c9dacca10..0241d3909 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 1d2e1cbb8..f442bd54f 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 1769df85d..17d623e4e 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 3079ea006..6523dffd1 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 3079ea006..6523dffd1 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 #%]