Bug 851818: Modernize the entry page for filing a bug by including, keeping, and removing products shown on the enter bug page

2 files changed, 39 insertions, 24 deletions

diff --git a/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl b/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl
index 50a7616be..c9bed9f41 100644
--- a/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl
+++ b/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl
@@ -231,10 +231,8 @@ dupes.setLabels(
         ></a>
       </div>
     </td>
-    <td width="100%">
-      <h2>
-        <a href="http://www.mozilla.org/support/">I need technical support</a>
-      </h2>
+    <td class="exit_text">
+      <a href="http://www.mozilla.org/support/">I need technical support</a><br>
       For technical support or help getting your site to work with Mozilla.
     </td>
   </tr>
@@ -246,14 +244,24 @@ dupes.setLabels(
         ></a>
       </div>
     </td>
-    <td width="100%">
-      &bull; <a href="http://input.mozilla.org/feedback/#sad">Offer us ideas on how to make Firefox better</a><br>
-      &bull; <a href="http://input.mozilla.org/feedback/#sad">Report an issue with a web site that I use</a><br>
-      &bull; <a href="enter_bug.cgi?format=guided&amp;product=Core">Report an issue with Firefox on a site that I've developed</a><br>
-      &bull; <a href="http://input.mozilla.org/feedback/">Provide feedback about Firefox</a><br>
+    <td class="exit_text">
+      <a href="http://input.mozilla.org/feedback/#sad">Offer us ideas on how to make Firefox better</a><br>
+      <a href="http://input.mozilla.org/feedback/">Provide feedback about Firefox</a><br>
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <div class="exit_img">
+        <img src="extensions/GuidedBugEntry/web/images/webbug.png" width="32" height="32">
+      </div>
+    </td>
+    <td class="exit_text_last">
+      <a href="enter_bug.cgi?format=guided&amp;product=Core">Report an issue with Firefox on a site that I've developed</a><br>
+      <a href="http://input.mozilla.org/feedback/#sad">Report an issue with a web site that I use</a><br>
     </td>
   </tr>
 </table>
+
 <h3>
   None of the above; my [% terms.bug %] is in:
 </h3>
@@ -423,7 +431,7 @@ explain how to write effective [% terms.bug %] reports.</li>
   <span class="help-bad">Bad example</span>: Mozilla crashed. You suck!<br>
   <span class="help-good">Good example</span>: After a crash which happened
   when I was sorting in the Bookmark Manager, all of my top-level bookmark
-  folders beginning with the letters Q to Z are no longer present. 
+  folders beginning with the letters Q to Z are no longer present.
   </div>
   </td>
 </tr>
diff --git a/extensions/GuidedBugEntry/template/en/default/guided/products.html.tmpl b/extensions/GuidedBugEntry/template/en/default/guided/products.html.tmpl
index 22c93a354..f775f837c 100644
--- a/extensions/GuidedBugEntry/template/en/default/guided/products.html.tmpl
+++ b/extensions/GuidedBugEntry/template/en/default/guided/products.html.tmpl
@@ -11,34 +11,41 @@
    icon="firefox.png"
 %]
 [% INCLUDE product_block
+   name="Boot2Gecko"
+   icon="firefox.png"
+   caption="Firefox OS"
+%]
+[% INCLUDE product_block
    name="Firefox for Android"
    icon="firefox.png"
 %]
 [% INCLUDE product_block
-   name="Thunderbird"
-   icon="thunderbird.png"
+   name="Firefox for Metro"
+   icon="firefox.png"
 %]
 [% INCLUDE product_block
-   name="Mozilla Services"
-   icon="dino.png"
+   name="Marketplace"
+   icon="marketplace.png"
 %]
 [% INCLUDE product_block
-   name="SeaMonkey"
-   icon="seamonkey.png"
+   name="Thunderbird"
+   icon="thunderbird.png"
 %]
 [% INCLUDE product_block
-   name="Mozilla Localizations"
-   icon="dino.png"
+   name="SeaMonkey"
+   icon="seamonkey.png"
 %]
 [% INCLUDE product_block
-   name="Mozilla Labs"
-   icon="labs.png"
+   name="Core"
+   icon="core.png"
 %]
 [% INCLUDE product_block
-   name="Calendar"
-   icon="sunbird.png"
+   name="Mozilla Localizations"
+   icon="dino.png"
+   caption="Localizations"
 %]
 [% INCLUDE product_block
-   name="Core"
-   icon="core.png"
+   name="Mozilla Services"
+   icon="dino.png"
+   caption="Services"
 %]