From 929b49c3e8e5720b750cb35fe27d2d79744a3589 Mon Sep 17 00:00:00 2001 From: Byron Jones Date: Wed, 24 Jul 2013 23:39:00 +0800 Subject: Bug 895282: Add Webmaker to Bugzilla enter_bug product selection pages --- .../en/default/global/choose-product.html.tmpl | 18 +++++++++++------- extensions/BMO/web/producticons/camino.png | Bin 6060 -> 0 bytes extensions/BMO/web/producticons/component.png | Bin 0 -> 7497 bytes extensions/BMO/web/producticons/fennec.png | Bin 9023 -> 0 bytes extensions/BMO/web/producticons/input.png | Bin 8333 -> 0 bytes extensions/BMO/web/producticons/labs.png | Bin 4085 -> 0 bytes extensions/BMO/web/producticons/localization.png | Bin 0 -> 6914 bytes extensions/BMO/web/producticons/mozilla.png | Bin 10808 -> 0 bytes extensions/BMO/web/producticons/sunbird.png | Bin 10462 -> 0 bytes extensions/BMO/web/producticons/sync.png | Bin 0 -> 8896 bytes extensions/BMO/web/producticons/webmaker.png | Bin 0 -> 59095 bytes .../template/en/default/guided/guided.html.tmpl | 2 +- .../template/en/default/guided/products.html.tmpl | 10 +++++++--- .../GuidedBugEntry/web/images/products/camino.png | Bin 6060 -> 0 bytes .../GuidedBugEntry/web/images/products/core.png | Bin 7497 -> 0 bytes .../GuidedBugEntry/web/images/products/dino.png | Bin 3375 -> 0 bytes .../GuidedBugEntry/web/images/products/fennec.png | Bin 9023 -> 0 bytes .../GuidedBugEntry/web/images/products/firefox.png | Bin 7720 -> 0 bytes .../GuidedBugEntry/web/images/products/labs.png | Bin 4085 -> 0 bytes .../web/images/products/marketplace.png | Bin 7412 -> 0 bytes .../GuidedBugEntry/web/images/products/mozilla.png | Bin 10808 -> 0 bytes .../GuidedBugEntry/web/images/products/other.png | Bin 6654 -> 0 bytes .../GuidedBugEntry/web/images/products/seamonkey.png | Bin 5255 -> 0 bytes .../GuidedBugEntry/web/images/products/sunbird.png | Bin 10462 -> 0 bytes .../web/images/products/thunderbird.png | Bin 9939 -> 0 bytes 25 files changed, 19 insertions(+), 11 deletions(-) delete mode 100644 extensions/BMO/web/producticons/camino.png create mode 100755 extensions/BMO/web/producticons/component.png delete mode 100644 extensions/BMO/web/producticons/fennec.png delete mode 100644 extensions/BMO/web/producticons/input.png delete mode 100644 extensions/BMO/web/producticons/labs.png create mode 100755 extensions/BMO/web/producticons/localization.png delete mode 100644 extensions/BMO/web/producticons/mozilla.png delete mode 100644 extensions/BMO/web/producticons/sunbird.png create mode 100755 extensions/BMO/web/producticons/sync.png create mode 100644 extensions/BMO/web/producticons/webmaker.png delete mode 100644 extensions/GuidedBugEntry/web/images/products/camino.png delete mode 100644 extensions/GuidedBugEntry/web/images/products/core.png delete mode 100644 extensions/GuidedBugEntry/web/images/products/dino.png delete mode 100644 extensions/GuidedBugEntry/web/images/products/fennec.png delete mode 100644 extensions/GuidedBugEntry/web/images/products/firefox.png delete mode 100644 extensions/GuidedBugEntry/web/images/products/labs.png delete mode 100644 extensions/GuidedBugEntry/web/images/products/marketplace.png delete mode 100644 extensions/GuidedBugEntry/web/images/products/mozilla.png delete mode 100644 extensions/GuidedBugEntry/web/images/products/other.png delete mode 100644 extensions/GuidedBugEntry/web/images/products/seamonkey.png delete mode 100644 extensions/GuidedBugEntry/web/images/products/sunbird.png delete mode 100644 extensions/GuidedBugEntry/web/images/products/thunderbird.png (limited to 'extensions') 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 @@ [% INCLUDE easyproduct name="Core" - icon="dino.png" + icon="component.png" %] [% INCLUDE easyproduct name="Firefox" @@ -97,14 +97,18 @@ name="Firefox for Metro" 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" %]
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 @@ -27,6 +27,10 @@ name="Marketplace" 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 Binary files a/extensions/GuidedBugEntry/web/images/products/camino.png and /dev/null differ 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 Binary files a/extensions/GuidedBugEntry/web/images/products/core.png and /dev/null differ 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 Binary files a/extensions/GuidedBugEntry/web/images/products/dino.png and /dev/null differ 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 Binary files a/extensions/GuidedBugEntry/web/images/products/fennec.png and /dev/null differ 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 Binary files a/extensions/GuidedBugEntry/web/images/products/firefox.png and /dev/null differ 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 Binary files a/extensions/GuidedBugEntry/web/images/products/labs.png and /dev/null differ 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 Binary files a/extensions/GuidedBugEntry/web/images/products/marketplace.png and /dev/null differ 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 Binary files a/extensions/GuidedBugEntry/web/images/products/mozilla.png and /dev/null differ 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 Binary files a/extensions/GuidedBugEntry/web/images/products/other.png and /dev/null differ 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 Binary files a/extensions/GuidedBugEntry/web/images/products/seamonkey.png and /dev/null differ 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 Binary files a/extensions/GuidedBugEntry/web/images/products/sunbird.png and /dev/null differ 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 Binary files a/extensions/GuidedBugEntry/web/images/products/thunderbird.png and /dev/null differ -- cgit v1.2.3-24-g4f1b