a_adli/colouring-montreal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More tweaks, mainly for consistency

Browse Source
This commit is contained in:
Mike Simpson 2023-05-18 21:06:27 +01:00
parent 79dec38f9f
commit 715cdfaa02
6 changed files with 46 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/src/frontend/building/data-containers/age-history.tsx
View File

@ -114,7 +114,8 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
user_verified_as={props.user_verified.date_source} user_verified_as={props.user_verified.date_source}
verified_count={props.building.verified.date_source} verified_count={props.building.verified.date_source}
/> />
<InfoBox> <hr/>
<InfoBox type='warning'>
This section is under development. This section is under development.
</InfoBox> </InfoBox>
<DataEntry <DataEntry
@ -221,16 +222,18 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
</> </>
} }
</DataEntryGroup> </DataEntryGroup>
<InfoBox> <InfoBox type='warning'>
This section is under development in collaboration with the historic environment sector. This section is under development in collaboration with the historic environment sector.
Please let us know your suggestions on the <a href="https://discuss.colouring.london/t/dynamics-category-discussion/107">discussion forum</a>! (external link - save your edits first) Please let us know your suggestions on the <a href="https://discuss.colouring.london/t/dynamics-category-discussion/107">discussion forum</a>! (external link - save your edits first)
</InfoBox> </InfoBox>
</DataEntryGroup> </DataEntryGroup>
<DataEntryGroup name="Survival and loss tracked using historical maps" collapsed={true} > <DataEntryGroup name="Survival and loss tracked using historical maps" collapsed={true} >
<InfoBox> <div className={`alert alert-dark`} role="alert" style={{ fontSize: 13, backgroundColor: "#f6f8f9" }}>
Can you help us create a map that shows how many buildings in London have survived since the 1890s? <i>
Choose a colour to indicate whether the building has survived. Can you help us create a map that shows how many buildings in London have survived since the 1890s?
</InfoBox> Choose a colour to indicate whether the building has survived.
</i>
</div>
<button className={`map-switcher-inline ${historicData}-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={historicDataSwitchOnClick}> <button className={`map-switcher-inline ${historicData}-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={historicDataSwitchOnClick}>
{(historicData === 'enabled')?'Click here to hide historical maps':'Click here to show historical maps'} {(historicData === 'enabled')?'Click here to hide historical maps':'Click here to show historical maps'}
</button> </button>
@ -347,7 +350,8 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
user_verified_as={props.user_verified.date_link} user_verified_as={props.user_verified.date_link}
verified_count={props.building.verified.date_link} verified_count={props.building.verified.date_link}
/> />
<InfoBox> <hr/>
<InfoBox type='warning'>
This section is under development. This section is under development.
</InfoBox> </InfoBox>
<DataEntry <DataEntry
@ -496,16 +500,18 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
</> </>
} }
</DataEntryGroup> </DataEntryGroup>
<InfoBox> <InfoBox type='warning'>
This section is under development in collaboration with the historic environment sector. This section is under development in collaboration with the historic environment sector.
Please let us know your suggestions on the <a href="https://discuss.colouring.london/t/dynamics-category-discussion/107">discussion forum</a>! (external link - save your edits first) Please let us know your suggestions on the <a href="https://discuss.colouring.london/t/dynamics-category-discussion/107">discussion forum</a>! (external link - save your edits first)
</InfoBox> </InfoBox>
</DataEntryGroup> </DataEntryGroup>
<DataEntryGroup name="Survival and Loss tracked using Historical Maps" collapsed={true} > <DataEntryGroup name="Survival and loss tracked using historical maps" collapsed={true} >
<InfoBox> <div className={`alert alert-dark`} role="alert" style={{ fontSize: 13, backgroundColor: "#f6f8f9" }}>
Can you help us create a map that shows how many buildings in London have survived since the 1890s? <i>
Choose a colour to indicate whether the building has survived. Can you help us create a map that shows how many buildings in London have survived since the 1890s?
</InfoBox> Choose a colour to indicate whether the building has survived.
</i>
</div>
<button className={`map-switcher-inline ${historicData}-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={historicDataSwitchOnClick}> <button className={`map-switcher-inline ${historicData}-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={historicDataSwitchOnClick}>
{(historicData === 'enabled')?'Click here to hide historical maps':'Click here to show historical maps'} {(historicData === 'enabled')?'Click here to hide historical maps':'Click here to show historical maps'}
</button> </button>

14
app/src/frontend/building/data-containers/community.tsx
View File

@ -41,9 +41,11 @@ const CommunityView: React.FunctionComponent<CategoryViewProps> = (props) => {
const worthKeepingReasonsNonEmpty = Object.values(props.building.community_type_worth_keeping_reasons ?? {}).some(x => x); const worthKeepingReasonsNonEmpty = Object.values(props.building.community_type_worth_keeping_reasons ?? {}).some(x => x);
return <> return <>
<DataEntryGroup name="Community views on building types"> <DataEntryGroup name="Community views on building types">
<InfoBox> <div className={`alert alert-dark`} role="alert" style={{ fontSize: 13, backgroundColor: "#f6f8f9" }}>
<i>
Note: We are not currently collecting data on domestic/privately owned properties, only on public buildings. Note: We are not currently collecting data on domestic/privately owned properties, only on public buildings.
</InfoBox> </i>
</div>
<div className='community-opinion-pane'> <div className='community-opinion-pane'>
{ {
@ -152,9 +154,11 @@ const CommunityView: React.FunctionComponent<CategoryViewProps> = (props) => {
</div> </div>
</DataEntryGroup> </DataEntryGroup>
<DataEntryGroup name="Building use for community activities"> <DataEntryGroup name="Building use for community activities">
<InfoBox> <div className={`alert alert-dark`} role="alert" style={{ fontSize: 13, backgroundColor: "#f6f8f9" }}>
Here we are collecting information on the location of buildings used for community activities so we can track loss of/additions to community space over time <i>
</InfoBox> Here we are collecting information on the location of buildings used for community activities so we can track loss of/additions to community space over time.
</i>
</div>
<LogicalDataEntry <LogicalDataEntry
slug='community_activities_current' slug='community_activities_current'
title={dataFields.community_activities_current.title} title={dataFields.community_activities_current.title}

1
app/src/frontend/building/data-containers/land-use.tsx
View File

@ -133,7 +133,6 @@ const UseView: React.FunctionComponent<CategoryViewProps> = (props) => {
{ {
props.mode != 'view' && props.mode != 'view' &&
<div> <div>
<hr/>
<div className={`alert alert-dark`} role="alert" style={{ fontSize: 13, backgroundColor: "#f6f8f9" }}> <div className={`alert alert-dark`} role="alert" style={{ fontSize: 13, backgroundColor: "#f6f8f9" }}>
<i> <i>
Below is a more general classification for the land use of this building, automatically derived from the information above. Below is a more general classification for the land use of this building, automatically derived from the information above.

8
app/src/frontend/building/data-containers/location.tsx
View File

@ -190,6 +190,7 @@ const LocationView: React.FunctionComponent<CategoryViewProps> = (props) => (
user_verified_as={props.user_verified.ref_osm_id} user_verified_as={props.user_verified.ref_osm_id}
verified_count={props.building.verified.ref_osm_id} verified_count={props.building.verified.ref_osm_id}
/> />
<hr/>
<NumericDataEntry <NumericDataEntry
title={dataFields.location_latitude.title} title={dataFields.location_latitude.title}
slug="location_latitude" slug="location_latitude"
@ -232,6 +233,13 @@ const LocationView: React.FunctionComponent<CategoryViewProps> = (props) => (
user_verified_as={props.user_verified.location_longitude} user_verified_as={props.user_verified.location_longitude}
verified_count={props.building.verified.location_longitude} verified_count={props.building.verified.location_longitude}
/> />
<DataEntry
title="Source"
slug=""
value=""
mode='view'
tooltip="Coming Soon"
/>
</DataEntryGroup> </DataEntryGroup>
</Fragment> </Fragment>
); );

12
app/src/frontend/building/data-containers/resilience.tsx
View File

@ -24,10 +24,12 @@ const ResilienceView: React.FunctionComponent<CategoryViewProps> = (props) => {
return (<> return (<>
<DataEntryGroup name="Building damage assessment tool" collapsed={true} > <DataEntryGroup name="Building damage assessment tool" collapsed={true} >
<InfoBox> <div className={`alert alert-dark`} role="alert" style={{ fontSize: 13, backgroundColor: "#f6f8f9" }}>
This feature is designed as an assessment tool to help communities capture data on the state of buildings following major disasters. <i>
It is intended to help support emergency services, to record damage, and to aid reconstruction programmes. This feature is designed as an assessment tool to help communities capture data on the state of buildings following major disasters.
</InfoBox> It is intended to help support emergency services, to record damage, and to aid reconstruction programmes.
</i>
</div>
<button className={`map-switcher-inline ${historicData}-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={historicDataSwitchOnClick}> <button className={`map-switcher-inline ${historicData}-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={historicDataSwitchOnClick}>
{(historicData === 'enabled')?'Click here to hide disaster maps':'Click here to show disaster maps'} {(historicData === 'enabled')?'Click here to hide disaster maps':'Click here to show disaster maps'}
</button> </button>
@ -141,7 +143,7 @@ const ResilienceView: React.FunctionComponent<CategoryViewProps> = (props) => {
/> />
</DataEntryGroup> </DataEntryGroup>
<DataEntryGroup name="Resilience indicators and risk assessment" collapsed={true} > <DataEntryGroup name="Resilience indicators and risk assessment" collapsed={true} >
<InfoBox> <InfoBox type='warning'>
This section is under development. This section is under development.
</InfoBox> </InfoBox>
<DataEntry <DataEntry

6
app/src/frontend/config/data-fields-config.ts
View File

@ -307,8 +307,8 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
}, },
date_source: { date_source: {
category: Category.Age, category: Category.Age,
title: "Source of information", title: "Source type",
tooltip: "Source for the main start date", tooltip: "Source type for the building dates above",
items: [ items: [
"Expert knowledge of building", "Expert knowledge of building",
"Expert estimate from image", "Expert estimate from image",
@ -774,7 +774,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
}, },
lead_designer_type: { lead_designer_type: {
category: Category.Team, category: Category.Team,
title: "Which best describes the lead designer?", title: "Which title best describes the lead designer?",
example: "", example: "",
items: [ items: [
"Landowner", "Landowner",