more porting work

6 files changed, 81 insertions, 308 deletions

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 %]