Bug 1318781 - Add link to Mozilla Community Participation Guidelines for new bugs...

diff --git a/extensions/BMO/template/en/default/pages/etiquette.html.tmpl b/extensions/BMO/template/en/default/pages/etiquette.html.tmpl
index 78cc0bad7396d54243903949970c0f20ae3add06..ad913bd9e1af423c086f2c84fd57f59d7ffed0e8 100644 (file)
--- a/extensions/BMO/template/en/default/pages/etiquette.html.tmpl
+++ b/extensions/BMO/template/en/default/pages/etiquette.html.tmpl
@@ -20,16 +20,21 @@
   #                 Gervase Markham <gerv@gerv.net>
   #%]
 
-[% PROCESS global/header.html.tmpl 
-   title = "Bugzilla Etiquette" 
+[% 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    
+  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. 
+  [%+ 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>
 
 <p>
@@ -46,8 +51,8 @@
 <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 
+  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
@@ -71,17 +76,17 @@
 
   <li>
   <span class="heading">No abusing people</span>.
-  Constant and intense critique is one of the reasons we build great products. 
+  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 
+  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>  
+  designers and users. <b>Attacking a person may result in you being banned
+  from [% terms.Bugzilla %].</b>
   </li>
-  
+
   <li>
   <span class="heading">No private email</span>.
   Unless the [% terms.bug %] owner or another respected project contributor has asked you
@@ -100,7 +105,7 @@
   <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, 
+  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>
@@ -110,8 +115,8 @@
   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. 
-  </li>  
+  INVALID or WONTFIX [% terms.bug %] should be reopened.
+  </li>
 
 </ol>
 
@@ -121,20 +126,20 @@
   <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>  
+  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. 
+  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. 
+  to look into it.
 </p>
 
 <p>
-  This entire document can be summed up in one sentence: 
+  This entire document can be summed up in one sentence:
   do unto others as you would have them do unto you.
 </p>
 

diff --git a/extensions/BugModal/template/en/default/bug_modal/new_comment.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/new_comment.html.tmpl
index 71a9b16aea909002d8f7e193edeca80956e24bc3..424cec30192f82a0d91f8b81109f6dd0037e5110 100644 (file)
--- a/extensions/BugModal/template/en/default/bug_modal/new_comment.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/new_comment.html.tmpl
@@ -48,6 +48,11 @@
     <pre id="comment-preview" class="comment-text"></pre>
   </div>
 
+  <div id="bugzilla-etiquette">
+    <a href="page.cgi?id=etiquette.html" target="_blank">
+      Comments Subject to Etiquette and Contributor Guidelines</a>
+  </div>
+
   <div id="after-comment-commit-button">
     [% Hook.process("after_comment_commit_button", 'bug/edit.html.tmpl') %]
 

diff --git a/extensions/BugModal/web/bug_modal.css b/extensions/BugModal/web/bug_modal.css
index b5e3c1a37fcb2b1ad2d045c7889daaa2daad1dbb..2c935f84b6d2e507dd1b7d9aff505b2d70b86a76 100644 (file)
--- a/extensions/BugModal/web/bug_modal.css
+++ b/extensions/BugModal/web/bug_modal.css
@@ -676,7 +676,8 @@ td.flag-requestee {
     margin-top: 20px;
 }
 
-#add-comment-private {
+#add-comment-private,
+#bugzilla-etiquette {
     float: right;
 }
 

diff --git a/skins/standard/show_bug.css b/skins/standard/show_bug.css
index 656e130a02d7c66b68c1836478f90c84fd73d2f5..d266419c58ff74b79dae19f0ae8e7a74dd5d0af2 100644 (file)
--- a/skins/standard/show_bug.css
+++ b/skins/standard/show_bug.css
@@ -155,3 +155,7 @@ table#flags {
     margin-bottom: 0px;
 }
 
+#bugzilla-etiquette {
+    float: right;
+}
+

diff --git a/template/en/default/bug/comment.html.tmpl b/template/en/default/bug/comment.html.tmpl
index 96cbb63ed1fd44512754618977cd2684994e05c8..46747cd1a79923f25e047dcc90ff741153092c36 100644 (file)
--- a/template/en/default/bug/comment.html.tmpl
+++ b/template/en/default/bug/comment.html.tmpl
@@ -12,6 +12,11 @@
   # with the exception of "name" and "id", which will always be "comment".
   #%]
 
+<div id="bugzilla-etiquette">
+  <a href="page.cgi?id=etiquette.html" target="_blank">
+    Comments Subject to Etiquette and Contributor Guidelines</a>
+</div>
+
 [% IF feature_enabled('jsonrpc') %]
   <div id="comment_tabs" role="tablist">
     <div id="comment_tab" class="comment_tab active_comment_tab"