mozilla
/
bedrock
зеркало из https://github.com/mozilla/bedrock.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge pull request #2593 from gerv/1112600 

Change Committer's Agreement to a web page that must be acknowledged
This commit is contained in:
Steven Garrity 2015-01-30 11:30:50 -04:00
Родитель 0f668e944e 158cd6cd0e
Коммит badc6598b7
8 изменённых файлов: 109 добавлений и 150 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

24
bedrock/mozorg/templates/mozorg/about/governance/policies/commit.html
Просмотреть файл

@ -15,10 +15,9 @@
<p>
{% trans policy=url('mozorg.about.governance.policies.commit.access-policy') %}
In all cases, you need to demonstrate you know what's going on, find a
You will need to demonstrate you know what's going on, and find a
<a href="{{ policy }}">person or people who have adequate authority</a> and
will vouch for your competence, and complete and sign a Committer's
Agreement.
will vouch for your competence.
{% endtrans %}
</p>
@ -40,10 +39,9 @@
</ul>
</li>
<li>{{ _('Attach your SSH <em>public</em> key to the bug - a file with extension ".pub". (Please mark it as <code>text/plain</code> when attaching it!)') }}</li>
<li>{% trans notification=url('mozorg.about.governance.policies.commit.notification') %}
Send us a <a href="{{ notification }}">completed Committer's Agreement</a>.
<li>{% trans requirements=url('mozorg.about.governance.policies.commit.requirements') %}
Make sure you are happy with the <a href="{{ requirements }}">Commit Access Requirements</a>.
{% endtrans %}</li>
<li>{{ _('Update the bug to note that you’ve sent in the Agreement.') }}</li>
<li>{{ _('Get your voucher(s), and/or the owner of the exception tree you want access for, to add a comment to the bug saying they support your application.') }}</li>
<li>{{ _('An appropriate Mozilla representative will update the bug when they have received your signed Agreement.') }}</li>
<li>{{ _('So, to recap, the bug needs:') }}
@ -51,21 +49,12 @@
<li>{{ _('Declaration of what level you want and the email address to use') }}
<li>{{ _('SSH public key') }}
<li>{{ _('Comments from all the necessary vouchers') }}
<li>{{ _('Comment from Mozilla that agreement has been received') }}
</ul>
</li>
<li>{{ _('A Mozilla representative will double-check that the needed info is recorded and, if so, reassign the bug to IT to have your account created.') }}</li>
<li>{{ _('A Mozilla IT representative will update the bug with account creation information and close the bug.') }}</li>
</ol>
<h2 id="form">{{ _('Contributor Form') }}</h2>
<p>
{% trans notification=url('mozorg.about.governance.policies.commit.notification'), pdf='https://static.mozilla.com/foundation/documents/commit-access/committers-agreement.pdf' %}
You'll need to fill out and <a href="{{ notification }}">submit</a> the <a href="{{ pdf }}">Committer's Agreement</a>
(both sections 1 and 6) to get your account set up. Read it carefully - signing it indicates you understand and agree to our legal requirements. Breaking these rules could cause legal problems for Mozilla and may cause us to revoke your access. If you have any questions, ask us.
{% endtrans %}
</p>
<h2 id="vouchers">{{ _('Vouchers') }}</h2>
<p>
{% trans policy=url('mozorg.about.governance.policies.commit.access-policy') %}
@ -78,14 +67,11 @@ You will need one or more vouchers. The <a href="{{ policy }}">Commit Access Pol
<h2 id="dormant-accounts">{{ _('Dormant Accounts') }}</h2>
<p>{{ _('If your account in a particular SCM is inactive for more than 6 months, it may be deactivated. However, the knowledge that you have achieved a particular level of access is retained. Therefore, getting your account reactivated is a simple matter of filing a bug asking IT to turn it back on. Such bugs should be dealt with extremely quickly.') }}</p>
<h2 id="problems">{{ _('Problems With Your Account') }}</h2>
<h2 id="problems">{{ _('Useful Information') }}</h2>
<ul>
<li>{% trans rheeet='https://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/bonus-tracks/rheet.wav' %}
Need to hear a <a href="{{ rheeet }}">rheeet</a>?
{% endtrans %}</li>
<li>{% trans notification=url('mozorg.about.governance.policies.commit.notification') %}
If you find that someone is using your account, <a href="{{ notification }}">notify us of the problem</a>.
{% endtrans %}</li>
<li>{% trans mercurial='https://developer.mozilla.org/Mercurial_FAQ#How_do_I_check_stuff_in.3F' %}
We have a document on <a href="{{ mercurial }}">checking in using Hg</a>.
{% endtrans %}</li>

40
bedrock/mozorg/templates/mozorg/about/governance/policies/commit/faq.html
Просмотреть файл

@ -1,40 +0,0 @@
{# 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/. -#}
{% extends "mozorg/about-base.html" %}
{% block page_title %}{{ _('Committers’ Agreement FAQ') }}{% endblock %}
{% block body_id %}commit-access-faq{% endblock %}
{% block article %}
<h1 class="title-shadow-box">{{ self.page_title() }}</h1>
<dl class="faq">
<dt>{{ _('So what’s changed from the previous version of the agreement?') }}</dt>
<dd>{% trans changelog='https://wiki.mozilla.org/Committers_Agreement:Changelog' %}
See the <a href="{{ changelog }}">summary of changes</a>.
{% endtrans%}</dd>
<dt>{{ _('I completed one of the old ones; do I need to complete a new one?') }}</dt>
<dd>{% trans notification=url('mozorg.about.governance.policies.commit.notification'), pdf='https://static.mozilla.com/foundation/documents/commit-access/committers-agreement.pdf' %}
Yes, please. We want to make sure everyone's signed up to the same thing, so there's no confusion or ambiguity. Please <a href="{{ pdf }}">get a copy of</a> the agreement and <a href="{{ notification }}">submit it to Shannon</a> using one of the approved methods.
{% endtrans %}</dd>
<dt>{{ _('Does this only cover code contributions?') }}</dt>
<dd>{{ _('"Code" in the agreement is defined as "information" - you need to fill out an agreement to contribute source code, documentation, localizations, or anything similar thing to the project.') }}</dd>
<dt>{{ _('Why do you need those personal details?') }}</dt>
<dd>{{ _('Your email address will form the basis of your login name. (That’s what we mean when we say "your email address, or a derivative of it, may be made visible worldwide via the Internet" - login names appear in all sorts of public places.) Your address and phone number are so you are legally identified and we can contact you if necessary. They will not be made public.') }}</dd>
<dt>{{ _('What’s all this stuff about crypto?') }}</dt>
<dd>{% trans email='mailto:hecker@mozillafoundation.org', newsgroup='https://groups.google.com/group/mozilla.governance/msg/563e7cd59738c182' %}
The crypto section is intended to apply primarily to NSS development, or if you are writing or importing your own code to do encryption. If you are concerned about whether the code you are writing falls under this clause, please email <a href="{{ email }}">Frank Hecker</a>. Frank has also made a <a href="{{ newsgroup }}">newsgroup post</a> on this subject.
{% endtrans %}</dd>
</dl>
{%endblock%}

84
bedrock/mozorg/templates/mozorg/about/governance/policies/commit/notification.html
Просмотреть файл

@ -1,84 +0,0 @@
{# 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/. -#}
{% extends "mozorg/about-base.html" %}
{% block page_title %}{{ _('Notification Address') }}{% endblock %}
{% block body_id %}commit-access-notification{% endblock %}
{% block article %}
<h1 class="title-shadow-box">{{ self.page_title() }}</h1>
<p>{% trans committer=url('mozorg.about.governance.policies.commit') %}
Once you have reached the appropriate stage in <a href="{{ committer }}">the application process</a>, please send us a signed Committer's Agreement. You can do this in any one of the following five ways (don't say we don't try and make it easy for you):
{% endtrans %}</p>
<ul>
<li>
{% trans pdf='https://static.mozilla.com/foundation/documents/commit-access/committers-agreement.pdf' %}
Print <a href="{{ pdf }}">the PDF</a>, fill it in (both sections 1 and 6), sign it and do one of the following:
{% endtrans %}
<ol>
<li>{{ _('<b>Post</b> it to:') }}
<blockquote>
<p>
{% trans %}
Marcia Knous<br>
(Committer’s Agreements)<br>
Mozilla<br>
331 E. Evelyn Avenue<br>
Mountain View, California 94041<br>
USA
{% endtrans %}
</p>
</blockquote>
</li>
<li>{{ _('<b>Fax</b> it to the attention of Marcia Knous at +1 (650) 903 0875. Sending the original by post also is appreciated but is not compulsory.') }}</li>
<li>{% trans email='&lt;mar<span></span>cia&#64;mozilla.com&gt;'|safe %}
<b>Scan</b> it legibly, in colour, and email the file to Marcia Knous {{ email }}. Sending the original by post also is appreciated but is not compulsory.
{% endtrans %}</li>
<li>{% trans email='&lt;mar<span></span>cia&#64;mozilla.com&gt;'|safe %}
<b>Photograph</b> it from directly above, in good ambient light, where the form fills the whole frame, using at least a 4 megapixel camera. Email the resulting photo to Marcia Knous {{ email }}. Sending the original by post also is appreciated but is not compulsory.
{% endtrans %}</li>
</ol>
</li>
<li>{{ _('By S/MIME-signed email:') }}
<ul>
<li>
{% trans email='mailto:marcia@mozilla.com?subject=Acceptance%20of%20Mozilla%20Committer\'s%20Agreement%20&body=I%20agree%20to%20all%20the%20terms%20and%20conditions%20of%20the%20Mozilla%20Foundation%20Committer\'s%20Agreement%20v2.0%20(\'Mozilla%20Committer\'s%20Agreement\')%20below%20and%20agree%20to%20be%20bound%20by%20such%20terms.%20I%20represent%20that%20the%20terms%20below%20are%20the%20same%20as%20those%20provided%20by%20Mozilla%20to%20me%20as%20the%20Mozilla%20Committer\'s%20Agreement%20and%20that%20the%20terms%20below%20have%20not%20been%20changed%20or%20altered%20in%20any%20way.%20In%20addition%2C%20I%20authorize%20this%20transaction%20to%20be%20conducted%20by%20electronic%20means.%20If%20signed%20anonymously%20by%20using%20an%20email%20address%20only%2C%20I%20acknowledge%20my%20intent%20to%20be%20bound%20by%20these%20terms%20and%20the%20Mozilla%20Committer\'s%20Agreement.%0A%0AName%3A%20%0APhone%20Number%3A%20%0APostal%20Address%3A%20%0A%0A%0A%5Bpaste%20in%20text%20version%20of%20Committer\'s%20Agreement%20here%2C%20replacing%20this%5D',
email_text='https://static.mozilla.com/foundation/documents/commit-access/acceptance-email.txt' %}
Click <a href="{{ email }}">this link</a> to create the special email (<a href="{{ email_text }}">plaintext copy</a>);
{% endtrans %}</li>
<li>{{ _('Fill in the blank fields within it;') }}</li>
<li>{% trans agreement_text='https://static.mozilla.com/foundation/documents/commit-access/committers-agreement.txt' %}
Copy and paste the entire contents of <a href="{{ agreement_text }}">the Committer's Agreement in text form</a> at the bottom;
{% endtrans %}</li>
<li>{{ _('Sign it using S/MIME with a certificate for your email address which chains to a root trusted by Thunderbird;') }}</li>
<li>{{ _('Send it.') }}</li>
</ul>
</li>
</ul>
<p>{{ _('If you are sending in a form for the first time, please update your access request bug with details of which method you used. Marcia Knous will respond by updating your bug to confirm (or not) receipt of the form.') }}</p>
<h2>{{ _('Compromised Password Procedure') }}</h2>
<p>{{ _('If you have reason to believe that anyone else has used your credentials to access a Mozilla project system, please do the following:') }}</p>
<ul>
<li>
{% trans bug='https://bugzilla.mozilla.org/enter_bug.cgi?product=mozilla.org&amp;bug_severity=blocker&amp;component=Server%20Operations%3A%20Security&amp;short_desc=Password%20Compromised%3A%20' %}
<a href="{{ bug }}">File a bug</a> in the "mozilla.org" product, "Server Operations: Security" component, asking for your password to be changed immediately.
{% endtrans %}
</li>
<li>
{% trans irc='irc://irc.mozilla.org/#it' %}
Go onto IRC, <a href="{{ irc }}">irc.mozilla.org channel #it</a>, and make sure someone is paying attention to the bug.
{% endtrans%}
</li>
</ul>
{%endblock%}

83
bedrock/mozorg/templates/mozorg/about/governance/policies/commit/requirements.html Normal file
Просмотреть файл

@ -0,0 +1,83 @@
{# 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/. -#}
{% extends "mozorg/about-base.html" %}
{% block page_title %}{{ _('Commit Access Requirements') }}{% endblock %}
{% block body_id %}commit-access-requirements{% endblock %}
{% block extrahead %}
{{ super() }}
{{ css('commit-access-requirements') }}
{% endblock %}
{% block article %}
<h1 class="title-shadow-box">{{ self.page_title() }}</h1>
<p>{{ _('By committing to Mozilla repositories - that is, by directly contributing
source code, documentation or other data ("Code") to a website or repository
operated, controlled or managed by the Mozilla Foundation or its affiliates (a "Mozilla
Repository") - you are indicating your agreement to the terms set out below.') }}</p>
<p>{{ _('For the avoidance of doubt: this document commits you to a set of
good behaviours; it is not a copyright assignment.') }}</p>
<h2>{{ _('Treatment of Account') }}</h2>
<p>{{ _('You will receive one or more sets of Mozilla project access credentials, and/or
one or more sets of credentials you already have will be given the power to
access a Mozilla Repository. You will not allow anyone else to use these
credentials to access any Mozilla system. Should You become aware of any such
use, You will immediately notify the Mozilla Foundation; until such notice is
received You will be presumed to have taken all actions made using Your
credentials.') }}</p>
<p>{{ _('The Mozilla Foundation and their designates will have complete control and
discretion over capabilities associated with Your credentials and may change
them for any reason at any time. Your name and email address, or a derivative
of it, may be attached to your contributions and so be visible worldwide via
the Internet.') }}</p>
<h2>{{ _('License Terms') }}</h2>
<p>
{% trans license_policy='https://www.mozilla.org/MPL/license-policy.html',
headers='https://www.mozilla.org/MPL/headers/' %}
Code committed by you to a Mozilla Repository, whether written by you or a
third party, must be governed by the Mozilla Public License 2.0, or another
license or set of licenses acceptable to the Mozilla Foundation for the Code
in question. Other licenses are not acceptable to the Mozilla Foundation until
the Foundation
<a href="{{ license_policy }}">declares them to be acceptable in writing</a>.
You will verify that committed Code contains
<a href="{{ headers }}">appropriate boilerplate licensing text</a>.
{% endtrans %}
</p>
<h2>{{ _('Notices and Knowledge') }}</h2>
<p>{{ _('By contributing Code, You confirm that, to the best of Your knowledge, the Code
does not violate the rights of any person or entity.') }}</p>
<p>{{ _('If You contribute Code on behalf of Your employer, then You confirm that an
appropriate representative of that employer has authorized the inclusion of
such Code in a Mozilla Repository and that it meets these
requirements.') }}</p>
<h2>{{ _('Committing Code Created by Others') }}</h2>
<p>{{ _('You may check in Code to a Mozilla Foundation repository that was not written
by You, provided that:') }}</p>
<ol>
<li>{{ _(' The checkin comment contains information (or references to information)
sufficient to identify the author of the Code, the license of the Code, and
the third-party public source code repository the code was taken from, if it
came from such a repository; and') }}</li>
<li>{{ _('You make all reasonable and appropriate efforts to ensure that such Code
conforms to sections 2 and 3 of this document.') }}</li>
</ol>
{%endblock%}

2
bedrock/mozorg/urls.py
Просмотреть файл

@ -37,7 +37,7 @@ urlpatterns = patterns('',
page('about/governance/policies/commit', 'mozorg/about/governance/policies/commit.html'),
page('about/governance/policies/commit/access-policy', 'mozorg/about/governance/policies/commit/access-policy.html'),
page('about/governance/policies/commit/faq', 'mozorg/about/governance/policies/commit/faq.html'),
page('about/governance/policies/commit/notification', 'mozorg/about/governance/policies/commit/notification.html'),
page('about/governance/policies/commit/requirements', 'mozorg/about/governance/policies/commit/requirements.html'),
page('about/governance/policies/security-group/bugs', 'mozorg/about/governance/policies/security/bugs.html'),
page('about/governance/policies/security-group/tld-idn', 'mozorg/about/governance/policies/security/tld-idn.html'),
page('about/governance/policies/security-group/membership', 'mozorg/about/governance/policies/security/membership.html'),

3
bedrock/settings/base.py
Просмотреть файл

@ -139,6 +139,9 @@ MINIFY_BUNDLES = {
'commit-access-policy': (
'css/mozorg/commit-access-policy.less',
),
'commit-access-requirements': (
'css/mozorg/commit-access-requirements.less',
),
'about-forums': (
'css/mozorg/about-forums.less',
),

8
etc/httpd/global.conf
Просмотреть файл

@ -864,12 +864,8 @@ RewriteRule ^/contribute\.json$ /b/contribute.json [PT]
# bug 876810
RewriteRule ^/hacking/commit-access-policy/$ /about/governance/policies/commit/access-policy/ [L,R=301]
RewriteRule ^/hacking/committer/$ /about/governance/policies/commit/ [L,R=301]
RewriteRule ^/hacking/committer/faq.html$ /about/governance/policies/commit/faq/ [L,R=301]
RewriteRule ^/hacking/notification/$ /about/governance/policies/commit/notification/ [L,R=301]
RewriteRule ^/hacking/committer/committers-agreement.odt$ https://static.mozilla.com/foundation/documents/commit-access/committers-agreement.odt [L,R=301]
RewriteRule ^/hacking/committer/committers-agreement.pdf$ https://static.mozilla.com/foundation/documents/commit-access/committers-agreement.pdf [L,R=301]
RewriteRule ^/hacking/committer/committers-agreement.txt$ https://static.mozilla.com/foundation/documents/commit-access/committers-agreement.txt [L,R=301]
RewriteRule ^/hacking/notification/acceptance-email.txt$ https://static.mozilla.com/foundation/documents/commit-access/acceptance-email.txt [L,R=301]
RewriteRule ^/hacking/committer/faq.html$ /about/governance/policies/commit/ [L,R=301]
RewriteRule ^/hacking/notification/$ /about/governance/policies/commit/ [L,R=301]
# bug 1071959
RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox/independent(/?.*)$ /b/$1firefox/independent$2 [PT]

15
media/css/mozorg/commit-access-requirements.less Normal file
Просмотреть файл

@ -0,0 +1,15 @@
// 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/.
@import "../sandstone/lib.less";
.main-column {
h2 {
counter-increment: step-counter;
&::before {
content: counter(step-counter) ". ";
}
}
}