comunes/todos-contra-el-fuego-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More work in home

Browse source
This commit is contained in:
vjrj 2017-12-11 12:30:35 +01:00
parent 9fd889f77f
commit b1c9aad0ea
12 changed files with 48 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

12
imports/ui/components/Navigation/Navigation.js
View file

@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import { Navbar } from 'react-bootstrap';
import { Link } from 'react-router-dom';
import { LinkContainer } from 'react-router-bootstrap';
import { translate } from 'react-i18next';
import { Trans, translate } from 'react-i18next';
import PublicNavigation from '../PublicNavigation/PublicNavigation';
import AuthenticatedNavigation from '../AuthenticatedNavigation/AuthenticatedNavigation';
import NavItem from '../NavItem/NavItem';
@ -30,11 +30,13 @@ const Navigation = props => (
{/* <Navbar.Collapse> */}
<div className="collapse navbar-collapse" id="navbarNavDropdown">
<ul className="navbar-nav ml-auto ">
<LinkContainer className="nav-item" anchorClassName="nav-link" to="/sandbox">
<NavItem eventKey={1.1} href="/sandbox">Sandbox</NavItem>
</LinkContainer>
{/* <LinkContainer className="nav-item" anchorClassName="nav-link" to="/sandbox">
<NavItem eventKey={1.1} href="/sandbox">Sandbox</NavItem>
</LinkContainer> */}
<LinkContainer className="nav-item" anchorClassName="nav-link" to="/subscriptions">
<NavItem eventKey={1.2} href="/subscriptions">Mis alertas</NavItem>
<NavItem eventKey={1.2} href="/subscriptions">
{props.authenticated ? <Trans>Mis alertas</Trans>:<Trans>Participar</Trans>}
</NavItem>
</LinkContainer>
<LinkContainer className="nav-item" anchorClassName="nav-link" to="/fires">
<NavItem eventKey={2} href="/fires">{props.t('activeFires')}</NavItem>

16
imports/ui/components/SelectionMap/SelectionMap.js
View file

@ -98,14 +98,14 @@ class SelectionMap extends Component {
<div>
{ this.state && this.state.center &&
<Map center={this.state.center} zoom={this.state.zoom}
ref={(map) => { this.selectionMap = map; }}
sleep={true}
sleepTime={10750}
wakeTime={750}
sleepNote={true}
hoverToWake={true}
wakeMessage={this.props.t('Pulsa para activar')}
sleepOpacity={.6}>
ref={(map) => { this.selectionMap = map; }}
sleep={window.location.pathname === '/'}
sleepTime={10750}
wakeTime={750}
sleepNote={true}
hoverToWake={true}
wakeMessage={this.props.t('Pulsa para activar')}
sleepOpacity={.6}>
<TileLayer
attribution="&amp;copy <a href=&quot;http://osm.org/copyright&quot;>OpenStreetMap</a> contributors"
url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"