scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2025-02-17 00:21:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #403 from LLK/release/2.2.7

Browse source 
[develop] Release 2.2.7
This commit is contained in:
Ray Schamp 2016-04-05 15:27:11 -04:00
commit 10455f980f
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/navigation/navigation.jsx
View file

@ -268,9 +268,9 @@ var Navigation = React.createClass({
</a>
</li>
] : []}
{this.state.session.permissions.student ? [
{this.props.session.permissions.student ? [
<li>
<a href={'/classes/' + this.state.session.user.classroomId + '/'}>
<a href={'/classes/' + this.props.session.user.classroomId + '/'}>
<FormattedMessage id="general.myClass" />
</a>
</li>

12
src/views/jobs/jobs.jsx
View file

@ -2,6 +2,8 @@ var React = require('react');
var render = require('../../lib/render.jsx');
var FormattedMessage = require('react-intl').FormattedMessage;
var Page = require('../../components/page/page.jsx');
require('./jobs.scss');
var Jobs = React.createClass({
@ -44,6 +46,14 @@ var Jobs = React.createClass({
(MIT Media Lab, Cambridge, MA)
</span>
</li>
<li>
<a href="/jobs/community-counselor/">
Community Counselor
</a>
<span>
(MIT Media Lab, Cambridge, MA or Remote)
</span>
</li>
</ul>
</div>
</div>
@ -52,4 +62,4 @@ var Jobs = React.createClass({
}
});
render(<Jobs />, document.getElementById('view'));
render(<Page><Jobs /></Page>, document.getElementById('app'));