Merge pull request #647 from dougtslug/dougtslug-645

Fix for issue #645.

seed_data/challenges/basic-bonfires.json

@@ -19,8 +19,7 @@
         "Add them as a new contact in Screen Hero, then click the monitor-looking button to attempt to share your screen with them.",
         "Once the Screen Hero session starts, your screen's margins will glow orange. You are now sharing your screen.",
         "Your pair will have their own cursor, and will be able to type text on his or her and keyboard.",
-        "Now it's time to tackle our Bonfires.",
-        "Go to <a href='http://freecodecamp.com/bonfires' target='_blank'>http://freecodecamp.com/bonfires</a> and start working through our Bonfire challenges.",
+        "Now it's time to tackle our Bonfires. You can begin them by advancing to the next challenge.",
         "Once you you finish pair programming, end the session in Screen Hero session.",
         "Congratulations! You have completed your first pair programming session.",
         "Pair program as much as possible with different campers until you've completed all the Bonfire challenges. This is a big time investment, but the JavaScript practice you get will be well worth it!",

seed_data/challenges/basic-html5-and-css.json

@@ -1013,8 +1013,8 @@
       "tests": [
         "assert($('ul').length > 0, 'You should have an <code>ul</code> element on your webpage.')",
         "assert($('ol').length > 0, 'You should have an <code>ol</code> element on your webpage.')",
-        "assert($('li').length > 5, 'You should have three <code>li</code> elements on within your <code>ul</code> element.')",
-        "assert($('li').length > 5, 'You should have three <code>li</code> elements on within your <code>ol</code> element.')"
+        "assert($('li').length > 5, 'You should have three <code>li</code> elements within your <code>ul</code> element.')",
+        "assert($('li').length > 5, 'You should have three <code>li</code> elements within your <code>ol</code> element.')"
       ],
       "challengeSeed": [
         "<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",
@@ -1325,8 +1325,8 @@
         "For example, if you wanted to make a text input field required, you can just add the word \"required\" within your <code>input</code> element use: <code>&#60;input type='text' required&#62;</code>"
       ],
       "tests": [
-        "assert($('input').prop('required'), 'Your text field have the property of being required.')",
-        "assert($('[placeholder]').length > 0, 'Your text field should have the placeholder text of \"cat photo URL\".')"
+        "assert($('input').prop('required'), 'Your text field should have the property of being required.')",
+        "assert(new RegExp('cat photo URL').test($('input').prop('placeholder')), 'Your text field should have the placeholder text of \"cat photo URL\".')"
       ],
       "challengeSeed": [
         "<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>",

seed_data/challenges/bootstrap.json

@@ -532,7 +532,7 @@
         "Put the \"like\", \"Info\" and \"Delete\" buttons side-by-side by wrapping all three of them within one <code>&#60;div class=\"row\"&#62;</code> element, then each of them within a <code>&#60;div class=\"col-xs-4\"&#62;</code> element.",
         "Bootstrap uses a responsive grid system, which makes it easy to put elements into rows and specify each element's relative width. Most of Bootstrap's classes can be applied to a <code>div</code> element.",
         "Here's a diagram of how Bootstrap's 12-column grid layout works:",
-        "<img class='img-responsive' src='https://www.evernote.com/l/AHTwlE2XCLhGFYJzoye_QfsF3ho6y87via4B/image.png'>",
+        "<a href='http://getbootstrap.com/css/#grid-example-basic' target='_blank'><img class='img-responsive' src='https://www.evernote.com/l/AHTwlE2XCLhGFYJzoye_QfsF3ho6y87via4B/image.png'></a>",
         "Note that in this illustration, we use the <code>col-md-*</code> class. Here, \"md\" means \"medium\", and \"*\" is a number specifying how many columns wide the element should be. In this case, we're specifying how many columns wide an element should be on a medium-sized screen, such as a laptop.",
         "In the Cat Photo App that we're building, we'll use <code>col-xs-*</code>, where \"*\" is the number of columns wide the element should be, and \"xs\" means \"extra small\", like an extra-small mobile phone screen.",
         "The <code>row</code> class is applied to a <code>div</code>, and the buttons themselves can be wrapped within it."
@@ -1183,12 +1183,12 @@
       "name": "Waypoint: Line up Form Elements Responsively with Bootstrap",
       "difficulty" : 0.062,
       "description": [
-        "Wrap both your form's text input field and submit button within a div with the class \"row\". Wrap your form's text input field within a div with the class of \"col-xs-7\". Wrap your form's submit button the in a div with the class \"col-xs-5\".",
         "Now let's get your form input and your submission button on the same line. We'll do this the same way we have previously: by using a \"row\" element with \"col-xs-*\" elements withing it.",
+        "Wrap both your form's text input field and submit button within a div with the class \"row\". Wrap your form's text input field within a div with the class of \"col-xs-7\". Wrap your form's submit button the in a div with the class \"col-xs-5\".",
         "This is the last challenge we'll do for our Cat Photo App for now. We hope you've enjoyed learning Font Awesome, Bootstrap, and responsive design!"
       ],
       "tests": [
-        "assert($('.row').length > 4, 'Wrap your all of your checkboxes inside one div with the class \"row\".')",
+        "assert($('.row').length > 4, 'Wrap your form submission button and text area in a div with class \"row\".')",
         "assert($('.col-xs-5').length > 0, 'Wrap your form submission button in a div with the class \"col-xs-5\".')",
         "assert($('.col-xs-7').length > 0, 'Wrap your form text area in a div with the class \"col-xs-7\".')"
       ],