Add back buttons to sidebar header
This commit is contained in:
parent
a012b24bd1
commit
fe8e6f7737
@ -59,7 +59,7 @@ class BuildingEdit extends Component {
|
|||||||
}
|
}
|
||||||
if (!this.props.building_id){
|
if (!this.props.building_id){
|
||||||
return (
|
return (
|
||||||
<Sidebar title="Building Not Found">
|
<Sidebar title="Building Not Found" back="/map/date_year.html">
|
||||||
<InfoBox msg="We can't find that one anywhere - try the map again?" />
|
<InfoBox msg="We can't find that one anywhere - try the map again?" />
|
||||||
<div className="buttons-container">
|
<div className="buttons-container">
|
||||||
<Link to="/map/date_year.html" className="btn btn-secondary">Back to maps</Link>
|
<Link to="/map/date_year.html" className="btn btn-secondary">Back to maps</Link>
|
||||||
@ -68,10 +68,10 @@ class BuildingEdit extends Component {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
return (
|
return (
|
||||||
<Sidebar title={`Edit Building`}>
|
<Sidebar title={`Edit Building`} back={`/building/${this.props.building_id}.html`}>
|
||||||
{
|
{
|
||||||
CONFIG.map((props) => {
|
CONFIG.map((conf_props) => {
|
||||||
return <EditForm {...props} {...this.props} key={props.slug} />
|
return <EditForm {...conf_props} {...this.props} key={conf_props.slug} />
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
</Sidebar>
|
</Sidebar>
|
||||||
|
@ -4,7 +4,7 @@ import { Link, NavLink } from 'react-router-dom';
|
|||||||
import Sidebar from './sidebar';
|
import Sidebar from './sidebar';
|
||||||
import Tooltip from './tooltip';
|
import Tooltip from './tooltip';
|
||||||
import InfoBox from './info-box';
|
import InfoBox from './info-box';
|
||||||
import { InfoIcon, EditIcon } from './icons';
|
import { HelpIcon, EditIcon } from './icons';
|
||||||
|
|
||||||
|
|
||||||
const DataSection = function(props){
|
const DataSection = function(props){
|
||||||
@ -18,7 +18,7 @@ const DataSection = function(props){
|
|||||||
{
|
{
|
||||||
props.helpLink?
|
props.helpLink?
|
||||||
<a className="icon-button help" title="Find out more" href={props.helpLink} target="_blank" rel="noopener noreferrer">
|
<a className="icon-button help" title="Find out more" href={props.helpLink} target="_blank" rel="noopener noreferrer">
|
||||||
<InfoIcon />
|
<HelpIcon />
|
||||||
</a>
|
</a>
|
||||||
: null
|
: null
|
||||||
}
|
}
|
||||||
@ -55,7 +55,7 @@ const BuildingView = function(props){
|
|||||||
}
|
}
|
||||||
const hash = (props.location && props.location.hash)? props.location.hash.replace('#', ''): undefined;
|
const hash = (props.location && props.location.hash)? props.location.hash.replace('#', ''): undefined;
|
||||||
return (
|
return (
|
||||||
<Sidebar title={`View Building`}>
|
<Sidebar title={`View Building`} back="/map/date_year.html">
|
||||||
<DataSection title="Location" slug="location" hash={hash}
|
<DataSection title="Location" slug="location" hash={hash}
|
||||||
helpLink="https://pollyhudson.wixsite.com/colouringlondon/location">
|
helpLink="https://pollyhudson.wixsite.com/colouringlondon/location">
|
||||||
<p className="data-intro">
|
<p className="data-intro">
|
||||||
|
@ -47,3 +47,14 @@
|
|||||||
height: auto;
|
height: auto;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.sidebar-header .h2 {
|
||||||
|
display: inline-block;
|
||||||
|
}
|
||||||
|
.sidebar-header .icon-button {
|
||||||
|
margin-left: 0.25rem;
|
||||||
|
margin-top: 0.4rem;
|
||||||
|
}
|
||||||
|
.sidebar-header .icon-button:hover {
|
||||||
|
background-color: #eee;
|
||||||
|
}
|
||||||
|
@ -1,10 +1,21 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
|
import { Link } from 'react-router-dom';
|
||||||
|
|
||||||
import './sidebar.css';
|
import './sidebar.css';
|
||||||
|
import { BackIcon } from './icons';
|
||||||
|
|
||||||
const Sidebar = (props) => (
|
const Sidebar = (props) => (
|
||||||
<div id="legend" className="info-container">
|
<div id="legend" className="info-container">
|
||||||
<h2 className="h2">{props.title}</h2>
|
<header className="sidebar-header">
|
||||||
|
{
|
||||||
|
props.back?
|
||||||
|
<Link className="icon-button back" to={props.back}>
|
||||||
|
<BackIcon />
|
||||||
|
</Link>
|
||||||
|
: null
|
||||||
|
}
|
||||||
|
<h2 className="h2">{props.title}</h2>
|
||||||
|
</header>
|
||||||
{props.children}
|
{props.children}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import React, { Component, Fragment } from 'react';
|
import React, { Component, Fragment } from 'react';
|
||||||
|
|
||||||
import './tooltip.css';
|
import './tooltip.css';
|
||||||
import { HelpIcon } from './icons';
|
import { InfoIcon } from './icons';
|
||||||
|
|
||||||
class Tooltip extends Component {
|
class Tooltip extends Component {
|
||||||
constructor(props) {
|
constructor(props) {
|
||||||
@ -25,7 +25,7 @@ class Tooltip extends Component {
|
|||||||
<div className="tooltip-wrap">
|
<div className="tooltip-wrap">
|
||||||
<button className="tooltip-hint icon-button" title={this.props.text}
|
<button className="tooltip-hint icon-button" title={this.props.text}
|
||||||
onClick={this.handleClick}>
|
onClick={this.handleClick}>
|
||||||
<HelpIcon />
|
<InfoIcon />
|
||||||
</button>
|
</button>
|
||||||
{
|
{
|
||||||
this.state.active?
|
this.state.active?
|
||||||
|
Loading…
Reference in New Issue
Block a user