4 files changed, 50 insertions, 14 deletions
diff --git a/template/en/default/attachment/created.html.tmpl b/template/en/default/attachment/created.html.tmpl
index da2fec823..92bd745a2 100644
--- a/template/en/default/attachment/created.html.tmpl
+++ b/template/en/default/attachment/created.html.tmpl
@@ -26,7 +26,14 @@
 
 [% PROCESS global/variables.none.tmpl %]
 [% bug = bugs.0 %]
-[% PROCESS "bug/show-header.html.tmpl" %]
+
+[%# BMO: allow experimental UIs to replace show-header %]
+[% IF alt_ui_header %]
+  [% PROCESS $alt_ui_header %]
+[% ELSE %]
+  [% PROCESS "bug/show-header.html.tmpl" %]
+[% END %]
+
 [% PROCESS global/header.html.tmpl
   title = "Attachment $attachment.id added to $terms.Bug $attachment.bug_id"
 %]
@@ -64,4 +71,9 @@
  Another Attachment to [% terms.Bug %] [%+ attachment.bug_id %]</a>
 </p>
 
-[% PROCESS bug/show.html.tmpl %]
+[%# BMO: allow experimental UIs to replace show-bug %]
+[% IF alt_ui_show %]
+  [% PROCESS $alt_ui_show %]
+[% ELSE %]
+  [% PROCESS "bug/show.html.tmpl" %]
+[% END %]
diff --git a/template/en/default/attachment/updated.html.tmpl b/template/en/default/attachment/updated.html.tmpl
index 9a74f5c98..5b37231bd 100644
--- a/template/en/default/attachment/updated.html.tmpl
+++ b/template/en/default/attachment/updated.html.tmpl
@@ -26,7 +26,13 @@
 [% PROCESS global/variables.none.tmpl %]
 [% bug = bugs.0 %]
 
-[% PROCESS "bug/show-header.html.tmpl" %]
+[%# BMO: allow experimental UIs to replace show-header %]
+[% IF alt_ui_header %]
+  [% PROCESS $alt_ui_header %]
+[% ELSE %]
+  [% PROCESS "bug/show-header.html.tmpl" %]
+[% END %]
+
 [% PROCESS global/header.html.tmpl
   title = "Changes Submitted to Attachment $attachment.id of $terms.Bug $attachment.bug_id"
 %]
@@ -43,4 +49,9 @@
   </dd>
 </dl>
 
-[% PROCESS bug/show.html.tmpl %]
+[%# BMO: allow experimental UIs to replace show-bug %]
+[% IF alt_ui_show %]
+  [% PROCESS $alt_ui_show %]
+[% ELSE %]
+  [% PROCESS "bug/show.html.tmpl" %]
+[% END %]
diff --git a/template/en/default/bug/create/created.html.tmpl b/template/en/default/bug/create/created.html.tmpl
index d9eaccbbf..4adad2d59 100644
--- a/template/en/default/bug/create/created.html.tmpl
+++ b/template/en/default/bug/create/created.html.tmpl
@@ -30,7 +30,13 @@
 
 [% PROCESS global/variables.none.tmpl %]
 
-[% PROCESS "bug/show-header.html.tmpl" %]
+[%# BMO: allow experimental UIs to replace show-header %]
+[% IF alt_ui_header %]
+  [% PROCESS $alt_ui_header %]
+[% ELSE %]
+  [% PROCESS "bug/show-header.html.tmpl" %]
+[% END %]
+
 [% PROCESS global/header.html.tmpl
   title = "$terms.Bug $id Submitted &ndash; $filtered_desc"
   header = "$terms.Bug&nbsp;$id Submitted"
@@ -39,7 +45,7 @@
 [% header_done = 1 %]
 
 [% FOREACH item = sentmail %]
-  [% PROCESS bug/process/results.html.tmpl
+  [% INCLUDE bug/process/results.html.tmpl
      type = item.type
      id = item.id
      sent_bugmail = item
@@ -50,12 +56,14 @@
 
 <hr>
 
-[% PROCESS bug/edit.html.tmpl %]
-
-<hr>
-
-[% PROCESS bug/navigate.html.tmpl bottom_navigator => 1 %]
-
-<br>
+[%# BMO: allow experimental UIs to replace show-header %]
+[% IF alt_ui_edit %]
+  [% PROCESS $alt_ui_edit %]
+[% ELSE %]
+  [% PROCESS "bug/edit.html.tmpl" %]
+  <hr>
+  [% PROCESS bug/navigate.html.tmpl bottom_navigator => 1 %]
+  <br>
+[% END %]
 
 [% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/bug/process/header.html.tmpl b/template/en/default/bug/process/header.html.tmpl
index 6b608b9ed..8c0825ef8 100644
--- a/template/en/default/bug/process/header.html.tmpl
+++ b/template/en/default/bug/process/header.html.tmpl
@@ -26,7 +26,12 @@
 
 [% USE Bugzilla %]
 
-[% PROCESS "bug/show-header.html.tmpl" %]
+[%# BMO: allow experimental UIs to replace show-header %]
+[% IF alt_ui_header %]
+  [% PROCESS $alt_ui_header %]
+[% ELSE %]
+  [% PROCESS "bug/show-header.html.tmpl" %]
+[% END %]
 
 [% IF    title_tag == "bug_processed" %]
   [% title = BLOCK %]