codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-30 19:06:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged

Browse source
This commit is contained in:
Nick Winter 2014-03-16 10:06:47 -07:00
commit 125ffa9f43
2 changed files with 46 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
app/templates/play/level/modal/victory.jade
View file

@ -1,54 +1,50 @@
// TODO: refactor to be like other modals extends /templates/modal/modal_base
.modal-dialog block modal-header-content
h3
span(data-i18n="play_level.victory_title_prefix")
span= levelName
span(data-i18n="play_level.victory_title_suffix") Complete
.modal-header block modal-body-content
button(type='button', data-dismiss="modal", aria-hidden="true").close × img.victory-banner(src="/images/level/victory.png", alt="")
h3 div!= body
span(data-i18n="play_level.victory_title_prefix")
span= levelName
span(data-i18n="play_level.victory_title_suffix") Complete
.modal-body
img.victory-banner(src="/images/level/victory.png", alt="")
div!= body
.modal-footer block modal-footer-content
if readyToRank if readyToRank
button.btn.btn-success.rank-game-button(data-i18n="play_level.victory_rank_my_game") Rank My Game button.btn.btn-success.rank-game-button(data-i18n="play_level.victory_rank_my_game") Rank My Game
else if level.get('type') === 'ladder' else if level.get('type') === 'ladder'
a.btn.btn-primary(href="/play/ladder/#{level.get('slug')}#my-matches", data-dismiss="modal", data-i18n="play_level.victory_go_ladder") Return to Ladder a.btn.btn-primary(href="/play/ladder/#{level.get('slug')}#my-matches", data-dismiss="modal", data-i18n="play_level.victory_go_ladder") Return to Ladder
else if hasNextLevel else if hasNextLevel
button.btn.btn-primary.next-level-button(data-dismiss="modal", data-i18n="play_level.victory_play_next_level") Play Next Level button.btn.btn-primary.next-level-button(data-dismiss="modal", data-i18n="play_level.victory_play_next_level") Play Next Level
else else
a.btn.btn-primary(href="/", data-dismiss="modal", data-i18n="play_level.victory_go_home") Go Home a.btn.btn-primary(href="/", data-dismiss="modal", data-i18n="play_level.victory_go_home") Go Home
if me.get('anonymous') if me.get('anonymous')
p.sign-up-poke p.sign-up-poke
button.btn.btn-success.sign-up-button.btn-large(data-toggle="coco-modal", data-target="modal/signup", data-i18n="play_level.victory_sign_up") Sign Up to Save Progress button.btn.btn-success.sign-up-button.btn-large(data-toggle="coco-modal", data-target="modal/signup", data-i18n="play_level.victory_sign_up") Sign Up to Save Progress
span(data-i18n="play_level.victory_sign_up_poke") Want to save your code? Create a free account! span(data-i18n="play_level.victory_sign_up_poke") Want to save your code? Create a free account!
p.clearfix p.clearfix
else else
div.rating.secret div.rating.secret
span(data-i18n="play_level.victory_rate_the_level") Rate the level: span(data-i18n="play_level.victory_rate_the_level") Rate the level:
i.icon-star-empty i.icon-star-empty
i.icon-star-empty i.icon-star-empty
i.icon-star-empty i.icon-star-empty
i.icon-star-empty i.icon-star-empty
i.icon-star-empty i.icon-star-empty
if !me.get('anonymous') if !me.get('anonymous')
div.review.secret div.review.secret
span(data-i18n="play_level.victory_review") Tell us more! span(data-i18n="play_level.victory_review") Tell us more!
br br
textarea textarea
div.share-buttons div.share-buttons
.g-plusone(data-href="http://codecombat.com", data-size="medium") .g-plusone(data-href="http://codecombat.com", data-size="medium")
.fb-like(data-href="https://www.facebook.com/codecombat", data-send="false", data-layout="button_count", data-width="350", data-show-faces="true", data-ref="coco_victory_#{fbRef}") .fb-like(data-href="https://www.facebook.com/codecombat", data-send="false", data-layout="button_count", data-width="350", data-show-faces="true", data-ref="coco_victory_#{fbRef}")
a.twitter-follow-button(href="https://twitter.com/CodeCombat", data-show-count="true", data-show-screen-name="false", data-dnt="true", data-align="right", data-i18n="nav.twitter_follow") Follow a.twitter-follow-button(href="https://twitter.com/CodeCombat", data-show-count="true", data-show-screen-name="false", data-dnt="true", data-align="right", data-i18n="nav.twitter_follow") Follow
iframe.github-star-button(src="http://ghbtns.com/github-btn.html?user=codecombat&repo=codecombat&type=watch&count=true", allowtransparency="true", frameborder="0", scrolling="0", width="110", height="20") iframe.github-star-button(src="http://ghbtns.com/github-btn.html?user=codecombat&repo=codecombat&type=watch&count=true", allowtransparency="true", frameborder="0", scrolling="0", width="110", height="20")
if showHourOfCodeDoneButton if showHourOfCodeDoneButton
.modal-footer h3.pull-left(data-i18n="play_level.victory_hour_of_code_done") Are You Done?
h3.pull-left(data-i18n="play_level.victory_hour_of_code_done") Are You Done? a(href="http://code.org/api/hour/finish")
a(href="http://code.org/api/hour/finish") strong(data-i18n="play_level.victory_hour_of_code_done_yes") Yes, I'm finished with my Hour of Code!
strong(data-i18n="play_level.victory_hour_of_code_done_yes") Yes, I'm finished with my Hour of Code! img(src="/images/level/csedweek-logo-final-small.jpg", alt="CS Ed Week Hour of Code", title="I'm finished with my Hour of Code", width=80)
img(src="/images/level/csedweek-logo-final-small.jpg", alt="CS Ed Week Hour of Code", title="I'm finished with my Hour of Code", width=80)

1
server/users/User.coffee
View file

@ -17,6 +17,7 @@ UserSchema.pre('init', (next) ->
return next() unless jsonschema.properties? return next() unless jsonschema.properties?
for prop, sch of jsonschema.properties for prop, sch of jsonschema.properties
@set(prop, sch.default) if sch.default? @set(prop, sch.default) if sch.default?
@set('permissions', ['admin']) if not isProduction
next() next()
) )