greatbody
/
freeCodeCamp
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of http://github.com/FreeCodeCamp/freecodecamp

pull/723/head
terakilobyte 2015-05-26 16:33:14 -04:00
parent 33b98f4054 8a737a992e
commit dd9e4e03c4
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
controllers/resources.js
View File

@ -622,12 +622,12 @@ module.exports = {
var userName = req.user.profile.username;
var challenge = req.body.payload.challenge;
slack.send({
text: "Anyone want to pair with *" + userName + "* on " + challenge +
text: "Anyone want to pair with @" + userName + " on " + challenge +
"?\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 +
"*, be sure to launch Screen Hero, then keep coding." +
"*, be sure to launch Screen Hero, then keep coding. " +
"Another camper may pair with you soon.",
channel: '#letspair',
username: "Companion Cube",

2
seed_data/challenges/basic-html5-and-css.json
View File

@ -1069,7 +1069,7 @@
"You can create one like this: <code>&#60;input type='text'&#62;</code>"
],
"tests": [
"assert($('input[type=\"text\"').length > 0, 'Your webpage should have an text field input element.')"
"assert($('input').length > 0, 'Your app should have an text field input element.')"
],
"challengeSeed": [
"<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",

5
views/account/show.jade
View File

@ -147,10 +147,11 @@ block content
th.col-xs-6 Link
for challenge in challenges
tr
td.col-xs-4= challenge.name
td.col-xs-4
a(href='/challenges/' + challenge.name, target='_blank')= challenge.name
td.col-xs-2= moment(challenge.completedDate, 'x').format("MMM DD, YYYY")
td.col-xs-6
a(href="http://" + challenge.solution, target='_blank') View my solution
a(href=challenge.solution, target='_blank') View my solution
br
- if (bonfires.length > 0)

17
views/coursewares/showZiplineOrBasejump.jade
View File

@ -33,7 +33,7 @@ block content
.button-spacer
script.
var userLoggedIn = true;
- else
else
a.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress
script.
var userLoggedIn = false;
@ -73,32 +73,31 @@ block content
form.form-horizontal(novalidate='novalidate', name='completedWithForm')
.form-group.text-center
.col-xs-10.col-xs-offset-1.col-sm-8.col-sm-offset-2.col-md-8.col-md-offset-2.animated.fadeIn
// extra field to distract password tools like lastpass from injecting css into our username field
input.form-control(ng-show="false")
if (challengeType === 3)
input.form-control#public-url(name="codepenUrl", placeholder="http://codepen.io/your-pen-here", autofocus)
input.form-control#public-url(type='url', name="solutionUrl", placeholder="http://codepen.io/your-pen-here", autofocus, required, ng-minlength="10", ng-model="deploymentUrl")
else
input.form-control#public-url(name="depoloymentUrl", placeholder="http://yourapp.com", autofocus)
input.form-control#github-url(name="githubUrl", placeholder="http://github.com/camper/project")
input.form-control#public-url(type='url', name="solutionUrl", placeholder="http://yourapp.com", autofocus, required, ng-minlength="10", ng-model="deploymentUrl")
input.form-control#github-url(name="githubUrl", placeholder="http://github.com/camper/project", ng-model="githubUrl")
input.form-control#completed-with(name="existingUser", placeholder="If you paired, enter your pair's username here", existing-username='', ng-model="existingUser")
input.form-control#completed-with(name="existingUser", ng-minlength placeholder="If you paired, enter your pair's username here", existing-username='', ng-model="existingUser")
.col-xs-10.col-xs-offset-1.col-sm-8.col-sm-offset-2.col-md-8.col-md-offset-2(ng-cloak, ng-show="completedWithForm.$error.exists && !completedWithForm.existingUser.$pristine && existingUser.length > 0")
alert(type='danger')
span.ion-close-circled
| Username not found
if (user)
a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block#next-courseware-button(name='_csrf', value=_csrf, ng-disabled='completedWithForm.$invalid && existingUser.length > 0') Go to my next challenge (ctrl + enter)
a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block#next-courseware-button(name='_csrf', value=_csrf, ng-disabled='completedWithForm.$invalid') Go to my next challenge (ctrl + enter)
script.
$('#complete-zipline-or-basejump-dialog').on('keypress', modalControlEnterHandler);
- if (user.progressTimestamps.length > 2)
if (user.progressTimestamps.length > 2)
.button-spacer
a.animated.fadeIn.btn.btn-lg.btn-block.btn-twitter(target="_blank")
i.fa.fa-twitter &thinsp;
= phrase
- else
else
a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress
script.
$('body').on('keypress', controlEnterHandler);

2
views/home.jade
View File

@ -6,9 +6,9 @@ block content
.embed-responsive.embed-responsive-16by9
iframe.embed-responsive-item(src='//player.vimeo.com/video/128853855')
br
h3 Note: If you're using Firefox and the buttons aren't working, do a full refresh (control + f5 on Windows and command + shift + r on Mac). We're working on this.
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