diff --git a/src/components/ttt-tile/ttt-tile.jsx b/src/components/ttt-tile/ttt-tile.jsx index 3a1fadf0c..ee163f132 100644 --- a/src/components/ttt-tile/ttt-tile.jsx +++ b/src/components/ttt-tile/ttt-tile.jsx @@ -14,16 +14,6 @@ var TTTTile = React.createClass({ tutorialLoc: React.PropTypes.string.isRequired, onGuideClick: React.PropTypes.func.isRequired }, - tileGuidesIfExists: function () { - if (this.props.onGuideClick) { - return ( -
- - -
- ); - } - }, render: function () { var classes = classNames( 'ttt-tile', @@ -54,7 +44,12 @@ var TTTTile = React.createClass({ - {this.tileGuidesIfExists()} + {this.props.onGuideClick && ( +
+ + +
+ )} ); } diff --git a/src/routes.json b/src/routes.json index a0ce7667f..3643be89d 100644 --- a/src/routes.json +++ b/src/routes.json @@ -250,7 +250,7 @@ { "name": "microworlds-homepage", "pattern": "^/microworlds/go/?(\\?.*)?$", - "routeAlias": "microworlds", + "routeAlias": "/microworlds", "view": "microworldshomepage/microworldshomepage", "title": "Microworlds" } diff --git a/src/views/microworldshomepage/microworldshomepage.jsx b/src/views/microworldshomepage/microworldshomepage.jsx index 7cf9378cc..93bb4d449 100644 --- a/src/views/microworldshomepage/microworldshomepage.jsx +++ b/src/views/microworldshomepage/microworldshomepage.jsx @@ -14,27 +14,6 @@ require('./microworldshomepage.scss'); var MicroworldsHomepage = injectIntl(React.createClass({ type: 'MicroworldsHomepage', - renderTTTTiles: function () { - var formatMessage = this.props.intl.formatMessage; - var translatedTiles = []; - var translatedTile = {}; - - Tiles.map(function (tile, key) { - translatedTile = { - title: formatMessage({id: tile.title}), - tutorialLoc: tile.tutorialLoc, - thumbUrl: tile.thumbUrl, - bannerUrl: tile.bannerUrl - }; - translatedTiles.push( - - ); - }, this); // don't forget to pass 'this' into map function - return translatedTiles; - }, render: function () { return (
@@ -48,7 +27,17 @@ var MicroworldsHomepage = injectIntl(React.createClass({
- {this.renderTTTTiles()} + {Tiles.map( + function (tile, key) { + return ; + }, this) + }