codeninjasllc/codecombat
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed

Browse source
This commit is contained in:
Scott Erickson 2014-01-27 18:05:39 -08:00
parent d6e21192f5
commit 096d318e96
3 changed files with 11 additions and 22 deletions

4
app/templates/modal/contact.jade
View file

@ -13,11 +13,11 @@ block modal-body-content
span(data-i18n="contact.forum_prefix") For anything public, please try span(data-i18n="contact.forum_prefix") For anything public, please try
a(href="http://discourse.codecombat.com/", data-i18n="contact.forum_page") our forum a(href="http://discourse.codecombat.com/", data-i18n="contact.forum_page") our forum
span(data-i18n="contact.forum_suffix") instead. span(data-i18n="contact.forum_suffix") instead.
.form-inline .form
.form-group .form-group
label.control-label(for="contact-email", data-i18n="general.email") Email label.control-label(for="contact-email", data-i18n="general.email") Email
input#contact-email.form-control(name="email", type="email", value="#{me.get('anonymous') ? '' : me.get('email')}", placeholder="Where should we reply?") input#contact-email.form-control(name="email", type="email", value="#{me.get('anonymous') ? '' : me.get('email')}", placeholder="Where should we reply?")
.control-group .form-group
label.control-label(for="contact-message", data-i18n="general.message") Message label.control-label(for="contact-message", data-i18n="general.message") Message
textarea#contact-message.form-control(name="message", rows=8) textarea#contact-message.form-control(name="message", rows=8)

4
app/templates/modal/login.jade
View file

@ -4,11 +4,11 @@ block modal-header-content
h3(data-i18n="login.log_in") Log In h3(data-i18n="login.log_in") Log In
block modal-body-content block modal-body-content
.form-inline .form
.form-group .form-group
label.control-label(for="login-email", data-i18n="general.email") Email label.control-label(for="login-email", data-i18n="general.email") Email
input#login-email.input-large.form-control(name="email", type="email") input#login-email.input-large.form-control(name="email", type="email")
.control-group .form-group
label.control-label(for="login-password", data-i18n="forms.password") Password label.control-label(for="login-password", data-i18n="forms.password") Password
input#login-password.input-large.form-control(name="password", type="password") input#login-password.input-large.form-control(name="password", type="password")

25
app/templates/modal/signup.jade
View file

@ -7,20 +7,20 @@ block modal-body-content
.modal-content .modal-content
.modal-body .modal-body
p(data-i18n="signup.description") It's free. Just need a couple things and you'll be good to go: p(data-i18n="signup.description") It's free. Just need a couple things and you'll be good to go:
.form-inline .form
.form-group .form-group
label.control-label(for="signup-email", data-i18n="general.email") Email label.control-label(for="signup-email", data-i18n="general.email") Email
input#signup-email.form-control.input-large(name="email", type="email") input#signup-email.form-control.input-large(name="email", type="email")
.control-group .form-group
label.control-label(for="signup-password", data-i18n="forms.password") Password label.control-label(for="signup-password", data-i18n="forms.password") Password
input#signup-password.input-large.form-control(name="password", type="password") input#signup-password.input-large.form-control(name="password", type="password")
hr hr
.control-group .form-group.checkbox
label.checkbox.control-label(for="signup-subscribe") label.control-label(for="signup-subscribe")
input#signup-subscribe(name="subscribe", type="checkbox", checked='checked') input#signup-subscribe(name="subscribe", type="checkbox", checked='checked')
span(data-i18n="signup.email_announcements") Receive announcements by email span(data-i18n="signup.email_announcements") Receive announcements by email
.control-group .form-group.checkbox
label.checkbox.control-label(for="signup-confirm-age") label.control-label(for="signup-confirm-age")
input#signup-confirm-age(name="confirm-age", type="checkbox", checked='checked') input#signup-confirm-age(name="confirm-age", type="checkbox", checked='checked')
span(data-i18n="signup.coppa") 13+ or non-USA span(data-i18n="signup.coppa") 13+ or non-USA
a(href="http://en.wikipedia.org/wiki/Children's_Online_Privacy_Protection_Act", data-i18n="signup.coppa_why", target="_blank") (Why?) a(href="http://en.wikipedia.org/wiki/Children's_Online_Privacy_Protection_Act", data-i18n="signup.coppa_why", target="_blank") (Why?)
@ -30,15 +30,4 @@ block modal-body-wait-content
block modal-footer block modal-footer
.modal-footer .modal-footer
button.btn.btn-primary.btn-large#signup-button(data-i18n="signup.sign_up") Sign Up button.btn.btn-primary.btn-large#signup-button(data-i18n="signup.sign_up") Sign Up
.modal-footer.network-logins
div
.fb-login-button(data-show-faces="false", data-width="200", data-max-rows="1", data-scope="email")
div
.gplus-login-button#gplus-login-button
// TODO does not work; the events (clicks, submissions) in new modal do not fire
div
span(data-i18n="general.or") or
span
a(data-toggle="coco-modal", data-target="modal/login", data-i18n="signup.log_in")#link-to-login log in with password