hotfixes - hide help/pair/bug buttons unless has created slack account

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

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

views/coursewares/showHTML.jade

@@ -43,15 +43,16 @@ block content
                     |  Go to my next challenge
                     br
                     |  (ctrl + enter)
-                .button-spacer
+                if (user.sentSlackInvite)
-                .btn-group.input-group.btn-group-justified
+                    .button-spacer
-                    label.btn.btn-success#i-want-help
+                    .btn-group.input-group.btn-group-justified
-                        i.fa.fa-medkit
+                        label.btn.btn-success#i-want-help
-                            |   Help
+                            i.fa.fa-medkit
-                    label.btn.btn-success#report-issue
+                                |   Help
-                        i.fa.fa-bug
+                        label.btn.btn-success#report-issue
-                            |   Bug
+                            i.fa.fa-bug
-                .button-spacer
+                                |   Bug
+                    .button-spacer
                 script.
                     var userLoggedIn = true;
             - else

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 && user.sentSlackInvite)
-                if (user)
+                    .button-spacer
                     .btn-group.input-group.btn-group-justified
                         label.btn.btn-success#i-want-help
                             i.fa.fa-medkit

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
+                if (user.sentSlackInvite)
-                    .btn.btn-success.btn-big#i-want-help-editorless
+                    .btn-group.input-group.btn-group-justified
-                        i.fa.fa-medkit
+                        .btn.btn-success.btn-big#i-want-help-editorless
-                            |   Get help
+                            i.fa.fa-medkit
-                    .btn.btn-success.btn-big#report-issue
+                                |   Get help
-                        i.fa.fa-bug
+                        .btn.btn-success.btn-big#report-issue
-                            |   Report a bug
+                            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;

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
+                if (user.sentSlackInvite)
-                .btn-group.input-group.btn-group-justified
+                    .button-spacer
-                    .btn.btn-success.btn-big#i-want-help-editorless
+                    .btn-group.input-group.btn-group-justified
-                        i.fa.fa-medkit
+                        .btn.btn-success.btn-big#i-want-help-editorless
-                            |   Help
+                            i.fa.fa-medkit
-                    .btn.btn-success.btn-big#i-want-to-pair
+                                |   Help
-                        i.fa.fa-user-plus
+                        .btn.btn-success.btn-big#i-want-to-pair
-                            |   Pair
+                            i.fa.fa-user-plus
-                    .btn.btn-success.btn-big#report-issue
+                                |   Pair
-                        i.fa.fa-bug
+                        .btn.btn-success.btn-big#report-issue
-                            |   Bug
+                            i.fa.fa-bug
+                                |   Bug
                 .button-spacer
                 script.
                     var userLoggedIn = true;

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

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