diff --git a/seed/challenges/jquery-ajax-and-json.json b/seed/challenges/jquery-ajax-and-json.json index aaaca56c96..3bd6b1db6b 100644 --- a/seed/challenges/jquery-ajax-and-json.json +++ b/seed/challenges/jquery-ajax-and-json.json @@ -734,13 +734,52 @@ "dashedName": "waypoint-target-a-specific-child-of-an-element-using-jquery", "difficulty": 3.15, "description": [ - + "You've seen why id attributes are so convenient for targeting with jQuery selectors. But you won't always have such neat ids to work with.", + "Fortunately, jQuery has some other tricks for targeting the right elements.", + "jQuery has a function called nth-child()/code> that will allow you select the nth element of a certain class or element type.", + "Let's give the fourth element with the class \"target\" the color pink.", + "Here's how you would give the third element the color blue: $('.target:nth-child(3)').css({'color': 'blue'});" ], "tests": [ ], "challengeSeed": [ - + "fccss", + " $(document).ready(function() {", + " $('#target1').css('color', 'red');", + " $('#target1').prop('disabled', true);", + " $('#target4').remove();", + " $('#target2').appendTo('#right-well');", + " $('#target5').clone().appendTo('#left-well');", + " $('#target1').parent().css('background-color', 'red');", + " $('#right-well').children().css('color', 'green');", + "", + " });", + "fcces", + "", + "", + "", + "
", + "

jQuery Playground

", + "
", + "
", + "

#left-well

", + "
", + " ", + " ", + " ", + "
", + "
", + "
", + "

#right-well

", + "
", + " ", + " ", + " ", + "
", + "
", + "
", + "
" ], "challengeType": 0 }, @@ -757,7 +796,43 @@ ], "challengeSeed": [ - + "fccss", + " $(document).ready(function() {", + " $('#target1').css('color', 'red');", + " $('#target1').prop('disabled', true);", + " $('#target4').remove();", + " $('#target2').appendTo('#right-well');", + " $('#target5').clone().appendTo('#left-well');", + " $('#target1').parent().css('background-color', 'red');", + " $('#right-well').children().css('color', 'green');", + " $('#left-well').children().css('color', 'green');", + "", + " });", + "fcces", + "", + "", + "", + "
", + "

jQuery Playground

", + "
", + "
", + "

#left-well

", + "
", + " ", + " ", + " ", + "
", + "
", + "
", + "

#right-well

", + "
", + " ", + " ", + " ", + "
", + "
", + "
", + "
" ], "challengeType": 0 }, diff --git a/seed/nonprofits.json b/seed/nonprofits.json index 2b862070c0..666fd549ee 100644 --- a/seed/nonprofits.json +++ b/seed/nonprofits.json @@ -262,5 +262,80 @@ "estimatedHours": 200, "currentStatus": "open", "moneySaved": 0 + }, + { + "id": "bd1325d8c464cbafaeb4bdef", + "whatDoesNonprofitDo": "SOLACE Foundation provides drug overdose prevention and awareness training as well as grief support for bereaved families.", + "websiteLink": "https://www.facebook.com/www.solaceorangecounty.org", + "name": "The Solace Foundation of Orange County", + "endUser": "Donors", + "approvedDeliverables": ["Website"], + "projectDescription": "Campers will build a basic website that accepts donations.", + "logoUrl": "http://i.imgur.com/79E3nP0.png", + "imageUrl": "http://i.imgur.com/kCWN1iT.jpg", + "interestedCampers": [], + "confirmedCampers": [], + "estimatedHours": 100 + }, + { + "id": "bd1325d8c463cbafaeb4bdef", + "whatDoesNonprofitDo": "We are an interdisciplinary team that works towards harmony among humans and nature through three distinct branches: sustainable agriculture, environmental education and applied and appropriate technology; focused in Líbano, Tolima, Colombia.", + "websiteLink": "string", + "name": "QET America", + "endUser": "Donors", + "approvedDeliverables": ["Website"], + "projectDescription": "Campers will build a multiple language website (English, Spanish) that accepts donations.", + "logoUrl": "http://i.imgur.com/jPuiPOy.jpg", + "imageUrl": "http://i.imgur.com/zaaL2pj.jpg", + "interestedCampers": [], + "confirmedCampers": [], + "estimatedHours": 100 + }, + { + "id": "bd1325d8c462cbafaeb4bdef", + "whatDoesNonprofitDo": "1to1 Movement provides free environmental education in schools", + "websiteLink": "http://1to1movement.org/", + "stakeholderName": "string", + "stakeholderEmail": "string", + "name": "1 to 1 Movement", + "endUser": "Pledgers", + "approvedDeliverables": ["Web App"], + "projectDescription": "Campers will build a simple, social, data-driven application that allows people to see the impact of their actions. User can make a pledge and track the outcome. Will make use of the D3.js visualization library.", + "logoUrl": "http://i.imgur.com/jaqxg0O.png", + "imageUrl": "http://i.imgur.com/GXSWTZw.jpg", + "interestedCampers": [], + "confirmedCampers": [], + "estimatedHours": 300 + }, + + { + "id": "bd1325d8c464cbcfaeb4bdef", + "whatDoesNonprofitDo": "Our missions is to elevate the national dialogue and engage the American people around climate change policy and the promotion of real clean energy solutions in the United States.", + "websiteLink": "http://www.usclimateplan.org/", + "name": "US Climate Plan", + "endUser": "Donors", + "approvedDeliverables": ["Website"], + "projectDescription": "Campers will build a basic website for sharing information, feeds from different campaign’s websites.", + "logoUrl": "http://i.imgur.com/uAyUiMN.png", + "imageUrl": "http://i.imgur.com/2Og5tqy.jpg", + "interestedCampers": [], + "confirmedCampers": [], + "estimatedHours": 100 + }, + { + "id": "bd1325d8c461cbafaeb4bdef", + "whatDoesNonprofitDo": "We empower the community through improved literacy.", + "websiteLink": "http://www.tleliteracy.com/", + "stakeholderName": "Darlene Brown", + "stakeholderEmail": "string", + "name": "The Learning Exchange", + "endUser": "string", + "approvedDeliverables": ["Website"], + "projectDescription": "Campers will build a simple website to replace essentialskillsquebec.com. Site will host many documents related to the Nine Essential Skills.", + "logoUrl": "http://i.imgur.com/jXQY01H.png", + "imageUrl": "http://i.imgur.com/iUXBpeL.jpg", + "interestedCampers": [], + "confirmedCampers": [], + "estimatedHours": 100 } ] diff --git a/server/views/field-guide/all-articles.jade b/server/views/field-guide/all-articles.jade deleted file mode 100644 index 309bde7be6..0000000000 --- a/server/views/field-guide/all-articles.jade +++ /dev/null @@ -1,29 +0,0 @@ -extends ../layout -block content - script. - var completed = !{JSON.stringify(completedFieldGuides)} - var all = !{JSON.stringify(allFieldGuideNamesAndIds)} - .col-xs-12.col-sm-12.col-md-12 - .panel.panel-info - .panel-heading.text-center Read our Field Guide in any order - .panel-body - .col-xs-12.col-md-10.col-md-offset-1 - .col-xs-12.no-right-padding - each category, index in categories - h2.text-center= category.charAt(0).toUpperCase() + category.slice(1) - h3 - ol - each fieldGuide in fieldGuides[index] - if completedFieldGuides.indexOf(fieldGuide.id) > -1 - .row - .hidden-xs.col-sm-3.col-md-2.text-primary.ion-checkmark-circled.padded-ionic-icon.text-center - .col-xs-12.col-sm-9.col-md-10 - li.faded - a(href="/field-guide/#{fieldGuide.dashedName}")= fieldGuide.name - else - .row - .hidden-xs.col-sm-3.col-md-2 - span - .col-xs-12.col-sm-9.col-md-10 - li - a(href="/field-guide/#{fieldGuide.dashedName}")= fieldGuide.name diff --git a/server/views/field-guide/show.jade b/server/views/field-guide/show.jade deleted file mode 100644 index cb428e237e..0000000000 --- a/server/views/field-guide/show.jade +++ /dev/null @@ -1,29 +0,0 @@ -extends ../layout -block content - script. - var challengeName = 'Field Guide View'; - .panel.panel-info.no-padding - .panel-heading.text-center - h1= title - .panel-body - div!= description - .col-xs-12.col-sm-6.col-sm-offset-3 - .spacer - .text-center - if user && user.uncompletedFieldGuides.length > 0 - .next-field-guide-button.btn.btn-primary.btn-big.btn-block Next article (ctrl + enter) - .button-spacer - a.btn.btn-info.btn-big.btn-block(href='/field-guide/all-articles') Show me all articles - if !user - .button-spacer - a.btn.btn-big.signup-btn.btn-block(href='/login') Start learning to code (it's free) - .spacer - #fieldGuideId.hidden= fieldGuideId - script. - $(document).ready(function() { - $('body').keydown(function(e) { - if (e.ctrlKey && e.keyCode == 13) { - $('.next-field-guide-button').click(); - } - }); - }); diff --git a/server/views/partials/footer.jade b/server/views/partials/footer.jade index fe25c7723a..d01e5ca34e 100644 --- a/server/views/partials/footer.jade +++ b/server/views/partials/footer.jade @@ -4,9 +4,9 @@ a.ion-social-github(href="http://github.com/freecodecamp", target='_blank')  GitHub   a.ion-social-twitch-outline(href="/twitch")  Twitch  a.ion-social-linkedin(href="/linkedin")  LinkedIn  - a.ion-social-facebook(href="/field-guide/how-can-i-find-other-free-code-camp-campers-in-my-city")  Facebook   + a.ion-social-facebook(href="//facebook.com/freecodecamp")  Facebook   a.ion-social-twitter(href="http://twitter.com/freecodecamp", target='_blank')  Twitter   - a.ion-locked(href="/privacy")  Privacy   + a.ion-locked(href="//github.com/FreeCodeCamp/freecodecamp/wiki/Free-Code-Camp's-Privacy-Policy")  Privacy   .col-xs-12.visible-xs.visible-sm a.ion-speakerphone(href='http://blog.freecodecamp.com', target='_blank') span.sr-only Free Code Camp's Blog @@ -16,9 +16,9 @@ span.sr-only Free Code Camp Live Pair Programming on Twitch.tv a.ion-social-linkedin(href="/linkedin") span.sr-only Free Code Camp LinkedIn Alumni Network - a.ion-social-facebook(href="/field-guide/how-can-i-find-other-free-code-camp-campers-in-my-city") + a.ion-social-facebook(href="//facebook.com/freecodecamp") span.sr-only Free Code Camp local groups on Facebook a.ion-social-twitter(href="http://twitter.com/freecodecamp", target='_blank') span.sr-only Free Code Camp on Twitter - a.ion-locked(href="/privacy") + a.ion-locked(href="//github.com/FreeCodeCamp/freecodecamp/wiki/Free-Code-Camp's-Privacy-Policy") span.sr-only Free Code Camp's Privacy Policy diff --git a/server/views/partials/navbar.jade b/server/views/partials/navbar.jade index f45f3a170b..b0667a59f3 100644 --- a/server/views/partials/navbar.jade +++ b/server/views/partials/navbar.jade @@ -19,8 +19,6 @@ nav.navbar.navbar-default.navbar-fixed-top.nav-height a(href='/news') News li a(href='//github.com/FreeCodeCamp/freecodecamp/wiki/Home') Wiki - li - a(href='/jobs') Jobs if !user li       li