Merge branch 'master' into production

This commit is contained in:
Michael Schmatz 2014-07-07 21:04:25 -07:00
commit f01e3ef3b2
3 changed files with 9 additions and 13 deletions

View file

@ -134,7 +134,7 @@ UserSchema = c.object {},
schoolFilter: schoolFilter:
title: 'School' title: 'School'
type: 'string' type: 'string'
enum: ['Top 20 Eng.', 'Other US', 'Other Intl.','Top School', 'Other'] enum: ['Top School', 'Other']
locationFilter: locationFilter:
title: 'Location' title: 'Location'
type: 'string' type: 'string'

View file

@ -34,18 +34,14 @@ block content
input(type="checkbox" name="visa" value="Need visa sponsorship") input(type="checkbox" name="visa" value="Need visa sponsorship")
| Not Authorized | Not Authorized
.filter_section#school_filter .filter_section#school_filter
h4 School h4 Education
label label
input(type="checkbox" name="schoolFilter" value="Top 20 Eng.") input(type="checkbox" name="schoolFilter" value="Top School")
| Top 20 Eng. | Top School
br br
label label
input(type="checkbox" name="schoolFilter" value="Other US") input(type="checkbox" name="schoolFilter" value="Other")
| Other US | Other
br
label
input(type="checkbox" name="schoolFilter" value="Other Intl.")
| Other Intl.
.filter_section#role_filter .filter_section#role_filter
h4 Role h4 Role
label label

View file

@ -112,10 +112,10 @@ module.exports = class EmployersView extends View
@filters = @filters =
phoneScreenFilter: [true, false] phoneScreenFilter: [true, false]
visa: ['Authorized to work in the US', 'Need visa sponsorship'] visa: ['Authorized to work in the US', 'Need visa sponsorship']
schoolFilter: ['Top 20 Eng.', 'Other US', 'Other Intl.'] schoolFilter: ['Top 20 Eng.', 'Other US', 'Other Intl.', 'Top School', 'Other']
locationFilter: ['Bay Area', 'New York', 'Other US', 'International'] locationFilter: ['Bay Area', 'New York', 'Other US', 'International']
roleFilter: ['Web Developer', 'Software Developer', 'iOS Developer', 'Android Developer', 'Project Manager'] roleFilter: ['Web Developer', 'Software Developer', 'Mobile Developer']
seniorityFilter: ['College Student', 'Recent Grad', 'Junior', 'Senior', 'Management'] seniorityFilter: ['College Student', 'Recent Grad', 'Junior', 'Senior']
@defaultFilters = _.cloneDeep @filters @defaultFilters = _.cloneDeep @filters