Bug 895282: Add Webmaker to Bugzilla enter_bug product selection pages

24 files changed, 19 insertions, 11 deletions

diff --git a/extensions/BMO/template/en/default/global/choose-product.html.tmpl b/extensions/BMO/template/en/default/global/choose-product.html.tmpl
index 38a43cd12..1ee21a8bd 100644
--- a/extensions/BMO/template/en/default/global/choose-product.html.tmpl
+++ b/extensions/BMO/template/en/default/global/choose-product.html.tmpl
@@ -78,7 +78,7 @@
 <table align="center" border="0" width="600" cellpadding="5" cellspacing="0">
 [% INCLUDE easyproduct
    name="Core"
-   icon="dino.png"
+   icon="component.png"
 %]
 [% INCLUDE easyproduct
    name="Firefox"
@@ -98,14 +98,18 @@
    icon="firefox.png"
 %]
 [% INCLUDE easyproduct
-   name="Toolkit"
-   icon="dino.png"
-%]
-[% INCLUDE easyproduct
    name="Marketplace"
    icon="marketplace.png"
 %]
 [% INCLUDE easyproduct
+   name="Webmaker"
+   icon="webmaker.png"
+%]
+[% INCLUDE easyproduct
+   name="Toolkit"
+   icon="component.png"
+%]
+[% INCLUDE easyproduct
    name="Thunderbird"
    icon="thunderbird.png"
 %]
@@ -115,11 +119,11 @@
 %]
 [% INCLUDE easyproduct
    name="Mozilla Localizations"
-   icon="dino.png"
+   icon="localization.png"
 %]
 [% INCLUDE easyproduct
    name="Mozilla Services"
-   icon="dino.png"
+   icon="sync.png"
 %]
 <tr>
    <td><a href="[% target FILTER uri %]?full=1
diff --git a/extensions/BMO/web/producticons/camino.png b/extensions/BMO/web/producticons/camino.png
deleted file mode 100644
index c833b4d04..000000000
--- a/extensions/BMO/web/producticons/camino.png
+++ /dev/null
diff --git a/extensions/GuidedBugEntry/web/images/products/core.png b/extensions/BMO/web/producticons/component.png
index b9c5053f6..b9c5053f6 100644..100755
--- a/extensions/GuidedBugEntry/web/images/products/core.png
+++ b/extensions/BMO/web/producticons/component.png
diff --git a/extensions/BMO/web/producticons/fennec.png b/extensions/BMO/web/producticons/fennec.png
deleted file mode 100644
index ebad7e358..000000000
--- a/extensions/BMO/web/producticons/fennec.png
+++ /dev/null
diff --git a/extensions/BMO/web/producticons/input.png b/extensions/BMO/web/producticons/input.png
deleted file mode 100644
index 81f355d85..000000000
--- a/extensions/BMO/web/producticons/input.png
+++ /dev/null
diff --git a/extensions/BMO/web/producticons/labs.png b/extensions/BMO/web/producticons/labs.png
deleted file mode 100644
index 346e0ef06..000000000
--- a/extensions/BMO/web/producticons/labs.png
+++ /dev/null
diff --git a/extensions/BMO/web/producticons/localization.png b/extensions/BMO/web/producticons/localization.png
new file mode 100755
index 000000000..df3eac2d0
--- /dev/null
+++ b/extensions/BMO/web/producticons/localization.png
diff --git a/extensions/BMO/web/producticons/mozilla.png b/extensions/BMO/web/producticons/mozilla.png
deleted file mode 100644
index e506328bc..000000000
--- a/extensions/BMO/web/producticons/mozilla.png
+++ /dev/null
diff --git a/extensions/BMO/web/producticons/sunbird.png b/extensions/BMO/web/producticons/sunbird.png
deleted file mode 100644
index 6b15c257d..000000000
--- a/extensions/BMO/web/producticons/sunbird.png
+++ /dev/null
diff --git a/extensions/BMO/web/producticons/sync.png b/extensions/BMO/web/producticons/sync.png
new file mode 100755
index 000000000..b42125ef6
--- /dev/null
+++ b/extensions/BMO/web/producticons/sync.png
diff --git a/extensions/BMO/web/producticons/webmaker.png b/extensions/BMO/web/producticons/webmaker.png
new file mode 100644
index 000000000..d576a5f01
--- /dev/null
+++ b/extensions/BMO/web/producticons/webmaker.png
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/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