From 4434d09061b49fd96fcdac4210edaab4a2d83722 Mon Sep 17 00:00:00 2001
From: Dylan Hardison <dylan@mozilla.com>
Date: Tue, 24 May 2016 09:45:40 -0400
Subject: Bug 1268305 - Integrate Readable Bug Status in Bug Detail Page

---
 .../BugModal/template/en/default/bug_modal/edit.html.tmpl   | 13 ++++++++++---
 .../BugModal/template/en/default/bug_modal/header.html.tmpl |  1 +
 2 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'extensions/BugModal/template/en/default')

diff --git a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
index 9ed5f28b7..a0b13feec 100644
--- a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
@@ -312,6 +312,13 @@
 [% END %]
 
 [%# === status === %]
+[% IF readable_bug_status_json %]
+    [% readable_bug_status_span = BLOCK -%]
+        [%- %]<span id="readable-bug-status" data-readable-bug-status="[% readable_bug_status_json FILTER html %]"></span>
+    [% END %]
+
+    [% subtitle = [{ unfiltered = readable_bug_status_span }] %]
+[% END %]
 
 [% WRAPPER bug_modal/module.html.tmpl
     title = "Status"
@@ -321,10 +328,10 @@
     [%# product %]
     [% can_edit_product = bug.check_can_change_field("product", 0, 1) %]
     [% WRAPPER bug_modal/field.html.tmpl
-        field = bug_fields.product
-        field_type = constants.FIELD_TYPE_SINGLE_SELECT
+        field        = bug_fields.product
+        field_type   = constants.FIELD_TYPE_SINGLE_SELECT
         hide_on_edit = can_edit_product
-        help = "describecomponents.cgi"
+        help         = "describecomponents.cgi"
     %]
       <span class="spin-latch" id="product-latch" data-latch="#product-latch" data-for="#product-info">&#9656;</span>
       <div class="spin-toggle" data-latch="#product-latch" data-for="#product-info">
diff --git a/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl
index e32f4c546..b86031b40 100644
--- a/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl
@@ -53,6 +53,7 @@
     "extensions/BugModal/web/bug_modal.js",
     "extensions/BugModal/web/comments.js",
     "extensions/BugModal/web/ZeroClipboard/ZeroClipboard.min.js",
+    "js/bugzilla-readable-status-min.js",
     "js/field.js",
     "js/comments.js",
     "js/util.js"
-- 
cgit v1.2.3-24-g4f1b