From 535a1fd09e4b150e31165e2e79af42c2e5f2bda5 Mon Sep 17 00:00:00 2001
From: Kohei Yoshino <kohei.yoshino@gmail.com>
Date: Wed, 18 Jul 2018 22:44:16 -0400
Subject: Bug 1472954 - Implement one-click component watching on bug modal and
 component description pages

---
 template/en/default/reports/components.html.tmpl | 111 ++++++++++-------------
 1 file changed, 46 insertions(+), 65 deletions(-)

(limited to 'template/en/default/reports/components.html.tmpl')

diff --git a/template/en/default/reports/components.html.tmpl b/template/en/default/reports/components.html.tmpl
index b2a21ccc1..f8b0f3f80 100644
--- a/template/en/default/reports/components.html.tmpl
+++ b/template/en/default/reports/components.html.tmpl
@@ -17,6 +17,7 @@
   #
   # Contributor(s): Bradley Baetz <bbaetz@student.usyd.edu.au>
   #                 Max Kanat-Alexander <mkanat@bugzilla.org>
+  #                 Kohei Yoshino <kohei.yoshino@gmail.com>
   #%]
 
 [%# INTERFACE:
@@ -29,53 +30,36 @@
   Components for [% product.name FILTER html %]
 [% END %]
 
-[% PROCESS global/header.html.tmpl 
-  style_urls = [ "skins/standard/reports.css" ]
-  title = title 
+[% DEFAULT
+  style_urls = [ "skins/standard/describecomponents.css" ]
+  javascript_urls = []
+  title = title
+  show_default_people = 1
 %]
 
-[% IF Param("useqacontact") %]
-  [% numcols = 3 %]
-[% ELSE %]
-  [% numcols = 2 %]
-[% END %]
-
-<h2>[% mark FILTER html %]</h2>
-
-<table cellpadding="0" cellspacing="0" id="components_header_table">
-  <tr>
-    <td class="instructions">
-      Select a component to see open [% terms.bugs %] in that component:
-    </td>
-    <td class="product_container">
-      <span class="product_name">[% product.name FILTER html %]</span>
-      <div class="product_desc">
-        [% product.description FILTER html_light %]
-      </div>
-    </td>
-  </tr>
-</table>
+[% Hook.process('start') %]
 
-<span class="components_header">Components</span>
+[% PROCESS global/header.html.tmpl
+  style_urls = style_urls
+  javascript_urls = javascript_urls
+  title = title
+%]
 
-<table summary="Components table"
-       class="component_table" cellspacing="0" cellpadding="0">
-  <thead>
-  <tr>
-    <th>&nbsp;</th>
-    <th>Default Assignee</th>
-    [% IF Param("useqacontact") %]
-      <th>Default QA Contact</th>
+<section class="product">
+  <header>
+    <h1>[% product.name FILTER html %]</h1>
+    <p>[% product.description FILTER html_light %]</p>
+    [% Hook.process('product_header') %]
+  </header>
+  <div class="instructions">
+    <p>Select a component to see open [% terms.bugs %] in that component:</p>
+  </div>
+  <div class="list">
+    [% FOREACH comp = product.components %]
+      [% INCLUDE describe_comp %]
     [% END %]
-  </tr>
-  </thead>
-
-  <tbody>
-  [% FOREACH comp = product.components %]
-    [% INCLUDE describe_comp %]
-  [% END %]
-  </tbody>
-</table>
+  </div>
+</section>
 
 [% PROCESS global/footer.html.tmpl %]
 
@@ -84,27 +68,24 @@
 [%############################################################################%]
 
 [% BLOCK describe_comp %]
-  <tr id="[% comp.name FILTER html %]"
-      [%- IF comp.name == component_mark %] class="component_hilite"[% END %]>
-    <td rowspan="2" class="component_name">
-      <a name="[% comp.name FILTER html %]" 
-         href="buglist.cgi?product=
-               [%- product.name FILTER uri %]&amp;component=
-               [%- comp.name FILTER uri %]&amp;resolution=---">
-      [% comp.name FILTER html %]</a>
-    </td>
-    <td class="component_assignee">
-      [% INCLUDE global/user.html.tmpl who = comp.default_assignee %]
-    </td>
-    [% IF Param("useqacontact") %]
-      <td class="component_qa_contact">
-        [% INCLUDE global/user.html.tmpl who = comp.default_qa_contact %]
-      </td>
-    [% END %]
-  </tr>
-  <tr[% IF comp.name == component_mark %] class="component_hilite"[% END %]>
-    <td colspan="[% numcols - 1 %]" class="component_description">
-      [% comp.description FILTER html_light %]
-    </td>
-  </tr>
+  <section id="[% comp.name FILTER html %]" class="component[%- IF comp.name == component_mark %] highlight[% END %]">
+    <header>
+      <h2><a href="buglist.cgi?product=[%- product.name FILTER uri %]&amp;component=
+                   [%- comp.name FILTER uri %]&amp;resolution=---">[% comp.name FILTER html %]</a></h2>
+    </header>
+    <div>
+      <p class="description">[% comp.description FILTER html_light %]</p>
+      [% IF show_default_people %]
+      <ul>
+        <li>Assignee: [% INCLUDE global/user.html.tmpl who = comp.default_assignee %]</li>
+        [% IF Param("useqacontact") %]
+        <li>QA: [% INCLUDE global/user.html.tmpl who = comp.default_qa_contact %]</li>
+        [% END %]
+      </ul>
+      [% END %]
+    </div>
+    <footer>
+      [% Hook.process('component_footer', 'reports/components.html.tmpl') %]
+    </footer>
+  </section>
 [% END %]
-- 
cgit v1.2.3-24-g4f1b