From a12ec8dea07e38c55593109c3afaab13a29e499d Mon Sep 17 00:00:00 2001
From: "gerv%gerv.net" <>
Date: Sat, 20 Apr 2002 05:37:42 +0000
Subject: 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/bug/activity/show.html.tmpl        |  6 +++---
 template/en/default/bug/choose-xml.html.tmpl           |  4 ++--
 template/en/default/bug/choose.html.tmpl               |  4 ++--
 template/en/default/bug/create/create.html.tmpl        |  4 ++--
 template/en/default/bug/create/created.html.tmpl       |  6 +++---
 template/en/default/bug/create/make-template.html.tmpl |  4 ++--
 template/en/default/bug/dependency-graph.html.tmpl     |  4 ++--
 template/en/default/bug/dependency-tree.html.tmpl      |  4 ++--
 template/en/default/bug/edit.html.tmpl                 | 12 ++++++------
 template/en/default/bug/show-multiple.html.tmpl        |  4 ++--
 template/en/default/bug/votes/delete-all.html.tmpl     |  4 ++--
 template/en/default/bug/votes/list-for-bug.html.tmpl   |  4 ++--
 template/en/default/bug/votes/list-for-user.html.tmpl  |  4 ++--
 13 files changed, 32 insertions(+), 32 deletions(-)

(limited to 'template/en/default/bug')

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 %]
-- 
cgit v1.2.1