diff --git a/app/lib/services/facebook.coffee b/app/lib/services/facebook.coffee index 5114ba2a1..29cf2cded 100644 --- a/app/lib/services/facebook.coffee +++ b/app/lib/services/facebook.coffee @@ -17,7 +17,7 @@ module.exports = initializeFacebook = -> if response.status is 'connected' # They have logged in to the app. - Backbone.Mediator.publish 'facebook-logged-in', response: response + Backbone.Mediator.publish 'auth:logged-in-with-facebook', response: response else if response.status is 'not_authorized' # diff --git a/app/lib/surface/Surface.coffee b/app/lib/surface/Surface.coffee index ea8b1ac0c..dcd55cf4c 100644 --- a/app/lib/surface/Surface.coffee +++ b/app/lib/surface/Surface.coffee @@ -424,7 +424,7 @@ module.exports = Surface = class Surface extends CocoClass oldHeight = parseInt @canvas.attr('height'), 10 aspectRatio = oldWidth / oldHeight pageWidth = $('#page-container').width() - 17 # 17px nano scroll bar - if @realTime + if @realTime or @options.spectateGame pageHeight = $('#page-container').height() - $('#control-bar-view').outerHeight() - $('#playback-view').outerHeight() newWidth = Math.min pageWidth, pageHeight * aspectRatio newHeight = newWidth / aspectRatio diff --git a/app/locale/pt-PT.coffee b/app/locale/pt-PT.coffee index 3c1bc4872..83049398d 100644 --- a/app/locale/pt-PT.coffee +++ b/app/locale/pt-PT.coffee @@ -126,8 +126,8 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: level_difficulty: "Dificuldade: " play_as: "Jogar Como" spectate: "Espectar" -# players: "players" -# hours_played: "hours played" + players: "jogadores" + hours_played: "horas jogadas" contact: contact_us: "Contacte o CodeCombat" @@ -513,7 +513,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: toggle_grid: "Ativar/desativar a sobreposição da grelha." toggle_pathfinding: "Ativar/desativar a sobreposição do encontrador de caminho." beautify: "Embelezar o código ao estandardizar a formatação." -# maximize_editor: "Maximize/minimize code editor." + maximize_editor: "Maximizar/minimizar o editor de código." move_wizard: "Mover o seu Feiticeiro pelo nível." admin: @@ -910,7 +910,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: unknown: "Erro desconhecido." resources: -# sessions: "Sessions" + sessions: "Sessões" your_sessions: "As Suas Sessões" level: "Nível" social_network_apis: "APIs das Redes Sociais" @@ -926,7 +926,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: patched_model: "Documento Fonte" model: "Modelo" system: "Sistema" -# systems: "Systems" + systems: "Sistemas" component: "Componente" components: "Componentes" thang: "Thang" @@ -941,16 +941,16 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription: source_document: "Documento Fonte" document: "Documento" sprite_sheet: "Folha de Sprite" -# employers: "Employers" -# candidates: "Candidates" + employers: "Empregadores" + candidates: "Candidatos" candidate_sessions: "Sessões de Candidatos" user_remark: "Observação do Utilizador" -# user_remarks: "User Remarks" + user_remarks: "Observações de Utilizador" versions: "Versões" items: "Itens" -# wizard: "Wizard" -# achievement: "Achievement" -# clas: "CLAs" + wizard: "Feiticeiro" + achievement: "Conquista" + clas: "CLAs" # play_counts: "Play Counts" delta: diff --git a/app/schemas/subscriptions/misc.coffee b/app/schemas/subscriptions/misc.coffee index 0f9d9b0c3..d279489ba 100644 --- a/app/schemas/subscriptions/misc.coffee +++ b/app/schemas/subscriptions/misc.coffee @@ -22,7 +22,7 @@ module.exports = 'router:navigate': c.object {required: ['route']}, route: {type: 'string'} view: {type: 'object'} - viewClass: {type: 'object'} + viewClass: {type: 'function'} viewArgs: {type: 'array'} 'achievements:new': c.object {required: 'earnedAchievements'}, diff --git a/app/styles/play/spectate.sass b/app/styles/play/spectate.sass index 746a6589f..c117b8d71 100644 --- a/app/styles/play/spectate.sass +++ b/app/styles/play/spectate.sass @@ -38,17 +38,12 @@ margin: 0px auto #canvas-wrapper - height: 100% + width: 100% position: relative margin: 0 auto canvas#surface background-color: #333 - max-height: 93% - max-height: -webkit-calc(100% - 60px) - max-height: calc(100% - 60px) - height: auto - max-width: 100% display: block z-index: 1 margin: 0 auto diff --git a/app/templates/play/spectate.jade b/app/templates/play/spectate.jade index 720cd4b30..7867ba9a6 100644 --- a/app/templates/play/spectate.jade +++ b/app/templates/play/spectate.jade @@ -3,7 +3,7 @@ .level-content #control-bar-view #canvas-wrapper - canvas(width=1848, height=1178)#surface + canvas(width=924, height=589)#surface #canvas-left-gradient.gradient #canvas-top-gradient.gradient #gold-view.secret.expanded