Merge branch 'master' into production

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'
         #

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

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"
+    players: "jogadores"
-#    hours_played: "hours played"
+    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"
+    employers: "Empregadores"
-#    candidates: "Candidates"
+    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"
+    wizard: "Feiticeiro"
-#    achievement: "Achievement"
+    achievement: "Conquista"
-#    clas: "CLAs"
+    clas: "CLAs"
 #    play_counts: "Play Counts"
 
   delta:

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'},

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

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