Merge branch 'master' into mx

This commit is contained in:
Letícia Camara 2018-10-13 18:06:12 -03:00
commit 9ed587f98b

View file

@ -233,23 +233,22 @@ class AmbassadorsPage extends Component {
addLocation(cities){ addLocation(cities){
return ( return (
<div> <span>
<br /><br /> {(cities.length > 1) && (<span><br /></span>)}
{cities.map((location, index) => ( {cities.map((location, index) => (
<div key={index}> <span key={index}>
{`${(location.name).replace(/(^|\s)\S/g, l => l.toUpperCase())} - ${countries.getName(location.country)}`} {`${(location.name).replace(/(^|\s)\S/g, l => l.toUpperCase())} - ${countries.getName(location.country)}`}
<br /><br /><br /> {(cities.length > 1) && (<span><br /><br /></span>)}
</div> </span>
))} ))}
</div> </span>
); );
} }
addMapButton(nickname, cities){ addMapButton(nickname, cities){
const app = this; const app = this;
return ( return (
<div> <span>
<br />
{cities.map((location, index) => ( {cities.map((location, index) => (
<div key={index}> <div key={index}>
<Button <Button
@ -257,7 +256,9 @@ class AmbassadorsPage extends Component {
variant="contained" variant="contained"
style={{ style={{
backgroundColor: "#2069b3", backgroundColor: "#2069b3",
color: 'white' color: 'white',
marginTop: 5,
marginBottom: 5
}} }}
onClick={() => app.openMaps( onClick={() => app.openMaps(
nickname, nickname,
@ -267,10 +268,9 @@ class AmbassadorsPage extends Component {
)} )}
>Show on Map >Show on Map
</Button> </Button>
<br /><br />
</div> </div>
))} ))}
</div> </span>
); );
} }