Bug 1321592 - Update Bugzilla Etiquette and add Abuse Policy

1 files changed, 69 insertions, 44 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 %]
-