Commit graph

91 commits

Author SHA1 Message Date
Matthew Taylor
eb56b27a88 Update otherDisabled check
Fall out from #1217. We should likely change the way this is set up, it seems not ideal. But not sure the best way atm.
2017-02-23 10:57:27 -05:00
Matthew Taylor
f59774bd0d Don’t localize an empty string 2017-02-23 09:52:33 -05:00
Ray Schamp
22802f87e8 Merge pull request #1160 from TheGrits/patch-3
Fix gh-1159: Add 2017 to Teacher Registration
2017-02-01 12:44:23 -05:00
Matthew Taylor
ca0985571e Revert "Merge pull request #1149 from mewtaylor/issue/r2-4092"
This reverts commit 8e82398255, reversing
changes made to e1a0e9fece.
2017-01-31 11:38:50 -05:00
Matthew Taylor
b2c32c465a Merge pull request #1138 from mewtaylor/issue/gh-1097
Fix GH-1097: Don’t validate username server side unless it passes client-side checks
2017-01-20 07:48:49 -05:00
Matthew Taylor
8e82398255 Merge pull request #1149 from mewtaylor/issue/r2-4092
For R2-4092: Add checkbox to opt-in to teacher emails
2017-01-19 18:37:11 -05:00
chrisgarrity
e1a0e9fece Fix GH 1102: Don’t allow duplicate strings in a single l10n file (#1150)
* Don’t allow duplicate strings in a single l10n file

Added check_duplicate_strings to test for duplicates in a single file.
removed duplicates - tried to keep the more generic ‘key’

* revised test case for safer file reads
2017-01-19 18:23:56 -05:00
Matthew Taylor
313f267cfe Add checkbox to opt-in to teacher emails 2017-01-17 15:57:15 -05:00
Matthew Taylor
6c589e1dc7 remove test ref
whoopsie :)
2016-12-28 10:03:11 -05:00
Matthew Taylor
5da9514f4d Don’t validate username server side if error
Fixes #1097 by not making the server-side username validation call if the client side validations have failed. This is not the ideal way to do this, since it’s getting the input from an array. However, to make this different would require significant refactor.
2016-12-28 09:54:46 -05:00
Matthew Taylor
ccd6713ef1 get formatMessage from props
Fixes #1125. I had fixed this last iteration, not sure how it got re-introduced.
2016-12-18 22:08:17 -05:00
Matthew Taylor
0111278fa5 Update id string for general error message strings
Fixes #1112, which was created by moving the error message into `general`
2016-12-15 15:32:40 -05:00
Matthew Taylor
ba50840809 only apply right margin to radio input
fixes #1101. I wanted to apply a custom class to the input, however that is unfortunately obscured and unreachable with our current implementation of `formsy-react-components`
2016-12-13 12:11:24 -05:00
Matthew Taylor
afa25dc1c2 Move other input to be the label for the button
thanks @rschamp! Never would’ve thought label would accept html.
2016-12-05 14:05:27 -05:00
Matthew Taylor
cc0496619d use width for radio buttons, not margin
This fixes #962 – the margin was causing flex to overflow the radio buttons when the text was long, causing the male and other options to render on top of each other. This fixes that by giving the radio buttons a fixed with relative to the parent container, and by ensuring that languages with long localizations will still be visible in overflow text.
2016-12-05 12:53:04 -05:00
Matthew Taylor
25f61fdb77 Merge pull request #1008 from mewtaylor/issue/gh-980
Implement GH-980: add new TTT modal component
2016-11-14 10:09:00 -05:00
Matthew Taylor
402efd8046 Some last tweaks
based on feedback from @rschamp, thanks!

1. make `ref` into method
2. remove accidental inclusion of prototype modal
3. use `omit` for props so that we don’t need a separate object for wrapped component properties
2016-11-10 17:13:44 -05:00
Matthew Taylor
c9de1d73d9 Refactor modal components
1. Split out base modal stylings from iframe modal stylings
2. Move iframe-specific stylings into a separate copmonent
3. Move width/height iframe stylings to scss
4. Change global stylings for modals to match #980
5. Update styles to use trello style guide
2016-11-08 14:44:03 -05:00
The_Grits
21941ecf86 Phone Number 'Required' Validation 2016-11-04 11:51:48 -04:00
The_Grits
10e49d87b3 Empty Phone Number Validation
Separated the null check from the area code check so that when the field is null the 'required' popup will be displayed.
2016-10-26 14:15:54 -04:00
Matthew Taylor
99cedec978 Put label for “Not Required” above input
Fixes #933
2016-09-30 15:02:05 -04:00
Matthew Taylor
2e3aee25d9 cover undefined case as well
thanks @rschamp!
2016-09-01 16:22:45 -04:00
Matthew Taylor
ffa249c3c5 Check for username before sending
the `//` for an empty username that gets sent to the backend causes a 500 error. This is an edge case in formsy, as it has not detected a change value yet, so handle it in the username validation method. Fixes #872
2016-09-01 14:59:02 -04:00
Matthew Taylor
e7b0415a6b Only require zip code for US addresses
Since we only check for the US, only require for that country. Other countries have zip codes, but it seems better to do it this way than codify which countries do/do not have zip codes (in case local practices are not the same as international information). Fixes #825
2016-08-26 11:14:26 -04:00
Matthew Taylor
70eb82f7cb remove .card-specific stylings 2016-08-19 15:16:35 -04:00
Matthew Taylor
bc0263531b align gender/org input msg with others
Because the `input` field is already to the right, they were being transformed too far over. This overrides the transform to be correct, and also scopes some css in more detail
2016-08-19 14:11:24 -04:00
Matthew Taylor
59d558116e Merge pull request #836 from mewtaylor/issue/gh-760
Fix GH-760: Add username `not equals` to password validation
2016-08-15 13:29:46 -04:00
Matthew Taylor
e791c0a8ff Merge branch 'issue/gh-835' of https://github.com/mewtaylor/scratch-www-1 into develop
* 'issue/gh-835' of https://github.com/mewtaylor/scratch-www-1:
  Switch ordering
  Remove `option` warning in console
  Add `maxLength` validations where needed

# Conflicts:
#	src/components/registration/steps.jsx
2016-08-12 17:23:32 -04:00
Matthew Taylor
61ef3c2c69 Switch ordering
so `intl` comes first
2016-08-12 16:43:56 -04:00
Matthew Taylor
0d9493de12 Remove option warning in console
`option` throws an error in React if it’s not a string. `FormattedMessage` returns a `span` around strings, so any time this function was loaded/called, it was throwing >100 warnings in the console. use `intl` to return a string instead.
2016-08-12 15:47:44 -04:00
Matthew Taylor
6d5bb4f850 Add maxLength validations where needed
fixes #835
2016-08-12 15:39:39 -04:00
Matthew Taylor
f8de61f067 Update from feedback
use props for username rather than constructed form data, and `studentUsername -> username`. Thanks @rschamp!
2016-08-12 10:11:14 -04:00
Matthew Taylor
537104c56b Add username validation to student complete registration
Fixes #760
2016-08-12 08:10:20 -04:00
Matthew Taylor
6e3a18a574 only look for empty phone on submit
thanks @rschamp!
2016-08-10 09:45:21 -04:00
Matthew Taylor
56e88685b5 Check for empty phone number on submit
Thanks @rschamp!
2016-08-10 09:38:43 -04:00
Matthew Taylor
56481c797e Remove phoneLength validation
It appears that some valid phone numbers in some countries differ in length from what is specified in the util’s phone number format. Fixes #816.
2016-08-10 07:47:12 -04:00
Matthew Taylor
73fbc36ff9 declare callback if undefined 2016-08-03 16:24:51 -04:00
Matthew Taylor
86662e13d6 Consolidate and remove onValidSubmit 2016-08-03 15:20:58 -04:00
Matthew Taylor
4e568f7c06 use minLength instead
it’s the same thing :). Thanks @rschamp!
2016-08-03 14:34:07 -04:00
Matthew Taylor
cec3214def some updates from feedback
thanks @rschamp!

1. moved org type validation to a custom validation
2. added a callback to the username validation call
2016-08-03 12:11:55 -04:00
Matthew Taylor
f0c2280fde Updates to registration UX for teachers
1. Phone too long validation occurs before submit now.
2. Organization “other” type is now being required
3. Organization type required now shows up at the same time as other organization validation errors
4. Username check now occurs earlier, on blur rather than on submit
2016-08-02 15:23:09 -04:00
Matthew Taylor
4909d509d2 remove ie fallback to mobile styling
it looks like @rschamp’s wodnerful `top` alignment fix for Chrome and Edge also helps here, from a test I did in IE11.
2016-07-28 15:46:56 -04:00
Matthew Taylor
d97bc193df Remove unnecessary redefinitions
These are already defined in the base, and are not overridden anywhere. Only redefine the things that were overridden.
2016-07-28 15:11:14 -04:00
Matthew Taylor
2c9df3237e Fix gender input error alignment in IE11
Also re-apply the arrow styling on the organization checkbox group, since it appears to be aligned correctly.
2016-07-28 14:10:36 -04:00
Ray Schamp
e218cc5169 Move "select country" to general strings
It's reused in the other registration views so doesn't belong in teacherregistration/l10n.json

Fixes #783
2016-07-28 12:26:56 -04:00
Matthew Taylor
40fb433d7d Make country choice a function that’s called
And also default the country in address to the country in demographics. Thanks @rschamp @carljbowman!
2016-07-28 09:56:01 -04:00
Matthew Taylor
2650e6e148 Move countryOptions to the global scope
thanks @rschamp!
2016-07-28 08:30:29 -04:00
Matthew Taylor
cf4a057278 Fix “afterschool” typo
Also make default country selectable in the user demographic step, and fix the spacing with `Create a Username`
2016-07-27 23:33:45 -04:00
Ray Schamp
668f141457 Merge pull request #778 from rschamp/bugfix/chrome-52
Set common y-origin for validation bubbles
2016-07-27 20:17:32 -04:00
Ray Schamp
ecbbeb5612 Set common y-origin for validation bubbles
I believe this will keep the misalignment from happening across browsers. Sets the top left corner to the top left corner of the input block.

Resolves #770
2016-07-27 20:15:53 -04:00