diff options
Diffstat (limited to 'extensions/BMO')
7 files changed, 180 insertions, 186 deletions
diff --git a/extensions/BMO/Extension.pm b/extensions/BMO/Extension.pm index d2e62eccd..743d03099 100644 --- a/extensions/BMO/Extension.pm +++ b/extensions/BMO/Extension.pm @@ -2742,4 +2742,96 @@ sub enter_bug_entrydefaultvars { } } +sub app_startup { + my ($self, $args) = @_; + my $app = $args->{app}; + my $r = $app->routes; + + $r->any( '/:REWRITE_itrequest' => [ REWRITE_itrequest => qr{form[\.:]itrequest} ] ) + ->to( 'CGI#enter_bug_cgi' => { 'product' => 'Infrastructure & Operations', 'format' => 'itrequest' } ); + $r->any( '/:REWRITE_mozlist' => [ REWRITE_mozlist => qr{form[\.:]mozlist} ] ) + ->to( 'CGI#enter_bug_cgi' => { 'product' => 'mozilla.org', 'format' => 'mozlist' } ); + $r->any( '/:REWRITE_poweredby' => [ REWRITE_poweredby => qr{form[\.:]poweredby} ] ) + ->to( 'CGI#enter_bug_cgi' => { 'product' => 'mozilla.org', 'format' => 'poweredby' } ); + $r->any( '/:REWRITE_presentation' => [ REWRITE_presentation => qr{form[\.:]presentation} ] ) + ->to( 'cgi#enter_bug_cgi' => { 'product' => 'mozilla.org', 'format' => 'presentation' } ); + $r->any( '/:REWRITE_trademark' => [ REWRITE_trademark => qr{form[\.:]trademark} ] ) + ->to( 'cgi#enter_bug_cgi' => { 'product' => 'mozilla.org', 'format' => 'trademark' } ); + $r->any( '/:REWRITE_recoverykey' => [ REWRITE_recoverykey => qr{form[\.:]recoverykey} ] ) + ->to( 'cgi#enter_bug_cgi' => { 'product' => 'mozilla.org', 'format' => 'recoverykey' } ); + $r->any( '/:REWRITE_legal' => [ REWRITE_legal => qr{form[\.:]legal} ] ) + ->to( 'CGI#enter_bug_cgi' => { 'product' => 'Legal', 'format' => 'legal' }, ); + $r->any( '/:REWRITE_recruiting' => [ REWRITE_recruiting => qr{form[\.:]recruiting} ] ) + ->to( 'CGI#enter_bug_cgi' => { 'product' => 'Recruiting', 'format' => 'recruiting' } ); + $r->any( '/:REWRITE_intern' => [ REWRITE_intern => qr{form[\.:]intern} ] ) + ->to( 'CGI#enter_bug_cgi' => { 'product' => 'Recruiting', 'format' => 'intern' } ); + $r->any( '/:REWRITE_mozpr' => [ REWRITE_mozpr => qr{form[\.:]mozpr} ] ) + ->to( 'CGI#enter_bug_cgi' => { 'product' => 'Mozilla PR', 'format' => 'mozpr' }, ); + $r->any( '/:REWRITE_reps_mentorship' => [ REWRITE_reps_mentorship => qr{form[\.:]reps[\.:]mentorship} ] ) + ->to( 'CGI#enter_bug_cgi' => { 'product' => 'Mozilla Reps', 'format' => 'mozreps' }, ); + $r->any( '/:REWRITE_reps_budget' => [ REWRITE_reps_budget => qr{form[\.:]reps[\.:]budget} ] ) + ->to( 'CGI#enter_bug_cgi' => { 'product' => 'Mozilla Reps', 'format' => 'remo-budget' } ); + $r->any( '/:REWRITE_reps_swag' => [ REWRITE_reps_swag => qr{form[\.:]reps[\.:]swag} ] ) + ->to( 'CGI#enter_bug_cgi' => { 'product' => 'Mozilla Reps', 'format' => 'remo-swag' } ); + $r->any( '/:REWRITE_reps_it' => [ REWRITE_reps_it => qr{form[\.:]reps[\.:]it} ] ) + ->to( 'CGI#enter_bug_cgi' => { 'product' => 'Mozilla Reps', 'format' => 'remo-it' } ); + $r->any( '/:REWRITE_reps_payment' => [ REWRITE_reps_payment => qr{form[\.:]reps[\.:]payment} ] ) + ->to( 'CGI#page_cgi' => { 'id' => 'remo-form-payment.html' } ); + $r->any( '/:REWRITE_csa_discourse' => [ REWRITE_csa_discourse => qr{form[\.:]csa[\.:]discourse} ] ) + ->to( 'CGI#enter_bug_cgi' => { 'product' => 'Infrastructure & Operations', 'format' => 'csa-discourse' } ); + $r->any( '/:REWRITE_employee_incident' => [ REWRITE_employee_incident => qr{form[\.:]employee[\.\-:]incident} ] ) + ->to( 'CGI#enter_bug_cgi' => { 'product' => 'mozilla.org', 'format' => 'employee-incident' } ); + $r->any( '/:REWRITE_brownbag' => [ REWRITE_brownbag => qr{form[\.:]brownbag} ] ) + ->to( 'CGI#https_air_mozilla_org_requests' => {} ); + $r->any( '/:REWRITE_finance' => [ REWRITE_finance => qr{form[\.:]finance} ] ) + ->to( 'CGI#enter_bug_cgi' => { 'product' => 'Finance', 'format' => 'finance' } ); + $r->any( + '/:REWRITE_moz_project_review' => [ REWRITE_moz_project_review => qr{form[\.:]moz[\.\-:]project[\.\-:]review} ] + )->to( 'CGI#enter_bug_cgi' => { 'product' => 'mozilla.org', 'format' => 'moz-project-review' } ); + $r->any( '/:REWRITE_docs' => [ REWRITE_docs => qr{form[\.:]docs?} ] ) + ->to( 'CGI#enter_bug_cgi' => { 'product' => 'Developer Documentation', 'format' => 'doc' } ); + $r->any( '/:REWRITE_mdn' => [ REWRITE_mdn => qr{form[\.:]mdn?} ] ) + ->to( 'CGI#enter_bug_cgi' => { 'format' => 'mdn', 'product' => 'developer.mozilla.org' } ); + $r->any( '/:REWRITE_swag_gear' => [ REWRITE_swag_gear => qr{form[\.:](swag|gear)} ] ) + ->to( 'CGI#enter_bug_cgi' => { 'format' => 'swag', 'product' => 'Marketing' } ); + $r->any( '/:REWRITE_costume' => [ REWRITE_costume => qr{form[\.:]costume} ] ) + ->to( 'CGI#enter_bug_cgi' => { 'product' => 'Marketing', 'format' => 'costume' } ); + $r->any( '/:REWRITE_ipp' => [ REWRITE_ipp => qr{form[\.:]ipp} ] ) + ->to( 'CGI#enter_bug_cgi' => { 'product' => 'Internet Public Policy', 'format' => 'ipp' } ); + $r->any( '/:REWRITE_creative' => [ REWRITE_creative => qr{form[\.:]creative} ] ) + ->to( 'CGI#enter_bug_cgi' => { 'format' => 'creative', 'product' => 'Marketing' } ); + $r->any( '/:REWRITE_user_engagement' => [ REWRITE_user_engagement => qr{form[\.:]user[\.\-:]engagement} ] ) + ->to( 'CGI#enter_bug_cgi' => { 'format' => 'user-engagement', 'product' => 'Marketing' } ); + $r->any( '/:REWRITE_dev_engagement_event' => + [ REWRITE_dev_engagement_event => qr{form[\.:]dev[\.\-:]engagement[\.\-\:]event} ] ) + ->to( 'CGI#enter_bug_cgi' => { 'product' => 'Developer Engagement', 'format' => 'dev-engagement-event' } ); + $r->any( '/:REWRITE_mobile_compat' => [ REWRITE_mobile_compat => qr{form[\.:]mobile[\.\-:]compat} ] ) + ->to( 'CGI#enter_bug_cgi' => { 'product' => 'Tech Evangelism', 'format' => 'mobile-compat' } ); + $r->any( '/:REWRITE_web_bounty' => [ REWRITE_web_bounty => qr{form[\.:]web[\.:]bounty} ] ) + ->to( 'CGI#enter_bug_cgi' => { 'format' => 'web-bounty', 'product' => 'mozilla.org' } ); + $r->any( '/:REWRITE_automative' => [ REWRITE_automative => qr{form[\.:]automative} ] ) + ->to( 'CGI#enter_bug_cgi' => { 'product' => 'Testing', 'format' => 'automative' } ); + $r->any( '/:REWRITE_comm_newsletter' => [ REWRITE_comm_newsletter => qr{form[\.:]comm[\.:]newsletter} ] ) + ->to( 'CGI#enter_bug_cgi' => { 'format' => 'comm-newsletter', 'product' => 'Marketing' } ); + $r->any( '/:REWRITE_screen_share_whitelist' => + [ REWRITE_screen_share_whitelist => qr{form[\.:]screen[\.:]share[\.:]whitelist} ] ) + ->to( 'CGI#enter_bug_cgi' => { 'format' => 'screen-share-whitelist', 'product' => 'Firefox' } ); + $r->any( '/:REWRITE_data_compliance' => [ REWRITE_data_compliance => qr{form[\.:]data[\.\-:]compliance} ] ) + ->to( 'CGI#enter_bug_cgi' => { 'product' => 'Data Compliance', 'format' => 'data-compliance' } ); + $r->any( '/:REWRITE_fsa_budget' => [ REWRITE_fsa_budget => qr{form[\.:]fsa[\.:]budget} ] ) + ->to( 'CGI#enter_bug_cgi' => { 'product' => 'FSA', 'format' => 'fsa-budget' } ); + $r->any( '/:REWRITE_triage_request' => [ REWRITE_triage_request => qr{form[\.:]triage[\.\-]request} ] ) + ->to( 'CGI#page_cgi' => { 'id' => 'triage_request.html' } ); + $r->any( '/:REWRITE_crm_CRM' => [ REWRITE_crm_CRM => qr{form[\.:](crm|CRM)} ] ) + ->to( 'CGI#enter_bug_cgi' => { 'format' => 'crm', 'product' => 'Marketing' } ); + $r->any( '/:REWRITE_nda' => [ REWRITE_nda => qr{form[\.:]nda} ] ) + ->to( 'CGI#enter_bug_cgi' => { 'product' => 'Legal', 'format' => 'nda' } ); + $r->any( '/:REWRITE_name_clearance' => [ REWRITE_name_clearance => qr{form[\.:]name[\.:]clearance} ] ) + ->to( 'CGI#enter_bug_cgi' => { 'format' => 'name-clearance', 'product' => 'Legal' } ); + $r->any( '/:REWRITE_shield_studies' => [ REWRITE_shield_studies => qr{form[\.:]shield[\.:]studies} ] ) + ->to( 'CGI#enter_bug_cgi' => { 'product' => 'Shield', 'format' => 'shield-studies' } ); + $r->any( '/:REWRITE_client_bounty' => [ REWRITE_client_bounty => qr{form[\.:]client[\.:]bounty} ] ) + ->to( 'CGI#enter_bug_cgi' => { 'product' => 'Firefox', 'format' => 'client-bounty' } ); +} + __PACKAGE__->NAME; 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 cff5e5796..05ec4e2d9 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 @@ -13,106 +13,106 @@ items = [ { 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 => '#1574522', name => 'Very Splendid Package Ladies 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 => '#1574542', name => 'Very Splendid Package Men\'s 2XL' }, - { id => '#1574543', name => 'Very Splendid Package Men\'s 3XL' }, - { 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 Gear' }, - { id => '#155751', name => 'Drawstring Tote ' }, - { id => '#155340', name => 'Beanie' }, - { id => '#155339', name => 'Black Cap with Tote ' }, - { id => '#212669', name => 'Stoneware Ceramic Mug' }, - { id => '#190928S', name => 'Firefox Tee w/Woven Tag Navy S' }, - { id => '#190928M', name => 'Firefox Tee w/Woven Tag Navy M' }, - { id => '#190928L', name => 'Firefox Tee w/Woven Tag Navy L' }, - { id => '#190928X', name => 'Firefox Tee w/Woven Tag Navy XL' }, - { id => '#1909282', name => 'Firefox Tee w/Woven Tag Navy 2XL' }, - { id => '#1909283', name => 'Firefox Tee w/Woven Tag Navy 3XL' }, - { id => '#190929S', name => 'Firefox SS Lapis Tee Lapis S' }, - { id => '#190929M', name => 'Firefox SS Lapis Tee Lapis M' }, - { id => '#190929L', name => 'Firefox SS Lapis Tee Lapis L' }, - { id => '#190929X', name => 'Firefox SS Lapis Tee Lapis XL' }, - { 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 => '#1554132', name => 'Ladies\' T-shirt Navy 2XL' }, +# { 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 => '#1574522', name => 'Very Splendid Package Ladies 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 => '#1574542', name => 'Very Splendid Package Men\'s 2XL' }, +# { id => '#1574543', name => 'Very Splendid Package Men\'s 3XL' }, +# { 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 Gear' }, +# { id => '#155751', name => 'Drawstring Tote ' }, +# { id => '#155340', name => 'Beanie' }, +# { id => '#155339', name => 'Black Cap with Tote ' }, +# { id => '#212669', name => 'Stoneware Ceramic Mug' }, +# { id => '#190928S', name => 'Firefox Tee w/Woven Tag Navy S' }, +# { id => '#190928M', name => 'Firefox Tee w/Woven Tag Navy M' }, +# { id => '#190928L', name => 'Firefox Tee w/Woven Tag Navy L' }, +# { id => '#190928X', name => 'Firefox Tee w/Woven Tag Navy XL' }, +# { id => '#1909282', name => 'Firefox Tee w/Woven Tag Navy 2XL' }, +# { id => '#1909283', name => 'Firefox Tee w/Woven Tag Navy 3XL' }, +# { id => '#190929S', name => 'Firefox SS Lapis Tee Lapis S' }, +# { id => '#190929M', name => 'Firefox SS Lapis Tee Lapis M' }, +# { id => '#190929L', name => 'Firefox SS Lapis Tee Lapis L' }, +# { id => '#190929X', name => 'Firefox SS Lapis Tee Lapis XL' }, +# { 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 => '#1554132', name => 'Ladies\' T-shirt Navy 2XL' }, { id => '', name => 'Splendid Gear' }, - { id => '#192150', name => '1.25" Firefox Button-PKG25 ' }, +# { id => '#192150', name => '1.25" Firefox Button-PKG25 ' }, { id => '#197156', name => 'Firefox Tattoos- Pkg50' }, - { id => '#197158', name => 'Firefox Sticker' }, - { id => '#197159', name => 'Firefox Laminated Badge' }, - { id => '#155754', name => 'Lanyard with Bulldog Clip (Mozilla)' }, +# { id => '#197158', name => 'Firefox Sticker' }, +# { id => '#197159', name => 'Firefox Laminated Badge' }, +# { id => '#155754', name => 'Lanyard with Bulldog Clip (Mozilla)' }, { id => '#155756', name => 'Silicone Wristband ' }, - { id => '', name => 'Limited Availability Gear' }, - { id => '#265073', name => 'Mozilla Cap' }, +# { id => '', name => 'Limited Availability Gear' }, +# { id => '#265073', name => 'Mozilla Cap' }, { id => '#265080', name => 'Fox Plush' }, - { id => '#265072S', name => 'Mozilla Custom Hoodie' }, - { id => '#265072M', name => 'Mozilla Custom Hoodie' }, - { id => '#265072L', name => 'Mozilla Custom Hoodie' }, - { id => '#265072X', name => 'Mozilla Custom Hoodie' }, - { id => '#2650722', name => 'Mozilla Custom Hoodie' }, - { id => '#265074S', name => 'Ladies\' Firefox Logo T-Shirt' }, - { id => '#265074M', name => 'Ladies\' Firefox Logo T-Shirt' }, - { id => '#265074L', name => 'Ladies\' Firefox Logo T-Shirt' }, - { id => '#265074X', name => 'Ladies\' Firefox Logo T-Shirt' }, - { id => '#2650742', name => 'Ladies\' Firefox Logo T-Shirt' }, - { id => '#265075S', name => 'Women\'s Vertical T-Shirt' }, - { id => '#265075M', name => 'Women\'s Vertical T-Shirt' }, - { id => '#265075L', name => 'Women\'s Vertical T-Shirt' }, - { id => '#265075X', name => 'Women\'s Vertical T-Shirt' }, - { id => '#2650752', name => 'Women\'s Vertical T-Shirt' }, - { id => '#265078S', name => 'Mozilla Horizontal T-Shirt' }, - { id => '#265078M', name => 'Mozilla Horizontal T-Shirt' }, - { id => '#265078L', name => 'Mozilla Horizontal T-Shirt' }, - { id => '#265078X', name => 'Mozilla Horizontal T-Shirt' }, - { id => '#2650782', name => 'Mozilla Horizontal T-Shirt' }, +# { id => '#265072S', name => 'Mozilla Custom Hoodie' }, +# { id => '#265072M', name => 'Mozilla Custom Hoodie' }, +# { id => '#265072L', name => 'Mozilla Custom Hoodie' }, +# { id => '#265072X', name => 'Mozilla Custom Hoodie' }, +# { id => '#2650722', name => 'Mozilla Custom Hoodie' }, +# { id => '#265074S', name => 'Ladies\' Firefox Logo T-Shirt' }, +# { id => '#265074M', name => 'Ladies\' Firefox Logo T-Shirt' }, +# { id => '#265074L', name => 'Ladies\' Firefox Logo T-Shirt' }, +# { id => '#265074X', name => 'Ladies\' Firefox Logo T-Shirt' }, +# { id => '#2650742', name => 'Ladies\' Firefox Logo T-Shirt' }, +# { id => '#265075S', name => 'Women\'s Vertical T-Shirt' }, +# { id => '#265075M', name => 'Women\'s Vertical T-Shirt' }, +# { id => '#265075L', name => 'Women\'s Vertical T-Shirt' }, +# { id => '#265075X', name => 'Women\'s Vertical T-Shirt' }, +# { id => '#2650752', name => 'Women\'s Vertical T-Shirt' }, +# { id => '#265078S', name => 'Mozilla Horizontal T-Shirt' }, +# { id => '#265078M', name => 'Mozilla Horizontal T-Shirt' }, +# { id => '#265078L', name => 'Mozilla Horizontal T-Shirt' }, +# { id => '#265078X', name => 'Mozilla Horizontal T-Shirt' }, +# { id => '#2650782', name => 'Mozilla Horizontal T-Shirt' }, ]; mozspaces = [ { name => 'Beijing', - address1 => 'Mozilla Online Ltd, International Club Office Tower 800A', - address2 => '21 Jian Guo Men Wai Avenue', + address1 => 'Mozilla Online Ltd.', + address2 => 'China Resources Building, Suite 1708, 8 Jianguomenbei Avenue', city => 'Beijing', - state => 'Chaoyang District', + state => 'Dongcheng District', country => 'China', - postcode => '100020', + postcode => '100005', }, { name => 'Berlin', address1 => 'MZ Denmark ApS - Germany', - address2 => 'Voltastrasse 5 / Building (Haus) 10 / Stair (Treppe) 6 / 2nd floor.', + address2 => 'GSG-Hof Schlesische Straße, Gebäude 3, 4. Obergeschoss, Schlesische Straße 27', city => 'Berlin', state => 'Germany', country => 'Germany', - postcode => '13355', + postcode => '10997', }, { name => 'London', address1 => 'Mozilla London', - address2 => '101 St. Martin\'s Lane, 3rd Floor', + address2 => 'Metal Box Factory, Suite 441, 4th floor, 30 Great Guildford Street', city => 'London', state => 'Greater London', country => 'UK', - postcode => 'WC2N 4AZ', + postcode => 'SE1 0HS', }, { name => 'Mountain View', @@ -160,15 +160,6 @@ mozspaces = [ postcode => '11047', }, { - name => 'Tokyo', - address1 => '7-5-6 Roppongi', - address2 => '', - city => 'Minato-ku', - state => 'Tokyo', - country => 'Japan', - postcode => '106-0032', - }, - { name => 'Toronto', address1 => 'Mozilla Canada', address2 => '366 Adelaide Street W, Suite 500', diff --git a/extensions/BMO/template/en/default/hook/global/header-external-links.html.tmpl b/extensions/BMO/template/en/default/hook/global/header-external-links.html.tmpl index 54a2f0e49..f79548e3d 100644 --- a/extensions/BMO/template/en/default/hook/global/header-external-links.html.tmpl +++ b/extensions/BMO/template/en/default/hook/global/header-external-links.html.tmpl @@ -15,7 +15,7 @@ <li role="presentation"> <a href="https://www.mozilla.org/" role="menuitem" tabindex="-1">Mozilla Home</a> </li> - <li role="separator" class="dropdown-separator"></li> + <li role="separator"></li> <li role="presentation"> <a href="https://www.mozilla.org/privacy/websites/" role="menuitem" tabindex="-1">Privacy</a> </li> diff --git a/extensions/BMO/template/en/default/hook/reports/components-start.html.tmpl b/extensions/BMO/template/en/default/hook/reports/components-start.html.tmpl new file mode 100644 index 000000000..a4234caa2 --- /dev/null +++ b/extensions/BMO/template/en/default/hook/reports/components-start.html.tmpl @@ -0,0 +1,10 @@ +[%# This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + # + # This Source Code Form is "Incompatible With Secondary Licenses", as + # defined by the Mozilla Public License, v. 2.0. + #%] + +[%# Don't show the default assignees and QA contacts %] +[% show_default_people = 0 %] diff --git a/extensions/BMO/template/en/default/pages/group_members.html.tmpl b/extensions/BMO/template/en/default/pages/group_members.html.tmpl index ec2cb2e46..1c593c07e 100644 --- a/extensions/BMO/template/en/default/pages/group_members.html.tmpl +++ b/extensions/BMO/template/en/default/pages/group_members.html.tmpl @@ -82,7 +82,7 @@ <a href="editusers.cgi?action=edit&userid=[% member.id FILTER none %]" target="_blank"> [% ELSE %] - <a href="user_profile?login=[% member.login FILTER uri %]" + <a href="user_profile?user_id=[% member.id FILTER none %]" target="_blank"> [% END %] <span [% 'class="bz_inactive"' UNLESS member.is_enabled %]> diff --git a/extensions/BMO/template/en/default/reports/components.html.tmpl b/extensions/BMO/template/en/default/reports/components.html.tmpl deleted file mode 100644 index 3e23d389e..000000000 --- a/extensions/BMO/template/en/default/reports/components.html.tmpl +++ /dev/null @@ -1,99 +0,0 @@ -[%# The contents of this file are subject to the Mozilla Public - # License Version 1.1 (the "License"); you may not use this file - # except in compliance with the License. You may obtain a copy of - # the License at http://www.mozilla.org/MPL/ - # - # Software distributed under the License is distributed on an "AS - # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - # implied. See the License for the specific language governing - # rights and limitations under the License. - # - # The Original Code is the Bugzilla Bug Tracking System. - # - # The Initial Developer of the Original Code is Netscape Communications - # Corporation. Portions created by Netscape are - # Copyright (C) 1998 Netscape Communications Corporation. All - # Rights Reserved. - # - # Contributor(s): Bradley Baetz <bbaetz@student.usyd.edu.au> - # Max Kanat-Alexander <mkanat@bugzilla.org> - #%] - -[%# INTERFACE: - # product: object. The product for which we want to display component - # descriptions. - # component: string. The name of the component to hilight in the browser - #%] - -[% title = BLOCK %] - Components for [% product.name FILTER html %] -[% END %] - -[% inline_style = BLOCK %] -.product_name { - font-size: 2em; - font-weight: normal; -} -.component_name { - font-size: 1.5em; - font-weight: normal; -} -.product_desc, .component_desc { - padding-left: 1em; - font-size: 1em; -} -.component_container { - padding-left: 1em; - margin-bottom: 1em; -} -.product_container, .instructions { - margin-bottom: 1em; -} -.component_highlight { - padding: 0 0 0 1em; -} -[% END %] - -[% PROCESS global/header.html.tmpl - style_urls = [ "skins/standard/reports.css" ] - title = title - style = inline_style -%] - -<h2>[% mark FILTER html %]</h2> - -<div class="product_container"> - <span class="product_name">[% product.name FILTER html %]</span> - <div class="product_desc"> - [% product.description FILTER html_light %] - </div> -</div> - -<div class="instructions"> - Select a component to see open [% terms.bugs %] in that component: -</div> - -[% FOREACH comp = product.components %] - [% INCLUDE describe_comp %] -[% END %] - -[% PROCESS global/footer.html.tmpl %] - -[%############################################################################%] -[%# BLOCK for components %] -[%############################################################################%] - -[% BLOCK describe_comp %] - <div class="component_container [%- IF comp.name == component_mark %] component_hilite[% END %]"> - <div class="component_name"> - <a name="[% comp.name FILTER html %]" - href="buglist.cgi?product= - [%- product.name FILTER uri %]&component= - [%- comp.name FILTER uri %]&resolution=---"> - [% comp.name FILTER html %]</a> - </div> - <div class="component_desc"> - [% comp.description FILTER html_light %] - </div> - </div> -[% END %] diff --git a/extensions/BMO/web/js/edituser_menu.js b/extensions/BMO/web/js/edituser_menu.js index 7008a2b84..a300f5c24 100644 --- a/extensions/BMO/web/js/edituser_menu.js +++ b/extensions/BMO/web/js/edituser_menu.js @@ -10,7 +10,7 @@ function show_usermenu(id, email, show_edit) { { name: "Profile", callback: function () { - var href = "user_profile?login=" + encodeURIComponent(email); + var href = "user_profile?user_id=" + id; window.open(href, "_blank"); } }, |