Bug 1321592 - Update Bugzilla Etiquette and add Abuse Policy

3 files changed, 183 insertions, 131 deletions

diff --git a/extensions/BMO/template/en/default/account/create.html.tmpl b/extensions/BMO/template/en/default/account/create.html.tmpl
index 3a4dd8a70..42070fe02 100644
--- a/extensions/BMO/template/en/default/account/create.html.tmpl
+++ b/extensions/BMO/template/en/default/account/create.html.tmpl
@@ -17,11 +17,12 @@
   #
   # Contributor(s): Gervase Markham <gerv@gerv.net>
   #                 Byron Jones <glob@mozilla.com>
+  #                 Emma Humphries <emma@mozilla.com>
   #%]
 
 [%# INTERFACE
   # none
-  # 
+  #
   # Param("maintainer") is used to display the maintainer's email.
   # Param("emailsuffix") is used to pre-fill the email field.
   #%]
@@ -40,11 +41,12 @@
 <script type="text/javascript">
 function onSubmit() {
   var email = document.getElementById('login').value;
+  var agreed = document.getElementById('agree').checked;
   if (email == '') {
     alert('You must enter your email address.');
     return false;
   }
-  var isValid = 
+  var isValid =
     email.match(/@/)
     && email.match(/@.+\./)
     && !email.match(/\.$/)
@@ -59,6 +61,13 @@ function onSubmit() {
     );
     return false;
   }
+  if (!agreed) {
+    alert(
+      "You must agree to [% terms.Bugzilla %] etiquette, Mozilla's participation " +
+      "guidelines, and the anti-abuse policy."
+    );
+    return false;
+  }
   return true;
 }
 </script>
@@ -110,52 +119,69 @@ function onSubmit() {
   <h2 class="column-header">I want to help</h2>
 
   <div id="right-blurb">
-  <p>
-  Great!  There are three things to know and do:
-  </p>
-  <ol>
-  <li>
-    Please consider reading our
-    <a href="https://developer.mozilla.org/en/Bug_writing_guidelines" target="_blank">[% terms.bug %]-writing guidelines</a>.
-  </li>
-  <li>
-    [% terms.Bugzilla %] is a public place.  Your comments and other activities
-    on [% terms.bugs %] will generally be publicly visible, and your email address will be
-    accessible through public APIs and will be visible to all logged-in users
-    of [% terms.Bugzilla %]. 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.
-    See Mozilla's <a href="https://www.mozilla.org/en-US/privacy/websites/"
-    target="_blank">Websites, Communications & Cookies Privacy Notice</a> for
-    more information on our privacy policies.
-  </li>
-  <li>
-    When using [% terms.Bugzilla %] to submit patches, comments, code, and any other content,
-    you agree to our policies on open source licensing and content submission.  See Mozilla’s
-    <a href="https://www.mozilla.org/en-US/about/legal/terms/mozilla/" target="_blank">Websites
-    and Communications Terms of Use</a> for more information.
-  </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.
-  </li>
-  </ol>
+    <p>
+      Great! There are five things to know and do:
+    </p>
+    <ol>
+      <li>
+        Please read our
+        <a href="https://developer.mozilla.org/en/Bug_writing_guidelines" target="_blank">[% terms.bug %]-writing guidelines</a>.
+      </li>
+      <li>
+        [% terms.Bugzilla %] is a public place.  Your comments and other activities
+        on [% terms.bugs %] will generally be publicly visible, and your email address will be
+        accessible through public APIs and will be visible to all logged-in users
+        of [% terms.Bugzilla %]. 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.
+        See Mozilla's <a href="https://www.mozilla.org/privacy/websites/"
+        target="_blank">Websites, Communications & Cookies Privacy Notice</a> for
+        more information on our privacy policies.
+      </li>
+      <li>
+        When using [% terms.Bugzilla %] to submit patches, comments, code, and any other content,
+        you agree to our policies on open source licensing and content submission.  See Mozilla’s
+        <a href="https://www.mozilla.org/about/legal/terms/mozilla/" target="_blank">Websites
+        and Communications Terms of Use</a> for more information.
+      </li>
+      <li>
+        Your understand that your conduct on this site is subject to both <a href="page.cgi?id=etiquette.html">[% terms.Bugzilla %] etiquette</a>,
+        and <a href="https://www.mozilla.org/about/governance/policies/participation/">Mozilla's participation guidelines</a>,
+        and in turn are governed by our <a href="page.cgi?id=anti-abuse.html">anti-abuse policy</a>. By creating an account,
+        you agree to abide by them.
+      </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.
+      </li>
+    </ol>
   </div>
 
   <h2 class="column-header">Create an account</h2>
 
   <form method="post" action="createaccount.cgi" onsubmit="return onSubmit()">
-  <table id="create-account-form">
-  <tr>
-    <td class="label">Email Address:</td>
-    <td>
-      <input size="35" id="login" name="login" placeholder="you@example.com">[% Param('emailsuffix') FILTER html %]</td>
-    <td>
-      <input type="hidden" id="token" name="token" value="[% issue_hash_token(['create_account']) FILTER html %]">
-      <input type="submit" value="Create Account">
-     </td>
-  </tr>
-  </table>
+    <table id="create-account-form">
+    <tr>
+      <td class="label">Email Address:</td>
+      <td>
+        <input size="35" id="login" name="login" placeholder="you@example.com">[% Param('emailsuffix') FILTER html %]
+      </td>
+    </tr>
+    </table>
+    <table>
+    <tr>
+      <td valign="top"><input type="checkbox" id="agree" value="agreed"></td>
+      <td>
+        I have read <a href="page.cgi?id=etiquette.html">[% terms.Bugzilla %] etiquette</a>
+        and <a href="https://www.mozilla.org/about/governance/policies/participation/">Mozilla's participation guidelines</a>
+        and agree to abide by them, and
+        I acknowledge, and have read the <a href="page.cgi?id=anti-abuse.html">anti-abuse policy</a>.
+      </td>
+    </tr>
+    </table>
+    <br>
+    <input type="hidden" id="token" name="token" value="[% issue_hash_token(['create_account']) FILTER html %]">
+    <input type="submit" value="Create Account">
   </form>
 
   [% Hook.process('additional_methods') %]
@@ -186,4 +212,3 @@ function onSubmit() {
   </td>
   </tr>
 [% END %]
-
diff --git a/extensions/BMO/template/en/default/pages/anti-abuse.html.tmpl b/extensions/BMO/template/en/default/pages/anti-abuse.html.tmpl
new file mode 100644
index 000000000..7d3bcad4b
--- /dev/null
+++ b/extensions/BMO/template/en/default/pages/anti-abuse.html.tmpl
@@ -0,0 +1,58 @@
+<!-- 1.0@bugzilla.org -->
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+
+[% PROCESS global/header.html.tmpl
+   title = "Bugzilla Anti-Abuse Policy"
+   style = "li { margin: 5px } .heading { font-weight: bold }" %]
+
+<h2>Anti-Abuse Policy</h2>
+
+<p>
+  It is our intention that [% terms.Bugzilla %] remains a useful tool for reporting
+  and commenting on [% terms.bugs %], feature-requests and tasks for the Mozilla community.
+</p>
+
+<p>
+  In order to keep [% terms.Bugzilla %] a useful, inclusive place for this work, we have
+  <a href="page.cgi?id=etiquette.html">guidelines</a>
+  for using this site which, by using this site, you agree to follow.
+</p>
+
+<ul>
+  <li>
+    If you find a [% terms.Bugzilla %] user violating or <a href="page.cgi?id=etiquette.html">guidelines</a>
+    or  <a href="https://www.mozilla.org/about/governance/policies/participation/">Mozilla's participation guidelines</a>
+    in comments on [% terms.bugs %], please <a href="https://wiki.mozilla.org/BMO/comment_tagging">tag the comments</a>
+    in question so that an administrator can review them.
+  </li>
+  <li>
+    If a comment is abusive or threatening use the tag <b><i>admin</i></b>. An admin will
+    receive a notification shortly and be able to follow up. [% terms.Bugs %] with comments marked 'spam',
+    and 'advocacy' will also be reviewed.
+  </li>
+  <li>
+    If a [% terms.bug %]'s short-description or whiteboard tags violate our guidelines,
+    please describe the issue in a comment and tag it <b><i>admin</i></b>.
+  </li>
+  <li>
+    If another [% terms.Bugzilla %] user asks you to stop a behavior, stop doing it.
+    If an administrator asks you to stop engaging in a behavior, do it. Administrators
+    have the discretion to limit or suspend your account, and take further actions
+    if necessary if you violate our guidelines.
+  </li>
+</ul>
+
+<p>
+  Questions about this policy should be addressed to
+  <a href="mailto:bugzilla-admin@mozilla.org">bugzilla-admin@mozilla.org</a>.
+  If you need to contact a [% terms.Bugzilla %] community administrator immediately,
+  please contact an administrator in the #bmo channel on irc.mozilla.org.
+</p>
+
+[% INCLUDE global/footer.html.tmpl %]
diff --git a/extensions/BMO/template/en/default/pages/etiquette.html.tmpl b/extensions/BMO/template/en/default/pages/etiquette.html.tmpl
index ad913bd9e..282c0c2ed 100644
--- a/extensions/BMO/template/en/default/pages/etiquette.html.tmpl
+++ b/extensions/BMO/template/en/default/pages/etiquette.html.tmpl
@@ -18,129 +18,98 @@
   #
   # Contributor(s): Stefan Seifert <nine@detonation.org>
   #                 Gervase Markham <gerv@gerv.net>
+  #                 Emma Humphries <ech@emmah.net>
   #%]
 
 [% PROCESS global/header.html.tmpl
    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
-  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.
-</p>
-
-<p>
-  <a href="https://www.mozilla.org/en-US/about/governance/policies/participation">
-    Please also read the Mozilla Community Participation Guidelines</a>
-</p>
+<h2>Bugzilla Etiquette</h2>
 
 <p>
-  That said, Mozilla developers are generally a friendly bunch, and will be
-  friendly towards you as long as you follow these guidelines.
+  It is our intention that [% terms.Bugzilla %] remains a useful tool for reporting
+  and commenting on [% terms.bugs %], feature-requests, and tasks for the Mozilla community.
+  In order to keep [%+ terms.Bugzilla %] a useful, inclusive place for this work, we have
+  guidelines for using this site which, by using this site, you agree to follow.
+  In addition, your participation on this site is also subject to
+  <a href="https://www.mozilla.org/about/governance/policies/participation">Mozilla's participation guidelines</a>.
+  Violations of [% terms.Bugzilla %] etiquette or Mozilla's participation guidelines will be considered
+  as grounds for suspending your privileges on this site, or suspend your account altogether.
 </p>
 
-<h3>1. Commenting</h3>
-
-<p>
-  This is the most important section.
-</p>
+<h3>Commenting</h3>
 
 <ol>
   <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
-  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.
-  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 %]
-  should go in the appropriate
-  <a href="http://www.mozilla.org/about/forums/">newsgroup</a>.
+    <span class="heading">No abusing people</span>.
+    Constant and intense critique is one of the reasons we build great products.
+    It's harder to fall into group-think if there is always a healthy amount of
+    dissent. We want to encourage vibrant debate inside of the Mozilla
+    community, we want you to disagree with us, and we want you to effectively
+    argue your case. However, we require that in the process, you criticize
+    <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 or encouraging attacks on a person
+    may result in you being banned from [% terms.Bugzilla %]</b>.
+  </li>
+
+  <li>
+    <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 no one else has any <i>obligation</i> to fix
+    the [% terms.bugs %] you want fixed. Therefore, you should not act as if you
+    expect someone to fix a [% terms.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.
   </li>
 
   <li>
-  <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 no one else has any <i>obligation</i> to fix
-  the [% terms.bugs %] you want fixed. Therefore, you should not act as if you
-  expect someone to fix a [% terms.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.
+    <span class="heading">No spam</span>.
+    Posting comment spam will lead to the supsension of your account.
   </li>
 
   <li>
-  <span class="heading">No abusing people</span>.
-  Constant and intense critique is one of the reasons we build great products.
-  It's harder to fall into group-think if there is always a healthy amount of
-  dissent. We want to encourage vibrant debate inside of the Mozilla
-  community, we want you to disagree with us, and we want you to effectively
-  argue your case. However, we require that in the process, you attack
-  <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>
+    <span class="heading">No pointless comments</span>.
+    Limit comments on a [% terms.bug %] to information which will help with
+    resolving it. Unless requested, 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.
   </li>
 
   <li>
-  <span class="heading">No private email</span>.
-  Unless the [% terms.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
-  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
-  and ask what to do.
+    <span class="heading">No private email</span>.
+    Do not send comments to [% terms.bugs %] by private email; no-one else can read
+    them if you do that, and they'll be missed and/or ignored. If an attachment
+    is too big for [% terms.Bugzilla %], add a comment giving the file size and contents
+    and ask what to do.
   </li>
 </ol>
 
-<h3>2. Changing Fields</h3>
+<h3>Changing Fields</h3>
 
 <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
-  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
-  instead, suggesting the change.
+    <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
+    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
+    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
-  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.
+    <span class="heading">No whining about decisions</span>.
+    If another project contributor has marked a [% terms.bug %] as INVALID, then it is
+    invalid. Filing another duplicate of it does not change this. Unless
+    you have further evidence to support this, do not post a comment arguing that an
+    INVALID or WONTFIX [% terms.bug %] should be reopened.
   </li>
 
 </ol>
 
-<h3>3. Applicability</h3>
-
-<ol>
-  <li>
-  Some of these rules may not apply to you. If they do not, you will know
-  exactly which ones do not, and why they do not apply. If you are not
-  sure, then they definitely all apply to you.
-  </li>
-</ol>
-
-<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
-  persistent offending you should ping an administrator on Mozilla IRC in channel #bmo and ask them
-  to look into it.
-</p>
-
 <p>
-  This entire document can be summed up in one sentence:
-  do unto others as you would have them do unto you.
+  If you observe, or are the subject of behavior in violation of these guidelines, please tag
+  the [% terms.bug %] or comment following our <a href="page.cgi?id=anti-abuse.html">anti-abuse policy</a>.
 </p>
 
 <p>