more porting work

40 files changed, 470 insertions, 1592 deletions

diff --git a/extensions/BMO/Extension.pm b/extensions/BMO/Extension.pm
index 79edaad3e..c800ade3d 100644
--- a/extensions/BMO/Extension.pm
+++ b/extensions/BMO/Extension.pm
@@ -42,6 +42,7 @@ use DateTime;
 use Bugzilla::Extension::BMO::FakeBug;
 use Bugzilla::Extension::BMO::Data qw($cf_visible_in_products
                                       $cf_flags
+                                      $cf_disabled_flags
                                       %group_to_cc_map
                                       $blocking_trusted_setters
                                       $blocking_trusted_requesters
@@ -51,7 +52,8 @@ use Bugzilla::Extension::BMO::Data qw($cf_visible_in_products
                                       %always_fileable_group
                                       %product_sec_groups);
 use Bugzilla::Extension::BMO::Reports qw(user_activity_report
-                                         triage_reports);
+                                         triage_reports
+                                         group_admins);
 
 our $VERSION = '0.1';
 
@@ -69,6 +71,7 @@ sub template_before_process {
     my $vars = $args->{'vars'};
     
     $vars->{'cf_hidden_in_product'} = \&cf_hidden_in_product;
+    $vars->{'cf_flag_disabled'} = \&cf_flag_disabled;
     
     if ($file =~ /^list\/list/) {
         # Purpose: enable correct sorting of list table
@@ -155,8 +158,8 @@ sub page_before_template {
         # that our hook template can see. 
         Bugzilla->request_cache->{'bmo_fields_page'} = 1;
     }
-    elsif ($page eq 'remo-form-payment.html') {
-        _remo_form_payment($vars);
+    elsif ($page eq 'group_admins.html') {
+        group_admins($vars);
     }
 }
 
@@ -242,6 +245,13 @@ sub cf_hidden_in_product {
     return 0;
 }
 
+sub cf_flag_disabled {
+    my ($field_name, $bug) = @_;
+    return 0 unless grep { $field_name eq $_ } @$cf_disabled_flags;
+    my $value = $bug->{$field_name};
+    return $value eq '---' || $value eq '';
+}
+
 # Purpose: CC certain email addresses on bugmail when a bug is added or 
 # removed from a particular group.
 sub bugmail_recipients {
@@ -440,6 +450,19 @@ sub _link_hg {
     return qq{<a href="https://hg.mozilla.org/$repo/rev/$id">$text</a>};
 }
 
+sub _link_bzr {
+    my $args = shift;
+    my $preamble = html_quote($args->{matches}->[0]);
+    my $url = html_quote($args->{matches}->[1]);
+    my $text = html_quote($args->{matches}->[2]);
+    my $id = html_quote($args->{matches}->[3]);
+
+    $url =~ s/\s+$//;
+    $url =~ s/\/$//;
+
+    return qq{$preamble<a href="http://$url/revision/$id">$text</a>};
+}
+
 sub bug_format_comment {
     my ($self, $args) = @_;
     my $regexes = $args->{'regexes'};
@@ -466,6 +489,13 @@ sub bug_format_comment {
         replace => \&_link_svn
     });
 
+    push (@$regexes, {
+        match => qr/\b(Committing\sto:\sbzr\+ssh:\/\/
+                    (?:[^\@]+\@)?(bzr\.mozilla\.org[^\n]+)\n.*?\nCommitted\s)
+                    (revision\s(\d+))\./sx,
+        replace => \&_link_bzr
+    });
+
     # Note: for grouping in this regexp, always use non-capturing parentheses.
     my $hgrepos = join('|', qw!(?:releases/)?comm-[\w.]+ 
                                (?:releases/)?mozilla-[\w.]+
@@ -597,146 +627,6 @@ sub install_update_db {
     }
 }
 
-sub _remo_form_payment {
-    my ($vars) = @_;
-    my $input = Bugzilla->input_params;
-
-    my $user = Bugzilla->login(LOGIN_REQUIRED);
-
-    if ($input->{'action'} eq 'commit') {
-        my $template = Bugzilla->template;
-        my $cgi      = Bugzilla->cgi;
-        my $dbh      = Bugzilla->dbh;
-
-        my $bug_id = $input->{'bug_id'};
-        detaint_natural($bug_id);
-        my $bug = Bugzilla::Bug->check($bug_id);
-
-        # Detect if the user already used the same form to submit again
-        my $token = trim($input->{'token'});
-        if ($token) {
-            my ($creator_id, $date, $old_attach_id) = Bugzilla::Token::GetTokenData($token);
-            if (!$creator_id 
-                || $creator_id != $user->id 
-                || $old_attach_id !~ "^remo_form_payment:")
-            {
-                # The token is invalid.
-                ThrowUserError('token_does_not_exist');
-            }
-
-            $old_attach_id =~ s/^remo_form_payment://;
-            if ($old_attach_id) {
-                ThrowUserError('remo_payment_cancel_dupe', 
-                               { bugid => $bug_id, attachid => $old_attach_id });
-            }
-        }
-
-        # Make sure the user can attach to this bug
-        if (!$bug->user->{'canedit'}) {
-            ThrowUserError("remo_payment_bug_edit_denied", 
-                           { bug_id => $bug->id });
-        }
-
-        # Make sure the bug is under the correct product/component
-        if ($bug->product ne 'Mozilla Reps' 
-            || $bug->component ne 'Budget Requests') 
-        {
-            ThrowUserError('remo_payment_invalid_product');    
-        }
-
-        my ($timestamp) = $dbh->selectrow_array("SELECT NOW()");
-
-        $dbh->bz_start_transaction;
-    
-        # Create the comment to be added based on the form fields from rep-payment-form
-        my $comment;
-        $template->process("pages/comment-remo-form-payment.txt.tmpl", $vars, \$comment)
-            || ThrowTemplateError($template->error());
-        $bug->add_comment($comment, { isprivate => 0 });
-
-        # Attach expense report
-        # FIXME: Would be nice to be able to have the above prefilled comment and
-        # the following attachments all show up under a single comment. But the longdescs
-        # table can only handle one attach_id per comment currently. At least only one
-        # email is sent the way it is done below.
-        my $attachment;
-        if (defined $cgi->upload('expenseform')) {
-            # Determine content-type
-            my $content_type = $cgi->uploadInfo($cgi->param('expenseform'))->{'Content-Type'};
- 
-            $attachment = Bugzilla::Attachment->create(
-                { bug           => $bug, 
-                  creation_ts   => $timestamp, 
-                  data          => $cgi->upload('expenseform'), 
-                  description   => 'Expense Form', 
-                  filename      => scalar $cgi->upload('expenseform'), 
-                  ispatch       => 0, 
-                  isprivate     => 0, 
-                  isurl         => 0, 
-                  mimetype      => $content_type, 
-                  store_in_file => 0, 
-            });
-
-            # Insert comment for attachment
-            $bug->add_comment('', { isprivate  => 0, 
-                                    type       => CMT_ATTACHMENT_CREATED, 
-                                    extra_data => $attachment->id });
-        }
-
-        # Attach receipts file
-        if (defined $cgi->upload("receipts")) {
-            # Determine content-type
-            my $content_type = $cgi->uploadInfo($cgi->param("receipts"))->{'Content-Type'};
-
-            $attachment = Bugzilla::Attachment->create(
-                { bug           => $bug, 
-                  creation_ts   => $timestamp, 
-                  data          => $cgi->upload('receipts'), 
-                  description   => "Receipts", 
-                  filename      => scalar $cgi->upload("receipts"), 
-                  ispatch       => 0, 
-                  isprivate     => 0, 
-                  isurl         => 0, 
-                  mimetype      => $content_type, 
-                  store_in_file => 0, 
-            });
-
-            # Insert comment for attachment
-            $bug->add_comment('', { isprivate  => 0, 
-                                    type       => CMT_ATTACHMENT_CREATED, 
-                                    extra_data => $attachment->id });
-        }
-
-        $bug->update($timestamp);
-
-        if ($token) {
-            trick_taint($token);
-            $dbh->do('UPDATE tokens SET eventdata = ? WHERE token = ?', undef,
-                     ("remo_form_payment:" . $attachment->id, $token));
-        }
-
-        $dbh->bz_commit_transaction;
-    
-        # Define the variables and functions that will be passed to the UI template.
-        $vars->{'attachment'} = $attachment;
-        $vars->{'bugs'} = [ new Bugzilla::Bug($bug_id) ];
-        $vars->{'header_done'} = 1;
-        $vars->{'contenttypemethod'} = 'autodetect';
- 
-        my $recipients = { 'changer' => $user };
-        $vars->{'sent_bugmail'} = Bugzilla::BugMail::Send($bug_id, $recipients);
-        
-        print $cgi->header();
-        # Generate and return the UI (HTML page) from the appropriate template.
-        $template->process("attachment/created.html.tmpl", $vars)
-            || ThrowTemplateError($template->error()); 
-        exit;
-    }
-    else {
-        $vars->{'token'} = issue_session_token('remo_form_payment:');
-    }
-}
-
 sub _last_closed_date {
     my ($self) = @_;
     my $dbh = Bugzilla->dbh;
@@ -796,4 +686,61 @@ sub webservice {
     $dispatch->{BMO} = "Bugzilla::Extension::BMO::WebService";
 }
 
+our $search_content_matches;
+BEGIN {
+    $search_content_matches = \&Bugzilla::Search::_content_matches;
+}
+
+sub search_operator_field_override {
+    my ($self, $args) = @_;
+    my $search = $args->{'search'};
+    my $operators = $args->{'operators'};
+
+    my $cgi = Bugzilla->cgi;
+    my @comments = $cgi->param('comments');
+    my $exclude_comments = scalar(@comments) && !grep { $_ eq '1' } @comments;
+
+    if ($cgi->param('query_format') eq 'specific' && $exclude_comments) {
+        # use the non-comment operator
+        $operators->{'content'}->{matches} = \&_short_desc_matches;
+        $operators->{'content'}->{notmatches} = \&_short_desc_matches;
+
+    } else {
+        # restore default content operator
+        $operators->{'content'}->{matches} = $search_content_matches;
+        $operators->{'content'}->{notmatches} = $search_content_matches;
+    }
+}
+
+sub _short_desc_matches {
+    # copy of Bugzilla::Search::_content_matches
+
+    my $self = shift;
+    my %func_args = @_;
+    my ($chartid, $supptables, $term, $groupby, $fields, $t, $v) =
+        @func_args{qw(chartid supptables term groupby fields t v)};
+    my $dbh = Bugzilla->dbh;
+
+    # Add the fulltext table to the query so we can search on it.
+    my $table = "bugs_fulltext_$$chartid";
+    push(@$supptables, "LEFT JOIN bugs_fulltext AS $table " .
+                       "ON bugs.bug_id = $table.bug_id");
+
+    # Create search terms to add to the SELECT and WHERE clauses.
+    my ($term1, $rterm1) = $dbh->sql_fulltext_search("$table.short_desc", $$v, 1);
+    $rterm1 = $term1 if !$rterm1;
+
+    # The term to use in the WHERE clause.
+    $$term = $term1;
+    if ($$t =~ /not/i) {
+        $$term = "NOT($$term)";
+    }
+
+    my $current = Bugzilla::Search::COLUMNS->{'relevance'}->{name};
+    $current = $current ? "$current + " : '';
+    # For NOT searches, we just add 0 to the relevance.
+    my $select_term = $$t =~ /not/ ? 0 : "($current$rterm1)";
+    Bugzilla::Search::COLUMNS->{'relevance'}->{name} = $select_term;
+}
+
 __PACKAGE__->NAME;
diff --git a/extensions/BMO/lib/Data.pm b/extensions/BMO/lib/Data.pm
index 17b84a37e..ccc729a6d 100644
--- a/extensions/BMO/lib/Data.pm
+++ b/extensions/BMO/lib/Data.pm
@@ -27,7 +27,7 @@ use base qw(Exporter);
 use Tie::IxHash;
 
 our @EXPORT_OK = qw($cf_visible_in_products
-                    $cf_flags
+                    $cf_flags $cf_disabled_flags
                     %group_to_cc_map
                     $blocking_trusted_setters
                     $blocking_trusted_requesters
@@ -78,7 +78,6 @@ tie(%$cf_visible_in_products, "Tie::IxHash",
         "Add-on SDK"            => [],
         "addons.mozilla.org"    => [],
         "AUS"                   => [],
-        "Camino"                => [],
         "Core Graveyard"        => [],
         "Core"                  => [],
         "Directory"             => [],
@@ -108,6 +107,9 @@ tie(%$cf_visible_in_products, "Tie::IxHash",
             "Server Operations: Security",
         ],
     },
+    qw/^cf_office$/ => {
+        "mozilla.org"           => ["Server Operations: Desktop Issues"],
+    },
     qr/^cf_crash_signature$/ => {
         "addons.mozilla.org"    => [], 
         "Add-on SDK"            => [], 
@@ -136,6 +138,9 @@ tie(%$cf_visible_in_products, "Tie::IxHash",
         "Mozilla Labs"          => [],
         "mozilla.org"           => [], 
         "Tech Evangelism"       => [],  
+    },
+    qw/^cf_due_date$/ => {
+        "Mozilla Reps" => [],
     }, 
 );
 
@@ -144,6 +149,28 @@ our $cf_flags = [
     qr/^cf_(?:blocking|tracking|status)_/,
 ];
 
+# List of disabled fields.
+# Temp kludge until custom fields can be disabled correctly upstream.
+# Disabled fields are hidden unless they have a value set
+our $cf_disabled_flags = [
+    'cf_blocking_20',
+    'cf_status_20',
+    'cf_tracking_firefox5',
+    'cf_status_firefox5',
+    'cf_blocking_thunderbird32',
+    'cf_status_thunderbird32',
+    'cf_blocking_thunderbird30',
+    'cf_status_thunderbird30',
+    'cf_blocking_seamonkey21',
+    'cf_status_seamonkey21',
+    'cf_tracking_seamonkey22',
+    'cf_status_seamonkey22',
+    'cf_tracking_firefox6',
+    'cf_status_firefox6',
+    'cf_tracking_thunderbird6',
+    'cf_status_thunderbird6',
+];
+
 # Who to CC on particular bugmails when certain groups are added or removed.
 our %group_to_cc_map = (
   'bugzilla-security'        => 'security@bugzilla.org',
diff --git a/extensions/BMO/lib/FakeBug.pm b/extensions/BMO/lib/FakeBug.pm
index d8cebe379..5610f5433 100644
--- a/extensions/BMO/lib/FakeBug.pm
+++ b/extensions/BMO/lib/FakeBug.pm
@@ -1,7 +1,5 @@
 package Bugzilla::Extension::BMO::FakeBug;
 
-use strict;
-
 # hack to allow the bug entry templates to use check_can_change_field to see if
 # various field values should be available to the current user
 
diff --git a/extensions/BMO/lib/Reports.pm b/extensions/BMO/lib/Reports.pm
index d1f979beb..f291e72e7 100644
--- a/extensions/BMO/lib/Reports.pm
+++ b/extensions/BMO/lib/Reports.pm
@@ -31,7 +31,8 @@ use DateTime;
 use base qw(Exporter);
 
 our @EXPORT_OK = qw(user_activity_report
-                    triage_reports);
+                    triage_reports
+                    group_admins);
 
 sub user_activity_report {
     my ($vars) = @_;
@@ -303,14 +304,16 @@ sub triage_reports {
 
         # load product and components from input
 
-        my $product = Bugzilla::Product->new({ name => $input->{'product'} });
+        my $product = Bugzilla::Product->new({ name => $input->{'product'} })
+            || ThrowUserError('invalid_object', { object => 'Product', value => $input->{'product'} });
 
         my @component_ids;
         if ($input->{'component'} ne '') {
             my $ra_components = ref($input->{'component'})
                 ? $input->{'component'} : [ $input->{'component'} ];
             foreach my $component_name (@$ra_components) {
-                my $component = Bugzilla::Component->new({ name => $component_name, product => $product });
+                my $component = Bugzilla::Component->new({ name => $component_name, product => $product })
+                    || ThrowUserError('invalid_object', { object => 'Component', value => $component_name });
                 push @component_ids, $component->id;
             }
         }
@@ -319,15 +322,22 @@ sub triage_reports {
 
         my $filter_commenter = $input->{'filter_commenter'};
         my $filter_commenter_on = $input->{'commenter'};
+        my $filter_last = $input->{'filter_last'};
+        my $filter_last_period = $input->{'last'};
+
+        if (!$filter_commenter || $filter_last) {
+            $filter_commenter = '1';
+            $filter_commenter_on = 'reporter';
+        }
+
         my $filter_commenter_id;
         if ($filter_commenter && $filter_commenter_on eq 'is') {
             Bugzilla::User::match_field({ 'commenter_is' => {'type' => 'single'} });
-            my $user = Bugzilla::User->new({ name => $input->{'commenter_is'} });
+            my $user = Bugzilla::User->new({ name => $input->{'commenter_is'} })
+                || ThrowUserError('invalid_object', { object => 'User', value => $input->{'commenter_is'} });
             $filter_commenter_id = $user ? $user->id : 0;
         }
 
-        my $filter_last = $input->{'filter_last'};
-        my $filter_last_period = $input->{'last'};
         my $filter_last_time;
         if ($filter_last) {
             if ($filter_last_period eq 'is') {
@@ -338,11 +348,10 @@ sub triage_reports {
                     $filter_last_period = 14 if $filter_last_period < 14;
             }
         }
-        my $now = (time);
-        $filter_commenter = 1 unless $filter_commenter || $filter_last;
 
         # form sql queries
 
+        my $now = (time);
         my $bugs_sql = "
               SELECT bug_id, short_desc, reporter, creation_ts
                 FROM bugs
@@ -473,4 +482,41 @@ sub triage_reports {
     $vars->{'input'} = $input;
 }
 
+sub group_admins {
+    my ($vars, $filter) = @_;
+    my $dbh = Bugzilla->dbh;
+    my $user = Bugzilla->user;
+
+    $user->in_group('editusers')
+        || ThrowUserError('auth_failure', { group  => 'editusers', 
+                                            action => 'run', 
+                                            object => 'group_admins' });
+
+    my $query = "
+        SELECT groups.name, " .
+               $dbh->sql_group_concat('profiles.login_name', "','", 1) . "
+          FROM groups
+               LEFT JOIN user_group_map
+                    ON user_group_map.group_id = groups.id
+                    AND user_group_map.isbless = 1
+                    AND user_group_map.grant_type = 0
+               LEFT JOIN profiles
+                    ON user_group_map.user_id = profiles.userid
+         WHERE groups.isbuggroup = 1
+      GROUP BY groups.name";
+    
+    my @groups;
+    foreach my $group (@{ $dbh->selectall_arrayref($query) }) {
+        my @admins;
+        if ($group->[1]) {
+            foreach my $admin (split(/,/, $group->[1])) {
+                push(@admins, Bugzilla::User->new({ name => $admin }));
+            }
+        }
+        push(@groups, { name => $group->[0], admins => \@admins });
+    }
+
+    $vars->{'groups'} = \@groups;
+}
+
 1;
diff --git a/extensions/BMO/template/en/default/account/create.html.tmpl b/extensions/BMO/template/en/default/account/create.html.tmpl
index 275df01f8..47355cf00 100644
--- a/extensions/BMO/template/en/default/account/create.html.tmpl
+++ b/extensions/BMO/template/en/default/account/create.html.tmpl
@@ -122,17 +122,17 @@ function onSubmit() {
   <ol>
   <li>
     Please consider reading our
-    <a href="https://developer.mozilla.org/en/Bug_writing_guidelines" target="_blank">[% terms.bug %] writing guidelines</a>.
+    <a href="https://developer.mozilla.org/en/Bug_writing_guidelines" target="_blank">bug writing guidelines</a>.
   </li>
   <li>
-    [% terms.Bugzilla %] is a public place, so what you type and your email address will be visible
+    Bugzilla is a public place, so what you type and your email address will be visible
     to all logged-in users.  Some people use an
     <a href="http://email.about.com/od/freeemailreviews/tp/free_email.htm" target="_blank">alternative email address</a>
     for this reason.
   </li>
   <li>
     Please give us an email address you want to use.  Once we confirm that it works,
-    you'll be asked to set a password and then you can start filing [% terms.bugs %] and helping fix them.
+    you'll be asked to set a password and then you can start filing bugs and helping fix them.
   </li>
   </ol>
   </div>
@@ -158,9 +158,9 @@ function onSubmit() {
 </table>
 
 <p id="bmo-admin">
-  If you think there's something wrong with [% terms.Bugzilla %], you can
+  If you think there's something wrong with Bugzilla, you can
   <a href="mailto:bugzilla-admin@mozilla.org">send an email to the admins</a>, but
-  remember, they can't file [% terms.bugs %] for you, or solve tech support problems.
+  remember, they can't file bugs for you, or solve tech support problems.
 </p>
 
 [% PROCESS global/footer.html.tmpl %]
diff --git a/extensions/BMO/template/en/default/bug/create/comment-mozreps.txt.tmpl b/extensions/BMO/template/en/default/bug/create/comment-mozreps.txt.tmpl
deleted file mode 100644
index 6c9d7c6b7..000000000
--- a/extensions/BMO/template/en/default/bug/create/comment-mozreps.txt.tmpl
+++ /dev/null
@@ -1,81 +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 BMO Bugzilla Extension.
-  #
-  # The Initial Developer of the Original Code is the Mozilla Foundation
-  # Portions created by the Initial Developers are Copyright (C) 2011 the
-  # Initial Developer. All Rights Reserved.
-  #
-  # Contributor(s): Byron Jones <glob@mozilla.com>
-  #%]
-[% USE Bugzilla %]
-[% cgi = Bugzilla.cgi %]
-First Name:
-[%+ cgi.param('first_name') %]
-
-Last Name:
-[%+ cgi.param('last_name') %]
-
-Under 18 years old:
-[%+ IF cgi.param('underage') %]Yes[% ELSE %]No[% END %]
-
-Sex:
-[%+ cgi.param('sex') %]
-
-City:
-[%+ cgi.param('city') %]
-
-Country:
-[%+ cgi.param('country') %]
-
-Local Community:
-[% IF cgi.param('community') %]
-[%+ cgi.param('community') %]
-[% ELSE %]
--
-[% END %]
-
-IM:
-[% IF cgi.param('im') %]
-[%+ cgi.param('im') %]
-[% ELSE %]
--
-[% END %]
-
-References:
-[% IF cgi.param('references') %]
-[%+ cgi.param('references') %]
-[% ELSE %]
--
-[% END %]
-
-Currently Involved with Mozilla:
-[% IF cgi.param('involved') %]
-[%+ cgi.param('involved') %]
-[% ELSE %]
--
-[% END %]
-
-Languages Spoken:
-[%+ cgi.param('languages') %]
-
-How did you lean about Mozilla Reps:
-[%+ cgi.param('learn') %]
-
-What motivates you most about joining Mozilla Reps:
-[%+ cgi.param('motivation') %]
-
-Comments:
-[% IF cgi.param('comments') %]
-[%+ cgi.param('comments') %]
-[% ELSE %]
--
-[% END %]
diff --git a/extensions/BMO/template/en/default/bug/create/comment-remo-budget.txt.tmpl b/extensions/BMO/template/en/default/bug/create/comment-remo-budget.txt.tmpl
deleted file mode 100644
index 9486c56fe..000000000
--- a/extensions/BMO/template/en/default/bug/create/comment-remo-budget.txt.tmpl
+++ /dev/null
@@ -1,64 +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): Gervase Markham <gerv@gerv.net>
-  #%]
-[%# INTERFACE:
-  # This template has no interface.
-  #
-  # Form variables from a bug submission (i.e. the fields on a template from
-  # enter_bug.cgi) can be access via Bugzilla.cgi.param. It can be used to
-  # pull out various custom fields and format an initial Description entry
-  # from them.
-  #%]  
-[% USE Bugzilla %]
-[% cgi = Bugzilla.cgi %]
-
-Requester info:
-
-Requester: [% cgi.param('firstname') %] [%+ cgi.param('lastname') %] 
-Wiki user profile: [% cgi.param('wikiprofile') %]
-Event wiki page: [% cgi.param('wikipage') %]
-Advance payment needed: [% IF cgi.param('advancepayment') %]Yes[% ELSE %]No[% END %]
-
-Budget breakdown: 
-
-Total amount requested in $USD: [% cgi.param('budgettotal') %]
-Costs per service:
-Service 1: [% cgi.param('service1') %]  Cost: [% cgi.param('cost1') %]
-Service 2: [% cgi.param('service2') %]  Cost: [% cgi.param('cost2') %]
-Service 3: [% cgi.param('service3') %]  Cost: [% cgi.param('cost3') %]
-Service 4: [% cgi.param('service4') %]  Cost: [% cgi.param('cost4') %]
-Service 5: [% cgi.param('service5') %]  Cost: [% cgi.param('cost5') %]
-
-Additional costs: (add comment box)
-[% cgi.param('costadditional') %]
-
-Success measurement: 
-
-How will the event help push the Mozilla project forward?
-[%+ cgi.param('successmeasure') %]
-
-Metric 1: [% cgi.param('metric1') %]  Success scenario: [% cgi.param('success1') %]
-Metric 2: [% cgi.param('metric2') %]  Success scenario: [% cgi.param('success2') %]
-Metric 3: [% cgi.param('metric3') %]  Success scenario: [% cgi.param('success3') %]
-
-Additional information:
-[%+ cgi.param('successadditional') %]
-
-[%+ cgi.param("comment") IF cgi.param("comment") %]
-
diff --git a/extensions/BMO/template/en/default/bug/create/comment-remo-swag.txt.tmpl b/extensions/BMO/template/en/default/bug/create/comment-remo-swag.txt.tmpl
deleted file mode 100644
index 0b98178b2..000000000
--- a/extensions/BMO/template/en/default/bug/create/comment-remo-swag.txt.tmpl
+++ /dev/null
@@ -1,68 +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): Gervase Markham <gerv@gerv.net>
-  #%]
-[%# INTERFACE:
-  # This template has no interface.
-  #
-  # Form variables from a bug submission (i.e. the fields on a template from
-  # enter_bug.cgi) can be access via Bugzilla.cgi.param. It can be used to
-  # pull out various custom fields and format an initial Description entry
-  # from them.
-  #%]  
-[% USE Bugzilla %]
-[% cgi = Bugzilla.cgi %]
-
-Requester info: 
-
-Requester name: [% cgi.param('firstname') %][% " " %][% cgi.param('lastname') %]
-Wiki user profile: [% cgi.param('wikiprofile') %]
-Event wiki page: [% cgi.param('wikipage') %]
-Estimated Attendance: [% cgi.param('attendance') %]
-
-Shipping details:
-
-Ship swag before: [% cgi.param('shipdate') %]
-
-[%+ cgi.param("shiptofirstname") +%] [%+ cgi.param("shiptolastname") +%]
-[%+ cgi.param("shiptoaddress") +%]
-[%+ cgi.param("shiptoaddress2") +%]
-[%+ cgi.param("shiptocity") +%] [%+ cgi.param("shiptostate") +%] [%+ cgi.param("shiptopcode") +%]
-[%+ cgi.param("shiptocountry") %]
-
-Phone:  [% cgi.param("shiptophone") %]
-[%+ IF cgi.param("shiptoidrut") %]Personal ID/RUT: [% cgi.param("shiptoidrut") %][% END %]
-
-Addition information for delivery person:
-[%+ cgi.param('shipadditional') %] 
-
-Swag requested: 
-
-Stickers: [% IF cgi.param('stickers') %]Yes[% ELSE %]No[% END %]
-Buttons: [% IF cgi.param('buttons') %]Yes[% ELSE %]No[% END %]
-Posters: [% IF cgi.param('posters') %]Yes[% ELSE %]No[% END %]
-Lanyards: [% IF cgi.param('lanyards') %]Yes[% ELSE %]No[% END %]
-T-shirts: [% IF cgi.param('tshirts') %]Yes[% ELSE %]No[% END %]
-Roll-up banners: [% IF cgi.param('rollupbanners') %]Yes[% ELSE %]No[% END %]
-Horizontal banners: [% IF cgi.param('horizontalbanners') %]Yes[% ELSE %]No[% END %]
-Booth cloth: [% IF cgi.param('boothcloth') %]Yes[% ELSE %]No[% END %]
-Pens: [% IF cgi.param('pens') %]Yes[% ELSE %]No[% END %]
-Other: [% IF cgi.param('otherswag') %][% cgi.param('otherswag') %][% ELSE %]No[% END %]
-
-[%+ cgi.param("comment") IF cgi.param("comment") %]
-
diff --git a/extensions/BMO/template/en/default/bug/create/create-brownbag.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-brownbag.html.tmpl
index 72d520dd4..e4c6cabfb 100644
--- a/extensions/BMO/template/en/default/bug/create/create-brownbag.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-brownbag.html.tmpl
@@ -80,17 +80,16 @@ function trySubmit() {
 <form method="post" action="post_bug.cgi" id="brownbagRequestForm" enctype="multipart/form-data"
       onSubmit="return trySubmit();">
 
-  <input type="hidden" name="product" value="mozilla.org">
-  <input type="hidden" name="component" value="Server Operations: Desktop Issues">
-  <input type="hidden" name="rep_platform" value="All">
-  <input type="hidden" name="op_sys" value="Other">
-  <input type="hidden" name="priority" value="--">
-  <input type="hidden" name="version" value="other">
-  <input type="hidden" name="bug_severity" id="bug_severity" value="normal">
-  <input type="hidden" name="comment" id="comment" value="">
-  <input type="hidden" name="short_desc" id="short_desc" value="">
-  <input type="hidden" name="groups" value="mozilla-corporation-confidential">
-
+        <input type="hidden" name="product" value="mozilla.org">
+        <input type="hidden" name="component" value="Server Operations: Desktop Issues">
+        <input type="hidden" name="rep_platform" value="All">
+        <input type="hidden" name="op_sys" value="Other">
+        <input type="hidden" name="priority" value="--">
+        <input type="hidden" name="version" value="other">
+        <input type="hidden" name="bug_severity" id="bug_severity" value="normal">
+        <input type="hidden" name="comment" id="comment" value="">
+        <input type="hidden" name="short_desc" id="short_desc" value="">
+	<input type="hidden" name="groups" value="mozilla-corporation-confidential">
 <table>
 
 <tr>
@@ -98,6 +97,7 @@ function trySubmit() {
   <td>
     <input type="text" name="presenter" id="presenter" value="" size="60" />
   </td>
+
 </tr>
 
 <tr>
@@ -146,7 +146,7 @@ function trySubmit() {
       <option value="AM" selected>AM</option>
       <option value="PM">PM</option>
     </select>
-  </td>            
+  </td>					  
 </tr>
 
 <tr>
@@ -171,14 +171,14 @@ function trySubmit() {
 </tr>
 
 <tr>
-  <td align="right"><strong>Archive this?</strong></td>
-  <td align="left"><input type="checkbox" name="archive" id="archive" value="yes"></td>
+<td align="right"><strong>Archive this?</strong></td>
+<td align="left"><input type="checkbox" name="archive" id="archive" value="yes"></td>
 </tr>
 
 
 <tr>
-  <td align="right"><strong>Need IT to help run A/V?</strong></td>
-  <td align="left"><input type="checkbox" name="ithelp" id="ithelp" value="yes" checked></td>
+<td align="right"><strong>Need IT to help run A/V?</strong></td>
+<td align="left"><input type="checkbox" name="ithelp" id="ithelp" value="yes" checked></td>
 </tr>
 
 <tr>
@@ -198,11 +198,12 @@ function trySubmit() {
   <th><label for="description">Description</label>:</th>
   <td>
     <em>Please briefly describe the brownbag and any specific needs you might have.</em><br>
+
     <textarea id="description" name="description" rows="10" cols="80"></textarea>
   </td>
 </tr>
 
-</table>
+  </table>
 
   <br>
   <input type="submit" id="commit" value="Submit Request">
diff --git a/extensions/BMO/template/en/default/bug/create/create-itrequest.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-itrequest.html.tmpl
index d2f30475d..08207fd8c 100644
--- a/extensions/BMO/template/en/default/bug/create/create-itrequest.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-itrequest.html.tmpl
@@ -32,7 +32,7 @@
 [% USE Bugzilla %]                                                            
 
 <p><strong>Please use this form for IT requests only!</strong></p>
-<p>If you have a [% terms.bug %] to file, go <a href="enter_bug.cgi">here</a>.</p>
+<p>If you have a bug to file, go <a href="enter_bug.cgi">here</a>.</p>
 
 <form method="post" action="post_bug.cgi" id="itRequestForm" enctype="multipart/form-data">
   <input type="hidden" name="product" value="mozilla.org">
@@ -75,12 +75,12 @@
 
   <td>
     <select id="bug_severity" name="bug_severity" onchange="setsevdesc(this)">
-      <option value="blocker">All work stops until this is done</option>
-      <option value="critical">As soon as possible (urgent)</option>
-      <option value="major">Within 24 hours</option>
-      <option value="normal">Within the next week</option>
-      <option value="minor" selected="selected">No rush</option>
-      <option value="trivial">Whenever you get around to it</option>
+      <option value="blocker">All work for IT stops until this is done</option>
+      <option value="critical">IT should work on it soon as possible (urgent)</option>
+      <option value="major">IT should get to it within 24 hours</option>
+      <option value="normal">IT should get to it within the next week</option>
+      <option value="minor" selected="selected">No rush, but hopefully IT can get to it soon</option>
+      <option value="trivial">Whenever IT can get around to it</option>
       <option value="enhancement">This is just an idea, filing it so we don't forget</option>
     </select>
   </td>
@@ -96,13 +96,16 @@
         <input type="radio" name="component" id="componentac" onclick="setcompdesc(this)" value="Server Operations: Account Requests">
         <label for="componentac">Request an LDAP/E-mail/etc. account</label><br>
         <input type="radio" name="component" id="componentmvd" onclick="setcompdesc(this)" value="Server Operations: Desktop Issues">
-        <label for="componentmvd">Desktop/Laptop/Printer/Phone problem/order/request</label><br>
-        <input type="radio" name="component" id="componenttbm" onclick="setcompdesc(this)" value="Server Operations: Tinderbox Maintenance">
+        <label for="componentmvd">Desktop/Laptop/Printer/Phone/Tablet/License problem/order/request</label><br>
+        <input type="radio" name="component" id="componenttbm" onclick="setcompdesc(this)" value="Server Operations: RelEng">
         <label for="componenttbm">Report a problem with a tinderbox machine</label><br>
-        <input type="radio" name="component" id="componentwcp" onclick="setcompdesc(this)" value="Server Operations: Web Content Push">
-        <label for="componentwcp">Deploy a change to a production website</label><br>
+        <input type="radio" name="component" id="componentwcp" onclick="setcompdesc(this)" value="Server Operations: Web Operations">
+        <label for="componentwcp">Report a problem with a Mozilla website, or to request a change or push</label><br>
+        <input type="radio" name="component" id="componentacl" onclick="setcompdesc(this)" value="Server Operations: ACL Request">
+        <label for="componentacl">Request a firewall change</label><br>
         <input type="radio" name="component" id="componentso" onclick="setcompdesc(this)" value="Server Operations">
         <label for="componentso">Any other issue</label><br>
+        Mailing list requests should be filed <a href="[% ulrbase FILTER none %]enter_bug.cgi?product=mozilla.org&format=mozlist">here</a> instead.
       </td>
       <td id="compdescription" align="left" style="color: green; padding-left: 1em">
       </td>
@@ -169,7 +172,7 @@
   </table>
 
   <br>
-  <!-- infra [% terms.bugs %] -->
+  <!-- infra bugs -->
   <input type="checkbox" name="groups" id="groups" value="infra" checked="checked"><label for="groups"><strong>This is an internal issue which should not be publicly visible.</strong></label><br>(please uncheck this box if it isn't)
   <br><br>
 
diff --git a/extensions/BMO/template/en/default/bug/create/create-mktgevent.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-mktgevent.html.tmpl
index 92354eac3..d6b6c188f 100644
--- a/extensions/BMO/template/en/default/bug/create/create-mktgevent.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-mktgevent.html.tmpl
@@ -91,18 +91,19 @@ function validateAndSubmit() {
 <form method="post" action="post_bug.cgi" id="swagRequestForm" enctype="multipart/form-data"
       onSubmit="return validateAndSubmit();">
 
-  <input type="hidden" name="format" value="mktgevent">
-  <input type="hidden" name="product" value="Marketing">
-  <input type="hidden" name="component" value="Event Requests">
-  <input type="hidden" name="rep_platform" value="All">
-  <input type="hidden" name="op_sys" value="Other">
-  <input type="hidden" name="priority" value="--">
-  <input type="hidden" name="version" value="unspecified">
-  <input type="hidden" name="bug_severity" id="bug_severity" value="normal">
-  <input type="hidden" name="short_desc" id="short_desc" value="">
-  <input type="hidden" name="groups" value="mozilla-corporation-confidential">
-
+        <input type="hidden" name="format" value="mktgevent">
+        <input type="hidden" name="product" value="Marketing">
+        <input type="hidden" name="component" value="Event Requests">
+        <input type="hidden" name="rep_platform" value="All">
+        <input type="hidden" name="op_sys" value="Other">
+        <input type="hidden" name="priority" value="--">
+        <input type="hidden" name="version" value="unspecified">
+        <input type="hidden" name="bug_severity" id="bug_severity" value="normal">
+
+        <input type="hidden" name="short_desc" id="short_desc" value="">
+	<input type="hidden" name="groups" value="mozilla-corporation-confidential">
 <table>
+
 <tr>
   <td align="right"><strong>First Name: <span style="color: red;">*</span></strong></td>
   <td align="left">
diff --git a/extensions/BMO/template/en/default/bug/create/create-mozlist.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-mozlist.html.tmpl
index 0a2edb5ee..138f1754b 100644
--- a/extensions/BMO/template/en/default/bug/create/create-mozlist.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-mozlist.html.tmpl
@@ -88,21 +88,21 @@
         var listName = document.getElementById('listName').value;
         var listAdmin = document.getElementById('listAdmin').value;
         var listTypeRadio = document.getElementsByName('listType');
-        var listType = "";
+	var listType = "";
 
-        for (var i = 0; i < listTypeRadio.length; i++) {
-            if (listTypeRadio[i].checked) {
-                listType = listTypeRadio[i].value;
-            }
-        }
+	for (var i = 0; i < listTypeRadio.length; i++) {
+	    if (listTypeRadio[i].checked) {
+		listType = listTypeRadio[i].value;
+	    }
+	}
 
         var alert_text = "";
         var short_desc = "";
 
-        if (listType) {
+	if (listType) {
             if (listType == "lists.mozilla.org") {
                 document.getElementById('component').value = "Discussion Forums";
-                short_desc = "Discussion Forum: " + listName;
+	            short_desc = "Discussion Forum: " + listName;
             } else if (listType == "mozilla.com" ) {
                 document.getElementById('component').value = "Server Operations: Desktop Issues";
                 short_desc = "[Zimbra Distribution List Request] " + listName + "@" + listType;
@@ -112,7 +112,7 @@
             }
         } else {
             alert_text += "Please select a list type\n";
-        }
+	}
 
         if (!isFilledOut('listName')) {
             alert_text += "Please enter the list name\n";
@@ -127,7 +127,7 @@
             return false;
         }
  
-        document.getElementById('short_desc').value = short_desc;
+       	document.getElementById('short_desc').value = short_desc;
 
         return true;
     }
@@ -220,8 +220,8 @@
        <br>
        <b>Note:</b>The list administrator is also initially considered to be the list moderator 
        and will be responsible for moderation tasks unless delegated to someone else.  For
-       convenience, [% terms.Bugzilla %] user accounts will autocomplete. The administrator is not required
-       to have a [% terms.Bugzilla %] account, and you can enter an address that doesn't autocomplete if
+       convenience, Bugzilla user accounts will autocomplete. The administrator is not required
+       to have a Bugzilla account, and you can enter an address that doesn't autocomplete if
        necessary.<hr />
     </td>
   </tr>
@@ -287,7 +287,7 @@
   <br>
 
   <div id="groups" style="display:none;">
-    <!-- infra [% terms.bugs %] -->
+    <!-- infra bugs -->
     <input type="checkbox" name="groups" id="group_35" value="infra" disabled="true">
     <label for="group_35"><strong>This is an internal issue which should not be publicly visible.</strong></label>
     <br><br>
diff --git a/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl
index 5b4cbf999..28a37a31e 100644
--- a/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl
@@ -57,12 +57,10 @@ var flags = new Array([% product.components.size %]);
     comp_desc[[% count %]] = "[% c.description FILTER html_light FILTER js %]";
     initialowners[[% count %]] = "[% c.default_assignee.login FILTER js %]";
     [% flag_list = [] %]
-    [% FOREACH f = c.flag_types.bug %]
-      [% NEXT UNLESS f.is_active %]
+    [% FOREACH f = c.flag_types(is_active=>1).bug %]
       [% flag_list.push(f.id) %]
     [% END %]
-    [% FOREACH f = c.flag_types.attachment %]
-      [% NEXT UNLESS f.is_active %]
+    [% FOREACH f = c.flag_types(is_active=>1).attachment %]
       [% flag_list.push(f.id) %]
     [% END %]
     flags[[% count %]] = [[% flag_list.join(",") FILTER js %]];
@@ -301,9 +299,9 @@ TUI_hide_default('expert_fields');
           </td>
         </tr>
       </table>
-      <input type="hidden" name="bug_severity" value="[% default.bug_severity FILTER html %]">
-      <input type="hidden" name="rep_platform" value="[% default.rep_platform FILTER html %]">
-      <input type="hidden" name="op_sys" value="[% default.op_sys FILTER html %]">
+      <input type="hidden" name="bug_severity" value="[% default.bug_severity %]">
+      <input type="hidden" name="rep_platform" value="[% default.rep_platform %]">
+      <input type="hidden" name="op_sys" value="[% default.op_sys %]">
       <input type="hidden" name="version" value="unspecified">
     </td>
   </tr>
@@ -335,18 +333,17 @@ TUI_hide_default('expert_fields');
     %]
 
     <td rowspan="[% num_rows FILTER html %]">
-      [% IF product.flag_types.bug.size > 0 %]
+      [% IF product.flag_types(is_active=>1).bug.size > 0 %]
         [% display_flag_headers = 0 %]
         [% any_flags_requesteeble = 0 %]
 
-        [% FOREACH flag_type = product.flag_types.bug %]
-          [% NEXT UNLESS flag_type.is_active %]
+        [% FOREACH flag_type = product.flag_types(is_active=>1).bug %]
           [% display_flag_headers = 1 %]
           [% SET any_flags_requesteeble = 1 IF flag_type.is_requestable && flag_type.is_requesteeble %]
         [% END %]
 
         [% IF display_flag_headers %]
-          [% PROCESS "flag/list.html.tmpl" flag_types = product.flag_types.bug
+          [% PROCESS "flag/list.html.tmpl" flag_types = product.flag_types(is_active=>1).bug
                                            any_flags_requesteeble = any_flags_requesteeble
                                            flag_table_id = "bug_flags"
           %]
@@ -469,7 +466,7 @@ TUI_hide_default('expert_fields');
     <td colspan="3">
       [% defaultcontent = BLOCK %]
         [% IF cloned_bug_id %]
-+++ This [% terms.bug %] was initially created as a clone of [% terms.Bug %] #[% cloned_bug_id FILTER html %] +++
++++ This [% terms.bug %] was initially created as a clone of [% terms.Bug %] #[% cloned_bug_id %] +++
 
 
         [% END %]
@@ -526,7 +523,7 @@ TUI_hide_default('expert_fields');
           <legend>Add an attachment</legend>
           <table class="attachment_entry">
             [% PROCESS attachment/createformcontents.html.tmpl
-                       flag_types = product.flag_types.attachment
+                       flag_types = product.flag_types(is_active=>1).attachment
                        any_flags_requesteeble = 1
                        flag_table_id ="attachment_flags" %]
           </table>
@@ -555,7 +552,7 @@ TUI_hide_default('expert_fields');
       <th>Status Whiteboard:</th>
       <td colspan="3">
         <input id="status_whiteboard" name="status_whiteboard" size="70"
-               value="[% status_whiteboard FILTER html %]">
+               value="[% status_whiteboard %]">
       </td>
     </tr>
     <tr>
@@ -592,10 +589,10 @@ TUI_hide_default('expert_fields');
       <!-- Checkboxes -->
       [% FOREACH g = group %]
         &nbsp;&nbsp;&nbsp;&nbsp;
-        <input type="checkbox" id="bit-[% g.bit FILTER html %]"
-          name="bit-[% g.bit FILTER html %]" value="1"
+        <input type="checkbox" id="bit-[% g.bit %]"
+          name="bit-[% g.bit %]" value="1"
           [% " checked=\"checked\"" IF g.checked %]>
-          <label for="bit-[% g.bit FILTER html %]">[% g.description FILTER html_light %]</label><br>
+          <label for="bit-[% g.bit %]">[% g.description FILTER html_light %]</label><br>
       [% END %]
     </td>
   </tr>
diff --git a/extensions/BMO/template/en/default/bug/create/create-mozreps.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-mozreps.html.tmpl
deleted file mode 100644
index 914e1f54d..000000000
--- a/extensions/BMO/template/en/default/bug/create/create-mozreps.html.tmpl
+++ /dev/null
@@ -1,204 +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 BMO Bugzilla Extension.
-  #
-  # The Initial Developer of the Original Code is the Mozilla Foundation
-  # Portions created by the Initial Developers are Copyright (C) 2011 the
-  # Initial Developer. All Rights Reserved.
-  #
-  # Contributor(s): Byron Jones <glob@mozilla.com>
-  #%]
-
-[% PROCESS global/variables.none.tmpl %]
-
-[% PROCESS global/header.html.tmpl
-   title = "Mozilla Reps - Application Form"
-   style_urls = [ "extensions/BMO/web/styles/moz_reps.css" ]
-%]
-
-[% USE Bugzilla %]
-[% mandatory = '<span class="mandatory" title="Required">*</span>' %]
-
-<script type="text/javascript">
-var Dom = YAHOO.util.Dom;
-
-function mandatory(ids) {
-  result = true;
-  for (i in ids) {
-    id = ids[i];
-    el = Dom.get(id);
-
-    if (el.type.toString() == "checkbox") {
-      value = el.checked;
-    } else {
-      value = el.value.replace(/^\s\s*/, '').replace(/\s\s*$/, '');
-      el.value = value;
-    }
-
-    if (value == '') {
-      Dom.addClass(id, 'missing');
-      result = false;
-    } else {
-      Dom.removeClass(id, 'missing');
-    }
-  }
-  return result;
-}
-
-function submitForm() {
-  if (!mandatory([ 'first_name', 'last_name', 'sex', 'city', 'country',
-                   'languages', 'learn', 'motivation', 'privacy' ])
-  ) {
-    alert('Please enter all the required fields.');
-    return false;
-  }
-
-  Dom.get('short_desc').value =
-    "Application Form: " + Dom.get('first_name').value + ' ' + Dom.get('last_name').value;
-
-  return true;
-}
-
-</script>
-
-<noscript>
-<h1>Javascript is required to use this form.</h1>
-</noscript>
-
-<h1>Mozilla Reps - Application Form</h1>
-
-<form method="post" action="post_bug.cgi" id="tmRequestForm">
-<input type="hidden" name="product" value="Mozilla Reps">
-<input type="hidden" name="component" value="Mentorship">
-<input type="hidden" name="bug_severity" value="normal">
-<input type="hidden" name="rep_platform" value="All">
-<input type="hidden" name="priority" value="--">
-<input type="hidden" name="op_sys" value="Other">
-<input type="hidden" name="version" value="unspecified">
-<input type="hidden" name="groups" value="mozilla-reps">
-<input type="hidden" name="format" value="[% format FILTER html %]">
-<input type="hidden" name="created-format" value="[% format FILTER html %]">
-<input type="hidden" name="comment" id="comment" value="">
-<input type="hidden" name="short_desc" id="short_desc" value="">
-
-<table id="reps-form">
-
-<tr class="odd">
-  <th>First Name:[% mandatory FILTER html %]</th>
-  <td><input id="first_name" name="first_name" size="40" placeholder="John"></td>
-</tr>
-
-<tr class="even">
-  <th>Last Name:[% mandatory FILTER html %]</th>
-  <td><input id="last_name" name="last_name" size="40" placeholder="Doe"></td>
-</tr>
-
-<tr class="odd">
-  <th>Are you under 18 years old?:</th>
-  <td><input type="checkbox" id="underage" name="underage" value="1"></td>
-</tr>
-
-<tr class="even">
-  <th>Sex:[% mandatory FILTER html %]</th>
-  <td>
-    <select id="sex" name="sex">
-      <option value="Male">Male</option>
-      <option value="Female">Female</option>
-      <option value="Other">Other</option>
-    </select>
-  </td>
-</tr>
-
-<tr class="odd">
-  <th>City:[% mandatory FILTER html %]</th>
-  <td><input id="city" name="city" size="40" placeholder="Your city"></td>
-</tr>
-
-<tr class="even">
-  <th>Country:[% mandatory FILTER html %]</th>
-  <td><input id="country" name="country" size="40" placeholder="Your country"></td>
-</tr>
-
-<tr class="odd">
-  <th>Local Community you participate in:</th>
-  <td><input id="community" name="community" size="40" placeholder="Name of your community"></td>
-</tr>
-
-<tr class="even">
-  <th>IM (specify service):</th>
-  <td><input id="im" name="im" size="40"></td>
-</tr>
-
-<tr class="odd">
-  <th colspan="2">
-    References:
-  </th>
-</tr>
-<tr class="odd">
-  <td colspan="2">
-    <textarea id="references" name="references" rows="4"
-              placeholder="Add contact info of people referencing you."></textarea>
-  </td>
-</tr>
-
-<tr class="even">
-  <th colspan="2">
-    How are you involved with Mozilla?
-  </th>
-</tr>
-<tr class="even">
-  <td colspan="2">
-    <textarea id="involved" name="involved" rows="4" placeholder="Add-ons,  l10n,  SUMO,  QA,  ..."></textarea>
-  </td>
-</tr>
-
-<tr class="odd">
-  <th>Languages Spoken:[% mandatory FILTER html %]</th>
-  <td><input id="languages" name="languages" size="40"></td>
-</tr>
-
-<tr class="even">
-  <th>How did you learn about Mozilla Reps?[% mandatory FILTER html %]</th>
-  <td><input id="learn" name="learn" size="40"></td>
-</tr>
-
-<tr class="odd">
-  <th colspan="2">What motivates you most about joining Mozilla Reps?[% mandatory FILTER html %]</th>
-</tr>
-<tr class="odd">
-  <td colspan="2"><textarea id="motivation" name="motivation" rows="4"></textarea></td>
-</tr>
-
-<tr class="even">
-  <th colspan="2">Comments:</th>
-</tr>
-<tr class="even">
-  <td colspan="2"><textarea id="comments" name="comments" rows="4"></textarea></td>
-</tr>
-
-<tr class="odd">
-  <th>
-    I have read the
-    <a href="http://www.mozilla.com/en-US/privacy-policy" target="_blank">Mozilla Privacy Policy</a>:[% mandatory FILTER html %]
-  </th>
-  <td><input id="privacy" type="checkbox"></td>
-</tr>
-
-<tr class="even">
-  <td>&nbsp;</td>
-  <td align="right"><input type="submit" value="Submit" onclick="return submitForm()"></td>
-</tr>
-
-</table>
-
-</form>
-
-[% PROCESS global/footer.html.tmpl %]
diff --git a/extensions/BMO/template/en/default/bug/create/create-presentation.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-presentation.html.tmpl
index 584b14912..cdbce5c8c 100644
--- a/extensions/BMO/template/en/default/bug/create/create-presentation.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-presentation.html.tmpl
@@ -86,7 +86,7 @@ function trySubmit() {
         <input type="hidden" name="bug_severity" id="bug_severity" value="normal">
         <input type="hidden" name="comment" id="comment" value="">
         <input type="hidden" name="short_desc" id="short_desc" value="">
-  <input type="hidden" name="groups" value="mozilla-corporation-confidential">
+	<input type="hidden" name="groups" value="mozilla-corporation-confidential">
 <table>
 
 <tr>
@@ -142,7 +142,7 @@ function trySubmit() {
       <option value="AM" selected>AM</option>
       <option value="PM">PM</option>
     </select>
-  </td> 
+  </td>					  
 </tr>
 
 <tr>
diff --git a/extensions/BMO/template/en/default/bug/create/create-remo-budget.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-remo-budget.html.tmpl
deleted file mode 100644
index 0aa18e41d..000000000
--- a/extensions/BMO/template/en/default/bug/create/create-remo-budget.html.tmpl
+++ /dev/null
@@ -1,248 +0,0 @@
-[%# 1.0@bugzilla.org %]
-[%# 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 Mozilla Corporation.
-  # Portions created by Mozilla are Copyright (C) 2008 Mozilla
-  # Corporation. All Rights Reserved.
-  #
-  # Contributor(s): Reed Loden <reed@mozilla.com>
-  #                 David Tran <dtran@mozilla.com>
-  #%]
-
-[% PROCESS global/variables.none.tmpl %]
-
-[% PROCESS global/header.html.tmpl
-   title = "Mozilla Reps Budget Request Form"
-   style_urls = [ 'extensions/BMO/web/styles/moz_reps.css' ]
-   javascript_urls = [ 'extensions/BMO/web/js/form_validate.js',
-                       'js/util.js',
-                       'js/field.js' ]
-%]
-
-<p>These requests will only be visible to the person who submitted the request,
-any persons designated in the CC line, and authorized members of the Mozilla
-Rep team.</p>
-
-<script language="javascript" type="text/javascript">
-function trySubmit() {
-  var firstname = document.getElementById('firstname').value;
-  var lastname = document.getElementById('lastname').value;
-  var wikipage = document.getElementById('wikipage').value;
-  var shortdesc = 'Budget Request - ' + firstname + ' ' + lastname + ' - ' + wikipage; 
-  document.getElementById('short_desc').value = shortdesc;
-  return true;
-}
-
-function validateAndSubmit() {
-  var alert_text = '';
-  if(!isFilledOut('firstname')) alert_text += "Please enter your first name\n";
-  if(!isFilledOut('lastname')) alert_text += "Please enter your last name\n";
-  if(!isFilledOut('wikiprofile')) alert_text += "Please enter a wiki user profile.\n";
-  if(!isFilledOut('wikipage')) alert_text += "Please enter a wiki page address.\n";
-  if(!isFilledOut('successmeasure')) alert_text += "Please enter how you will measure the success of the event.\n";
-  if(!isFilledOut('budgettotal')) alert_text += "Please enter the total budget for the event.\n";
-  if(!isFilledOut('service1') || !isFilledOut('cost1')) alert_text += "Please enter at least one service and cost value.\n";
-  if(!isFilledOut('metric1') || !isFilledOut('success1')) alert_text += "Please enter at least one metric and success scenario.\n";
-
-  //Everything required is filled out..try to submit the form!
-  if(alert_text == '') {
-    return trySubmit();
-  }
-
-  //alert text, stay here on the pagee
-  alert(alert_text);
-  return false;
-}
-
-function togglePaymentInfo (e) {
-  var div = document.getElementById('paymentinfo');
-  if (e.checked == true) {
-    div.style.display = 'block';
-  }
-  else {
-    div.style.display = 'none';
-  }
-}
-
-</script>
-
-<h1>Mozilla Reps - Budget Request Form</h1>
-
-<form method="post" action="post_bug.cgi" id="swagRequestForm" enctype="multipart/form-data"
-      onSubmit="return validateAndSubmit();">
-
-  <input type="hidden" name="format" value="remo-budget">
-  <input type="hidden" name="product" value="Mozilla Reps">
-  <input type="hidden" name="component" value="Budget Requests">
-  <input type="hidden" name="rep_platform" value="All">
-  <input type="hidden" name="op_sys" value="Other">
-  <input type="hidden" name="priority" value="--">
-  <input type="hidden" name="version" value="unspecified">
-  <input type="hidden" name="bug_severity" id="bug_severity" value="normal">
-  <input type="hidden" name="short_desc" id="short_desc" value="">
-  <input type="hidden" name="groups" value="mozilla-reps">
-
-<table id="reps-form">
-
-<tr class="odd">
-  <td><strong>First Name: <span style="color: red;">*</span></strong></td>
-  <td>
-    <input type="text" name="firstname" id="firstname" value="" size="40" placeholder="John">
-  </td>
-</tr>
-
-<tr class="even">
-  <td><strong>Last Name: <span style="color: red;">*</span></strong></td>
-  <td>
-    <input type="text" name="lastname" id="lastname" value="" size="40" placeholder="Doe">
-  </td>
-</tr>
-
-<tr class="odd">
-  <td><strong>Wiki user profile:<span style="color: red;">*</span></strong></td>
-  <td>
-    <input type="text" name="wikiprofile" id="wikiprofile" value="" size="40" placeholder="JohnDoe">
-  </td>
-</tr>
-
-<tr class="even">
-  <td><strong>Event wiki page: <span style="color: red;">*</span></strong></td>
-  <td>
-    <input type="text" name="wikipage" id="wikipage" value="" size="40" placeholder="http://wiki.mozilla.org/JohnDoe">
-  </td>
-</tr>
-
-<tr class="odd">
-  <td><!--spacer-->&nbsp;</td>
-  <td><!--spacer-->&nbsp;</td>
-</tr>
-
-<tr class="even">
-  <td colspan="2">
-    <strong>Is advance payment needed?</strong>
-    <input type="checkbox" name="advancepayment" id="advancepayment" value="1"
-           onchange="togglePaymentInfo(this);">
-    <div id="paymentinfo" style="display:none;">
-      Please send an email to William at mozilla.com with all the information below:<br>
-      <br>
-      Payment information:<br>
-      Bank name:<br>
-      Bank address: <br> 
-      IBAN:<br>
-      Swift code/BIC:<br>
-      Additional bank details (if necessary):
-    </div>
-  </td>
-</tr>
-
-<tr class="odd">
-  <td><!--spacer-->&nbsp;</td>
-  <td><!--spacer-->&nbsp;</td>
-</tr>
-
-<tr class="even">
-  <td colspan="2">
-    <strong>Budget breakdown:</strong><br>
-    Total amount requested in $USD:  <span style="color: red;">*</span>
-    <input type="text" name="budgettotal" id="budgettotal" value="" size="40"><br>
-    Costs per service:
-    <table>
-    <tr>
-      <td>Service 1:  <span style="color: red;">*</span></td>
-      <td><input type="text" id="service1" name="service1" size="30"></td>
-      <td>Cost 1: <span style="color: red;">*</span></td>
-      <td><input type="text" id="cost1" name="cost1" size="30"></td>
-    </tr>
-    <tr>
-      <td>Service 2:</td>                        
-      <td><input type="text" id="service2" name="service2" size="30"></td>                        
-      <td>Cost 2:</td>                  
-      <td><input type="text" id="cost2" name="cost2" size="30"></td>
-    </tr>
-    <tr>
-      <td>Service 3:</td>                        
-      <td><input type="text" id="service3" name="service3" size="30"></td>                        
-      <td>Cost 3:</td>                  
-      <td><input type="text" id="cost3" name="cost3" size="30"></td>
-    </tr>
-    <tr>
-      <td>Service 4:</td>                        
-      <td><input type="text" id="service4" name="service4" size="30"></td>                        
-      <td>Cost 4:</td>                  
-      <td><input type="text" id="cost4" name="cost4" size="30"></td>
-    </tr>
-    <tr>
-      <td>Service 5:</td>                        
-      <td><input type="text" id="service5" name="service5" size="30"></td>                        
-      <td>Cost 5:</td>                  
-      <td><input type="text" id="cost5" name="cost5" size="30"></td>
-    </tr>
-    </table>
-    Additional costs:<br>
-    <textarea id="costadditional" name="costadditional" rows="5" cols="50"></textarea>
-  </td>
-</tr>
-
-<tr class="odd">
-  <td><!--spacer-->&nbsp;</td>
-  <td><!--spacer-->&nbsp;</td>
-</tr>
-
-<tr class="even">
-  <td colspan="2">
-    <strong>Success measurement:</strong><br>
-    How will the event help push the Mozilla project forward? 
-    <span style="color: red;">*</span><br>
-    <textarea id="successmeasure" name="successmeasure" rows="5" cols="50"></textarea>
-    <table>
-    </tr>
-      <td>Metric 1: <span style="color: red;">*</span></td>
-      <td><input type="text" id="metric1" name="metric1" size="30">
-      <td>Success scenario: <span style="color: red;">*</span></td>
-      <td><input type="text" id="success1" name="success1" size="30">
-    </tr>
-    <tr>
-      <td>Metric 2:</td>                         
-      <td><input type="text" id="metric2" name="metric2" size="30">
-      <td>Success scenario:</td> 
-      <td><input type="text" id="success2" name="success2" size="30">
-    </tr>
-    <tr>
-      <td>Metric 3:</td>                         
-      <td><input type="text" id="metric3" name="metric3" size="30">
-      <td>Success scenario:</td> 
-      <td><input type="text" id="success3" name="success3" size="30">
-    </tr>
-    </table>
-    Additional information:<br>
-    <textarea id="successadditional" name="successadditional" rows="5" cols="50"></textarea>
-  </td>
-</tr>
-
-<tr class="odd">
-  <td>&nbsp;</td>
-  <td align="right">
-    <input type="submit" id="commit" value="Submit Request">
-  </td>
-</tr>
-
-</table>
-
-</form>
-
-<p>
-  <strong><span style="color: red;">*</span></strong> - Required field<br />
-  Thanks for contacting us.
-</p>
-
-[% PROCESS global/footer.html.tmpl %]
diff --git a/extensions/BMO/template/en/default/bug/create/create-remo-swag.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-remo-swag.html.tmpl
deleted file mode 100644
index 0b15240fd..000000000
--- a/extensions/BMO/template/en/default/bug/create/create-remo-swag.html.tmpl
+++ /dev/null
@@ -1,292 +0,0 @@
-[%# 1.0@bugzilla.org %]
-[%# 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 Mozilla Corporation.
-  # Portions created by Mozilla are Copyright (C) 2008 Mozilla
-  # Corporation. All Rights Reserved.
-  #
-  # Contributor(s): Reed Loden <reed@mozilla.com>
-  #                 David Tran <dtran@mozilla.com>
-  #%]
-
-[% PROCESS global/variables.none.tmpl %]
-
-[% PROCESS global/header.html.tmpl
-   title = "Mozilla Reps Swag Request Form"
-   javascript_urls = [ 'extensions/BMO/web/js/swag.js',
-                       'extensions/BMO/web/js/form_validate.js',
-                       'js/field.js', 
-                       'js/util.js' ]
-   style_urls = [ "extensions/BMO/web/styles/moz_reps.css",  
-                  "skins/custom/calendar.css" ]
-   yui = [ 'calendar' ]
-%]
-
-<p>These requests will only be visible to the person who submitted the request,
-any persons designated in the CC line, and authorized members of the Mozilla Rep team.</p>
-
-<script language="javascript" type="text/javascript">
-function trySubmit() {
-  var firstname = document.getElementById('firstname').value;
-  var lastname = document.getElementById('lastname').value;
-  var requester = firstname + ' ' + lastname;
-  var shortdesc = 'Swag Request - ' + requester;
-  document.getElementById('short_desc').value = shortdesc;
-  return true;
-}
-
-function validateAndSubmit() {
-  var alert_text = '';
-  if(!isFilledOut('firstname')) alert_text += "Please enter your first name\n";
-  if(!isFilledOut('lastname')) alert_text += "Please enter your last name\n";
-  if(!isFilledOut('wikiprofile')) alert_text += "Please enter your wiki user profile\n";
-  if(!isFilledOut('wikipage')) alert_text += "Please enter the event wiki page.\n";
-  if(!isFilledOut('attendance')) alert_text += "Please enter the estimated attendance.\n";
-  if(!isFilledOut('shiptofirstname')) alert_text += "Please enter the shipping first name\n";
-  if(!isFilledOut('shiptolastname')) alert_text += "Please enter the shipping last name\n";
-  if(!isFilledOut('shiptoaddress')) alert_text += "Please enter the ship to address\n";
-  if(!isFilledOut('shiptocity')) alert_text += "Please enter the ship to city\n";
-  if(!isFilledOut('shiptocountry')) alert_text += "Please enter the ship to country\n";
-  if(!isFilledOut('shiptopcode')) alert_text += "Please enter the ship to postal code\n";
-  if(!isFilledOut('shiptophone')) alert_text += "Please enter the ship to contact number\n";
- 
-  //Everything required is filled out..try to submit the form!
-  if(alert_text == '') {
-    return trySubmit();
-  }
-
-  //alert text, stay here on the pagee
-  alert(alert_text);
-  return false;
-}
-
-</script>
-
-<h1>Mozilla Reps - Swag Request Form</h1>
-
-<form method="post" action="post_bug.cgi" id="swagRequestForm" enctype="multipart/form-data"
-      onSubmit="return validateAndSubmit();">
-
-  <input type="hidden" name="format" value="remo-swag">
-  <input type="hidden" name="product" value="Mozilla Reps">
-  <input type="hidden" name="component" value="Swag Requests">
-  <input type="hidden" name="rep_platform" value="All">
-  <input type="hidden" name="op_sys" value="Other">
-  <input type="hidden" name="priority" value="--">
-  <input type="hidden" name="version" value="unspecified">
-  <input type="hidden" name="bug_severity" id="bug_severity" value="normal">
-  <input type="hidden" name="short_desc" id="short_desc" value="">
-  <input type="hidden" name="groups" value="mozilla-reps">
-
-<table id="reps-form">
-
-<tr class="odd">
-  <td><strong>First Name: <span style="color: red;" title="Required">*</span></strong></td>
-  <td>
-    <input type="text" name="firstname" id="firstname" placeholder="John" size="40">
-  </td>
-</tr>
-
-<tr class="even">
-  <td><strong>Last Name: <span style="color: red;" title="Required">*</span></strong></td>
-  <td>
-    <input type="text" name="lastname" id="lastname" placeholder="Doe" size="40">
-  </td>
-</tr>
-
-<tr class="odd">
-  <td><strong>Wiki User Profile: <span style="color: red;" title="Required">*</span></strong></td>
-  <td>
-    <input type="text" name="wikiprofile" id="wikiprofile" size="40">
-  </td>
-</tr>
-
-<tr class="even">
-  <td><strong>Event Wiki Page: <span style="color: red;" title="Required">*</span></strong></td>
-  <td>
-    <input type="text" name="wikipage" id="wikipage" size="40">
-  </td>
-</tr>
-
-<tr class="even">
-  <td><strong>Estimated Attendance: <span style="color: red;" title="Required">*</span></strong></td>
-  <td>
-    <input type="text" name="attendance" id="attendance" size="40">
-  </td>
-</tr
-
-<tr class="odd">
-  <td><!--spacer-->&nbsp;</td>
-  <td><!--spacer-->&nbsp;</td>
-</tr>
-
-<tr class="even">
-  <td colspan="2"><strong>Shipping Details:</strong></td>
-</tr>
-
-<tr class="odd">
-  <td><strong>Ship Before:</strong>
-  <td>
-    <input type="text" id="shipdate" name="shipdate" size="10"
-           onchange="updateCalendarFromField(this)">
-    <button type="button" class="calendar_button" id="button_calendar_date"
-            onclick="showCalendar('shipdate')"><span>Calendar</span>
-    </button>
-    <div id="con_calendar_shipdate"></div>
-  </td>
-</tr>
-
-<tr class="even">
-  <td><strong>First Name: <span style="color: red;" title="Required">*</span></strong></td>
-  <td><input name="shiptofirstname" id="shiptofirstname" placeholder="John" size="40"></td>
-</tr>
-
-<tr class="odd">
-  <td><strong>Last Name: <span style="color: red;" title="Required">*</span></strong></td>
-  <td><input name="shiptolastname" id="shiptolastname" placeholder="Doe" size="40"></td>
-</tr>
-
-<tr class="even">
-  <td><strong>Address: <span style="color: red;" title="Required">*</span></strong></td>
-  <td><input name="shiptoaddress" id="shiptoaddress" placeholder="123 Main St." size="40"></td>
-</tr>
-
-<tr class="odd">
-  <td><strong>Address 2:</strong></td>
-  <td><input name="shiptoaddress2" id="shiptoaddress2" size="40"></td>
-</tr>
-
-<tr class="even">
-  <td><strong>City: <span style="color: red;" title="Required">*</span></strong></td>
-  <td><input name="shiptocity" id="shiptocity" size="40" placeholder="Anytown"></td>
-</tr>
-
-<tr class="odd">
-  <td><strong>State:</strong></td>
-  <td><input name="shiptostate" id="shiptostate" placeholder="CA" size="40"></td>
-</tr>
-
-<tr class="even">
-  <td><strong>Country: <span style="color: red;" title="Required">*</span></strong></td>
-  <td><input name="shiptocountry" id="shiptocountry" placeholder="USA" size="40"></td>
-</tr>
-
-<tr class="odd">
-  <td><strong>Postal Code: <span style="color: red;" title="Required">*</span></strong></td>
-  <td><input name="shiptopcode" id="shiptopcode" placeholder="90210" size="40"></td>
-</tr>
-
-<tr class="even">
-  <td><strong>Contact Number: <span style="color: red;" title="Required">*</span></strong></td>
-  <td><input name="shiptophone" id="shiptophone" placeholder="919-555-1212" size="40"></td>
-</tr>
-
-<tr class="odd">
-  <td><strong>Personal ID/RUT:</strong><br><small>(if your country requires this)</small></td>
-  <td><input name="shiptoidrut" id="shiptoidrut" size="40"></td>
-</tr>
-
-<tr class="even">
-  <td colspan="2">
-    <strong>Addition information for delivery person:</strong><br>
-    <textarea id="shipadditional" name="shipadditional" rows="4"></textarea>
-  </td>
-</tr>
-
-<tr class="odd">
-  <td><!--spacer-->&nbsp;</td>
-  <td><!--spacer-->&nbsp;</td>
-</tr>
-
-<tr class="even">
-  <td colspan="2"><strong>Swag Requested:</strong></td>
-</tr>
-
-<tr class="odd">
-  <td><strong>Stickers:</strong></td>
-  <td><input type="checkbox" id="stickers" name="stickers" value="1"></td>
-</tr>
-
-<tr class="odd">
-  <td><strong>Buttons:</strong></td>
-  <td><input type="checkbox" id="buttons" name="buttons" value="1"></td>
-</tr>
-
-<tr class="even">
-  <td><strong>Posters:</strong></td>
-  <td><input type="checkbox" id="posters" name="posters" value="1"></td>
-</tr>
-
-<tr class="odd">
-  <td><strong>Lanyards:</strong></td>
-  <td><input type="checkbox" id="lanyards" name="lanyards" value="1"></td>
-</tr>
-
-<tr class="even">
-  <td><strong>T-Shirts:</strong></td>
-  <td><input type="checkbox" id="tshirts" name="tshirts" value="1"></td>
-</tr>
-
-<tr class="odd">
-  <td><strong>Roll-Up Banners:</strong></td>
-  <td><input type="checkbox" id="rollupbanners" name="rollupbanners" value="1"></td>
-</tr>
-
-<tr class="even">
-  <td><strong>Horizontal Banner:</strong></td>
-  <td><input type="checkbox" id="horizontalbanner" name="horizontalbanner" value="1"></td>
-</tr>
-
-<tr class="odd">
-  <td><strong>Booth Cloth:</strong></td>
-  <td><input type="checkbox" id="boothcloth" name="boothcloth" value="1"></td>
-</tr>
-
-<tr class="even">
-  <td><strong>Pens:</strong></td>
-  <td><input type="checkbox" id="pens" name="pens" value="1"></td>
-</tr>
-
-<tr class="odd">
-  <td><strong>Other:</strong> (please specify)</td>
-  <td><input type="text" id="otherswag" name="otherswag" size="40"></td>
-</tr>
-
-<tr class="even">
-  <td>&nbsp;</td>
-  <td align="right">
-    <input type="submit" id="commit" value="Submit Request">
-  </td>
-</tr>
-
-</table>
-
-<p>
-  Quantities of different swag items requested that will actually be shipped 
-  depend on stock availability and number of attendees. Mozilla cannot guarantee 
-  that all items requested will be in stock at the time of shipment and you will 
-  be notified in case an item cannot be shipped. Please request swag at least 1 
-  month before desired delivery date.
-</p>
-
-<p>
-  <strong><span style="color: red;">*</span></strong> - Required field<br />
-  Thanks for contacting us.
-   You will be notified by email of any progress made in resolving your request.
-</p>
-
-<script type="text/javascript">
-  createCalendar('shipdate');
-</script>
-
-[% PROCESS global/footer.html.tmpl %]
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 b2698ae72..f7edccbe1 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
@@ -34,7 +34,7 @@
 <p><strong>Swag Request:</strong> Please use this form to file a request for swag. </p>
 
 <ol>
-  <li>You first need submit a <a href="/enter_bug.cgi?product=Marketing&amp;format=mktgevent">Event Request Form</a>. You'll be asked for the [% terms.bug %] number below.</li>
+  <li>You first need submit a <a href="/enter_bug.cgi?product=Marketing&amp;format=mktgevent">Event Request Form</a>. You'll be asked for the bug number below.</li>
   <li>Complete and submit request below.</li>
   <li>Your request will be reviewed by the appropriate person in the Engagement team.</li>
   <li>Your swag request will be reviewed and if approved shipped to you from
@@ -70,7 +70,7 @@ function validateAndSubmit() {
   var alert_text = '';
   if(!isFilledOut('firstname')) alert_text += "Please enter your first name\n";
   if(!isFilledOut('lastname')) alert_text += "Please enter your last name\n";
-  if(!isFilledOut('dependson')) alert_text += "Please enter the [% terms.bug %] number for your Event Request Form\n";
+  if(!isFilledOut('dependson')) alert_text += "Please enter the bug number for your Event Request Form\n";
   if(!isValidEmail(document.getElementById('email').value)) alert_text += "Please enter a valid email address\n";
   
   //Everything required is filled out..try to submit the form!
@@ -88,25 +88,25 @@ function validateAndSubmit() {
 <form method="post" action="post_bug.cgi" id="swagRequestForm" enctype="multipart/form-data"
       onSubmit="return validateAndSubmit();">
 
-  <input type="hidden" name="format" value="swag">
-  <input type="hidden" name="product" value="Marketing">
-  <input type="hidden" name="component" value="Swag Requests">
-  <input type="hidden" name="rep_platform" value="All">
-  <input type="hidden" name="op_sys" value="Other">
-  <input type="hidden" name="priority" value="--">
-  <input type="hidden" name="version" value="unspecified">
-  <input type="hidden" name="bug_severity" id="bug_severity" value="normal">
-  <input type="hidden" name="short_desc" id="short_desc" value="">
-  <input type="hidden" name="groups" value="mozilla-corporation-confidential">
-
+        <input type="hidden" name="format" value="swag">
+        <input type="hidden" name="product" value="Marketing">
+        <input type="hidden" name="component" value="Swag Requests">
+        <input type="hidden" name="rep_platform" value="All">
+        <input type="hidden" name="op_sys" value="Other">
+        <input type="hidden" name="priority" value="--">
+        <input type="hidden" name="version" value="unspecified">
+        <input type="hidden" name="bug_severity" id="bug_severity" value="normal">
+
+        <input type="hidden" name="short_desc" id="short_desc" value="">
+	<input type="hidden" name="groups" value="mozilla-corporation-confidential">
 <table>
+
 <tr>
   <td align="right"><strong>First Name: <span style="color: red;">*</span></strong></td>
   <td align="left">
     <input type="text" name="firstname" id="firstname" value="" size="20" maxlength="20" />
   </td>
 </tr>
-
 <tr>
   <td align="right"><strong>Last Name: <span style="color: red;">*</span></strong></td>
   <td align="left">
@@ -143,7 +143,7 @@ function validateAndSubmit() {
 </tr>
 
 <tr>
-  <td align="right"><strong>[% terms.Bug %] number assigned to previously- &nbsp;&nbsp;<br>submitted <a href="/enter_bug.cgi?product=Marketing&amp;format=mktgevent">Event Request Form</a>: <span style="color: red;">*</span></strong></td>
+  <td align="right"><strong>Bug number assigned to previously- &nbsp;&nbsp;<br>submitted <a href="/enter_bug.cgi?product=Marketing&amp;format=mktgevent">Event Request Form</a>: <span style="color: red;">*</span></strong></td>
   <td colspan="3"><input name="dependson" id="dependson"></td>
 </tr>
 
diff --git a/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl b/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl
index 70a51b9ab..e7cea5d2b 100644
--- a/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl
@@ -62,9 +62,9 @@ the <a href="https://bugzilla.mozilla.org/enter_bug.cgi">full product list</a>.
 
 <p>
 <b>The product you have chosen is for [% terms.bug %] reports and enhancement requests for the 
-<a href="http://www.bugzilla.org/">[% terms.Bugzilla %] [% terms.bug %] tracking software</a> only.</b>
-If your [% terms.bug %] is not reporting that [% terms.Bugzilla %] is broken or that you'd like
-a new feature in [% terms.Bugzilla %], your [% terms.bug %] report does not belong in this product.
+<a href="http://www.bugzilla.org/">Bugzilla [% terms.bug %] tracking software</a> only.</b>
+If your [% terms.bug %] is not reporting that Bugzilla is broken or that you'd like
+a new feature in Bugzilla, your [% terms.bug %] report does not belong in this product.
 [% IF format == "guided" %]
    See the instructions next to the stop sign above.
 [% ELSE %]
@@ -72,22 +72,22 @@ a new feature in [% terms.Bugzilla %], your [% terms.bug %] report does not belo
 [% END %]
 </p>
 
-<p><b>We WILL NOT accept [% terms.bug %] reports for [% terms.Bugzilla %]
-installed via the Debian packaging system.  If you obtained [% terms.Bugzilla %] from Debian,
+<p><b>We WILL NOT accept [% terms.bug %] reports for Bugzilla
+installed via the Debian packaging system.  If you obtained Bugzilla from Debian,
 please visit the <a href="http://www.debian.org/support">Debian Support page</a>,
-or file a [% terms.bug %] on the <a href="http://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=bugzilla">Debian
-[% terms.Bug %] Tracker</a>.</b>  The Debian package maintainer will then determine whether the [% terms.bug %]
-is specific to the package or not, and can move the [% terms.bug %] "upstream" if needed.</p>
+or file a bug on the <a href="http://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=bugzilla">Debian
+Bug Tracker</a>.</b>  The Debian package maintainer will then determine whether the bug
+is specific to the package or not, and can move the bug "upstream" if needed.</p>
 
 <p>
-[% terms.Bugs %] specific to bugzilla.mozilla.org, rather than the [% terms.Bugzilla %] software in
+Bugs specific to bugzilla.mozilla.org, rather than the Bugzilla software in
 general (which is used by many sites), should be filed in the
 <a href="enter_bug.cgi?product=mozilla.org">mozilla.org product</a>.
 </p>
 
 <p>
 Please do not file test [% terms.bugs %] or support requests here!  You 
-can test [% terms.Bugzilla %] at 
+can test Bugzilla at 
 <a href="http://landfill.bugzilla.org/">landfill.bugzilla.org</a> and ask
 for support in the 
 <a href="news://news.mozilla.org/mozilla.support.bugzilla">
@@ -106,7 +106,7 @@ support-bugzilla&#64;lists.mozilla.org mailing list</a>, or
 [% UNLESS cloned_bug_id %]
 Consider using the
 <a href="enter_bug.cgi?product=[% product.name FILTER html %]&amp;format=guided">
-[% terms.Bugzilla %] Helper</a> instead of this form.
+Bugzilla Helper</a> instead of this form.
 [% END +%]
 Before reporting a [% terms.bug %], make sure you've read our
 <a href="http://www.mozilla.org/quality/bug-writing-guidelines.html">
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 c957edca7..a65605a93 100644
--- a/extensions/BMO/template/en/default/global/choose-product.html.tmpl
+++ b/extensions/BMO/template/en/default/global/choose-product.html.tmpl
@@ -42,8 +42,7 @@
 
 <center>
 <hr>
-<p><span style="font-family: verdana,helvetica;">Looking for technical support or help getting your site to work with Mozilla? <a href="http://www.mozilla.org/support/">Visit the
-mozilla.org support page</a> before filing [% terms.bugs %].</span></p>
+<p><span style="font-family: verdana,helvetica;">Looking for technical support or help getting your site to work with Mozilla? <a href="http://www.mozilla.org/support/">Visit the mozilla.org support page</a> before filing bugs.</span></p>
 <hr>
 </center>
 
@@ -147,7 +146,7 @@ mozilla.org support page</a> before filing [% terms.bugs %].</span></p>
 
 <br>
 [% IF target == "enter_bug.cgi" AND user.settings.product_chooser.value != 'full_product_chooser' %]
-<p align="center">You can choose to get this screen by default when you click "New [% terms.Bug %]" by changing your <a href="userprefs.cgi?tab=settings">preferences</a>.</p>
+<p align="center">You can choose to get this screen by default when you click "New Bug" by changing your <a href="userprefs.cgi?tab=settings">preferences</a>.</p>
 [% END %]
 [% END %]
 <br>
diff --git a/extensions/BMO/template/en/default/hook/bug/create/create-guided-form.html.tmpl b/extensions/BMO/template/en/default/hook/bug/create/create-guided-form.html.tmpl
index 5b58a9637..ee88aac7c 100644
--- a/extensions/BMO/template/en/default/hook/bug/create/create-guided-form.html.tmpl
+++ b/extensions/BMO/template/en/default/hook/bug/create/create-guided-form.html.tmpl
@@ -1,4 +1,4 @@
-  <tr bgcolor="[% tablecolour  FILTER html %]">
+  <tr bgcolor="[% tablecolour %]">
     <td valign="middle" align="right">
       <b>Security</b>
     </td>
diff --git a/extensions/BMO/template/en/default/hook/bug/edit-after_custom_fields.html.tmpl b/extensions/BMO/template/en/default/hook/bug/edit-after_custom_fields.html.tmpl
index ba6eeb78c..0c68d8e72 100644
--- a/extensions/BMO/template/en/default/hook/bug/edit-after_custom_fields.html.tmpl
+++ b/extensions/BMO/template/en/default/hook/bug/edit-after_custom_fields.html.tmpl
@@ -49,6 +49,7 @@
       [% FOREACH field = Bugzilla.active_custom_fields %]
         [% NEXT IF NOT user.id AND field.value == "---" %]
         [% NEXT IF cf_hidden_in_product(field.name, bug.product, bug.component, 2) %]
+        [% NEXT IF cf_flag_disabled(field.name, bug) %]
         [% custom_flags.push(field.name) %]
         <tr id="row_[% field.name FILTER js %]">
           <td>&nbsp;</td>
diff --git a/extensions/BMO/template/en/default/hook/global/header-additional_header.html.tmpl b/extensions/BMO/template/en/default/hook/global/header-additional_header.html.tmpl
index 05276d5f7..0277f3e7e 100644
--- a/extensions/BMO/template/en/default/hook/global/header-additional_header.html.tmpl
+++ b/extensions/BMO/template/en/default/hook/global/header-additional_header.html.tmpl
@@ -21,7 +21,7 @@
 
 <link rel="shortcut icon" href="extensions/BMO/web/images/bugzilla.png">
 [% IF bug %]
-<link id="shorturl" rev="canonical" href="https://bugzil.la/[% bug.bug_id FILTER uri %]">
+<link id="shorturl" rev="canonical" href="https://bugzil.la/[% bug.bug_id %]">
 [% END %]
 
 <style type="text/css">
diff --git a/extensions/BMO/template/en/default/hook/global/user-error-auth_failure_object.html.tmpl b/extensions/BMO/template/en/default/hook/global/user-error-auth_failure_object.html.tmpl
new file mode 100644
index 000000000..067347f3b
--- /dev/null
+++ b/extensions/BMO/template/en/default/hook/global/user-error-auth_failure_object.html.tmpl
@@ -0,0 +1,3 @@
+[% IF object == 'group_admins' %]
+  the group administrators report
+[% END %]
diff --git a/extensions/BMO/template/en/default/hook/global/user-error-errors.html.tmpl b/extensions/BMO/template/en/default/hook/global/user-error-errors.html.tmpl
index 5a3e2bed6..85881aca7 100644
--- a/extensions/BMO/template/en/default/hook/global/user-error-errors.html.tmpl
+++ b/extensions/BMO/template/en/default/hook/global/user-error-errors.html.tmpl
@@ -34,22 +34,7 @@
     [% title = "Invalid Date" %]
     The date '[% date FILTER html %]' is invalid.
 
-[% ELSIF error == "remo_payment_invalid_product" %]
-   [% title = "Mozilla Reps Payment Invalid $terms.Bug" %]
-   You can only attach budget payment information to [% terms.bugs %] under
-   the product 'Mozilla Reps' and component 'Budget Requests'.
-
-[% ELSIF error == "remo_payment_bug_edit_denied" %] 
-   [% title = "Mozilla Reps Payment $terms.Bug Edit Denied" %]
-   You do not have permission to edit [% terms.bug %] '[% bug_id FILTER html %]'.
-
-[% ELSIF error == "remo_payment_cancel_dupe" %]
-   [% title = "Already filed payment request" %]
-   You already used the form to file
-   <a href="[% urlbase FILTER html %]attachment.cgi?id=[% attachid FILTER uri %]&action=edit">
-   attachment [% attachid FILTER uri %]</a>.<br>
-   <br>
-   You can either <a href="[% urlbase FILTER html %]page.cgi?id=remo-form-payment.html">
-   create a new payment request</a> or [% "go back to $terms.bug $bugid" FILTER bug_link(bugid) FILTER none %].
+[% ELSIF error == "invalid_object" %]
+   Invalid [% object FILTER html %]: "[% value FILTER html %]"
 
 [% END %]
diff --git a/extensions/BMO/template/en/default/hook/global/user-error.html.tmpl/auth_failure/permissions.html.tmpl b/extensions/BMO/template/en/default/hook/global/user-error.html.tmpl/auth_failure/permissions.html.tmpl
index 346e02373..5f6ca946a 100644
--- a/extensions/BMO/template/en/default/hook/global/user-error.html.tmpl/auth_failure/permissions.html.tmpl
+++ b/extensions/BMO/template/en/default/hook/global/user-error.html.tmpl/auth_failure/permissions.html.tmpl
@@ -22,7 +22,7 @@
 
 [% IF (group == "canconfirm" OR group == "editbugs") AND !reason %]
   <p>
-    If you are attempting to confirm an unconfirmed [% terms.bug %] or edit the fields of a [% terms.bug %],
+    If you are attempting to confirm an unconfirmed bug or edit the fields of a bug,
     <a href="http://www.gerv.net/hacking/before-you-mail-gerv.html#bugzilla-permissions">find
     out how to get the necessary permissions</a>.
   </p>
diff --git a/extensions/BMO/template/en/default/hook/pages/fields-resolution.html.tmpl b/extensions/BMO/template/en/default/hook/pages/fields-resolution.html.tmpl
new file mode 100644
index 000000000..4d12ab345
--- /dev/null
+++ b/extensions/BMO/template/en/default/hook/pages/fields-resolution.html.tmpl
@@ -0,0 +1,13 @@
+<dt>
+  [% display_value("resolution", "INCOMPLETE") FILTER html %]
+</dt>
+<dd>
+  The problem is vaguely described with no steps to reproduce,
+  or is a support request. The reporter should be directed to the
+  product's support page for help diagnosing the issue. If there
+  are only a few comments in the [% terms.bug %], it may be reopened only if
+  the original reporter provides more info, or confirms someone
+  else's steps to reproduce. If the [% terms.bug %] is long, when enough info
+  is provided a new [% terms.bug %] should be filed and the original [% terms.bug %]
+  marked as a duplicate of it.
+</dd>
diff --git a/extensions/BMO/template/en/default/hook/reports/menu-end.html.tmpl b/extensions/BMO/template/en/default/hook/reports/menu-end.html.tmpl
index b42ff8d2a..6e8463020 100644
--- a/extensions/BMO/template/en/default/hook/reports/menu-end.html.tmpl
+++ b/extensions/BMO/template/en/default/hook/reports/menu-end.html.tmpl
@@ -31,5 +31,11 @@
     %]page.cgi?id=triage_reports.html">Triage Report</a></strong> - Report
     on UNCONFIRMED [% terms.bugs %] to assist triage.
   </li>
+  [% IF user.in_group('editusers') %]
+    <li>
+      <strong><a href="[% urlbase FILTER none
+      %]page.cgi?id=group_admins.html">Group Admins</a></strong> - Group Admins Report
+    </li>
+  [% END %]
 </ul>
 
diff --git a/extensions/BMO/template/en/default/list/list.microsummary.tmpl b/extensions/BMO/template/en/default/list/list.microsummary.tmpl
index a095a7e4d..8f6b13cbd 100644
--- a/extensions/BMO/template/en/default/list/list.microsummary.tmpl
+++ b/extensions/BMO/template/en/default/list/list.microsummary.tmpl
@@ -21,8 +21,9 @@
 
 [% PROCESS global/variables.none.tmpl %]
 
+
 [% IF searchname %]
-    [% searchname FILTER html %] ([% bugs.size %])
+    [% searchname %] ([% bugs.size %])
 [% ELSE %]
     [% terms.Bug %] List ([% bugs.size %])
 [% END %]
diff --git a/extensions/BMO/template/en/default/list/server-push.html.tmpl b/extensions/BMO/template/en/default/list/server-push.html.tmpl
index 1c1f3cf36..40432a35b 100644
--- a/extensions/BMO/template/en/default/list/server-push.html.tmpl
+++ b/extensions/BMO/template/en/default/list/server-push.html.tmpl
@@ -34,7 +34,7 @@
     <div style="margin-top: 15%; text-align: center;">
       <center><img src="extensions/BMO/web/images/mozchomp.gif" alt=""
       width="160" height="87"></center>
-      <h1>Please wait while your [% terms.bugs %] are retrieved.</h1>
+      <h1>Please wait while your bugs are retrieved.</h1>
     </div>
 
     [% IF debug %]
diff --git a/extensions/BMO/template/en/default/pages/comment-remo-form-payment.txt.tmpl b/extensions/BMO/template/en/default/pages/comment-remo-form-payment.txt.tmpl
deleted file mode 100644
index c43a92ae7..000000000
--- a/extensions/BMO/template/en/default/pages/comment-remo-form-payment.txt.tmpl
+++ /dev/null
@@ -1,37 +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 BMO Extension
-  #
-  # The Initial Developer of the Original Code is the Mozilla Foundation
-  # Portions created by the Initial Developers are Copyright (C) 2011 the
-  # Initial Developer. All Rights Reserved.
-  #
-  # Contributor(s):
-  #   Dave Lawrence <dkl@mozilla.com>
-  #%]
-
-[% USE Bugzilla %]
-[% cgi = Bugzilla.cgi %]
-
-Mozilla Reps Payment Request
-----------------------------
-
-Requester info:
-
-First name: [% cgi.param('firstname') %]  
-Last name: [% cgi.param('lastname') %]  
-Wiki user profile: [% cgi.param('wikiprofile') %]    
-Event wiki page: [% cgi.param('wikipage') %]
-Budget request [% terms.bug %]: [% cgi.param('bug_id') %]
-Have you already received payment for this event? [% IF cgi.param('receivedpayment') %]Yes[% ELSE %]No[% END %]
-
-[%+ cgi.param("comment") IF cgi.param("comment") %]
-
diff --git a/extensions/BMO/template/en/default/pages/etiquette.html.tmpl b/extensions/BMO/template/en/default/pages/etiquette.html.tmpl
index 8bccaea9d..281057eeb 100644
--- a/extensions/BMO/template/en/default/pages/etiquette.html.tmpl
+++ b/extensions/BMO/template/en/default/pages/etiquette.html.tmpl
@@ -21,15 +21,15 @@
   #%]
 
 [% INCLUDE global/header.html.tmpl 
-   title = "$terms.Bugzilla Etiquette" 
+   title = "Bugzilla Etiquette" 
    style = "li { margin: 5px } .heading { font-weight: bold }" %]
 
 <p>
   There's a number of <i lang="fr">faux pas</i> you can commit when using 
-  [% terms.Bugzilla %]. At the very   
+  Bugzilla. At the very   
   least, these will make Mozilla contributors upset at you; if committed enough    
   times they will cause those contributors to demand the disabling of your
-  [% terms.Bugzilla %] account. So, ignore this advice at your peril. 
+  Bugzilla account. So, ignore this advice at your peril. 
 </p>
 
 <p>
@@ -47,14 +47,14 @@
   <li>
   <span class="heading">No pointless comments</span>.
   Unless you have something constructive and helpful to say, do not add a 
-  comment to a [% terms.bug %]. In [% terms.bugs %] where there is a heated debate going on, you 
+  comment to a bug. In bugs where there is a heated debate going on, you 
   should be even more
   inclined not to add a comment. Unless you have something new to contribute,
-  then the [% terms.bug %] owner is aware of all the issues, and will make a judgement
-  as to what to do. If you agree the [% terms.bug %] should be fixed, vote for it.
+  then the bug owner is aware of all the issues, and will make a judgement
+  as to what to do. If you agree the bug should be fixed, vote for it.
   Additional "I see this too" or "It works for me" comments are unnecessary
   unless they are on a different platform or a significantly different build.
-  Constructive and helpful thoughts unrelated to the topic of the [% terms.bug %]
+  Constructive and helpful thoughts unrelated to the topic of the bug
   should go in the appropriate
   <a href="http://www.mozilla.org/about/forums/">newsgroup</a>.
   </li>
@@ -63,8 +63,8 @@
   <span class="heading">No obligation</span>.
   "Open Source" is not the same as "the developers must do my bidding." 
   Everyone here wants to help, but the only person who has any
-  <i>obligation</i> to fix the [% terms.bugs %] you want fixed is you. Therefore, you 
-  should not act as if you expect someone to fix a [% terms.bug %] by a particular date 
+  <i>obligation</i> to fix the bugs you want fixed is you. Therefore, you 
+  should not act as if you expect someone to fix a bug by a particular date 
   or release. Aggressive or repeated demands will not be received
   well and will almost certainly diminish the impact and interest in your 
   suggestions.
@@ -80,17 +80,17 @@
   <i>things</i>, not <i>people</i>. Examples of things include: interfaces,
   algorithms, and schedules. Examples of people include: developers,
   designers and users. <b>Attacking a person may result in you being banned 
-  from [% terms.Bugzilla %].</b>  
+  from Bugzilla.</b>  
   </li>
   
   <li>
   <span class="heading">No private email</span>.
-  Unless the [% terms.bug %] owner or another respected project contributor has asked you
+  Unless the bug owner or another respected project contributor has asked you
   to email them with specific information, please place all information
-  relating to [% terms.bugs %]
-  in the [% terms.bug %] itself. Do not send them by private email; no-one else can read
+  relating to bugs
+  in the bug itself. Do not send them by private email; no-one else can read
   them if you do that, and they'll probably just get ignored. If a file
-  is too big for [% terms.Bugzilla %], add a comment giving the file size and contents
+  is too big for Bugzilla, add a comment giving the file size and contents
   and ask what to do.
   </li>
 </ol>
@@ -99,19 +99,19 @@
 
 <ol>
   <li>
-  <span class="heading">No messing with other people's [% terms.bugs %]</span>.
-  Unless you are the [% terms.bug %] assignee, or have some say over the use of their
+  <span class="heading">No messing with other people's bugs</span>.
+  Unless you are the bug assignee, or have some say over the use of their
   time, never change the Priority or Target Milestone fields. If in doubt, 
-  do not change the fields of [% terms.bugs %] you do not own - add a comment
+  do not change the fields of bugs you do not own - add a comment
   instead, suggesting the change.
   </li>
 
   <li>
   <span class="heading">No whining about decisions</span>.
-  If a respected project contributor has marked a [% terms.bug %] as INVALID, then it is
+  If a respected project contributor has marked a bug as INVALID, then it is
   invalid. Someone filing another duplicate of it does not change this. Unless
   you have further important evidence, do not post a comment arguing that an
-  INVALID or WONTFIX [% terms.bug %] should be reopened. 
+  INVALID or WONTFIX bug should be reopened. 
   </li>  
 
 </ol>
@@ -129,7 +129,7 @@
 <p>
   If you see someone not following these rules, the first step is, as an exception
   to guideline 1.4, to make them aware of this document by <em>private</em> mail. 
-  Flaming people publically in [% terms.bugs %] violates guidelines 1.1 and 1.3. In the case of
+  Flaming people publically in bugs violates guidelines 1.1 and 1.3. In the case of
   persistent offending you should report the matter to 
   <a href="mailto:gerv@mozilla.org">Gerv</a>. 
 </p>
@@ -141,7 +141,7 @@
 
 <p>
   Other useful documents:
-  <a href="page.cgi?id=bug-writing.html">The [% terms.Bug %] Writing Guidelines</a>.
+  <a href="page.cgi?id=bug-writing.html">The Bug Writing Guidelines</a>.
 </p>
 
 [% INCLUDE global/footer.html.tmpl %]
diff --git a/extensions/BMO/template/en/default/pages/group_admins.html.tmpl b/extensions/BMO/template/en/default/pages/group_admins.html.tmpl
new file mode 100644
index 000000000..a55b6e2ad
--- /dev/null
+++ b/extensions/BMO/template/en/default/pages/group_admins.html.tmpl
@@ -0,0 +1,53 @@
+[%# 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 BMO Extension
+  #
+  # The Initial Developer of the Original Code is the Mozilla Foundation
+  # Portions created by the Initial Developers are Copyright (C) 2011 the
+  # Initial Developer. All Rights Reserved.
+  #
+  # Contributor(s):
+  #   David Lawrence <dkl@mozilla.com>
+  #%]
+
+[% INCLUDE global/header.html.tmpl
+  title = "Group Admins Report"
+  style_urls = [ "extensions/BMO/web/styles/reports.css" ]
+%]
+
+[% IF groups.size > 0 %]
+  <table border="0" cellspacing="0" id="report" width="100%">
+    <tr id="report-header">
+      <th align="left">Name</th>
+      <th align="left">Admins</th>
+    </tr>
+
+    [% FOREACH group = groups %]
+      [% count = loop.count() %]
+      <tr class="report_item [% count % 2 == 1 ? "report_row_odd" : "report_row_even" %]">
+        <td>
+          [% group.name FILTER html %]
+        </td>
+        <td>
+          [% FOREACH admin = group.admins %]
+            [% INCLUDE global/user.html.tmpl who = admin %][% ", " UNLESS loop.last %]
+          [% END %]
+        </td>
+      </tr>
+    [% END %]
+  </table>
+[% ELSE %]
+  <p>
+    No groups found.
+  </p>
+[% END %]
+
+[% INCLUDE global/footer.html.tmpl %]
diff --git a/extensions/BMO/template/en/default/pages/remo-form-payment.html.tmpl b/extensions/BMO/template/en/default/pages/remo-form-payment.html.tmpl
deleted file mode 100644
index ae4ca6f2e..000000000
--- a/extensions/BMO/template/en/default/pages/remo-form-payment.html.tmpl
+++ /dev/null
@@ -1,243 +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 BMO Extension
-  #
-  # The Initial Developer of the Original Code is the Mozilla Foundation
-  # Portions created by the Initial Developers are Copyright (C) 2011 the
-  # Initial Developer. All Rights Reserved.
-  #
-  # Contributor(s):
-  #   Dave Lawrence <dkl@mozilla.com>
-  #%]
-
-[% PROCESS global/variables.none.tmpl %]
-
-[% PROCESS global/header.html.tmpl
-   title = "Mozilla Reps Payment Form"
-   style_urls = [ 'extensions/BMO/web/styles/moz_reps.css' ]
-   javascript_urls = [ 'extensions/BMO/web/js/form_validate.js',
-                       'js/util.js',
-                       'js/field.js' ]
-   yui = ['connection', 'json'] 
-%]
-
-<script language="javascript" type="text/javascript">
-
-var bug_cache = {};
-
-function validateAndSubmit() {
-  var alert_text = '';
-  if(!isFilledOut('firstname')) alert_text += "Please enter your first name\n";
-  if(!isFilledOut('lastname')) alert_text += "Please enter your last name\n";
-  if(!isFilledOut('wikiprofile')) alert_text += "Please enter a wiki user profile.\n";
-  if(!isFilledOut('wikipage')) alert_text += "Please enter a wiki page address.\n";
-  if(!isFilledOut('bug_id')) alert_text += "Please enter a valid [%terms.bug %] id to attach this additional information to.\n";
-  if(!isFilledOut('expenseform')) alert_text += "Please enter an expense form to upload.\n";
-  if(!isFilledOut('receipts')) alert_text += "Please enter a receipts file to upload.\n";
-
-  if (alert_text) {
-    alert(alert_text);
-    return false;
-  }
-
-  return true;
-}
-
-function togglePaymentInfo (e) {
-  var div = document.getElementById('paymentinfo');
-  if (e.checked == false) {
-    div.style.display = 'block';
-  }
-  else {
-    div.style.display = 'none';
-  }
-}
-
-function getBugInfo (e, div) {
-  var bug_id = e.value;
-  div = document.getElementById(div);
-
-  if (!bug_id) {
-    div.innerHTML = "";
-    return true;
-  }
-
-  div.style.display = 'block';
-
-  if (bug_cache[bug_id]) {
-    div.innerHTML = bug_cache[bug_id];
-    e.disabled = false;
-    return true;    
-  }
-
-  e.disabled = true;
-  div.innerHTML = 'Getting [% terms.bug %] info...';
-
-  YAHOO.util.Connect.setDefaultPostHeader('application/json', true); 
-  YAHOO.util.Connect.asyncRequest(
-    'POST',
-    'jsonrpc.cgi',
-    {
-      success: function(res) {
-        var bug_message = "";
-        data = YAHOO.lang.JSON.parse(res.responseText);
-        if (data.error) {
-          bug_message = "Get [% terms.bug %] failed: " + data.error.message;
-        }
-        else if (data.result) {
-          if (data.result.bugs[0].product !== 'Mozilla Reps'
-              || data.result.bugs[0].component !== 'Budget Requests') 
-          {
-            bug_message = "You can only attach budget payment " +
-                          "information to [% terms.bugs %] under the product " + 
-                          "'Mozilla Reps' and component 'Budget Requests'.";
-          }
-          else {
-            bug_message = "Bug " + bug_id + " - " + data.result.bugs[0].status +
-                          " - " + data.result.bugs[0].summary;
-          }
-        }
-        else {
-          bug_message = "Get [% terms.bug %] failed: " + res.responseText; 
-        }
-        div.innerHTML = bug_message;
-        bug_cache[bug_id] = bug_message;
-        e.disabled = false;
-      },
-      failure: function(res) {
-        if (res.responseText) {
-          div.innerHTML = "Get [% terms.bug %] failed: " + res.responseText;
-        }
-      }
-    },
-    YAHOO.lang.JSON.stringify({
-      version: "1.1",
-      method: "Bug.get",
-      id: bug_id,
-      params: {
-        ids: [ bug_id ], 
-        include_fields: [ 'product', 'component', 'status',  'summary' ]
-      }
-    })
-  );    
-}
-
-</script>
-
-<h1>Mozilla Reps - Payment Form</h1>
-
-<form method="post" action="page.cgi" id="paymentForm" enctype="multipart/form-data"
-      onSubmit="return validateAndSubmit();">
-<input type="hidden" id="id" name="id" value="remo-form-payment.html">
-<input type="hidden" id="token" name="token" value="[% token FILTER html %]">
-<input type="hidden" id="action" name="action" value="commit">
-
-<table id="reps-form">
-
-<tr class="odd">
-  <td width="25%"><strong>First Name: <span style="color: red;">*</span></strong></td>
-  <td>
-    <input type="text" name="firstname" id="firstname" value="" size="40" placeholder="John">
-  </td>
-</tr>
-
-<tr class="even">
-  <td><strong>Last Name: <span style="color: red;">*</span></strong></td>
-  <td>
-    <input type="text" name="lastname" id="lastname" value="" size="40" placeholder="Doe">
-  </td>
-</tr>
-
-<tr class="odd">
-  <td><strong>Wiki user profile:<span style="color: red;">*</span></strong></td>
-  <td>
-    <input type="text" name="wikiprofile" id="wikiprofile" value="" size="40" placeholder="JohnDoe">
-  </td>
-</tr>
-
-<tr class="even">
-  <td><strong>Event wiki page: <span style="color: red;">*</span></strong></td>
-  <td>
-    <input type="text" name="wikipage" id="wikipage" value="" size="40">
-  </td>
-</tr>
-
-<tr class="odd">
-  <td><strong>Budget request [% terms.bug %]: <span style="color: red;">*</span></strong></td>
-  <td>
-    <input type="text" name="bug_id" id="bug_id" value="" size="40"
-           onblur="getBugInfo(this,'bug_info');")>
-  </td>
-</tr>
-
-<tr class="odd">
-  <td colspan="2">
-    <div id="bug_info" style="display:none;"></div>
-  </td>
-</tr>
-
-<tr class="even">
-  <td colspan="2">
-    <strong>Have you already received payment for this event?</strong>
-    <input type="checkbox" name="receivedpayment" id="receivedpayment" value="1"
-           onchange="togglePaymentInfo(this);" checked="true">
-    <div id="paymentinfo" style="display:none;">
-      Please send an email to William at mozilla.com with all the information below:<br>
-      <br>
-      Payment information:<br>
-      Bank name:<br>
-      Bank address: <br> 
-      IBAN:<br>
-      Swift code/BIC:<br>
-      Additional bank details (if necessary):
-    </div>
-  </td>
-</tr>
-
-<tr class="odd">
-  <td colspan="2">
-    <strong>Expense form and scanned receipts/invoices:</strong>
-  </td>
-</tr>
-
-<tr class="odd">
-  <td>Expense Form: <span style="color: red;">*</span></td>
-  <td><input type="file" id="expenseform" name="expenseform" size="40"></td>
-</tr>
-
-<tr class="odd">
-  <td valign="top">Receipts File: <span style="color: red;">*</span></td>
-  <td>
-    <input type="file" id="receipts" name="receipts" size="40"><br>
-    <font style="color:red;">
-      Please black out any bank account information included<br>
-      on receipts before attaching them.
-    </font>
-  </td>
-</tr>
-
-<tr class="even">
-  <td>&nbsp;</td>
-  <td align="right">
-    <input type="submit" id="commit" value="Submit Request">
-  </td>
-</tr>
-
-</table>
-
-</form>
-
-<p>
-  <strong><span style="color: red;">*</span></strong> - Required field<br>
-  Thanks for contacting us.
-</p>
-
-[% PROCESS global/footer.html.tmpl %]
diff --git a/extensions/BMO/template/en/default/pages/triage_reports.html.tmpl b/extensions/BMO/template/en/default/pages/triage_reports.html.tmpl
index a7f26e86d..023dc4791 100644
--- a/extensions/BMO/template/en/default/pages/triage_reports.html.tmpl
+++ b/extensions/BMO/template/en/default/pages/triage_reports.html.tmpl
@@ -59,7 +59,7 @@ var selected_components = [
 <input type="hidden" name="id" value="triage_reports.html">
 <input type="hidden" name="action" value="run">
 
-Show UNCONFIRMED [% terms.bugs %] with:
+Show UNCONFIRMED bugs with:
 <table id="triage_form">
 
 <tr>
@@ -149,7 +149,7 @@ Show UNCONFIRMED [% terms.bugs %] with:
   </p>
   <table border="0" cellspacing="0" id="report" width="100%">
     <tr id="report-header">
-      <th>[% terms.Bug %] / Date</th>
+      <th>Bug / Date</th>
       <th>Summary</th>
       <th>Reporter / Commenter</th>
       <th>Comment Date</th>
@@ -190,7 +190,7 @@ Show UNCONFIRMED [% terms.bugs %] with:
 
 [% ELSE %]
   <p>
-    No [% terms.bugs %] found.
+    No bugs found.
   </p>
 [% END %]
 
diff --git a/extensions/BMO/template/en/default/pages/user_activity.html.tmpl b/extensions/BMO/template/en/default/pages/user_activity.html.tmpl
index 904f0ba62..dd16595ab 100644
--- a/extensions/BMO/template/en/default/pages/user_activity.html.tmpl
+++ b/extensions/BMO/template/en/default/pages/user_activity.html.tmpl
@@ -96,7 +96,7 @@
 
 [% IF incomplete_data %]
   <p>
-    There used to be an issue in <a href="http://www.bugzilla.org/">[% terms.Bugzilla %]</a>
+    There used to be an issue in <a href="http://www.bugzilla.org/">Bugzilla</a>
     which caused activity data to be lost if there were a large number of cc's
     or dependencies.  That has been fixed, but some data was already lost in
     your activity table that could not be regenerated.  The changes that 
@@ -110,7 +110,7 @@
     <tr id="report-header">
       <th>Who</th>
       <th>When</th>
-      <th>[% terms.Bug %]</th>
+      <th>Bug</th>
       <th>What</th>
       <th>Removed</th>
       <th>Added</th>
@@ -131,9 +131,9 @@
           [% "</tr><tr>" IF loop.index > 0 %]
             <td>
               [% IF change.attachid %]
-                <a href="attachment.cgi?id=[% change.attachid FILTER uri %]">Attachment #[% change.attachid FILTER html %]</a>
+                <a href="attachment.cgi?id=[% change.attachid %]">Attachment #[% change.attachid %]</a>
               [% ELSIF change.comment.defined && change.fieldname == 'longdesc' %]
-                [% "Comment $change.comment.count" FILTER bug_link(operation.bug, comment_num => change.comment.count) FILTER none %]
+                 [% "Comment $change.comment.count" FILTER bug_link(operation.bug, comment_num => change.comment.count) %]
               [% ELSE %]
                 [%+ field_descs.${change.fieldname} FILTER html %]
               [% END %]
diff --git a/extensions/BMO/web/js/edit_bug.js b/extensions/BMO/web/js/edit_bug.js
index 6f0bc4587..5fc2ab6f7 100644
--- a/extensions/BMO/web/js/edit_bug.js
+++ b/extensions/BMO/web/js/edit_bug.js
@@ -54,3 +54,18 @@ function bmo_show_tracking_flags() {
     }
   }
 }
+
+// -- make attachment table, comments, new comment textarea equal widths
+
+YAHOO.util.Event.onDOMReady(function() {
+  var comment_tables = Dom.getElementsByClassName('bz_comment_table', 'table', 'comments');
+  if (comment_tables.length) {
+    var comment_width = comment_tables[0].getElementsByTagName('td')[0].clientWidth + 'px';
+    var attachment_table = Dom.get('attachment_table');
+    if (attachment_table)
+      attachment_table.style.width = comment_width;
+    var new_comment = Dom.get('comment');
+    if (new_comment)
+      new_comment.style.width = comment_width;
+  }
+});
diff --git a/extensions/BMO/web/js/edituser_menu.js b/extensions/BMO/web/js/edituser_menu.js
new file mode 100644
index 000000000..9ce78d9ce
--- /dev/null
+++ b/extensions/BMO/web/js/edituser_menu.js
@@ -0,0 +1,26 @@
+var admin_usermenu;
+
+YAHOO.util.Event.onDOMReady(function() {
+  admin_usermenu = new YAHOO.widget.Menu('admin_usermenu', { position : 'dynamic' });
+  admin_usermenu.addItems([
+    { text: 'Edit',     url: '#', target: '_new' },
+    { text: 'Activity', url: '#', target: '_new' },
+    { text: 'Mail',     url: '#', target: '_new' }
+  ]);
+  admin_usermenu.render(document.body);
+});
+
+function show_admin_username(event, id, email) {
+  if (!admin_usermenu)
+    return;
+  admin_usermenu.getItem(0).cfg.setProperty('url', 'editusers.cgi?action=edit&userid=' + id);
+  admin_usermenu.getItem(1).cfg.setProperty('url',
+    'page.cgi?id=user_activity.html&action=run' +
+    '&from=' + YAHOO.util.Date.format(new Date(new Date() - (1000 * 60 * 60 * 24 * 14)), {format: '%Y-%m-%d'}) +
+    '&to=' + YAHOO.util.Date.format(new Date(), {format: '%Y-%m-%d'}) +
+    '&who=' + escape(email));
+  admin_usermenu.getItem(2).cfg.setProperty('url', 'mailto:' + escape(email));
+  admin_usermenu.cfg.setProperty('xy', YAHOO.util.Event.getXY(event));
+  admin_usermenu.show();
+}
+
diff --git a/extensions/BMO/web/styles/moz_reps.css b/extensions/BMO/web/styles/moz_reps.css
deleted file mode 100644
index 989733c41..000000000
--- a/extensions/BMO/web/styles/moz_reps.css
+++ /dev/null
@@ -1,44 +0,0 @@
-#reps-form {
-  width: 700px;
-  border-spacing: 0px;
-  border: 4px solid #e0e0e0;
-}
-
-#reps-form th, #reps-form td {
-  padding: 5px;
-}
-
-#reps-form .even th, #reps-form .even td {
-  background: #e0e0e0;
-}
-
-#reps-form th {
-  text-align: left;
-}
-
-#reps-form textarea {
-  font-family: Verdana, sans-serif;
-  font-size: small;
-  width: 590px;
-}
-
-#reps-form .mandatory {
-  color: red;
-  font-size: 80%;
-}
-
-#reps-form .missing {
-  box-shadow: #FF0000 0 0 1.5px 1px;
-}
-
-#reps-form .hidden {
-  display: none;
-}
-
-#reps-form .subTH {
-  padding-left: 2em;
-}
-
-#reps-form .missing {
-  background: #FFC1C1;
-}
diff --git a/extensions/BMO/web/styles/reports.css b/extensions/BMO/web/styles/reports.css
new file mode 100644
index 000000000..3106a6295
--- /dev/null
+++ b/extensions/BMO/web/styles/reports.css
@@ -0,0 +1,37 @@
+.hidden {
+  display: none;
+}
+
+#triage_form th {
+    text-align: left;
+}
+
+#product, #component {
+    width: 20em;
+}
+
+#report tr.bugitem:hover {
+  background: #ccccff;
+}
+
+#report td {
+  padding: 1px 10px 1px 10px;
+}
+
+#report-header {
+  background: #dddddd;
+}
+
+.report_row_odd {
+    background-color: #F7F7F7;
+    color: #000000;
+}
+
+.report_row_even {
+    background-color: #FFFFFF;
+    color: #000000;
+}
+
+tr.report_item:hover {
+    background-color: #ccccff;
+}