Merge branch 'master' of https://github.com/codecombat/codecombat

app/lib/surface/Camera.coffee

@@ -5,8 +5,8 @@ CocoClass = require 'lib/CocoClass'
 r2d = (radians) -> radians * 180 / Math.PI
 d2r = (degrees) -> degrees / 180 * Math.PI
 
-MAX_ZOOM = 8
-MIN_ZOOM = 0.1
+MAX_ZOOM = 4
+MIN_ZOOM = 0.05
 DEFAULT_ZOOM = 2.0
 DEFAULT_TARGET = {x:0, y:0}
 DEFAULT_TIME = 1000

app/styles/play/level/tome/spell_debug.sass

@@ -3,6 +3,7 @@
 .spell-debug-view
   position: absolute
   z-index: 9001
+  min-width: 250px
   max-width: 400px
   padding: 10px
   background: transparent url(/images/level/popover_background.png)

app/views/play/level/modal/docs_modal.coffee

@@ -25,7 +25,8 @@ module.exports = class DocsModal extends View
     @docs = specific.concat(general)
     marked.setOptions {gfm: true, sanitize: false, smartLists: true, breaks: false}
     @docs = _.cloneDeep(@docs)
-    doc.html = marked(doc.body) for doc in @docs
+    doc.html = marked(doc.i18n?[me.lang()]?.body or doc.body) for doc in @docs
+    doc.name = (doc.i18n?[me.lang()]?.name or doc.name) for doc in @docs
     doc.slug = _.string.slugify(doc.name) for doc in @docs
     super()
 

app/views/play/level/tome/spell_debug_view.coffee

@@ -61,7 +61,9 @@ module.exports = class DebugView extends View
       @variableChain = chain
       offsetX = e.domEvent.offsetX ? e.clientX - $(e.domEvent.target).offset().left
       offsetY = e.domEvent.offsetY ? e.clientY - $(e.domEvent.target).offset().top
-      @pos = {left: offsetX + 50, top: offsetY + 50}
+      w = $(document).width()
+      offsetX = w - $(e.domEvent.target).offset().left - 300 if e.clientX + 300 > w
+      @pos = {left: offsetX + 50, top: offsetY + 20}
       @markerRange = new Range pos.row, start, pos.row, end
     else
       @variableChain = @markerRange = null

server/articles/article_handler.coffee

@@ -3,7 +3,7 @@ Handler = require('../commons/Handler')
 
 ArticleHandler = class ArticleHandler extends Handler
   modelClass: Article
-  editableProperties: ['body', 'name']
+  editableProperties: ['body', 'name', 'i18n']
 
   hasAccess: (req) ->
     req.method is 'GET' or req.user?.isAdmin()

server/articles/article_schema.coffee

@@ -4,6 +4,7 @@ ArticleSchema = c.object()
 c.extendNamedProperties ArticleSchema  # name first
 
 ArticleSchema.properties.body = { type: 'string', title: 'Content', format: 'markdown' }
+ArticleSchema.properties.i18n = { type: 'object', title: 'i18n', format: 'i18n', props: ['body'] }
 
 c.extendBasicProperties(ArticleSchema, 'article')
 c.extendSearchableProperties(ArticleSchema)