Closed Bug 1321592 Opened 3 years ago Closed 3 years ago

Update Bugzilla Etiquette and add Abuse Policy

Categories

(bugzilla.mozilla.org :: General, defect, P1)

Production
defect

Tracking

()

RESOLVED FIXED

People

(Reporter: emceeaich, Assigned: emceeaich)

References

Details

(Keywords: bmo-bug-quality, bmo-goal)

Attachments

(1 file, 5 obsolete files)

Update the Etiquette page, add an abuse policy page, and link to abuse policy from the front page.
Attached file autolander isn't doing its job (obsolete) β€”
Attachment #8816193 - Flags: review?(dkl)
Attached patch Updated Patch (obsolete) β€” β€” Splinter Review
Updated patch, resolving conflict with etiquette.html.tmpl
Attachment #8816193 - Attachment is obsolete: true
Attachment #8816193 - Flags: review?(mhoye)
Attachment #8816193 - Flags: review?(lshapiro)
Attachment #8816193 - Flags: review?(dkl)
Attachment #8818388 - Flags: review?(dkl)
Attachment #8818388 - Flags: feedback?(lshapiro)
Updated diff that resolves the conflict in etiquette.html.tmpl.
Attachment #8818388 - Attachment is obsolete: true
Attachment #8818388 - Flags: review?(dkl)
Attachment #8818388 - Flags: feedback?(lshapiro)
Attachment #8818389 - Flags: review?(dkl)
Attachment #8818389 - Flags: feedback?(lshapiro)
Comment on attachment 8818389 [details] [diff] [review]
Updated Patch (diff so there's just one set of changes)

Review of attachment 8818389 [details] [diff] [review]:
-----------------------------------------------------------------

t/009bugwords.t ........... 1/734
#   Failed test 'extensions/BMO/template/en/default/pages/etiquette.html.tmpl contains invalid bare words (e.g. 'bug') --WARNING'
#
#   at t/009bugwords.t line 68.
#
t/009bugwords.t ........... 687/734 # Looks like you failed 1 test of 734.
t/009bugwords.t ........... Dubious, test returned 1 (wstat 256, 0x100)
Failed 1/734 subtests

Look for any words such as Bugzilla, Bugs, bugs, bug, etc. and replace with the equivalent [% terms.XXX %]. You can ignore anything inside of html tags or [% %].
You can check yourself using 'perl t/009bugwords.t'.

Lots of trailing whitespace in various files.

Also rename extensions/BMO/template/en/default/pages/anti-abuse.html to extensions/BMO/template/en/default/pages/anti-abuse.html.tmpl

::: extensions/BMO/template/en/default/account/create.html.tmpl
@@ +146,5 @@
>    </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, 

Nit: remove trailing whitespace. Also it is 'page.cgi...' not '/page.cgi...'. That way it will work either in production or our devel environments.

@@ +171,5 @@
> +    <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>.

remove forward slashes for both page.cgi links.

@@ +180,4 @@
>      <td>
> +    <input type="hidden" id="token" name="token" value="[% issue_hash_token(['create_account']) FILTER html %]">
> +    <input type="submit" value="Create Account">
> +    </td>  

Nit: remove extra whitespace. Also we tab 2 spaces in side html tags so instead:

<td>
  <input type="hidden" id="token" name="token" value="[% 
    issue_hash_token(['create_account']) FILTER html %]">
  <input type="submit" value="Create Account">
</td>

Same for other changes you made.

::: extensions/BMO/template/en/default/pages/anti-abuse.html
@@ +16,5 @@
> +  # Copyright (C) 1998 Netscape Communications Corporation. All
> +  # Rights Reserved.
> +  #
> +  # Contributor(s): Emma Humphries <ech@emmah.net>
> +  #%]

We use a new license blurb in new files that looks like this:

[%# 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.
  #%]

@@ +21,5 @@
> +
> +[% PROCESS global/header.html.tmpl 
> +   title = "Bugzilla Anti-Abuse Policy" 
> +   style = "li { margin: 5px } .heading { font-weight: bold }" %]
> +

Nit: Add a header such as <h2>Anti-Abuse Policy</h2>, etc.

::: extensions/BMO/template/en/default/pages/etiquette.html.tmpl
@@ +26,5 @@
>     style = "li { margin: 5px } .heading { font-weight: bold }" %]
>  
>  <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.

2 space indentions.

@@ +46,1 @@
>  </p>

I almost think it would look better and be fine if we put all of the sentences above together in one paragraph instead of breaking out into several paragraphs.
Attachment #8818389 - Flags: review?(dkl) → review-
Attached patch 1321592.etiquette.diff (obsolete) β€” β€” Splinter Review
Patch incorporating :dkl's comments.
Attachment #8818389 - Attachment is obsolete: true
Attachment #8818389 - Flags: feedback?(lshapiro)
Attachment #8819107 - Flags: review?(dkl)
Comment on attachment 8819107 [details] [diff] [review]
1321592.etiquette.diff

I made a few fixes and alterations but overall looked good. Thanks Emma.

To https://github.com/mozilla-bteam/bmo.git
   d3a4b61..50fe01e  master -> master

dkl
Attachment #8819107 - Flags: review?(dkl) → review+
Status: NEW → RESOLVED
Closed: 3 years ago
Resolution: --- → FIXED
Thanks. Is this on bugzilla.allizom.org? I want to take a look before it goes out and I need to check to make sure MOC is ready to handle the abuse reports.
Flags: needinfo?(ehumphries)
(In reply to Emma Humphries β˜•οΈ [:emceeaich] (UTC-8) +needinfo me from comment #8)
> Thanks. Is this on bugzilla.allizom.org? I want to take a look before it
> goes out and I need to check to make sure MOC is ready to handle the abuse
> reports.

Yes it is there. 

dkl
Note this isn't ready to go out yet, so is not resolved.
Status: RESOLVED → REOPENED
Resolution: FIXED → ---
(In reply to Dylan Hardison [:dylan] from comment #10)
> Note this isn't ready to go out yet, so is not resolved.

Backed out. We will re-push out after the beginning of the year. Just let me know. Sorry for being trigger happy.

dkl
:dkl can you deploy the pull request to dev?
Status: REOPENED → NEW
Keywords: bmo-goal
(In reply to Emma Humphries β˜•οΈ [:emceeaich] (UTC-8) +needinfo me from comment #13)
> :dkl can you deploy the pull request to dev?

It is currently on bugzilla-dev

https://bugzilla-dev.allizom.org/page.cgi?id=anti-abuse.html

dkl
Attached patch etiquette.diff (obsolete) β€” β€” Splinter Review
Updated diff file.
Attachment #8819107 - Attachment is obsolete: true
Attachment #8829761 - Flags: review?(dkl)
Attached patch etiquette.diff β€” β€” Splinter Review
Updated patch with new email address for contacting moderators.
Attachment #8829761 - Attachment is obsolete: true
Attachment #8829761 - Flags: review?(dkl)
Attachment #8831388 - Flags: review?(dkl)
Comment on attachment 8831388 [details] [diff] [review]
etiquette.diff

r=dkl. One minor error that I will fix on commit. Good to go. Shall I commit it?
Flags: needinfo?(ehumphries)
Attachment #8831388 - Flags: review?(dkl) → review+
To https://github.com/mozilla-bteam/bmo.git
   92096d7..1451ed6  development -> development


Should be on bugzilla-dev.allizom.org momentarily.

dkl
To https://github.com/mozilla-bteam/bmo.git
   b139c33..1cb4e01  master -> master
Status: NEW → RESOLVED
Closed: 3 years ago3 years ago
Resolution: --- → FIXED
This is now live.

dkl
You need to log in before you can comment on or make changes to this bug.