mirror of
https://github.com/codeninjasllc/codecombat.git
synced 2024-11-23 23:58:02 -05:00
Fixed #2416: LadderTabView now shows hero portraits.
This commit is contained in:
parent
588b7c9834
commit
8649383a8c
4 changed files with 15 additions and 4 deletions
|
@ -51,10 +51,11 @@
|
||||||
td
|
td
|
||||||
padding: 1px 2px
|
padding: 1px 2px
|
||||||
|
|
||||||
.code-language-cell
|
.code-language-cell, .hero-portrait-cell
|
||||||
padding: 0 10px
|
padding: 0 10px
|
||||||
background: transparent url(/images/common/code_languages/javascript_icon.png) no-repeat center center
|
background: transparent url(/images/common/code_languages/javascript_icon.png) no-repeat center center
|
||||||
height: 16px
|
height: 16px
|
||||||
|
background-size: 16px 16px
|
||||||
|
|
||||||
.spectate-cell
|
.spectate-cell
|
||||||
cursor: pointer
|
cursor: pointer
|
||||||
|
|
|
@ -38,6 +38,12 @@
|
||||||
td
|
td
|
||||||
padding: 1px 2px
|
padding: 1px 2px
|
||||||
|
|
||||||
|
.name-cell
|
||||||
|
max-width: 130px
|
||||||
|
white-space: nowrap
|
||||||
|
overflow: hidden
|
||||||
|
text-overflow: ellipsis
|
||||||
|
|
||||||
.code-language-cell
|
.code-language-cell
|
||||||
padding: 0 10px
|
padding: 0 10px
|
||||||
background: transparent url(/images/common/code_languages/javascript_icon.png) no-repeat center center
|
background: transparent url(/images/common/code_languages/javascript_icon.png) no-repeat center center
|
||||||
|
|
|
@ -5,12 +5,12 @@ div#columns.row
|
||||||
table.table.table-bordered.table-condensed.table-hover(data-team=team.id)
|
table.table.table-bordered.table-condensed.table-hover(data-team=team.id)
|
||||||
thead
|
thead
|
||||||
tr
|
tr
|
||||||
th(colspan=2)
|
th(colspan=level.get('type', true) == 'hero-ladder' ? 3 : 2)
|
||||||
th(colspan=4, style="color: #{team.primaryColor}")
|
th(colspan=4, style="color: #{team.primaryColor}")
|
||||||
span= team.name
|
span= team.name
|
||||||
span.spl(data-i18n="ladder.leaderboard") Leaderboard
|
span.spl(data-i18n="ladder.leaderboard") Leaderboard
|
||||||
tr
|
tr
|
||||||
th(colspan=2)
|
th(colspan=level.get('type', true) == 'hero-ladder' ? 3 : 2)
|
||||||
th(data-i18n="general.score") Score
|
th(data-i18n="general.score") Score
|
||||||
th(data-i18n="general.name").name-col-cell Name
|
th(data-i18n="general.name").name-col-cell Name
|
||||||
th
|
th
|
||||||
|
@ -25,6 +25,8 @@ div#columns.row
|
||||||
- var myRow = session.get('creator') == me.id
|
- var myRow = session.get('creator') == me.id
|
||||||
tr(class=myRow ? "success" : "", data-player-id=session.get('creator'), data-session-id=session.id)
|
tr(class=myRow ? "success" : "", data-player-id=session.get('creator'), data-session-id=session.id)
|
||||||
td.code-language-cell(style="background-image: url(/images/common/code_languages/" + session.get('submittedCodeLanguage') + "_icon.png)" title=capitalize(session.get('submittedCodeLanguage')))
|
td.code-language-cell(style="background-image: url(/images/common/code_languages/" + session.get('submittedCodeLanguage') + "_icon.png)" title=capitalize(session.get('submittedCodeLanguage')))
|
||||||
|
if level.get('type', true) == 'hero-ladder'
|
||||||
|
td.hero-portrait-cell(style="background-image: url(/file/db/thang.type/#{(session.get('heroConfig') || {}).thangType || '529ffbf1cf1818f2be000001'}/portrait.png)")
|
||||||
td.rank-cell= rank + 1
|
td.rank-cell= rank + 1
|
||||||
td.score-cell= Math.round(session.get('totalScore') * 100)
|
td.score-cell= Math.round(session.get('totalScore') * 100)
|
||||||
td.name-col-cell= session.get('creatorName') || "Anonymous"
|
td.name-col-cell= session.get('creatorName') || "Anonymous"
|
||||||
|
@ -41,6 +43,8 @@ div#columns.row
|
||||||
- var myRow = session.get('creator') == me.id
|
- var myRow = session.get('creator') == me.id
|
||||||
tr(class=myRow ? "success" : "", data-player-id=session.get('creator'), data-session-id=session.id)
|
tr(class=myRow ? "success" : "", data-player-id=session.get('creator'), data-session-id=session.id)
|
||||||
td.code-language-cell(style="background-image: url(/images/common/code_languages/" + session.get('submittedCodeLanguage') + "_icon.png)")
|
td.code-language-cell(style="background-image: url(/images/common/code_languages/" + session.get('submittedCodeLanguage') + "_icon.png)")
|
||||||
|
if level.get('type', true) == 'hero-ladder'
|
||||||
|
td.hero-portrait-cell(style="background-image: url(/file/db/thang.type/#{(session.get('heroConfig') || {}).thangType || '529ffbf1cf1818f2be000001'}/portrait.png)")
|
||||||
td.rank-cell= session.rank
|
td.rank-cell= session.rank
|
||||||
td.score-cell= Math.round(session.get('totalScore') * 100)
|
td.score-cell= Math.round(session.get('totalScore') * 100)
|
||||||
td.name-col-cell= session.get('creatorName') || "Anonymous"
|
td.name-col-cell= session.get('creatorName') || "Anonymous"
|
||||||
|
|
|
@ -197,7 +197,7 @@ LevelHandler = class LevelHandler extends Handler
|
||||||
|
|
||||||
sortParameters =
|
sortParameters =
|
||||||
'totalScore': req.query.order
|
'totalScore': req.query.order
|
||||||
selectProperties = ['totalScore', 'creatorName', 'creator', 'submittedCodeLanguage']
|
selectProperties = ['totalScore', 'creatorName', 'creator', 'submittedCodeLanguage', 'heroConfig']
|
||||||
|
|
||||||
query = Session
|
query = Session
|
||||||
.find(sessionsQueryParameters)
|
.find(sessionsQueryParameters)
|
||||||
|
|
Loading…
Reference in a new issue