From ffbac22511739ba46c25ed8c0646f9a79ab6129d Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Thu, 12 Nov 2015 16:35:37 -0800
Subject: [PATCH 1/5] update labs

---
 server/resources/labs.json | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

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",

From 3dcc77278bcff456fb8723b65e506c26b5e7c15d Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Thu, 12 Nov 2015 16:36:08 -0800
Subject: [PATCH 2/5] add testimonial to jobs and remove twitter button

---
 client/less/main.less                      |  6 +++++
 common/app/components/Nav/Nav.jsx          |  3 ++-
 common/app/components/Nav/links.json       |  4 ++++
 common/app/routes/Jobs/components/Jobs.jsx | 28 +++++++++++++++-------
 4 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/client/less/main.less b/client/less/main.less
index 8d3ceb2ad1..12523d6991 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 a199d0a539..b4a64fe6f6 100644
--- a/common/app/components/Nav/Nav.jsx
+++ b/common/app/components/Nav/Nav.jsx
@@ -41,12 +41,13 @@ export default React.createClass({
   },
 
   renderLinks() {
-    return navLinks.map(({ content, link, react }, index) => {
+    return navLinks.map(({ content, link, react, target }, index) => {
       if (react) {
         return (
           <LinkContainer
             eventKey={ index + 1 }
             key={ content }
+            target={ target || "_self"}
             to={ link }>
             <NavItem>
               { content }
diff --git a/common/app/components/Nav/links.json b/common/app/components/Nav/links.json
index 175e5170cf..698924d970 100644
--- a/common/app/components/Nav/links.json
+++ b/common/app/components/Nav/links.json
@@ -4,6 +4,10 @@
 }, {
   "content": "Chat",
   "link": "//gitter.im/FreeCodeCamp/FreeCodeCamp"
+},{
+  "content": "Wiki",
+  "link": "https://github.com/freecodecamp/freecodecamp/wiki/",
+  "target": "_blank"
 },{
   "content": "News",
   "link": "/news"
diff --git a/common/app/routes/Jobs/components/Jobs.jsx b/common/app/routes/Jobs/components/Jobs.jsx
index 09c03030c7..91cc6110a5 100644
--- a/common/app/routes/Jobs/components/Jobs.jsx
+++ b/common/app/routes/Jobs/components/Jobs.jsx
@@ -61,7 +61,6 @@ export default contain(
     render() {
       const {
         children,
-        numOfFollowers,
         jobs,
         appActions
       } = this.props;
@@ -74,27 +73,40 @@ export default contain(
               mdOffset= { 1 }
               xs={ 12 }>
               <h1 className='text-center'>
-                Talented web developers with strong portfolios are eager
-                to work for your company
+                Hire a JavaScript engineer who's experienced in HTML5, Node.js, MongoDB, and Agile Development.
               </h1>
+              <div className='spacer' />
               <Row className='text-center'>
                 <Col
                   sm={ 8 }
                   smOffset={ 2 }
                   xs={ 12 }>
                   <Button
-                    bsSize='large'
-                    className='signup-btn btn-block'
+                    className='signup-btn btn-block btn-cta'
                     onClick={ ()=> {
                       appActions.updateRoute('/jobs/new');
                     }}>
-                    Post a job: $200 for 30 days + weekly tweets
+                    Post a job: $200 for 30 days
                   </Button>
-                  <div className='button-spacer' />
-                  <TwitterBtn count={ numOfFollowers || 0 } />
                   <div className='spacer' />
                 </Col>
               </Row>
+              <div className='spacer' />
+              <Row>
+                <Col
+                  md={ 2 }
+                  xs={ 4 }>
+                    <img className="img-responsive testimonial-image-jobs img-center" src="http://i.imgur.com/tGcAA8H.jpg" alt="a photo of Michael Gai, who recently hired a software engineer through Free Code Camp" />
+                </Col>
+                <Col
+                  md={ 10 }
+                  xs={ 8 }>
+                    <blockquote>
+                      <p>"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."</p>
+                      <footer> Michael Gai, <cite>CEO at CoNarrative</cite></footer>
+                    </blockquote>
+                </Col>
+              </Row>
               <Row>
               { this.renderChild(children, jobs) ||
                 this.renderList(this.handleJobClick, jobs) }

From e843e3daf1f147633e421fb72264734d5df5ece6 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Fri, 13 Nov 2015 11:31:55 -0800
Subject: [PATCH 3/5] Fix lint errors

---
 common/app/components/Nav/Nav.jsx          |  2 +-
 common/app/routes/Jobs/components/Jobs.jsx | 24 +++++++++++++++++-----
 package.json                               |  2 +-
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/common/app/components/Nav/Nav.jsx b/common/app/components/Nav/Nav.jsx
index 37ff15817d..baf1acac2b 100644
--- a/common/app/components/Nav/Nav.jsx
+++ b/common/app/components/Nav/Nav.jsx
@@ -48,7 +48,7 @@ export default React.createClass({
           <LinkContainer
             eventKey={ index + 1 }
             key={ content }
-            target={ target || "_self"}
+            target={ target || null }
             to={ link }>
             <NavItem>
               { content }
diff --git a/common/app/routes/Jobs/components/Jobs.jsx b/common/app/routes/Jobs/components/Jobs.jsx
index 91cc6110a5..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(
   {
@@ -73,7 +72,8 @@ export default contain(
               mdOffset= { 1 }
               xs={ 12 }>
               <h1 className='text-center'>
-                Hire a JavaScript engineer who's experienced in HTML5, Node.js, MongoDB, and Agile Development.
+                Hire a JavaScript engineer who's experienced in HTML5,
+                Node.js, MongoDB, and Agile Development.
               </h1>
               <div className='spacer' />
               <Row className='text-center'>
@@ -96,14 +96,28 @@ export default contain(
                 <Col
                   md={ 2 }
                   xs={ 4 }>
-                    <img className="img-responsive testimonial-image-jobs img-center" src="http://i.imgur.com/tGcAA8H.jpg" alt="a photo of Michael Gai, who recently hired a software engineer through Free Code Camp" />
+                  <img
+                    alt={`
+                      a photo of Michael Gai, who recently hired a software
+                      engineer through Free Code Camp
+                    `}
+                    className='img-responsive testimonial-image-jobs img-center'
+                    src='http://i.imgur.com/tGcAA8H.jpg' />
                 </Col>
                 <Col
                   md={ 10 }
                   xs={ 8 }>
                     <blockquote>
-                      <p>"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."</p>
-                      <footer> Michael Gai, <cite>CEO at CoNarrative</cite></footer>
+                      <p>
+                        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.
+                      </p>
+                      <footer>
+                        Michael Gai, <cite>CEO at CoNarrative</cite>
+                      </footer>
                     </blockquote>
                 </Col>
               </Row>
diff --git a/package.json b/package.json
index 79e7ad80bf..9eff512300 100644
--- a/package.json
+++ b/package.json
@@ -101,7 +101,7 @@
     "react": "~0.14.2",
     "react-bootstrap": "~0.27.3",
     "react-motion": "~0.3.1",
-    "react-router": "^1.0.0-rc4",
+    "react-router": "^1.0.0",
     "react-router-bootstrap": "~0.19.2",
     "react-vimeo": "~0.0.3",
     "request": "^2.65.0",

From cde48b5c6b8d8deed0bb8a7471ba02c374618c6c Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Fri, 13 Nov 2015 12:21:37 -0800
Subject: [PATCH 4/5] Fix hover effect issue

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9eff512300..285a746055 100644
--- a/package.json
+++ b/package.json
@@ -102,7 +102,7 @@
     "react-bootstrap": "~0.27.3",
     "react-motion": "~0.3.1",
     "react-router": "^1.0.0",
-    "react-router-bootstrap": "~0.19.2",
+    "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",

From eab4771466d322077cd839fa30f915f775db2186 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Fri, 13 Nov 2015 12:54:46 -0800
Subject: [PATCH 5/5] Fix target blank issue

---
 common/app/components/Nav/Nav.jsx    | 7 ++++---
 common/app/components/Nav/links.json | 6 ++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/common/app/components/Nav/Nav.jsx b/common/app/components/Nav/Nav.jsx
index baf1acac2b..b508a16b92 100644
--- a/common/app/components/Nav/Nav.jsx
+++ b/common/app/components/Nav/Nav.jsx
@@ -48,9 +48,9 @@ export default React.createClass({
           <LinkContainer
             eventKey={ index + 1 }
             key={ content }
-            target={ target || null }
             to={ link }>
-            <NavItem>
+            <NavItem
+              target={ target || null } >
               { content }
             </NavItem>
           </LinkContainer>
@@ -60,7 +60,8 @@ export default React.createClass({
         <NavItem
           eventKey={ index + 1 }
           href={ link }
-          key={ content }>
+          key={ content }
+          target={ target || null }>
           { content }
         </NavItem>
       );
diff --git a/common/app/components/Nav/links.json b/common/app/components/Nav/links.json
index 698924d970..79cb418e11 100644
--- a/common/app/components/Nav/links.json
+++ b/common/app/components/Nav/links.json
@@ -3,14 +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",