Merge remote-tracking branch 'LLK/develop' into develop

package.json

@@ -31,11 +31,11 @@
     "raven": "0.10.0"
   },
   "devDependencies": {
-    "autoprefixer-loader": "2.1.0",
+    "autoprefixer": "6.3.6",
     "classnames": "2.1.3",
     "cookie": "0.2.2",
     "copy-webpack-plugin": "0.2.0",
-    "css-loader": "0.17.0",
+    "css-loader": "0.23.1",
     "eslint": "1.3.1",
     "eslint-plugin-react": "3.3.1",
     "exenv": "1.2.0",
@@ -54,6 +54,7 @@
     "node-sass": "3.3.3",
     "pako": "0.2.8",
     "po2icu": "git://github.com/LLK/po2icu.git#develop",
+    "postcss-loader": "0.8.2",
     "react-addons-test-utils": "0.14.7",
     "react-modal": "0.6.1",
     "react-onclickoutside": "4.1.1",

src/components/navigation/navigation.jsx

@@ -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>

src/views/about/l10n.json

@@ -22,5 +22,5 @@
     "about.research": "Research",
     "about.researchDescription": "The MIT Scratch Team and collaborators are researching how people use and learn with Scratch (for an introduction, see <a href=\"http://web.media.mit.edu/~mres/papers/Scratch-CACM-final.pdf\">Scratch: Programming for All</a>). Find out more about Scratch <a href=\"/info/research\">research</a> and <a href=\"/statistics\">statistics</a> about Scratch.",
     "about.support": "Support and Funding",
-    "about.supportDescription": "The Scratch project, initiated in 2003, has received generous support from the National Science Foundation (grants 0325828, 1002713, 1027848, 1019396), Intel Foundation, Microsoft, MacArthur Foundation, LEGO Foundation, Code-to-Learn Foundation, Google, Dell, Fastly, Inversoft, and MIT Media Lab research consortia. If you&#39;d like to support Scratch, please see our <a href=\"https://secure.donationpay.org/scratchfoundation/\">donate page</a>, or contact us at donate@scratch.mit.edu."
+    "about.supportDescription": "The Scratch project has received financial support from the National Science Foundation, Scratch Foundation, Google, LEGO Foundation, Intel, Cartoon Network, Lemann Foundation, and MacArthur Foundation. See the <a href=\"/info/credits\">credits page</a> for more information. If you&#39;d like to support Scratch, please see the Scratch Foundation <a href=\"https://secure.donationpay.org/scratchfoundation/\">donate page</a>, or contact us at <a href=\"mailto:donate@scratch.mit.edu\">donate@scratch.mit.edu</a>."
 }

src/views/credits/credits.jsx

@@ -124,6 +124,16 @@ var Credits = React.createClass({
                         <img src="//cdn.scratch.mit.edu/get_image/user/1915915_170x170.png" alt="Hannah Avatar" />
                         <span className="name">Hannah Cole</span>
                     </li>
+                    
+                    <li>
+                        <img src="//cdn.scratch.mit.edu/get_image/user/1494_170x170.png" alt="Chris Avatar" />
+                        <span className="name">Chris Garrity</span>
+                    </li>
+                    
+                    <li>
+                        <img src="//cdn.scratch.mit.edu/get_image/user/2796185_170x170.png" alt="Julia Avatar" />
+                        <span className="name">Julia Zimmerman</span>
+                    </li>
                 </ul>
 
                 <p>The team of Scratch moderators manages, supports, and improves the Scratch online community:</p>
@@ -243,7 +253,9 @@ var Credits = React.createClass({
                     <a href="http://www.scratchfoundation.org/"> Scratch Foundation</a>,
                     <a href="http://www.google.org/"> Google</a>,
                     <a href="http://www.legofoundation.com/"> LEGO Foundation</a>,
-                    <a href="http://www.intel.com/">Intel Foundation</a>,
+                    <a href="http://www.intel.com/"> Intel</a>,
+                    <a href="http://www.turner.com/company/"> Cartoon Network</a>,
+                    <a href="http://www.fundacaolemann.org.br/lemann-foundation/"> Lemann Foundation</a>,
                     <a href="https://www.macfound.org/"> MacArthur Foundation</a>.
                 </p>
                 <p>

src/views/jobs/jobs.jsx

@@ -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'));

src/views/wedo2/wedo2.jsx

@@ -2,6 +2,7 @@ var FormattedHTMLMessage = require('react-intl').FormattedHTMLMessage;
 var FormattedMessage = require('react-intl').FormattedMessage;
 var React = require('react');
 
+var Page = require('../../components/page/page.jsx');
 var render = require('../../lib/render.jsx');
 
 require('./wedo2.scss');
@@ -130,4 +131,4 @@ var Wedo2 = React.createClass({
     }
 });
 
-render(<Wedo2 />, document.getElementById('view'));
+render(<Page><Wedo2 /></Page>, document.getElementById('app'));

webpack.config.js

@@ -1,3 +1,4 @@
+var autoprefixer = require('autoprefixer');
 var CopyWebpackPlugin = require('copy-webpack-plugin');
 var path = require('path');
 var webpack = require('webpack');
@@ -40,7 +41,7 @@ module.exports = {
             },
             {
                 test: /\.scss$/,
-                loader: 'style!css!autoprefixer-loader?browsers=last 3 versions!sass'
+                loader: 'style!css!postcss-loader!sass'
             },
             {
                 test: /\.(png|jpg|gif|eot|svg|ttf|woff)$/,
@@ -48,6 +49,9 @@ module.exports = {
             }
         ]
     },
+    postcss: function () {
+        return [autoprefixer({browsers: ['last 3 versions']})];
+    },
     node: {
         fs: 'empty'
     },