Bug 135707 - template reorganisation. This makes the new copies of the templates...

diff --git a/template/en/default/account/create.html.tmpl b/template/en/default/account/create.html.tmpl
index e39d6ff5e8dab25686afca2d4ac03d559817b413..fd1a5edfe33d6e27c25c5a19721294fcb798b98b 100644 (file)
--- 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 46bc82ad2d5325edfbe2f3d1518e831749167ce0..2a59eb60a088614de503d198136c1078fe7e283a 100644 (file)
--- 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 4d4102968d43c095b05822b5f08cfea2c6715c21..0773df6b1d2f1f3d84829973bb670ce16fdb5ea9 100644 (file)
--- 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 a4357a5a0a8f83ecd7c09bf7c44bd0043f615379..2553763f233af6c50a992f7cae21d3df69d1d417 100644 (file)
--- 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 a8ad930eee4b74b18ab56d862a40964d0d9d8fb3..675db62d166b7549088a37c81e2476c893316327 100644 (file)
--- 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 5d9fc6eb3510611868dc4c09e6f86d9ab5bfa92b..9c103661b150527bda35680e7743938fb91a5856 100644 (file)
--- 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 7354b385249f68483a99b96b8bb72f1b12355e25..1837645ee63f4ab61480d0346cb12ba949c357c2 100644 (file)
--- 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 dc50052b917821e9f58765987b39bb2e103e1cc9..81b2057586312e2bff933eaa328e1b1b1cc90196 100644 (file)
--- 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 1186d7637633aa8e3974b811a0d02f32b86296f9..9bdfa1a5e464a45821d468ecdee60abaaea07329 100644 (file)
--- 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 551ab182a918b16b5aadecf2680dc1be32bb3da3..1bb4126b901b9ad3b16529b149bf75b14c65a165 100644 (file)
--- 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 44533512e4c9dff512ded30fb9de6cf35e2e5ba6..fd0b67d9da5a1e44d189b8775d36ba2ad02ff4d1 100644 (file)
--- 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 c46afe06b11d821115dbd03d3d96b83182b37b48..466b7da5fc282536b812aee4144822b2eb31fa0b 100644 (file)
--- 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 1d06bfb6f4adcf3fecb0c0df5a6d712476780f97..0f08cd2affc23dc47f1b5fa7141031a6a518d1fe 100644 (file)
--- 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 88c92b9699d4696be08181d52d51f345a6cfcccd..7fc7d60ab06ed3a121ca40910e2bdf01ad2559d5 100644 (file)
--- 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 e245957474cfd08d0ce902b87291e4e0207f860f..eec9c6f3a81aed6da279e194083e95db8f2ea3a3 100644 (file)
--- 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 387ba6d6c6cf110c43d758eb87ac07bb68deed55..d3ca1ac0b34e79f8ee6da1dfafdca7d1a3dad340 100644 (file)
--- 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 4456534f5bad6bd173921e3dd40c8ce877032a26..65d579679020f511072347175751df7ce3a1bfe5 100644 (file)
--- 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 b776ff255ed7226775761525e9bd4836adf28cbb..f6c08adb601b167c336d46e617a650363f103f09 100644 (file)
--- 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 cb82c8401abef297fd00ec47b7182bbdfa3e9b9c..46995305c01eba14719ce488284473338714112b 100644 (file)
--- 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 9eba2edf528bd59d4c94c71bd8efa0de94c30516..431e478d1e01be1efe8bade11ab84d8e94a2ee1d 100644 (file)
--- 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 c5e0175291da126bba20f8f3a381000a53f81014..844a0bc355e5b4abc904eeb8d64c7489a204d095 100644 (file)
--- 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 fff5f1b4d3ad6b1a6dcc773e3a9220f7738090d9..631e49e5f579d138dee73bafcfae76695af54c47 100644 (file)
--- 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 fb6163b2414ae427a53d706acfd5c63eac6f6d77..bf8aa2d64a5d7b052cd301e9479093c17f6f2ed4 100644 (file)
--- 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 9b77c23a24524b98a3b727a6cbdfeeecd52f671f..b7b0d69958419fda1540491683333e7a1f14b507 100644 (file)
--- 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 8313323aaa1a6ef886dea368a032a49154c2771e..970af35ea42b41e296c9fdf89c9ae3a864c31606 100644 (file)
--- 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 9a63f75afbec570dae7c646ef56ee9c11bc91893..78224e6ecaf172095b048ec5cdb5555067c59e34 100644 (file)
--- 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 a9bcaf5c81063276e81dd572a38b4453dbb3d02e..44554f0ca9c632ee0c6841ea5ead0cf39a922093 100644 (file)
--- 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 96d9ad84aaca85f7096384931b319f8591413023..e8850fc9468df80bd464ad3b67e383d8039d93c1 100644 (file)
--- 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 31d9ea7bad814986f13c0351d83c6169707a5fe9..03dd356ddbd83ece9af28f3db9b3a29c45b9fdcb 100644 (file)
--- 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 9f1fe29643835de2c48ea0584847b98765fb90fe..f9261b20fe335144860a02c214840ccb80c3d67b 100644 (file)
--- 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 98d525a7881a8668feb436349e6f81bb2b603c68..e8978b3a2fe1a721d970af95a2f7ae01a5c7b90d 100644 (file)
--- 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 dfb3cc0801bf7f32a56b2ee4f4b7c091e3e29777..bba911ff4fa9523efefc6971111ca4271dca1d0c 100644 (file)
--- 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 d0c8281eb50acaeb8feeee456d5c69844671b10a..8738def08069545ebf39e5c4614ea702b89b7e58 100644 (file)
--- 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 a76ad5fa77d5ca5fbc6a0fbdd8a99362574adfcc..3b0819f531300137d4c7d777d77ac2b01765dd18 100644 (file)
--- 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 40117297cb7e7f7d024e15d41d89db05c58e5728..118e04339a5cc9263c00283e71588bf1ae7fb9b6 100644 (file)
--- 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 d3b008c49e7b75f1b68c59b596c4a9cb294084db..e67b347b6d885ab96b927ae7658b6ce7c51a9d69 100644 (file)
--- 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 883b278d7f21ea5bb2e1d5ca400a48972b47610c..3dd6656d2c28e58b27bed1a16efafca13cf24ad2 100644 (file)
--- 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 150ac2c54032caef38dd05d542ac88a17ea12c51..1665d7a1e3523bf13a7831df48c413dcc459e7fa 100644 (file)
--- 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 d055576500f474f16b3a2559255ff480312d65ea..d7d2a04d64210d820071961d8b53c74098ffd031 100644 (file)
--- 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 c9dacca10920d6b9dc60975ac12907354c27868c..0241d39097e7ee24a9df65af0deabe39190e5703 100644 (file)
--- 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 1d2e1cbb8526a7bcfcdb939406566de5e59d90f6..f442bd54fe015b35ed3dc8a0380c10b2e64da285 100644 (file)
--- 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 1769df85dbb10ea8326ca9ba3657fedef0177472..17d623e4e7d1e43d851f866e11738871d6519af2 100644 (file)
--- 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 3079ea0068966f50b5e588828b610fb3361ab367..6523dffd120e6b49e2cc512c10eca21b96265282 100644 (file)
--- 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 3079ea0068966f50b5e588828b610fb3361ab367..6523dffd120e6b49e2cc512c10eca21b96265282 100644 (file)
--- 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                                                  #%]