Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Unify section names. #1428

Merged
merged 3 commits into from
Oct 30, 2024
Merged

Unify section names. #1428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5cca6be
Unify section names.
matkoniecz Oct 28, 2024
2b97be7
Tweak category titles after consultation.
matkoniecz Oct 28, 2024
637eece
standarize on no spaces around /
matkoniecz Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions app/src/frontend/building/data-containers/age-history.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ const AgeHistoryView: React.FunctionComponent<CategoryViewProps> = (props) => {

return (
<Fragment>
<DataEntryGroup name="Architectural style/historical period" collapsed={subcat==null || subcat!="2"}>
<DataEntryGroup name="Architectural Style/Historical Period" collapsed={subcat==null || subcat!="2"}>
{(props.mapColourScale != "typology_style_period") ?
<button className={`map-switcher-inline enabled-state btn btn-outline btn-outline-dark key-button`} onClick={switchToStylePeriodMapStyle}>
Click to show architectural style.
Expand Down Expand Up @@ -134,7 +134,7 @@ const AgeHistoryView: React.FunctionComponent<CategoryViewProps> = (props) => {
</>
}
</DataEntryGroup>
<DataEntryGroup name="Building age/construction date" collapsed={subcat==null || subcat!="1"}>
<DataEntryGroup name="Building Age/Construction Date" collapsed={subcat==null || subcat!="1"}>
{(props.mapColourScale != "date_year") ?
<button className={`map-switcher-inline enabled-state btn btn-outline btn-outline-dark key-button`} onClick={switchToAgeMapStyle}>
Click to show building age.
Expand Down Expand Up @@ -246,7 +246,7 @@ const AgeHistoryView: React.FunctionComponent<CategoryViewProps> = (props) => {
</>
}
</DataEntryGroup>
<DataEntryGroup name="Cladding, extensions and retrofits" collapsed={subcat==null || subcat!="3"}>
<DataEntryGroup name="Cladding, Extensions and Retrofits" collapsed={subcat==null || subcat!="3"}>
<NumericDataEntry
slug='age_cladding_date'
title={dataFields.age_cladding_date.title}
Expand Down Expand Up @@ -397,8 +397,8 @@ const AgeHistoryView: React.FunctionComponent<CategoryViewProps> = (props) => {
</>
}
</DataEntryGroup>
<DataEntryGroup name="Lifespan and site history" collapsed={subcat==null || subcat!="4"}>
<DataEntryGroup name="Constructions and demolitions on this site" collapsed={subcat==null || subcat!="4"}>
<DataEntryGroup name="Lifespan and Site History" collapsed={subcat==null || subcat!="4"}>
<DataEntryGroup name="Constructions and Demolitions on this Site" collapsed={subcat==null || subcat!="4"}>
<DynamicsBuildingPane>
<label>Current building (building age data editable above)</label>
<FieldRow>
Expand Down Expand Up @@ -484,7 +484,7 @@ const AgeHistoryView: React.FunctionComponent<CategoryViewProps> = (props) => {
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>
</DataEntryGroup>
<DataEntryGroup name="Survival tracking" collapsed={subcat==null || subcat!="5"}>
<DataEntryGroup name="Survival Tracking" collapsed={subcat==null || subcat!="5"}>
<div className={`alert alert-dark`} role="alert" style={{ fontSize: 13, backgroundColor: "#f6f8f9" }}>
<i>
Can you help us create a map that shows how many buildings in this area have survived since the 1890s?
Expand Down Expand Up @@ -548,7 +548,7 @@ const AgeHistoryView: React.FunctionComponent<CategoryViewProps> = (props) => {
</>
}
</DataEntryGroup>
<DataEntryGroup name="Historical map data options" collapsed={subcat==null || subcat!="6"}>
<DataEntryGroup name="Historical Map Data Options" collapsed={subcat==null || subcat!="6"}>
<InfoBox type='warning'>
This section is under development
</InfoBox>
Expand Down
4 changes: 2 additions & 2 deletions app/src/frontend/building/data-containers/community.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ const CommunityView: React.FunctionComponent<CategoryViewProps> = (props) => {

return (
<Fragment>
<DataEntryGroup name="Community views on buildings & streetscapes" collapsed={subcat==null || subcat!="1"}>
<DataEntryGroup name="Community Views On Buildings & Streetscapes" collapsed={subcat==null || subcat!="1"}>
<div className={`alert alert-dark`} role="alert" style={{ fontSize: 14, backgroundColor: "#f6f8f9" }}>
<i>
This section collects data on what people feel about the exterior of a building and the surrounding streetscape.
Expand Down Expand Up @@ -359,7 +359,7 @@ const CommunityView: React.FunctionComponent<CategoryViewProps> = (props) => {
required={streetscapeResponseRequired}
/> */}
</DataEntryGroup>
<DataEntryGroup name="Building in Community Use / Ownership" collapsed={subcat==null || subcat!="2"}>
<DataEntryGroup name="Building in Community Use/Ownership" collapsed={subcat==null || subcat!="2"}>
<div className={`alert alert-dark`} role="alert" style={{ fontSize: 14, backgroundColor: "#f6f8f9" }}>
<i>
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.
Expand Down
10 changes: 5 additions & 5 deletions app/src/frontend/building/data-containers/construction-design.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ const ConstructionDesignView: React.FunctionComponent<CategoryViewProps> = (prop
</>
}
</DataEntryGroup>
<DataEntryGroup name="Decorative features" collapsed={subcat==null || subcat!="3"}>
<DataEntryGroup name="Decorative Features" collapsed={subcat==null || subcat!="3"}>
<LogicalDataEntry
slug='construction_decorative_features'
title={dataFields.construction_decorative_features.title}
Expand Down Expand Up @@ -587,8 +587,8 @@ const ConstructionDesignView: React.FunctionComponent<CategoryViewProps> = (prop
}
</DataEntryGroup>
</DataEntryGroup>
<DataEntryGroup name="Design / Team" collapsed={subcat==null || subcat!="2"}>
<DataEntryGroup name="Land ownership at time of construction" collapsed={subcat==null || subcat!="1"}>
<DataEntryGroup name="Design/Team" collapsed={subcat==null || subcat!="2"}>
<DataEntryGroup name="Land Ownership at Time of Construction" collapsed={subcat==null || subcat!="1"}>
<MultiDataEntry
title={dataFields.landowner.title}
slug="landowner"
Expand Down Expand Up @@ -651,7 +651,7 @@ const ConstructionDesignView: React.FunctionComponent<CategoryViewProps> = (prop
</>
}
</DataEntryGroup>
<DataEntryGroup name="Main building" collapsed={subcat==null || subcat!="2"}>
<DataEntryGroup name="Main Building" collapsed={subcat==null || subcat!="2"}>
<NumericDataEntry
title={dataFields.date_year.title}
slug="date_year"
Expand Down Expand Up @@ -943,7 +943,7 @@ const ConstructionDesignView: React.FunctionComponent<CategoryViewProps> = (prop
}
</DataEntryGroup>
</DataEntryGroup>
<DataEntryGroup name="Most significant extension" collapsed={subcat==null || subcat!="7"}>
<DataEntryGroup name="Most Significant Extension" collapsed={subcat==null || subcat!="7"}>
<NumericDataEntry
slug='extension_year'
title={dataFields.extension_year.title}
Expand Down
4 changes: 2 additions & 2 deletions app/src/frontend/building/data-containers/disaster-management.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const DisasterManagementView: React.FunctionComponent<CategoryViewProps> = (prop
}

return (<>
<DataEntryGroup name="Disaster management tool" collapsed={subcat==null || subcat!="1"}>
<DataEntryGroup name="Disaster Management Tool" collapsed={subcat==null || subcat!="1"}>
<div className={`alert alert-dark`} role="alert" style={{ fontSize: 13, backgroundColor: "#f6f8f9" }}>
<i>
This feature is designed as an assessment tool to help communities capture data on the state of buildings following major disasters.
Expand Down Expand Up @@ -127,7 +127,7 @@ const DisasterManagementView: React.FunctionComponent<CategoryViewProps> = (prop
</>
}
</DataEntryGroup>
<DataEntryGroup name="Resilience indicators and risk assessment" collapsed={subcat==null || subcat!="2"}>
<DataEntryGroup name="Resilience Indicators and Risk Assessment" collapsed={subcat==null || subcat!="2"}>
<InfoBox type='warning'>
This section is under development.
</InfoBox>
Expand Down
6 changes: 3 additions & 3 deletions app/src/frontend/building/data-containers/energy-performance.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const EnergyPerformanceView: React.FunctionComponent<CategoryViewProps> = (props
return (
<form>
<DataEntryGroup name="Energy Performance" collapsed={subcat==null || subcat!="1"}>
<DataEntryGroup name="Official environmental quality rating" collapsed={subcat==null || subcat!="1"}>
<DataEntryGroup name="Official Environmental Quality Rating" collapsed={subcat==null || subcat!="1"}>
<SelectDataEntry
title={dataFields.sust_breeam_rating.title}
slug="sust_breeam_rating"
Expand Down Expand Up @@ -81,7 +81,7 @@ const EnergyPerformanceView: React.FunctionComponent<CategoryViewProps> = (props
</>
}
</DataEntryGroup>
<DataEntryGroup name="Official energy rating" collapsed={subcat==null || subcat!="2"}>
<DataEntryGroup name="Official Energy Rating" collapsed={subcat==null || subcat!="2"}>
<SelectDataEntry
title={dataFields.sust_dec.title}
slug="sust_dec"
Expand Down Expand Up @@ -153,7 +153,7 @@ const EnergyPerformanceView: React.FunctionComponent<CategoryViewProps> = (props
This section is under development.
Please let us know your suggestions on the <a href="https://github.com/colouring-cities/colouring-core/discussions">discussion forum</a>! (external link - save your edits first)
</InfoBox>
<DataEntryGroup name="Solar panels" collapsed={subcat==null || subcat!="4"}>
<DataEntryGroup name="Solar Panels" collapsed={subcat==null || subcat!="4"}>
<LogicalDataEntry
title={dataFields.energy_solar.title}
slug="energy_solar"
Expand Down
2 changes: 1 addition & 1 deletion app/src/frontend/building/data-containers/land-use.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ const LandUseView: React.FunctionComponent<CategoryViewProps> = (props) => {
</>
}
</DataEntryGroup>
<DataEntryGroup name="Specific land use(s)" collapsed={subcat==null || subcat!="2"}>
<DataEntryGroup name="Specific Land Use(s)" collapsed={subcat==null || subcat!="2"}>
{(props.mapColourScale != "landuse") ?
<button className={`map-switcher-inline disabled-state btn btn-outline btn-outline-dark key-button`} onClick={switchToLandUseMapStyle}>
{"Click to see specific land use."}
Expand Down
8 changes: 4 additions & 4 deletions app/src/frontend/building/data-containers/location.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const LocationView: React.FunctionComponent<CategoryViewProps> = (props) => {

return (
<Fragment>
<DataEntryGroup name="Property address" collapsed={subcat==null || subcat!="1"}>
<DataEntryGroup name="Property Address" collapsed={subcat==null || subcat!="1"}>
{/* <DataEntry
title={dataFields.location_name.title}
slug="location_name"
Expand Down Expand Up @@ -212,7 +212,7 @@ const LocationView: React.FunctionComponent<CategoryViewProps> = (props) => {
</>
}
</DataEntryGroup>
<DataEntryGroup name="Building subdivision" collapsed={subcat==null || subcat!="2"}>
<DataEntryGroup name="Building Subdivision" collapsed={subcat==null || subcat!="2"}>
<LogicalDataEntry
slug='location_subdivided'
title={dataFields.location_subdivided.title}
Expand Down Expand Up @@ -282,7 +282,7 @@ const LocationView: React.FunctionComponent<CategoryViewProps> = (props) => {
</>
}
</DataEntryGroup>
<DataEntryGroup name="Open property IDs/footprint IDs" collapsed={subcat==null || subcat!="3"}>
<DataEntryGroup name="Open Property IDs/Footprint IDs" collapsed={subcat==null || subcat!="3"}>
<DataEntry
title={dataFields.ref_toid.title}
slug="ref_toid"
Expand Down Expand Up @@ -349,7 +349,7 @@ const LocationView: React.FunctionComponent<CategoryViewProps> = (props) => {
isUrl={true}
/>
</DataEntryGroup>
<DataEntryGroup name="Base building footprints/polygons used for data collation, verification and visualisation" collapsed={subcat==null || subcat!="4"}>
<DataEntryGroup name="Base Building Footprints/Polygons Used For Data Collation, Verification And Visualisation" collapsed={subcat==null || subcat!="4"}>
<NumericDataEntry
title={dataFields.location_latitude.title}
slug="location_latitude"
Expand Down
18 changes: 9 additions & 9 deletions app/src/frontend/building/data-containers/planning-conservation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ const PlanningConservationView: React.FunctionComponent<CategoryViewProps> = (pr
return (
<Fragment>
<DataEntryGroup name="Planning" collapsed={subcat==null || (subcat!="1" && subcat!="2" && subcat!="3")}>
<DataEntryGroup name="Current planning applications" collapsed={subcat==null || (subcat!="1" && subcat!="2" && subcat!="3")}>
<DataEntryGroup name="Official data" collapsed={subcat==null || subcat!="1"}>
<DataEntryGroup name="Current Planning Applications" collapsed={subcat==null || (subcat!="1" && subcat!="2" && subcat!="3")}>
<DataEntryGroup name="Official Data" collapsed={subcat==null || subcat!="1"}>
<InfoBox>
This section provides data on active applications. We define these as applications with any activity in the last year.
<br />
Expand All @@ -115,7 +115,7 @@ const PlanningConservationView: React.FunctionComponent<CategoryViewProps> = (pr
: <></>
}
</DataEntryGroup>
<DataEntryGroup name="Year of completion" collapsed={subcat==null || subcat!="2"}>
<DataEntryGroup name="Year of Completion" collapsed={subcat==null || subcat!="2"}>
<LogicalDataEntry
slug='planning_crowdsourced_site_completion_status'
title={dataFields.planning_crowdsourced_site_completion_status.title}
Expand Down Expand Up @@ -187,7 +187,7 @@ const PlanningConservationView: React.FunctionComponent<CategoryViewProps> = (pr
</>
}
</DataEntryGroup>
<DataEntryGroup name="Incomplete/missing data" collapsed={subcat==null || subcat!="3"}>
<DataEntryGroup name="Incomplete/Missing Data" collapsed={subcat==null || subcat!="3"}>
<LogicalDataEntry
slug='planning_missing_data'
title={dataFields.planning_missing_data.title}
Expand Down Expand Up @@ -227,7 +227,7 @@ const PlanningConservationView: React.FunctionComponent<CategoryViewProps> = (pr
</InfoBox>
</DataEntryGroup>
</DataEntryGroup>
<DataEntryGroup name="Past applications" collapsed={subcat==null || subcat!="4"}>
<DataEntryGroup name="Past Applications" collapsed={subcat==null || subcat!="4"}>
<InfoBox>
This section provides data on past applications where available from the GLA, including those with no decision in over a year
</InfoBox>
Expand Down Expand Up @@ -258,7 +258,7 @@ const PlanningConservationView: React.FunctionComponent<CategoryViewProps> = (pr
: <></>
}
</DataEntryGroup>
<DataEntryGroup name="Possible future applications" collapsed={subcat==null || subcat!="5"}>
<DataEntryGroup name="Possible Future Applications" collapsed={subcat==null || subcat!="5"}>
<InfoBox type='info'>Click and colour buildings here if you think they may be subject to a future planning application involving demolition. To add your opinion on how well this building works, please also visit the <Link to={communityLinkUrl}>Community</Link> section.</InfoBox>
{props.mapColourScale != "community_expected_planning_application_total" ?
<button className={`map-switcher-inline disabled-state btn btn-outline btn-outline-dark key-button`} onClick={switchToExpectedApplicationMapStyle}>
Expand Down Expand Up @@ -295,7 +295,7 @@ const PlanningConservationView: React.FunctionComponent<CategoryViewProps> = (pr
<></>
}
</DataEntryGroup>
<DataEntryGroup name="Planning zones" collapsed={subcat==null || subcat!="6"}>
<DataEntryGroup name="Planning Zones" collapsed={subcat==null || subcat!="6"}>
<InfoBox>
To view planning zone data for London click the buttons below. You may need to <u>zoom out</u>.
Information on whether a specific building is in a zone will be added automatically in future.
Expand Down Expand Up @@ -367,7 +367,7 @@ const PlanningConservationView: React.FunctionComponent<CategoryViewProps> = (pr
/>
*/}
</DataEntryGroup>
<DataEntryGroup name="Land ownership type" collapsed={subcat==null || subcat!="8"}>
<DataEntryGroup name="Land Ownership Type" collapsed={subcat==null || subcat!="8"}>
<InfoBox>
This section is designed to provide information on land parcels and their ownership type. Can you help us collect this information?
</InfoBox>
Expand Down Expand Up @@ -434,7 +434,7 @@ const PlanningConservationView: React.FunctionComponent<CategoryViewProps> = (pr
</button>
</DataEntryGroup>
</DataEntryGroup>
<DataEntryGroup name="Heritage assets and building protection" collapsed={subcat==null || subcat!="7"}>
<DataEntryGroup name="Heritage Assets and Building Protection" collapsed={subcat==null || subcat!="7"}>
<InfoBox>
Help us produce the most accurate map possible for London's designated/protected buildings. Please add data if missing or click "Verify" where entries are correct.
</InfoBox>
Expand Down
2 changes: 1 addition & 1 deletion app/src/frontend/building/data-containers/retrofit-condition.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const RetrofitConditionView: React.FunctionComponent<CategoryViewProps> = (props

return (
<Fragment>
<DataEntryGroup name="Retrofit history" collapsed={subcat==null || subcat!="3"}>
<DataEntryGroup name="Retrofit History" collapsed={subcat==null || subcat!="3"}>
<NumericDataEntry
slug='age_retrofit_date'
title={dataFields.age_retrofit_date.title}
Expand Down
Loading
Loading