diff --git a/controllers/resources.js b/controllers/resources.js index 0fcef198ab..d12e04c6d0 100644 --- a/controllers/resources.js +++ b/controllers/resources.js @@ -626,7 +626,7 @@ module.exports = { "?\nMake sure you install Screen Hero here:" + "http://freecodecamp.com/field-guide/how-do-i-install-screenhero\n" + "Then start your pair program session with *" + userName + - "* by typing \"/hero @" + userName + "\" into Slack.\n* And"+ userName + + "* by typing \"/hero @" + userName + "\" into Slack.\n And *"+ userName + "*, be sure to launch Screen Hero, then keep coding." + "Another camper may pair with you soon.", channel: '#letspair', diff --git a/views/coursewares/showBonfire.jade b/views/coursewares/showBonfire.jade index 9c4a9d7c41..7e9e63e683 100644 --- a/views/coursewares/showBonfire.jade +++ b/views/coursewares/showBonfire.jade @@ -91,7 +91,7 @@ block content span.ion-close-circled | Username not found #submitButton.btn.btn-primary.btn-big.btn-block Run code (ctrl + enter) - if (user) + if (user && user.sentSlackInvite) .button-spacer .btn-group.input-group.btn-group-justified label.btn.btn-success#i-want-help diff --git a/views/coursewares/showHTML.jade b/views/coursewares/showHTML.jade index a7598892fe..4a8f42fad6 100644 --- a/views/coursewares/showHTML.jade +++ b/views/coursewares/showHTML.jade @@ -43,15 +43,16 @@ block content | Go to my next challenge br | (ctrl + enter) - .button-spacer - .btn-group.input-group.btn-group-justified - label.btn.btn-success#i-want-help - i.fa.fa-medkit - |   Help - label.btn.btn-success#report-issue - i.fa.fa-bug - |   Bug - .button-spacer + if (user.sentSlackInvite) + .button-spacer + .btn-group.input-group.btn-group-justified + label.btn.btn-success#i-want-help + i.fa.fa-medkit + |   Help + label.btn.btn-success#report-issue + i.fa.fa-bug + |   Bug + .button-spacer script. var userLoggedIn = true; - else diff --git a/views/coursewares/showJS.jade b/views/coursewares/showJS.jade index 345ac1fab4..c32427ca22 100644 --- a/views/coursewares/showJS.jade +++ b/views/coursewares/showJS.jade @@ -35,8 +35,8 @@ block content span.ion-arrow-up-b | Less information #submitButton.btn.btn-primary.btn-big.btn-block Run code (ctrl + enter) - .button-spacer - if (user) + if (user && user.sentSlackInvite) + .button-spacer .btn-group.input-group.btn-group-justified label.btn.btn-success#i-want-help i.fa.fa-medkit diff --git a/views/coursewares/showVideo.jade b/views/coursewares/showVideo.jade index 4ea1ad5011..dd6576b74f 100644 --- a/views/coursewares/showVideo.jade +++ b/views/coursewares/showVideo.jade @@ -16,20 +16,21 @@ block content .embed-responsive.embed-responsive-16by9 iframe.embed-responsive-item(src='//player.vimeo.com/video/#{video}') br - - if (user) + if (user) a.btn.btn-primary.btn-big.btn-block#completed-courseware I've completed this challenge (ctrl + enter) script. var userLoggedIn = true; .button-spacer - .btn-group.input-group.btn-group-justified - .btn.btn-success.btn-big#i-want-help-editorless - i.fa.fa-medkit - |   Get help - .btn.btn-success.btn-big#report-issue - i.fa.fa-bug - |   Report a bug + if (user.sentSlackInvite) + .btn-group.input-group.btn-group-justified + .btn.btn-success.btn-big#i-want-help-editorless + i.fa.fa-medkit + |   Get help + .btn.btn-success.btn-big#report-issue + i.fa.fa-bug + |   Report a bug .button-spacer - - else + else a.btn.btn-big.signup-btn.btn-block(href='/login') Sign in so you can save your progress script. var userLoggedIn = false; diff --git a/views/coursewares/showZiplineOrBasejump.jade b/views/coursewares/showZiplineOrBasejump.jade index 1fe595c8d0..f1b91cdd10 100644 --- a/views/coursewares/showZiplineOrBasejump.jade +++ b/views/coursewares/showZiplineOrBasejump.jade @@ -16,19 +16,20 @@ block content .embed-responsive.embed-responsive-16by9 iframe.embed-responsive-item(src='//player.vimeo.com/video/#{video}') br - - if (user) + if (user) a.btn.btn-primary.btn-big.btn-block#completed-zipline-or-basejump I've completed this challenge (ctrl + enter) - .button-spacer - .btn-group.input-group.btn-group-justified - .btn.btn-success.btn-big#i-want-help-editorless - i.fa.fa-medkit - |   Help - .btn.btn-success.btn-big#i-want-to-pair - i.fa.fa-user-plus - |   Pair - .btn.btn-success.btn-big#report-issue - i.fa.fa-bug - |   Bug + if (user.sentSlackInvite) + .button-spacer + .btn-group.input-group.btn-group-justified + .btn.btn-success.btn-big#i-want-help-editorless + i.fa.fa-medkit + |   Help + .btn.btn-success.btn-big#i-want-to-pair + i.fa.fa-user-plus + |   Pair + .btn.btn-success.btn-big#report-issue + i.fa.fa-bug + |   Bug .button-spacer script. var userLoggedIn = true; diff --git a/views/home.jade b/views/home.jade index 8245c42808..b968ed12b0 100644 --- a/views/home.jade +++ b/views/home.jade @@ -5,6 +5,15 @@ block content .col-xs-12 .embed-responsive.embed-responsive-16by9 iframe.embed-responsive-item(src='//player.vimeo.com/video/128853855') + br + h3 Note: If you've already completed the HTML, CSS, Bootstrap Waypoints, you do not need to do these new Waypoints. + h3 Note: If you were already doing full stack JavaScript Waypoints (Node.js, Angular.js), go ahead and start the Bonfires (Basic Algorithm Scripting). + h3 Note: If you're using Firefox and the buttons aren't working, do a full refresh (control/apple + f5). We're working on this. + h3 Thanks for your patience everyone! We're confident these curriculum improvements will better prepare you for your nonprofit projects and for the workplace. + br + br + br + br .text-center h1.hug-top Code with Us h2 Let's learn to code by building projects for nonprofits diff --git a/views/resources/jobs.jade b/views/resources/jobs.jade index 4ed9f43423..a681d7cc1b 100644 --- a/views/resources/jobs.jade +++ b/views/resources/jobs.jade @@ -6,7 +6,7 @@ block content a(href='https://www.linkedin.com/groups?viewMembers=&gid=6966827&sik=1432338555021' target='_blank') and many already have | ). h3.hidden-xs.hidden-sm This is a small sampling of the 1,000s of junior software engineer jobs. Learn about the   - a(href='http://blog.freecodecamp.com/2014/10/the-real-reason-to-learn-mean-stack.html') the job market in aggregate + a(href='http://blog.freecodecamp.com/2014/10/the-real-reason-to-learn-mean-stack.html' target='_blank') the job market in aggregate | . .spacer a.btn.btn-primary.btn-big(href='/jobs-form') My organization is hiring software engineers