diff options
Diffstat (limited to 'extensions/BMO')
-rw-r--r-- | extensions/BMO/template/en/default/bug/create/cost-centers.none.tmpl (renamed from extensions/BMO/template/en/default/bug/create/cost-centers.html.tmpl) | 44 | ||||
-rw-r--r-- | extensions/BMO/template/en/default/bug/create/create-intern.html.tmpl | 5 | ||||
-rw-r--r-- | extensions/BMO/template/en/default/bug/create/create-recruiting.html.tmpl | 5 | ||||
-rw-r--r-- | extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl | 241 |
4 files changed, 117 insertions, 178 deletions
diff --git a/extensions/BMO/template/en/default/bug/create/cost-centers.html.tmpl b/extensions/BMO/template/en/default/bug/create/cost-centers.none.tmpl index 592ee9d7c..44afd9d25 100644 --- a/extensions/BMO/template/en/default/bug/create/cost-centers.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/cost-centers.none.tmpl @@ -8,8 +8,6 @@ [% cost_centers = [ - "900 - Mozilla Foundation" - "901 - MoFo NSF" "1000 - Support Services" "1001 - Office of Chair" "1002 - Participation" @@ -32,11 +30,11 @@ "1350 - Recruiting" "1360 - Metrics" "1400 - IT and Network" - "1500 - General Content Services" - "1501 - Engineering" - "1502 - Sales" - "1503 - Product" - "1700 - Strategic Initiative" + "1500 - Content Services General" + "1501 - Content Services Engineering" + "1502 - Content Services Sales" + "1503 - Content Services Product" + "1700 - Strategic Initiative " "2000 - Engagement" "2200 - PR" "2300 - Community Engagement" @@ -49,10 +47,10 @@ "3110 - Production Cloud Infra" "3120 - Development Cloud Infra" "3130 - Production DC Infra" - "3210 - Services and Engineering Operations" + "3210 - Services Engineering & Operations" "3220 - Cloud Services Operation" "3240 - Cloud Services Product and Project Management" - "3290 - Identity Services" + "3290 - Identity Engineering" "5000 - Firefox" "5100 - Firefox Product Marketing" "5200 - Firefox Desktop" @@ -60,13 +58,13 @@ "5220 - Firefox Desktop UX" "5230 - Firefox Desktop Product Management" "5250 - Firefox Hello" - "5300 - Firefox Mobile" + "5300 - Firefox Mobile " "5310 - Firefox Android Engineering" "5320 - Firefox Android UX" "5330 - Firefox Android Product Management" "5400 - Firefox Dev Tools" "5500 - Firefox iOS" - "5600 - Firefox Program Management" + "5600 - Firefox Program Manangement" "6000 - Mobile" "6110 - Firefox OS Engineering I" "6140 - Firefox OS Automation" @@ -81,9 +79,9 @@ "7120 - Mobile Planning" "7130 - Mobile Apps Engineering" "7150 - Mobile Partners Contents" - "7200 - Mobile Ecosystem Program Management" + "7200 - Mobile Ecosystem Program Manangement" "7220 - Mobile Partner Products" - "7500 - Reviews and Community" + "7500 - Add Ons" "8000 - Engineering Platform" "8100 - Release Engineering" "8300 - Engineering Program Management" @@ -95,15 +93,25 @@ "8450 - Platform Rendering, Media and Graphics" "8460 - Platform Android" "8470 - Platform WebRTC" - "8480 - Platform e10s" + "8480 - Platform Integration" "8490 - Platform Accessibility" "8510 - Platform QE" "8600 - Development Tools and Automation" "8700 - JavaScript" "8750 - Localization (l10n)" + "900 - Mozilla Foundation" ]; -%] -[% FOREACH cost_center IN cost_centers %] - <option value="[% cost_center FILTER html %]">[% cost_center FILTER html %]</option> -[% END %] + # the above list is in a format that mirrors the output we get from our financial system + # some forms prefer different ordering, so cut it up and reorder + cost_centers_by_name = []; + cost_centers_by_number = []; + FOREACH cost_center IN cost_centers; + matches = cost_center.match('^(\d+) - (.+)'); + cost_centers_by_name.push(matches.1 _ " (" _ matches.0 _ ")"); + num = matches.0 FILTER format("%04d"); + cost_centers_by_number.push(num _ " - " _ matches.1); + END; + cost_centers_by_name = cost_centers_by_name.sort; + cost_centers = cost_centers_by_number.sort; +%] diff --git a/extensions/BMO/template/en/default/bug/create/create-intern.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-intern.html.tmpl index 358b0fd61..8f5039464 100644 --- a/extensions/BMO/template/en/default/bug/create/create-intern.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-intern.html.tmpl @@ -151,9 +151,12 @@ $(document).ready(function() { <div class="row"> <label class="required" for="cost_center">Cost Center:</label> + [% PROCESS "bug/create/cost-centers.none.tmpl" %] <select required id="cost_center" name="cost_center"> <option value="">Select..</option> - [% INCLUDE "bug/create/cost-centers.html.tmpl" %] + [% FOREACH cost_center IN cost_centers %] + <option value="[% cost_center FILTER html %]">[% cost_center FILTER html %]</option> + [% END %] </select> </div> diff --git a/extensions/BMO/template/en/default/bug/create/create-recruiting.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-recruiting.html.tmpl index cac19e0b5..49c0fe752 100644 --- a/extensions/BMO/template/en/default/bug/create/create-recruiting.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-recruiting.html.tmpl @@ -115,9 +115,12 @@ function jobDescToggle(what) { <label class="required" for="cost_center">Cost Center:</label> </th> <td> + [% PROCESS "bug/create/cost-centers.none.tmpl" %] <select required id="cost_center" name="cost_center"> <option value="">Select..</option> - [% INCLUDE "bug/create/cost-centers.html.tmpl" %] + [% FOREACH cost_center IN cost_centers %] + <option value="[% cost_center FILTER html %]">[% cost_center FILTER html %]</option> + [% END %] </select> </td> </tr> diff --git a/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl index 06e12c3d3..a1d5b3731 100644 --- a/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl @@ -9,66 +9,86 @@ [% PROCESS global/variables.none.tmpl %] [% + items = [ - { id => '' , name => 'Splendidest gear' }, - { id => '#185687' , name => 'Moleskine Notebook' }, - { id => '#155749' , name => 'Rickshaw Messenger Bag' }, - { id => '#155415S', name => 'Champion Hooded Sweatshirt S' }, - { id => '#155415M', name => 'Champion Hooded Sweatshirt M' }, - { id => '#155415L', name => 'Champion Hooded Sweatshirt L' }, - { id => '#155415X', name => 'Champion Hooded Sweatshirt XL' }, - { id => '#1554152', name => 'Champion Hooded Sweatshirt 2XL' }, - { id => '#157454S', name => 'Very Splendid Package, Men\'s S' }, - { id => '#157454M', name => 'Very Splendid Package, Men\'s M' }, - { id => '#157454L', name => 'Very Splendid Package, Men\'s L' }, - { id => '#157454X', name => 'Very Splendid Package, Men\'s XL' }, - { id => '#157452S', name => 'Very Splendid Package, Ladies S' }, - { id => '#157452M', name => 'Very Splendid Package, Ladies M' }, - { id => '#157452L', name => 'Very Splendid Package, Ladies L' }, - { id => '#157452X', name => 'Very Splendid Package, Ladies XL' }, - { id => '#157451S', name => 'Most Splendid Package, S' }, - { id => '#157451M', name => 'Most Splendid Package, M ' }, - { id => '#157451L', name => 'Most Splendid Package, L ' }, - { id => '#157451X', name => 'Most Splendid Package, XL ' }, - { id => '' , name => 'Splendider' }, - { id => '#155341X', name => 'Unisex T-shirt Poppy XL' }, - { id => '#1553412', name => 'Unisex T-shirt Poppy 2XL' }, - { id => '#155344S', name => 'Ladies\' T-shirt Poppy S' }, - { id => '#155344M', name => 'Ladies\' T-shirt Poppy M' }, - { id => '#155344L', name => 'Ladies\' T-shirt Poppy L' }, - { id => '#190928S', name => 'Unisex T-shirt Navy S' }, - { id => '#190928M', name => 'Unisex T-shirt Navy M' }, - { id => '#190928L', name => 'Unisex T-shirt Navy L' }, - { id => '#190928X', name => 'Unisex T-shirt Navy XL' }, - { id => '#1553422', name => 'Unisex T-shirt Navy 2XL' }, - { id => '#1553423', name => 'Unisex T-shirt Navy 3XL' }, - { id => '#155413S', name => 'Ladies\' T-shirt Navy S' }, - { id => '#155413M', name => 'Ladies\' T-shirt Navy M' }, - { id => '#155413L', name => 'Ladies\' T-shirt Navy L' }, - { id => '#155413X', name => 'Ladies\' T-shirt Navy XL' }, - { id => '#190929L', name => 'Unisex T-shirt Lapis L' }, - { id => '#155343X', name => 'Unisex T-shirt Lapis XL' }, - { id => '#155414S', name => 'Ladies\' T-shirt Lapis S' }, - { id => '#155414M', name => 'Ladies\' T-shirt Lapis M' }, - { id => '#155414L', name => 'Ladies\' T-shirt Lapis L' }, - { id => '#155339' , name => 'Black Cap with Tote ' }, - { id => '#155340' , name => 'Beanie ' }, - { id => '#155751' , name => 'Drawstring Tote ' }, - { id => '212669' , name => 'Glossy Finish Ceramic Mug ' }, - { id => '' , name => 'Splendid' }, - { id => '#197158' , name => '3" Firefox Sticker (single)' }, - { id => '#155754' , name => 'Lanyard with Bulldog Clip' }, - { id => '#197159' , name => 'Vertical Laminated Badge' }, - { id => '#155756' , name => 'Silicone Wristband' }, - { id => '#197156' , name => 'Custom Tattoos- Pkg50' }, - { id => '#192150' , name => '1.25" Firefox Button-PKG25' }, - { id => '' , name => 'Firefox OS items' }, - { id => '#189674' , name => '3" Firefox OS Mobilizer Sticker' }, - { id => '#187062' , name => 'OS Lanyard w/ Bulldog Clip' }, - { id => '#180589' , name => 'Sunglasses Firefox OS' }, - { id => '#180595' , name => 'Rubber Grip Pens Firefox OS' }, - { id => '#180593' , name => 'Firefox OS Moleskine Notebook' }, -] + { id => '' , name => 'Splendidest gear,' }, + { id => '#185687' , name => 'Moleskine Notebook (Firefox)' }, + { id => '#155749' , name => 'Rickshaw Messenger Bag' }, + { id => '#155415S', name => 'Champion Hooded Sweatshirt S' }, + { id => '#155415M', name => 'Champion Hooded Sweatshirt M' }, + { id => '#155415L', name => 'Champion Hooded Sweatshirt L' }, + { id => '#155415X', name => 'Champion Hooded Sweatshirt XL' }, + { id => '#1554152', name => 'Champion Hooded Sweatshirt 2XL' }, + { id => '#157452S', name => 'Very Splendid Package Ladies S' }, + { id => '#157452M', name => 'Very Splendid Package Ladies M' }, + { id => '#157452L', name => 'Very Splendid Package Ladies L' }, + { id => '#157452X', name => 'Very Splendid Package Ladies XL' }, + { id => '#157454S', name => 'Very Splendid Package Men\'s S' }, + { id => '#157454M', name => 'Very Splendid Package Men\'s M' }, + { id => '#157454L', name => 'Very Splendid Package Men\'s L' }, + { id => '#157454X', name => 'Very Splendid Package Men\'s XL' }, + { id => '#157451S', name => 'Most Splendid Package' }, + { id => '#157451M', name => 'Most Splendid Package' }, + { id => '#157451L', name => 'Most Splendid Package' }, + { id => '#157451X', name => 'Most Splendid Package' }, + { id => '' , name => 'Splendider gear,' }, + { id => '#155341X', name => 'Unisex Firefox T-shirt Poppy XL' }, + { id => '#1553412', name => 'Unisex Firefox T-shirt Poppy 2XL' }, + { id => '#155344S', name => 'Ladies\' Firefox T-shirt Poppy S' }, + { id => '#155344M', name => 'Ladies\' Firefox T-shirt Poppy M' }, + { id => '#155344L', name => 'Ladies\' Firefox T-shirt Poppy L' }, + { id => '#190928S', name => 'Unisex Firefox T-shirt Navy S' }, + { id => '#190928M', name => 'Unisex Firefox T-shirt Navy M' }, + { id => '#190928L', name => 'Unisex Firefox T-shirt Navy L' }, + { id => '#190928X', name => 'Unisex Firefox T-shirt Navy XL' }, + { id => '#1553422', name => 'Unisex Firefox T-shirt Navy 2XL*' }, + { id => '#1553423', name => 'Unisex Firefox T-shirt Navy 3XL*' }, + { id => '#155413S', name => 'Ladies\' Firefox T-shirt Navy S' }, + { id => '#155413M', name => 'Ladies\' Firefox T-shirt Navy M' }, + { id => '#155413L', name => 'Ladies\' Firefox T-shirt Navy L' }, + { id => '#155413X', name => 'Ladies\' Firefox T-shirt Navy XL' }, + { id => '#190929S', name => 'Unisex Firefox T-shirt Lapis S' }, + { id => '#190929M', name => 'Unisex Firefox T-shirt Lapis M' }, + { id => '#190929L', name => 'Unisex Firefox T-shirt Lapis L' }, + { id => '#155343X', name => 'Unisex Firefox T-shirt Lapis XL' }, + { id => '#155414S', name => 'Ladies\' Firefox T-shirt Lapis S' }, + { id => '#155414M', name => 'Ladies\' Firefox T-shirt Lapis M' }, + { id => '#155414L', name => 'Ladies\' Firefox T-shirt Lapis L' }, + { id => '#155339' , name => 'Black Cap with Tote' }, + { id => '#212669' , name => 'Stoneware Ceramic Mug' }, + { id => '#155340' , name => 'Beanie' }, + { id => '#155751' , name => 'Drawstring Tote' }, + { id => '' , name => 'Splendid gear,' }, + { id => '#192150' , name => '1.25" Firefox Button-PKG25' }, + { id => '#197156' , name => 'Firefox Tattoos- Pkg50' }, + { id => '#155754' , name => 'Lanyard with Bulldog Clip (Mozilla)' }, + { id => '#197159' , name => 'Firefox Laminated Badge' }, + { id => '#155756' , name => 'Silicone Wristband' }, + { id => '#197158' , name => 'Firefox Sticker' }, + { id => '' , name => 'Firefox OS gear,' }, + { id => '#180593' , name => 'Moleskine Notebook (Firefox OS)' }, + { id => '#180595' , name => 'Rubber Grip Pens Firefox OS' }, + { id => '#187062' , name => 'OS Lanyard w/ Bulldog Clip' }, + { id => '#180589' , name => 'Sunglasses Firefox OS' }, + { id => '#189674' , name => '3" Firefox Mobilizer Sticker' }, + { id => '#180792S', name => 'Firefox OS Tee Blueprint S' }, + { id => '#180792M', name => 'Firefox OS Tee Blueprint M' }, + { id => '#180792L', name => 'Firefox OS Tee Blueprint L' }, + { id => '#180792X', name => 'Firefox OS Tee Blueprint XL' }, + { id => '#1807922', name => 'Firefox OS Tee Blueprint 2XL' }, + { id => '#182464S', name => 'Firefox OS Ladies Teal Tee S' }, + { id => '#182464M', name => 'Firefox OS Ladies Teal Tee M' }, + { id => '#182464L', name => 'Firefox OS Ladies Teal Tee L' }, + { id => '#182464X', name => 'Firefox OS Ladies Teal Tee XL' }, + { id => '#1824642', name => 'Firefox OS Ladies Teal Tee 2XL' }, + { id => '#182465S', name => 'Firefox OS Teal Tee S' }, + { id => '#182465M', name => 'Firefox OS Teal Tee M' }, + { id => '#182465L', name => 'Firefox OS Teal Tee L' }, + { id => '#182465X', name => 'Firefox OS Teal Tee XL' }, + { id => '#1824652', name => 'Firefox OS Teal Tee 2XL' }, + { id => '#1824653', name => 'Firefox OS Teal Tee 3XL' }, + { id => '#1824654', name => 'Firefox OS Teal Tee 4XL' }, +]; mozspaces = [ { @@ -170,104 +190,9 @@ mozspaces = [ country => 'Canada', postcode => 'V6B 1H5', }, -] - -cost_centers = [ - 'Accounting (1210)', - 'Add Ons (7500)', - 'Advanced Techology Lab (6400)', - 'Brand Engagement (2400)', - 'Business Affairs (1100)', - 'Business Development (1150)', - 'Business Development Programs (7700)', - 'Business Support Services (1000)', - 'Cloud & Services (3000)', - 'Community Engagement (2300)', - 'Design (4400)', - 'Dev Infra (3130)', - 'Engagement (2000)', - 'Engineering Platform (8000)', - 'Engineering Program Management (8300)', - 'Facilities (1250)', - 'Finance Planning & Analysis (1211)', - 'Firefox (5000)', - 'Firefox Android Engineering (5310)', - 'Firefox Android Product Management (5330)', - 'Firefox Android UX (5320)', - 'Firefox Desktop (5200)', - 'Firefox Desktop Engineering (5210)', - 'Firefox Desktop Platform Integration (5240)', - 'Firefox Desktop Product Management (5230)', - 'Firefox Desktop UX (5220)', - 'Firefox Dev Tools (5400)', - 'Firefox Mobile (5300)', - 'Firefox OS Engineering I (6110)', - 'Firefox OS Engineering II (6120)', - 'Firefox OS Product Management (6200)', - 'Firefox OS UX (6300)', - 'Identity Eng (3210)', - 'Identity Infra (3110)', - 'Infrastructure (servers) (3100)', - 'Insights and Strategy (4000)', - 'IT & Network (1400)', - 'Labs (7600)', - 'Legal (1120)', - 'Localization (L10n) (5100)', - 'Location Engineering (3230)', - 'Location Infra (3150)', - 'Marketplace (7000)', - 'Marketplace Apps Engineering (7110)', - 'Marketplace Bus. Development (7400)', - 'Marketplace Engineering / AMO (7120)', - 'Marketplace Engineering /Dev Ecosystem (7130)', - 'Marketplace Product Management (7200)', - 'Marketplace UX (7300)', - 'Market Strategy (4200)', - 'Metrics (4300)', - 'Misc Infra (3160)', - 'Mobile (6000)', - 'Mobile Business Development (1130)', - 'Mobile Engineering (6130)', - 'Operations (3600)', - 'People (1340)', - 'People Ops (1320)', - 'Platform Accessibility (8490)', - 'Platform Content (8440)', - 'Platform Integration (8480)', - 'Platform Network (8410)', - 'Platform Network & Security (8400)', - 'Platform Performance (8470)', - 'Platform Rendering & Media (8450)', - 'Platform Security (8420)', - 'Platform Security Assurance (8430)', - 'Platform Stability & Plugin (8460)', - 'PR (2200)', - 'Product Marketing (2100)', - 'QA (8500)', - 'QA Android (8550)', - 'QA Automation (8520)', - 'QA Firefox Desktop (8510)', - 'QA FirefoxOS (8560)', - 'QA Mobile (8540)', - 'QA Services (8570)', - 'QA Web (8530)', - 'Release Engineering (8100)', - 'Release Management (5010)', - 'Research (6900)', - 'Services Engineering (3200)', - 'Services Product Management (3400)', - 'Services UX (3300)', - 'SUMO (2600)', - 'Sync Engineering (3220)', - 'Sync Infra (3120)', - 'UP (5500)', - 'User Research (4100)', - 'Web Engineering (8200)', - 'WebRTC (1160)', - 'WebRTC Infra (3140)', - 'Web Security and Security Automation (3500)', - 'Websites & Developer Engagement (2500)', -] +]; + +PROCESS "bug/create/cost-centers.none.tmpl"; %] @@ -782,7 +707,7 @@ function showGear() { <td> <select name="teamcode" id="teamcode"> <option value="">Please select..</option> - [% FOREACH cost IN cost_centers %] + [% FOREACH cost IN cost_centers_by_name %] <option value="[% cost FILTER html %]">[% cost FILTER html %]</option> [% END %] </select> |