gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Michael Q Larson
2015-01-14 12:04:37 -08:00
parent 19c39f9fee 0dced1538c
commit 16e8ab1f40
4 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/js/main.js
View File

@ -68,6 +68,12 @@ profileValidation.controller('emailSignInController', ['$scope',
}
]);
profileValidation.controller('nonprofitFormController', ['$scope',
function($scope) {
}
]);
profileValidation.directive('uniqueUsername', function($http) {
return {
restrict: 'A',

2
seed_data/challenges.json
View File

@ -165,7 +165,7 @@
"video": "114591799",
"challengeNumber": 13,
"steps": [
"Now that we've built a foundation in jQuery, let's go back to Dash and do it's last challenge.",
"Now that we've built a foundation in jQuery, let's go back to Dash and do its last challenge.",
"If you aren't familiar with Mad Libs, they basically involve inserting random nouns, adjectives and verbs in to stories. The stories that result are often hilarious.",
"Go to <a href='https://dash.generalassemb.ly/projects/mad-libs-1' target='_blank'>https://dash.generalassemb.ly/projects/mad-libs-1</a> and complete the fifth project."
]

30
views/contact.jade
View File

@ -14,22 +14,34 @@ block content
li &#8226 Understand that they will build your project using JavaScript frameworks (as opposed to older or proprietary tools)
li &#8226 Keep your expectations high. Our students' goal is to produce work that's up to your standards
h3 If you're OK with these terms, great! We'd love to help you! Fill in this form and we'll get right back to you.
form.form-horizontal(role='form', action="/nonprofits/", method='POST')
form.form-horizontal(role='form', action="/nonprofits/", method='POST', novalidate='novalidate', name='nonprofitForm')
input(type='hidden', name='_csrf', value=_csrf)
.form-group
label(class='col-sm-2 control-label', for='name') Your name
label(class='col-sm-2 control-label', for='name') Your name *
.col-sm-8
input.form-control(type='text', name='name', id='name')
input.form-control(type='text', name='name', id='name', autocomplete="off", ng-model='name', required='required')
.col-sm-8.col-sm-offset-2(ng-show="nonprofitForm.name.$invalid && nonprofitForm.name.$error.required && !nonprofitForm.name.$pristine")
alert(type='danger')
span.ion-close-circled(id='#name-error')
| Your name is required.
.form-group
label(class='col-sm-2 control-label', for='email') Your email
label(class='col-sm-2 control-label', for='email') Your email *
.col-sm-8
input.form-control(type='text', name='email', id='email')
input.form-control(type='text', name='email', id='email', autocomplete="off", ng-model='email', required='required')
.col-sm-8.col-sm-offset-2(ng-show="nonprofitForm.email.$invalid && nonprofitForm.email.$error.required && !nonprofitForm.email.$pristine")
alert(type='danger')
span.ion-close-circled(id='#email-error').
Your email is required.
.form-group
label(class='col-sm-2 control-label', for='message') Briefly describe what problem you need to solve, and for whom.
label(class='col-sm-2 control-label', for='message') Briefly describe what problem you need to solve, and for whom. *
.col-sm-8
textarea.form-control(type='text', name='message', id='message', rows='7')
textarea.form-control(type='text', name='message', id='message', rows='7', autocomplete="off", ng-model='message', required='required')
.col-sm-8.col-sm-offset-2(ng-show="nonprofitForm.message.$invalid && nonprofitForm.message.$error.required && !nonprofitForm.message.$pristine")
alert(type='danger')
span.ion-close-circled(id='#message-error')
| Your message is required.
.form-group
.col-sm-offset-2.col-sm-8
button.btn.btn-primary(type='submit')
button.btn.btn-primary(type='submit', ng-disabled='nonprofitForm.$invalid')
span.ion-paper-airplane
| Submit
| Submit

2
views/partials/faq.jade
View File

@ -70,7 +70,7 @@
p.landing-p Our name is Free Code Camp. We are a free code camp. If you had to pay us (or sign over future earnings), we'd have to change our name. And we are not going to do that.
h2 Does Free Code Camp have an application process?
ul
p.landing-p Unlike most bootcamps, anyone can study at Free Code Camp. We're not going to tell you that you can't become a software engineer. We believe the only person who should be able to tell you that is you. If you perservere, and keep working through our challenges and nonprofits' projects, you will become an employable software engineer.
p.landing-p Unlike most bootcamps, anyone can study at Free Code Camp. We're not going to tell you that you can't become a software engineer. We believe the only person who should be able to tell you that is you. If you persevere, and keep working through our challenges and nonprofits' projects, you will become an employable software engineer.
br
br
.text-center