Merge pull request #1033 from colouring-cities/feature/new-categories-menu

Feature/new categories menu (+ other fixes)

app/src/frontend/building/data-containers/age.tsx

@@ -135,6 +135,9 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                 />
             </DataEntryGroup>
             <DataEntryGroup name="Lifespan and Site History" collapsed={true} >
+                <button className="map-switcher-inline btn btn-outline btn-outline-dark" onClick={historicDataSwitchOnClick}> 
+                    {(historicData === 'enabled')?'Click here to hide historical maps':'Click here to show historical maps'}
+                </button>
                 <DataEntryGroup collapsed={false} name="Constructions and demolitions on this site" showCount={false}>
                     <DynamicsBuildingPane>
                         <label>Current building (age data <Link to={ageLinkUrl}>editable here</Link>)</label>
@@ -216,26 +219,6 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                             </>
                     }
                 </DataEntryGroup>
-                <DataEntryGroup name="Future planned data collection" collapsed={false} showCount={false}>
-                    <DataEntry
-                        title="Historical land use change"
-                        slug=""
-                        value=""
-                        mode='view'
-                    />
-                    <DataEntry
-                        title="Longitudinal historical footprints (raster) link"
-                        slug=""
-                        value=""
-                        mode='view'
-                    />
-                    <DataEntry
-                        title="Longitudinal historical footprints (vector) link"
-                        slug=""
-                        value=""
-                        mode='view'
-                    />
-                </DataEntryGroup>
                 <InfoBox>
                     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)
@@ -245,8 +228,8 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                 <InfoBox>
                     This section is under development.
                 </InfoBox>
-                <button className="map-switcher-inline btn btn-outline btn-outline-dark" /*onClick={}*/> 
+                <button className="map-switcher-inline btn btn-outline btn-outline-dark" onClick={historicDataSwitchOnClick}> 
-                    {'Click here for historical maps'}
+                    {(historicData === 'enabled')?'Click here to hide historical maps':'Click here to show historical maps'}
                 </button>
                 <SelectDataEntry
                     title={dataFields.historical_status.title}
@@ -258,6 +241,12 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     copy={props.copy}
                     onChange={props.onChange}
                 />
+                <DataEntry
+                    title="Historical land use change"
+                    slug=""
+                    value=""
+                    mode='view'
+                />
             </DataEntryGroup>
           </Fragment>
         );
@@ -415,6 +404,9 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                 />
             </DataEntryGroup>
             <DataEntryGroup name="Lifespan and Site History" collapsed={true} >
+                <button className="map-switcher-inline btn btn-outline btn-outline-dark" onClick={historicDataSwitchOnClick}> 
+                    {(historicData === 'enabled')?'Click here to hide historical maps':'Click here to show historical maps'}
+                </button>
                 <DataEntryGroup collapsed={false} name="Constructions and demolitions on this site" showCount={false}>
                     <DynamicsBuildingPane>
                         <label>Current building (age data <Link to={ageLinkUrl}>editable here</Link>)</label>
@@ -496,26 +488,6 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                             </>
                     }
                 </DataEntryGroup>
-                <DataEntryGroup name="Future planned data collection" collapsed={false} showCount={false}>
-                    <DataEntry
-                        title="Historical land use change"
-                        slug=""
-                        value=""
-                        mode='view'
-                    />
-                    <DataEntry
-                        title="Longitudinal historical footprints (raster) link"
-                        slug=""
-                        value=""
-                        mode='view'
-                    />
-                    <DataEntry
-                        title="Longitudinal historical footprints (vector) link"
-                        slug=""
-                        value=""
-                        mode='view'
-                    />
-                </DataEntryGroup>
                 <InfoBox>
                     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)
@@ -538,6 +510,12 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     copy={props.copy}
                     onChange={props.onChange}
                 />
+                <DataEntry
+                    title="Historical land use change"
+                    slug=""
+                    value=""
+                    mode='view'
+                />
             </DataEntryGroup>
         </Fragment>
     );

app/src/frontend/building/data-containers/planning.tsx

@@ -399,7 +399,7 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => {
         <DataEntryGroup name="Active application info (crowdsourced)" collapsed={true} >
                 {/* will be titled "Other active application info (crowdsourced data)" once active" */}
                 <InfoBox type='warning'>
-                    This category is not yet activated.
+                    This category is not yet activated -  Until this section is activated please report inaccuracies or problems on the <a href=" https://github.com/colouring-cities/colouring-london/discussions/categories/planning-section-comments">Discussion Forum</a>.
                 </InfoBox>
                 {/* that is placeholder display, will be replaced by actual code */}
                 <div className="data-title">

app/src/frontend/header.tsx

@@ -58,11 +58,17 @@ function getCurrentMenuLinks(username: string): MenuLink[][] {
                 text: "Access open code",
                 external: true
             },
+            {
+                to: "https://github.com/colouring-cities/manual/wiki",
+                text: "Colouring Cities Open Manual/Wiki",
+                disabled: false,
+                external: true
+            },
             {
                 to: "/showcase.html",
-                text: "View Data Showcase",
+                text: "Case Study Showcase",
                 disabled: true,
-                note: "Coming soon"
+                note: "Not Yet Activated"
             },
         ],
         [