diff --git a/app/assets/images/pages/play/modal/leaderboard-background.png b/app/assets/images/pages/play/modal/leaderboard-background.png new file mode 100644 index 000000000..28d3a8260 Binary files /dev/null and b/app/assets/images/pages/play/modal/leaderboard-background.png differ diff --git a/app/styles/play/modal/leaderboard-modal.sass b/app/styles/play/modal/leaderboard-modal.sass index a6736b873..110344506 100644 --- a/app/styles/play/modal/leaderboard-modal.sass +++ b/app/styles/play/modal/leaderboard-modal.sass @@ -18,16 +18,30 @@ #leaderboard-background position: absolute - top: -146px + top: -126px left: -3px + + //- Header + + .level-title + position: absolute + left: 172px + top: -46px + margin: 0 + width: 457px + text-align: center + color: rgb(254,188,68) + font-size: 38px + text-shadow: black 4px 4px 0, black -4px -4px 0, black 4px -4px 0, black -4px 4px 0, black 4px 0px 0, black 0px -4px 0, black -4px 0px 0, black 0px 4px 0 + //- Close modal button #close-modal position: absolute - left: 769px - top: -5px + left: 616px + top: -51px width: 60px height: 60px color: white diff --git a/app/templates/play/modal/leaderboard-modal.jade b/app/templates/play/modal/leaderboard-modal.jade index 86192586f..a2e4a417d 100644 --- a/app/templates/play/modal/leaderboard-modal.jade +++ b/app/templates/play/modal/leaderboard-modal.jade @@ -1,16 +1,25 @@ .modal-dialog .modal-content - img(src="/images/pages/play/modal/game-menu-background.png", draggable="false")#leaderboard-background + img(src="/images/pages/play/modal/leaderboard-background.png", draggable="false")#leaderboard-background + + h1.level-title= levelName div#close-modal span.glyphicon.glyphicon-remove ul#leaderboard-nav.nav.nav-pills.nav-stacked + - var lastScoreType = null; for submenu, index in submenus + if lastScoreType && submenu.scoreType != lastScoreType + br li(class=index ? "" : "active") a(href='#' + submenu.scoreType + '-' + submenu.timespan + '-view', data-toggle='tab') - .scoreType(data-i18n='leaderboard.' + submenu.scoreType.replace('-', '_'))= submenu.scoreType + if submenu.scoreType != lastScoreType + .scoreType(data-i18n='leaderboard.' + submenu.scoreType.replace('-', '_'))= submenu.scoreType + else + .scoreType .timespan(data-i18n='leaderboard.' + submenu.timespan) + - lastScoreType = submenu.scoreType; .tab-content.leaderboard-tab-content for submenu, index in submenus diff --git a/app/views/play/CampaignView.coffee b/app/views/play/CampaignView.coffee index b9c8a9a7c..e075bd583 100644 --- a/app/views/play/CampaignView.coffee +++ b/app/views/play/CampaignView.coffee @@ -207,7 +207,7 @@ module.exports = class CampaignView extends RootView for nextLevelOriginal in level.nextLevels ? [] if nextLevel = _.find(@campaign.renderedLevels, original: nextLevelOriginal) @createLine level.position, nextLevel.position - @showLeaderboard @options.justBeatLevel?.get('slug') if @options.showLeaderboard# or true + @showLeaderboard @options.justBeatLevel?.get('slug') if @options.showLeaderboard# or true # Testing @applyCampaignStyles() @testParticles() diff --git a/app/views/play/modal/LeaderboardModal.coffee b/app/views/play/modal/LeaderboardModal.coffee index a9ba8fc65..2e33093fe 100644 --- a/app/views/play/modal/LeaderboardModal.coffee +++ b/app/views/play/modal/LeaderboardModal.coffee @@ -2,6 +2,7 @@ ModalView = require 'views/core/ModalView' template = require 'templates/play/modal/leaderboard-modal' LeaderboardTabView = require 'views/play/modal/LeaderboardTabView' Level = require 'models/Level' +utils = require 'core/utils' module.exports = class LeaderboardModal extends ModalView id: 'leaderboard-modal' @@ -26,6 +27,7 @@ module.exports = class LeaderboardModal extends ModalView for scoreType in @level.get('scoreTypes') ? [] for timespan in @timespans c.submenus.push scoreType: scoreType, timespan: timespan + c.levelName = utils.i18n @level.attributes, 'name' c afterRender: -> diff --git a/app/views/play/modal/PlayHeroesModal.coffee b/app/views/play/modal/PlayHeroesModal.coffee index 17218c71f..431d6eb76 100644 --- a/app/views/play/modal/PlayHeroesModal.coffee +++ b/app/views/play/modal/PlayHeroesModal.coffee @@ -50,7 +50,7 @@ module.exports = class PlayHeroesModal extends ModalView @formatHero hero for hero in @heroes.models formatHero: (hero) -> - hero.name = utils.i18n hero.attributes, 'extendedName' # or whatever the property name ends up being + hero.name = utils.i18n hero.attributes, 'extendedName' hero.name ?= utils.i18n hero.attributes, 'name' hero.description = utils.i18n hero.attributes, 'description' hero.unlockLevelName = utils.i18n hero.attributes, 'unlockLevelName'