openinfra/openstackweb
Code Issues Proposed changes

Merge "Workflow documentation is now in infra-manual"

Browse Source
This commit is contained in:
Jenkins 2014-12-19 14:13:00 +00:00 committed by Gerrit Code Review
commit c4262a4089
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ICLA/code/model/CCLATeamManager.php
View File

@ -98,7 +98,7 @@ final class CCLATeamManager {
else { else {
$member = $member_repository->findByEmail(trim($data['email'])); $member = $member_repository->findByEmail(trim($data['email']));
if($member && !$member->hasSignedCLA()) if($member && !$member->hasSignedCLA())
throw new MemberNotSignedCCLAException('This user has not yet signed the ICLA. Please ensure they have followed the appropriate steps outlined here: https://wiki.openstack.org/wiki/How_To_Contribute#Contributor_License_Agreement'); throw new MemberNotSignedCCLAException('This user has not yet signed the ICLA. Please ensure they have followed the appropriate steps outlined here: http://docs.openstack.org/infra/manual/developers.html#account-setup');
} }
if($member && ($team->isMember($member) || $team->isInvite($member))) if($member && ($team->isMember($member) || $team->isInvite($member)))

4
README.md
View File

@ -7,7 +7,7 @@ WHAT IS IT?
This project includes the code that powers the openstack.org website, which is itself powered by a PHP web application called Silverstripe, and we've made several customizations to meet the specific needs of OpenStack. More about the Silverstripe CMS is available here: http://silverstripe.org/ This project includes the code that powers the openstack.org website, which is itself powered by a PHP web application called Silverstripe, and we've made several customizations to meet the specific needs of OpenStack. More about the Silverstripe CMS is available here: http://silverstripe.org/
This repository is designed to help other project members develop, test, and contribute to the openstack.org website project, or to build other websites. Note that this project is based on ther code that powers the public openstack.org _website_ , not the openstack cloud software itself. To participate in building the actual OpenStack cloud platform software, go to: This repository is designed to help other project members develop, test, and contribute to the openstack.org website project, or to build other websites. Note that this project is based on ther code that powers the public openstack.org _website_ , not the openstack cloud software itself. To participate in building the actual OpenStack cloud platform software, go to:
http://wiki.openstack.org/HowToContribute http://docs.openstack.org/infra/manual/developers.html
WHY RELEASE THE SOURCE? WHY RELEASE THE SOURCE?
@ -61,7 +61,7 @@ We need detailed installation instructions to run the site locally on LAMP or MA
SUBMITTING PATCHES: SUBMITTING PATCHES:
We ask that all contributors sign the OpenStack CLA, consistent with how we manage other OpenStack projects: https://wiki.openstack.org/wiki/How_To_Contribute#Contributor_License_Agreement . Please note that this process is based on the Apache Software Foundation model, and the CLA does NOT require copyright assignment. We ask that all contributors sign the OpenStack CLA, consistent with how we manage other OpenStack projects: http://docs.openstack.org/infra/manual/developers.html#account-setup . Please note that this process is based on the Apache Software Foundation model, and the CLA does NOT require copyright assignment.
In the future we will integrate with the OpenStack gerrit system for managing reviwes. Once that is rolled out, the CLA signature check will be automated to prevent unauthorized pull requests. In the interim, we will verify contributors manually based on the email address associated with their Gerrit account. If your email address in gerrit is different than the one you use for github, please note that in the pull request. In the future we will integrate with the OpenStack gerrit system for managing reviwes. Once that is rolled out, the CLA signature check will be automated to prevent unauthorized pull requests. In the interim, we will verify contributors manually based on the email address associated with their Gerrit account. If your email address in gerrit is different than the one you use for github, please note that in the pull request.

2
registration/code/EditProfileForm.php
View File

@ -164,7 +164,7 @@ class EditProfileForm extends SafeXSSForm {
new LiteralField('header', '<h3 class="section-divider">Private Information</h3>'), new LiteralField('header', '<h3 class="section-divider">Private Information</h3>'),
new HeaderField("Email Addresses"), new HeaderField("Email Addresses"),
new LiteralField('instructions', '<p class="info"><strong>If you\'re an active developer on the OpenStack project, please list any email addresses you use to commit code.</strong> (This will really help us avoid duplicates!) If you contributed code ONLY using gerrit, all email addresses you used will be listed on the <a href="https://review.openstack.org/#/settings/web-identities" target="_blank">web identities page</a>. If you have contributed also <em>before</em> gerrit was put in place, please make an effort to remember other email addresses you may have used. Interested in how to <a href="http://wiki.openstack.org/HowToContribute" target="_blank">become a contributor</a>?</p>'), new LiteralField('instructions', '<p class="info"><strong>If you\'re an active developer on the OpenStack project, please list any email addresses you use to commit code.</strong> (This will really help us avoid duplicates!) If you contributed code ONLY using gerrit, all email addresses you used will be listed on the <a href="https://review.openstack.org/#/settings/web-identities" target="_blank">web identities page</a>. If you have contributed also <em>before</em> gerrit was put in place, please make an effort to remember other email addresses you may have used. Interested in how to <a href="http://docs.openstack.org/infra/manual/developers.html" target="_blank">become a contributor</a>?</p>'),
$PrimaryEmailField, $PrimaryEmailField,
new LiteralField('instructions', '<p class="info">This email address is also the account name you use to login.</p>'), new LiteralField('instructions', '<p class="info">This email address is also the account name you use to login.</p>'),
$SecondEmailField, $SecondEmailField,

4
themes/openstack/templates/Layout/Includes/Footer.ss
View File

@ -17,7 +17,7 @@
<li><a href="http://openstack.org/community/events/">Events</a></li> <li><a href="http://openstack.org/community/events/">Events</a></li>
<li><a href="http://openstack.org/community/jobs/">Jobs</a></li> <li><a href="http://openstack.org/community/jobs/">Jobs</a></li>
<li><a href="http://openstack.org/foundation/companies/">Companies</a></li> <li><a href="http://openstack.org/foundation/companies/">Companies</a></li>
<li><a href="https://wiki.openstack.org/wiki/How_To_Contribute">Contribute</a></li> <li><a href="http://docs.openstack.org/infra/manual/developers.html">Contribute</a></li>
</ul> </ul>
</div> </div>
<div class="col-lg-2 col-sm-2"> <div class="col-lg-2 col-sm-2">
@ -35,7 +35,7 @@
<li><a href="http://openstack.org/brand/">Logos & Guidelines</a></li> <li><a href="http://openstack.org/brand/">Logos & Guidelines</a></li>
<li><a href="http://openstack.org/brand/openstack-trademark-policy/">Trademark Policy</a></li> <li><a href="http://openstack.org/brand/openstack-trademark-policy/">Trademark Policy</a></li>
<li><a href="http://openstack.org/privacy/">Privacy Policy</a></li> <li><a href="http://openstack.org/privacy/">Privacy Policy</a></li>
<li><a href="https://wiki.openstack.org/wiki/How_To_Contribute#Contributors_License_Agreement">OpenStack CLA</a></li> <li><a href="http://docs.openstack.org/infra/manual/developers.html#account-setup">OpenStack CLA</a></li>
</ul> </ul>
</div> </div>
<div class="col-lg-4 col-sm-4"> <div class="col-lg-4 col-sm-4">

2
themes/openstack/templates/Layout/Includes/StartPageFooter.ss
View File

@ -14,6 +14,6 @@
<div class="span-8 last"> <div class="span-8 last">
<h4>Get involved with OpenStack</h4> <h4>Get involved with OpenStack</h4>
<p>The wiki has a useful guide to contributing.</p> <p>The wiki has a useful guide to contributing.</p>
<p><a class="roundedButton" href="http://wiki.openstack.org/HowToContribute">How To Contribute</a></p> <p><a class="roundedButton" href="http://docs.openstack.org/infra/manual/developers.html">How To Contribute</a></p>
</div> </div>
</div> </div>