Merge pull request #448 from tomalrussell/fix/minor-text
Fix/minor text
This commit is contained in:
mz8i
GitHub
commit
64dc5bb334
@ -213,7 +213,7 @@ const withCopyEdit = (WrappedComponent) => {
|
||||
onSubmit={this.handleSubmit}>
|
||||
<ErrorBox msg={this.state.error} />
|
||||
{
|
||||
(this.props.mode === 'edit' && this.props.inactive) ?
|
||||
(this.props.inactive) ?
|
||||
<InfoBox
|
||||
msg={`We're not collecting data on ${this.props.title.toLowerCase()} yet - check back soon.`}
|
||||
/>
|
||||
@ -232,8 +232,6 @@ const withCopyEdit = (WrappedComponent) => {
|
||||
{
|
||||
(this.props.mode === 'edit' && !this.props.inactive) ?
|
||||
<Fragment>
|
||||
<InfoBox
|
||||
msg="Colouring may take a few seconds - try zooming the map or hitting refresh after saving (we're working on making this smoother)." />
|
||||
{
|
||||
this.props.slug === 'like' ? // special-case for likes
|
||||
null :
|
||||
@ -242,14 +240,36 @@ const withCopyEdit = (WrappedComponent) => {
|
||||
type="submit"
|
||||
className="btn btn-primary">
|
||||
Save
|
||||
</button>
|
||||
</button>
|
||||
</div>
|
||||
}
|
||||
</Fragment>
|
||||
: null
|
||||
}
|
||||
</form>
|
||||
: <InfoBox msg="Select a building to view data"></InfoBox>
|
||||
:
|
||||
<form>
|
||||
{
|
||||
(this.props.inactive)?
|
||||
<Fragment>
|
||||
<InfoBox
|
||||
msg={`We're not collecting data on ${this.props.title.toLowerCase()} yet - check back soon.`}
|
||||
/>
|
||||
<WrappedComponent
|
||||
building={undefined}
|
||||
building_like={undefined}
|
||||
mode={this.props.mode}
|
||||
copy={copy}
|
||||
onChange={this.handleChange}
|
||||
onCheck={this.handleCheck}
|
||||
onLike={this.handleLike}
|
||||
onUpdate={this.handleUpdate}
|
||||
/>
|
||||
</Fragment>
|
||||
:
|
||||
<InfoBox msg="Select a building to view data"></InfoBox>
|
||||
}
|
||||
</form>
|
||||
}
|
||||
</section>
|
||||
);
|
||||
|
||||
@ -51,6 +51,7 @@ const SizeView = (props) => (
|
||||
<NumericDataEntry
|
||||
title="Height to eaves (m)"
|
||||
slug="size_height_eaves"
|
||||
disabled={true}
|
||||
value={props.building.size_height_eaves}
|
||||
mode={props.mode}
|
||||
copy={props.copy}
|
||||
|
||||
@ -8,8 +8,6 @@ const ContributorAgreementPage : React.SFC<any> = () => (
|
||||
<section className='main-col'>
|
||||
<h1>Contributor Agreement</h1>
|
||||
|
||||
<InfoBox msg="This is a draft contributor agreement." />
|
||||
|
||||
<h2 className='h2'>Open data</h2>
|
||||
|
||||
<p>
|
||||
|
||||
@ -7,7 +7,6 @@ const PrivacyPolicyPage: React.SFC<any> = () => (
|
||||
<article>
|
||||
<section className='main-col'>
|
||||
<h1 className='h1'>Colouring London Privacy Policy </ h1>
|
||||
<InfoBox msg="This is a draft privacy policy." />
|
||||
<p>
|
||||
This privacy policy explains how Colouring London uses the personal data we collect from you when you use our website. Colouring London is a research project developed by the Bartlett Centre for Advanced Spatial Analysis (CASA) at UCL. Colouring London is registered for data protection purposes with the UCL data protection office.
|
||||
</p>
|
||||
@ -29,6 +28,9 @@ const PrivacyPolicyPage: React.SFC<any> = () => (
|
||||
<p>
|
||||
Colouring London uses your personal data to enable you to login to access and contribute to the Colouring London project and to provide a personalised user experience when you are logged in. We will not share your personal data (such as your email address) with any other parties or use your personal data for any purposes other than the Colouring London project.
|
||||
</p>
|
||||
<p>
|
||||
If you request a password reset, an automated email will be sent using <a href="https://www.mailgun.com/">Mailgun</a>, who process the email in order to deliver it to your email address. Mailgun retain personal data they process on behalf of Colouring London for as long as is needed to provide email services. Mailgun will retain the personal information as necessary to comply with their legal obligations, resolve disputes, and enforce their agreements.
|
||||
</p>
|
||||
|
||||
<h2 className='h2'>What is the legal basis for processing your data?</h2>
|
||||
<p>
|
||||
@ -95,7 +97,7 @@ const PrivacyPolicyPage: React.SFC<any> = () => (
|
||||
|
||||
<h2 className='h2'>Changes to this privacy policy</h2>
|
||||
<p>
|
||||
Changes to this privacy policy will be notified via the Colouring London website. This privacy policy was last updated on 13 August 2019.
|
||||
Changes to this privacy policy will be notified via the Colouring London website. This privacy policy was last updated on 2 October 2019 to add a paragraph on password reset emails. The previous update was on 13 August 2019.
|
||||
</p>
|
||||
|
||||
<h2 className='h2'>Who do I contact with questions?</h2>
|
||||
|
||||
@ -133,7 +133,7 @@ class MyAccountPage extends Component<any, any> { // TODO: add proper types
|
||||
|
||||
<hr/>
|
||||
|
||||
<h2 className="h2">Techical details</h2>
|
||||
<h2 className="h2">Technical details</h2>
|
||||
<p>Are you a software developer? If so, you might be interested in these.</p>
|
||||
<h3 className="h3">API key</h3>
|
||||
<p>{this.props.user.api_key? this.props.user.api_key : '-'}</p>
|
||||
@ -141,8 +141,8 @@ class MyAccountPage extends Component<any, any> { // TODO: add proper types
|
||||
<input className="btn btn-warning" type="submit" value="Generate API key"/>
|
||||
</form>
|
||||
|
||||
<h3 className="h3">GitHub</h3>
|
||||
<a href="http://github.com/tomalrussell/colouring-london/">Colouring London Github repository</a>
|
||||
<h3 className="h3">Open Source Code</h3>
|
||||
Colouring London site code is developed at <a href="http://github.com/tomalrussell/colouring-london/">colouring-london</a> on Github
|
||||
|
||||
<hr />
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user