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

A few more tweaks for #1584. Hero victory now always goes to world map.

Browse source
This commit is contained in:
Nick Winter 2014-09-23 17:13:41 -07:00
parent 1a46d4345d
commit a57cc0126e
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/locale/en.coffee
View file

@ -400,6 +400,7 @@
victory_rate_the_level: "Rate the level: "
victory_return_to_ladder: "Return to Ladder"
victory_play_next_level: "Play Next Level"
victory_play_continue: "Continue"
victory_go_home: "Go Home"
victory_review: "Tell us more!"
victory_hour_of_code_done: "Are You Done?"

2
app/schemas/models/user.coffee
View file

@ -17,7 +17,6 @@ UserSchema = c.object
simulatedBy: 0
simulatedFor: 0
jobProfile: {}
lastIP: '0.0.0.0'
c.extendNamedProperties UserSchema # let's have the name be the first property
@ -91,6 +90,7 @@ _.extend UserSchema.properties,
mailChimp: {type: 'object'}
hourOfCode: {type: 'boolean'}
hourOfCodeComplete: {type: 'boolean'}
lastIP: {type: 'string'}
emailLower: c.shortString()
nameLower: c.shortString()

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

@ -15,10 +15,10 @@ block modal-footer-content
.ladder-submission-view
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
else if level.get('type', true) === 'hero'
a.btn.btn-success(href="/play-hero", data-dismiss="modal", data-i18n="play_level.victory_continue") Continue
else if hasNextLevel
button.btn.btn-success.next-level-button(data-dismiss="modal", data-i18n="play_level.victory_play_next_level") Play Next Level
else if level.get('type', true) === 'hero'
a.btn.btn-success(href="/play-hero", data-dismiss="modal", data-i18n="play_level.victory_play_next_level") Play Next Level
else
a.btn.btn-primary(href="/", data-dismiss="modal", data-i18n="play_level.victory_go_home") Go Home
if me.get('anonymous')

2
server/users/user_handler.coffee
View file

@ -15,7 +15,7 @@ EarnedAchievement = require '../achievements/EarnedAchievement'
UserRemark = require './remarks/UserRemark'
{isID} = require '../lib/utils'
serverProperties = ['passwordHash', 'emailLower', 'nameLower', 'passwordReset']
serverProperties = ['passwordHash', 'emailLower', 'nameLower', 'passwordReset', 'lastIP']
candidateProperties = [
'jobProfile', 'jobProfileApproved', 'jobProfileNotes'
]