Last bits of #546.

This commit is contained in:
Nick Winter 2014-03-17 04:44:00 -07:00
parent 1397b63e50
commit 36a90de7f9
4 changed files with 64 additions and 66 deletions

View file

@ -1,33 +1,34 @@
.modal-dialog
.modal-content
.modal-header
button(type='button', data-dismiss="modal", aria-hidden="true").close ×
h3
if selectingPoint
| Select Point
else
| Select Region
.modal-body
div.instructions
div.alert.alert-info
strong Click
| to pan
div.alert.alert-info
strong Scroll
| to zoom
if selectingPoint
div.alert.alert-info
strong Shift-click
| to select
else
div.alert.alert-info
strong Shift-drag
| to select
div.alert.alert-info
strong Enter
| to confirm
canvas(width=1848, height=1178)
.modal-footer
a.btn.btn-primary#done-button Done
extends /templates/modal/modal_base
block modal-header-content
h3
if selectingPoint
| Select Point
else
| Select Region
block modal-body-content
div.instructions
div.alert.alert-info
strong Click
| to pan
div.alert.alert-info
strong Scroll
| to zoom
if selectingPoint
div.alert.alert-info
strong Shift-click
| to select
else
div.alert.alert-info
strong Shift-drag
| to select
div.alert.alert-info
strong Enter
| to confirm
canvas(width=1848, height=1178)
block modal-footer-content
a.btn.btn-primary#done-button Done

View file

@ -15,6 +15,8 @@ block content
hr
div.results
table
// TODO: make this into a ModalView subview
div.modal.fade#new-model-modal
.modal-dialog
.modal-content

View file

@ -4,16 +4,14 @@ block modal-header-content
h3(data-i18n="diplomat_suggestion.title")
block modal-body-content
// Replace this with content from the user's language
.modal-body
h4(data-i18n="diplomat_suggestion.sub_heading") We need your language skills.
h4(data-i18n="diplomat_suggestion.sub_heading") We need your language skills.
p(data-i18n="diplomat_suggestion.pitch_body") We develop CodeCombat in English, but we already have players all over the world. Many of them want to play in {English} but don't speak English, so if you can speak both, please consider signing up to be a Diplomat and help translate both the CodeCombat website and all the levels into {English}.
p(data-i18n="diplomat_suggestion.pitch_body") We develop CodeCombat in English, but we already have players all over the world. Many of them want to play in {English} but don't speak English, so if you can speak both, please consider signing up to be a Diplomat and help translate both the CodeCombat website and all the levels into {English}.
p(data-i18n="diplomat_suggestion.missing_translations") Until we can translate everything into {English}, you'll see English when {English} isn't available.
p(data-i18n="diplomat_suggestion.missing_translations") Until we can translate everything into {English}, you'll see English when {English} isn't available.
p
a(href="/contribute#diplomat", data-i18n="diplomat_suggestion.learn_more") Learn more about being a Diplomat
p
a(href="/contribute#diplomat", data-i18n="diplomat_suggestion.learn_more") Learn more about being a Diplomat
block modal-footer-content
button.btn.btn-primary.btn-large#subscribe-button(data-i18n="diplomat_suggestion.subscribe_as_diplomat") Subscribe as a Diplomat

View file

@ -4,34 +4,31 @@ block modal-header-content
h3(data-i18n="signup.create_account_title") Create Account to Save Progress
block modal-body-content
.modal-content
.modal-body
if showRequiredError
.alert.alert-success
span(data-i18n="signup.required") You need to sign up first before you can go over there. Luckily, it's really easy.
else
p(data-i18n="signup.description") It's free. Just need a couple things and you'll be good to go:
.form
.form-group
label.control-label(for="signup-email", data-i18n="general.email") Email
input#signup-email.form-control.input-large(name="email", type="email")
.form-group
label.control-label(for="signup-password", data-i18n="general.password") Password
input#signup-password.input-large.form-control(name="password", type="password")
hr
.form-group.checkbox
label.control-label(for="signup-subscribe")
input#signup-subscribe(name="subscribe", type="checkbox", checked='checked')
span(data-i18n="signup.email_announcements") Receive announcements by email
.form-group.checkbox
label.control-label(for="signup-confirm-age")
input#signup-confirm-age(name="confirm-age", type="checkbox", checked='checked')
span(data-i18n="signup.coppa") 13+ or non-USA
a(href="https://en.wikipedia.org/wiki/Children's_Online_Privacy_Protection_Act", data-i18n="signup.coppa_why", target="_blank") (Why?)
if showRequiredError
.alert.alert-success
span(data-i18n="signup.required") You need to sign up first before you can go over there. Luckily, it's really easy.
else
p(data-i18n="signup.description") It's free. Just need a couple things and you'll be good to go:
.form
.form-group
label.control-label(for="signup-email", data-i18n="general.email") Email
input#signup-email.form-control.input-large(name="email", type="email")
.form-group
label.control-label(for="signup-password", data-i18n="general.password") Password
input#signup-password.input-large.form-control(name="password", type="password")
hr
.form-group.checkbox
label.control-label(for="signup-subscribe")
input#signup-subscribe(name="subscribe", type="checkbox", checked='checked')
span(data-i18n="signup.email_announcements") Receive announcements by email
.form-group.checkbox
label.control-label(for="signup-confirm-age")
input#signup-confirm-age(name="confirm-age", type="checkbox", checked='checked')
span(data-i18n="signup.coppa") 13+ or non-USA
a(href="https://en.wikipedia.org/wiki/Children's_Online_Privacy_Protection_Act", data-i18n="signup.coppa_why", target="_blank") (Why?)
block modal-body-wait-content
h3(data-i18n="signup.creating") Creating Account...
block modal-footer
.modal-footer
button.btn.btn-primary.btn-large#signup-button(data-i18n="signup.sign_up") Sign Up
block modal-footer-content
button.btn.btn-primary.btn-large#signup-button(data-i18n="signup.sign_up") Sign Up