codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-02-17 08:50:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Switch to flat modal

Browse source 
- Diffuse test time bomb
This commit is contained in:
Rob 2016-04-26 14:35:07 -07:00
parent 5bd8f7a1cb
commit 4e630362ce
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/templates/core/coppa-deny.jade
View file

@ -1,4 +1,4 @@
extends /templates/core/modal-base
extends /templates/core/modal-base-flat
block modal-header-content
@ -8,4 +8,4 @@ block modal-body-content
div(data-i18n="coppa_deny.text2")
block modal-footer-content
a(href='#', data-dismiss="modal", aria-hidden="true", data-i18n="coppa_deny.close").btn
a.btn.btn-primary(href='#', data-dismiss="modal", aria-hidden="true", data-i18n="coppa_deny.close").btn

11
app/templates/core/create-account-modal.jade
View file

@ -75,18 +75,19 @@
span(data-i18n="signup.birthday")
| :
.input-border
select#birthday-month-input.input-large.form-control(name="birthdayMonth", value=view.previousFormInputs.birthdayMonth || '', tabindex=4, style="width: 120px; float: left")
select#birthday-month-input.input-large.form-control(name="birthdayMonth", value=view.previousFormInputs.birthdayMonth || '', tabindex=4, style="width: 110px; float: left")
option(value='',data-i18n="calendar.month")
for name, val in ['january','february','march','april','may','june','july','august','september','october','november','december']
option(data-i18n="calendar.#{name}" value=val+1)
select#birthday-day-input.input-large.form-control(name="birthdayDay", value=view.previousFormInputs.birthdayDay || '', tabindex=5, style="width: 55px; float: left")
select#birthday-day-input.input-large.form-control(name="birthdayDay", value=view.previousFormInputs.birthdayDay || '', tabindex=5, style="width: 75px; float: left")
option(value='',data-i18n="calendar.day")
for dummy, val in new Array(31)
option #{val+1}
select#birthday-year-input.input-large.form-control(name="birthdayYear", value=view.previousFormInputs.birthdayMonth || '', tabindex=6, style="width: 100px;")
select#birthday-year-input.input-large.form-control(name="birthdayYear", value=view.previousFormInputs.birthdayMonth || '', tabindex=6, style="width: 90px;")
option(value='',data-i18n="calendar.year")
for dummy, val in new Array(30)
option #{2016-29+val}
- var startYear = new Date().getFullYear() - 1
for dummy, val in new Array(100)
option #{startYear-val}
.form-group
label.control-label(for="school-input")

2
test/app/views/core/CreateAccountModal.spec.coffee
View file

@ -54,7 +54,7 @@ describe 'CreateAccountModal', ->
it 'fails if user is too young', ->
modal.$('form').each (i, el) -> el.reset()
forms.objectToForm(modal.$el, { email: 'some@email.com', password: 'xyzzy', birthdayDay: 24, birthdayMonth: 7, birthdayYear: 2015 })
forms.objectToForm(modal.$el, { email: 'some@email.com', password: 'xyzzy', birthdayDay: 24, birthdayMonth: 7, birthdayYear: (new Date().getFullYear() - 10) })
modalOpened = false
spyOn(modal, 'openModalView').and.callFake (modal) ->
modalOpened = true