diff --git a/client/less/main.less b/client/less/main.less
index 64b89d0f48..1c41b9dd15 100644
--- a/client/less/main.less
+++ b/client/less/main.less
@@ -495,6 +495,12 @@ thead {
color: #009900
}
+.testimonial-image-jobs {
+ border-radius: 5px;
+ color: #009900
+}
+
+
.default-border-radius {
border-radius: 5px;
}
diff --git a/common/app/components/Nav/Nav.jsx b/common/app/components/Nav/Nav.jsx
index 874d791e91..b508a16b92 100644
--- a/common/app/components/Nav/Nav.jsx
+++ b/common/app/components/Nav/Nav.jsx
@@ -42,14 +42,15 @@ export default React.createClass({
},
renderLinks() {
- return navLinks.map(({ content, link, react }, index) => {
+ return navLinks.map(({ content, link, react, target }, index) => {
if (react) {
return (
-
+
{ content }
@@ -59,7 +60,8 @@ export default React.createClass({
+ key={ content }
+ target={ target || null }>
{ content }
);
diff --git a/common/app/components/Nav/links.json b/common/app/components/Nav/links.json
index 175e5170cf..79cb418e11 100644
--- a/common/app/components/Nav/links.json
+++ b/common/app/components/Nav/links.json
@@ -3,10 +3,16 @@
"link": "/map"
}, {
"content": "Chat",
- "link": "//gitter.im/FreeCodeCamp/FreeCodeCamp"
+ "link": "//gitter.im/FreeCodeCamp/FreeCodeCamp",
+ "target": "_blank"
+},{
+ "content": "Wiki",
+ "link": "https://github.com/freecodecamp/freecodecamp/wiki/",
+ "target": "_blank"
},{
"content": "News",
- "link": "/news"
+ "link": "/news",
+ "target": "_blank"
},{
"content": "Jobs",
"link": "/jobs",
diff --git a/common/app/routes/Jobs/components/Jobs.jsx b/common/app/routes/Jobs/components/Jobs.jsx
index af47b0c2b0..21aa7d40f2 100644
--- a/common/app/routes/Jobs/components/Jobs.jsx
+++ b/common/app/routes/Jobs/components/Jobs.jsx
@@ -3,7 +3,6 @@ import { contain } from 'thundercats-react';
import { Button, Panel, Row, Col } from 'react-bootstrap';
import ListJobs from './List.jsx';
-import TwitterBtn from './TwitterBtn.jsx';
export default contain(
{
@@ -61,7 +60,6 @@ export default contain(
render() {
const {
children,
- numOfFollowers,
jobs,
appActions
} = this.props;
@@ -74,27 +72,55 @@ export default contain(
mdOffset= { 1 }
xs={ 12 }>
- Hire JavaScript engineers experienced in
- HTML5, Node.js, MongoDB, and Agile Development
+ Hire a JavaScript engineer who's experienced in HTML5,
+ Node.js, MongoDB, and Agile Development.
+
{
appActions.updateRoute('/jobs/new');
}}>
- Post a job: $200 for 30 days + weekly tweets
+ Post a job: $200 for 30 days
-
-
+
+
+
+
+
+
+
+
+ We hired our last developer out of Free Code Camp
+ and couldn't be happier. Free Code Camp is now
+ our go-to way to bring on pre-screened candidates
+ who are enthusiastic about learning quickly and
+ becoming immediately productive in their new career.
+
+
+ Michael Gai, CEO at CoNarrative
+
+
+
+
{ this.renderChild(children, jobs) ||
this.renderList(this.handleJobClick, jobs) }
diff --git a/package.json b/package.json
index 79e7ad80bf..285a746055 100644
--- a/package.json
+++ b/package.json
@@ -101,8 +101,8 @@
"react": "~0.14.2",
"react-bootstrap": "~0.27.3",
"react-motion": "~0.3.1",
- "react-router": "^1.0.0-rc4",
- "react-router-bootstrap": "~0.19.2",
+ "react-router": "^1.0.0",
+ "react-router-bootstrap": "https://github.com/FreeCodeCamp/react-router-bootstrap.git#freecodecamp",
"react-vimeo": "~0.0.3",
"request": "^2.65.0",
"rev-del": "^1.0.5",
diff --git a/server/resources/labs.json b/server/resources/labs.json
index 0d025eeebc..07c50012b3 100644
--- a/server/resources/labs.json
+++ b/server/resources/labs.json
@@ -20,6 +20,20 @@
"description": "A path to a free education in Computer Science.",
"image": "https://camo.githubusercontent.com/c42438055d3fee26b29e6d046fd8d06ebff3db20/687474703a2f2f692e696d6775722e636f6d2f6838786a72726a2e706e67"
},
+ {
+ "camper": "akiralaine",
+ "name": "Musare",
+ "url": "http://musare.com/",
+ "description": "Musare is a modern, collaborative, open-source Music App.",
+ "image": "http://i.imgur.com/Y4D4MPL.png"
+ },
+ {
+ "camper": "storbeck",
+ "name": "Free Code Camp Event Zipline: Recipe Box",
+ "url": "http://codepen.io/GeoffStorbeck/full/bVKyzd/",
+ "description": "Try to reverse engineer this Recipe Box as an optional Zipline challenge.",
+ "image": "http://i.imgur.com/5o0bwVQ.png"
+ },
{
"camper": "akiralaine",
"name": "Camper News Bot",