Bug 895282: Add Webmaker to Bugzilla enter_bug product selection pages

14 files changed, 8 insertions, 4 deletions

diff --git a/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl b/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl
index 38bf793fd..5b57a0900 100644
--- a/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl
+++ b/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl
@@ -149,7 +149,7 @@ dupes.setLabels(
       [% ELSE %]
       onclick="product.select('[% name FILTER js %]')"
       [% END %]
-      ><img src="extensions/GuidedBugEntry/web/images/products/[% icon FILTER uri %]" width="64" height="64"
+      ><img src="extensions/BMO/web/producticons/[% icon FILTER uri %]" width="64" height="64"
       ></a>
     </td>
     <td>
diff --git a/extensions/GuidedBugEntry/template/en/default/guided/products.html.tmpl b/extensions/GuidedBugEntry/template/en/default/guided/products.html.tmpl
index f775f837c..59f7e8cb8 100644
--- a/extensions/GuidedBugEntry/template/en/default/guided/products.html.tmpl
+++ b/extensions/GuidedBugEntry/template/en/default/guided/products.html.tmpl
@@ -28,6 +28,10 @@
    icon="marketplace.png"
 %]
 [% INCLUDE product_block
+   name="Webmaker"
+   icon="webmaker.png"
+%]
+[% INCLUDE product_block
    name="Thunderbird"
    icon="thunderbird.png"
 %]
@@ -37,15 +41,15 @@
 %]
 [% INCLUDE product_block
    name="Core"
-   icon="core.png"
+   icon="component.png"
 %]
 [% INCLUDE product_block
    name="Mozilla Localizations"
-   icon="dino.png"
+   icon="localization.png"
    caption="Localizations"
 %]
 [% INCLUDE product_block
    name="Mozilla Services"
-   icon="dino.png"
+   icon="sync.png"
    caption="Services"
 %]
diff --git a/extensions/GuidedBugEntry/web/images/products/camino.png b/extensions/GuidedBugEntry/web/images/products/camino.png
deleted file mode 100644
index c833b4d04..000000000
--- a/extensions/GuidedBugEntry/web/images/products/camino.png
+++ /dev/null
diff --git a/extensions/GuidedBugEntry/web/images/products/core.png b/extensions/GuidedBugEntry/web/images/products/core.png
deleted file mode 100644
index b9c5053f6..000000000
--- a/extensions/GuidedBugEntry/web/images/products/core.png
+++ /dev/null
diff --git a/extensions/GuidedBugEntry/web/images/products/dino.png b/extensions/GuidedBugEntry/web/images/products/dino.png
deleted file mode 100644
index 9e0470a07..000000000
--- a/extensions/GuidedBugEntry/web/images/products/dino.png
+++ /dev/null
diff --git a/extensions/GuidedBugEntry/web/images/products/fennec.png b/extensions/GuidedBugEntry/web/images/products/fennec.png
deleted file mode 100644
index ebad7e358..000000000
--- a/extensions/GuidedBugEntry/web/images/products/fennec.png
+++ /dev/null
diff --git a/extensions/GuidedBugEntry/web/images/products/firefox.png b/extensions/GuidedBugEntry/web/images/products/firefox.png
deleted file mode 100644
index 3ba536ed2..000000000
--- a/extensions/GuidedBugEntry/web/images/products/firefox.png
+++ /dev/null
diff --git a/extensions/GuidedBugEntry/web/images/products/labs.png b/extensions/GuidedBugEntry/web/images/products/labs.png
deleted file mode 100644
index 346e0ef06..000000000
--- a/extensions/GuidedBugEntry/web/images/products/labs.png
+++ /dev/null
diff --git a/extensions/GuidedBugEntry/web/images/products/marketplace.png b/extensions/GuidedBugEntry/web/images/products/marketplace.png
deleted file mode 100644
index 62025a2a8..000000000
--- a/extensions/GuidedBugEntry/web/images/products/marketplace.png
+++ /dev/null
diff --git a/extensions/GuidedBugEntry/web/images/products/mozilla.png b/extensions/GuidedBugEntry/web/images/products/mozilla.png
deleted file mode 100644
index e506328bc..000000000
--- a/extensions/GuidedBugEntry/web/images/products/mozilla.png
+++ /dev/null
diff --git a/extensions/GuidedBugEntry/web/images/products/other.png b/extensions/GuidedBugEntry/web/images/products/other.png
deleted file mode 100644
index e436c22ae..000000000
--- a/extensions/GuidedBugEntry/web/images/products/other.png
+++ /dev/null
diff --git a/extensions/GuidedBugEntry/web/images/products/seamonkey.png b/extensions/GuidedBugEntry/web/images/products/seamonkey.png
deleted file mode 100644
index fcb261ae1..000000000
--- a/extensions/GuidedBugEntry/web/images/products/seamonkey.png
+++ /dev/null
diff --git a/extensions/GuidedBugEntry/web/images/products/sunbird.png b/extensions/GuidedBugEntry/web/images/products/sunbird.png
deleted file mode 100644
index 6b15c257d..000000000
--- a/extensions/GuidedBugEntry/web/images/products/sunbird.png
+++ /dev/null
diff --git a/extensions/GuidedBugEntry/web/images/products/thunderbird.png b/extensions/GuidedBugEntry/web/images/products/thunderbird.png
deleted file mode 100644
index f3523183a..000000000
--- a/extensions/GuidedBugEntry/web/images/products/thunderbird.png
+++ /dev/null