Merge branch 'master' into feature/bootstrap3

app/styles/editor/level/component/edit.sass

@@ -1 +1,12 @@
-//#editor-level-component-edit-view
+#editor-level-component-edit-view
+  .navbar-text
+    float: left
+    
+  #component-code-editor
+    position: absolute
+    left: 0
+    right: 0
+    bottom: 0
+    top: 50px
+    border: 2px solid black
+    border-top: none

app/styles/editor/level/edit.sass

@@ -35,14 +35,14 @@
   
   // keeps the editor tabs a certain height
 
-  .tab-content
+  #level-editor-tabs
     margin-top: 108px
     // keeps the tab content at a specific ratio
     width: 100%
     padding-bottom: 45%
     position: relative
     
-  .tab-pane
+  .level-editor-tab-pane
     // makes sure the pane itself fills the whole ratio'd space
     position: absolute
     top: 10px

app/styles/editor/level/system/edit.sass

@@ -1 +1,12 @@
-//#editor-level-system-edit-view
+#editor-level-system-edit-view
+  .navbar-text
+    float: left
+
+  #system-code-editor
+    position: absolute
+    left: 0
+    right: 0
+    bottom: 0
+    top: 50px
+    border: 2px solid black
+    border-top: none

app/templates/editor/level/component/edit.jade

@@ -1,7 +1,22 @@
-h3.edit-component-name
+.navbar
-  span(data-i18n="editor.level_component_edit_title")
+  .navbar-inner
-    | Edit Component
+    p.navbar-text
-  span : 
+      span(data-i18n="editor.level_component_edit_title")
-    | "#{editTitle}"
+        | Edit Component
+      span : 
+        | "#{editTitle}"
+    ul.nav.nav-pills
+      li
+        a(href="#code" data-toggle="tab") Code
+      li
+        a(href="#config-schema" data-toggle="tab") Config Schema
+      li
+        a(href="#settings" data-toggle="tab") Settings
 
-#edit-component-treema
+.tab-content
+  .tab-pane.active#code
+    #component-code-editor
+  .tab-pane#config-schema
+    #config-schema-treema
+  .tab-pane#settings
+    #edit-component-treema

app/templates/editor/level/edit.jade

@@ -41,15 +41,15 @@ block outer_content
         li
           a(href="#editor-level-systems-tab-view", data-toggle="tab", data-i18n="editor.level_tab_systems") Systems
   
-    div.tab-content
+    div.tab-content#level-editor-tabs
-      div.tab-pane.active#editor-level-thangs-tab-view
+      div.tab-pane.level-editor-tab-pane.active#editor-level-thangs-tab-view
         
-      div.tab-pane#editor-level-scripts-tab-view
+      div.tab-pane.level-editor-tab-pane#editor-level-scripts-tab-view
   
-      div.tab-pane#editor-level-settings-tab-view
+      div.tab-pane.level-editor-tab-pane#editor-level-settings-tab-view
 
-      div.tab-pane#editor-level-components-tab-view
+      div.tab-pane.level-editor-tab-pane#editor-level-components-tab-view
 
-      div.tab-pane#editor-level-systems-tab-view
+      div.tab-pane.level-editor-tab-pane#editor-level-systems-tab-view
 
 block footer

app/templates/editor/level/system/edit.jade

@@ -1,7 +1,21 @@
-h3.edit-system-name
+.navbar
-  span(data-i18n="editor.level_system_edit_title")
+  .navbar-inner
-    | Edit System
+    p.navbar-text
-  span : 
+      span(data-i18n="editor.level_system_edit_title")
-    | "#{editTitle}"
+        | Edit System
-
+      span : 
-#edit-system-treema
+        | "#{editTitle}"
+    ul.nav.nav-pills
+        li
+          a(href="#code" data-toggle="tab") Code
+        li
+          a(href="#config-schema" data-toggle="tab") Config Schema
+        li
+          a(href="#settings" data-toggle="tab") Settings
+.tab-content
+  .tab-pane.active#code
+    #system-code-editor
+  .tab-pane#config-schema
+    #config-schema-treema
+  .tab-pane#settings
+    #edit-system-treema

app/views/editor/level/component/edit.coffee

@@ -5,9 +5,11 @@ LevelComponent = require 'models/LevelComponent'
 module.exports = class LevelComponentEditView extends View
   id: "editor-level-component-edit-view"
   template: template
+  editableSettings: ['name', 'description', 'system', 'language', 'dependencies', 'propertyDocumentation', 'i18n']
 
   events:
     'click #done-editing-component-button': 'endEditing'
+    'click .nav a': (e) -> $(e.target).tab('show')
 
   constructor: (options) ->
     super options
@@ -21,30 +23,67 @@ module.exports = class LevelComponentEditView extends View
 
   afterRender: ->
     super()
-    @buildTreema()
+    @buildSettingsTreema()
+    @buildConfigSchemaTreema()
+    @buildCodeEditor()
+
+  buildSettingsTreema: ->
+    data = _.pick @levelComponent.attributes, (value, key) => key in @editableSettings
+    schema = _.cloneDeep LevelComponent.schema.attributes
+    schema.properties = _.pick schema.properties, (value, key) => key in @editableSettings
+    schema.required = _.intersection schema.required, @editableSettings
 
-  buildTreema: ->
-    data = $.extend(true, {}, @levelComponent.attributes)
     treemaOptions =
       supermodel: @supermodel
-      schema: LevelComponent.schema.attributes
+      schema: schema
       data: data
-      callbacks: {change: @onComponentEdited}
+      callbacks: {change: @onComponentSettingsEdited}
-    unless me.isAdmin()
+    treemaOptions.readOnly = true unless me.isAdmin()
-      treemaOptions.readOnly = true
+    @componentSettingsTreema = @$el.find('#edit-component-treema').treema treemaOptions
-    @componentTreema = @$el.find('#edit-component-treema').treema treemaOptions
+    @componentSettingsTreema.build()
-    @componentTreema.build()
+    @componentSettingsTreema.open()
-    @componentTreema.open()
-    # TODO: schema is not loaded for the first one here?
-    @componentTreema.tv4.addSchema('metaschema', LevelComponent.schema.get('properties').configSchema)
 
-  onComponentEdited: (e) =>
+  onComponentSettingsEdited: =>
     # Make sure it validates first?
-    for key, value of @componentTreema.data
+    for key, value of @componentSettingsTreema.data
       @levelComponent.set key, value unless key is 'js' # will compile code if needed
     Backbone.Mediator.publish 'level-component-edited', levelComponent: @levelComponent
     null
 
+  buildConfigSchemaTreema: ->
+    treemaOptions =
+      supermodel: @supermodel
+      schema: LevelComponent.schema.get('properties').configSchema
+      data: @levelComponent.get 'configSchema'
+      callbacks: {change: @onConfigSchemaEdited}
+    treemaOptions.readOnly = true unless me.isAdmin()
+    @configSchemaTreema = @$el.find('#config-schema-treema').treema treemaOptions
+    @configSchemaTreema.build()
+    @configSchemaTreema.open()
+    # TODO: schema is not loaded for the first one here?
+    @configSchemaTreema.tv4.addSchema('metaschema', LevelComponent.schema.get('properties').configSchema)
+
+  onConfigSchemaEdited: =>
+    @levelComponent.set 'configSchema', @configSchemaTreema.data
+    Backbone.Mediator.publish 'level-component-edited', levelComponent: @levelComponent
+
+  buildCodeEditor: ->
+    editorEl = @$el.find '#component-code-editor'
+    editorEl.text @levelComponent.get('code')
+    @editor = ace.edit(editorEl[0])
+    @editor.setReadOnly(not me.isAdmin())
+    session = @editor.getSession()
+    session.setMode 'ace/mode/coffee'
+    session.setTabSize 2
+    session.setNewLineMode = 'unix'
+    session.setUseSoftTabs true
+    @editor.on 'change', @onEditorChange
+    
+  onEditorChange: =>
+    @levelComponent.set 'code', @editor.getValue()
+    Backbone.Mediator.publish 'level-component-edited', levelComponent: @levelComponent
+    null
+
   endEditing: (e) ->
     Backbone.Mediator.publish 'level-component-editing-ended', levelComponent: @levelComponent
     null

app/views/editor/level/system/edit.coffee

@@ -5,9 +5,11 @@ LevelSystem = require 'models/LevelSystem'
 module.exports = class LevelSystemEditView extends View
   id: "editor-level-system-edit-view"
   template: template
+  editableSettings: ['name', 'description', 'language', 'dependencies', 'propertyDocumentation', 'i18n']
 
   events:
     'click #done-editing-system-button': 'endEditing'
+    'click .nav a': (e) -> $(e.target).tab('show')
 
   constructor: (options) ->
     super options
@@ -21,30 +23,67 @@ module.exports = class LevelSystemEditView extends View
 
   afterRender: ->
     super()
-    @buildTreema()
+    @buildSettingsTreema()
+    @buildConfigSchemaTreema()
+    @buildCodeEditor()
+
+  buildSettingsTreema: ->
+    data = _.pick @levelSystem.attributes, (value, key) => key in @editableSettings
+    schema = _.cloneDeep LevelSystem.schema.attributes
+    schema.properties = _.pick schema.properties, (value, key) => key in @editableSettings
+    schema.required = _.intersection schema.required, @editableSettings
 
-  buildTreema: ->
-    data = $.extend(true, {}, @levelSystem.attributes)
     treemaOptions =
       supermodel: @supermodel
-      schema: LevelSystem.schema.attributes
+      schema: schema
       data: data
-      callbacks: {change: @onSystemEdited}
+      callbacks: {change: @onSystemSettingsEdited}
-    unless me.isAdmin()
+    treemaOptions.readOnly = true unless me.isAdmin()
-      treemaOptions.readOnly = true
+    @systemSettingsTreema = @$el.find('#edit-system-treema').treema treemaOptions
-    @systemTreema = @$el.find('#edit-system-treema').treema treemaOptions
+    @systemSettingsTreema.build()
-    @systemTreema.build()
+    @systemSettingsTreema.open()
-    @systemTreema.open()
-    # TODO: schema is not loaded for the first one here?
-    @systemTreema.tv4.addSchema('metaschema', LevelSystem.schema.get('properties').configSchema)
 
-  onSystemEdited: (e) =>
+  onSystemSettingsEdited: =>
     # Make sure it validates first?
-    for key, value of @systemTreema.data
+    for key, value of @systemSettingsTreema.data
       @levelSystem.set key, value unless key is 'js' # will compile code if needed
     Backbone.Mediator.publish 'level-system-edited', levelSystem: @levelSystem
     null
 
+  buildConfigSchemaTreema: ->
+    treemaOptions =
+      supermodel: @supermodel
+      schema: LevelSystem.schema.get('properties').configSchema
+      data: @levelSystem.get 'configSchema'
+      callbacks: {change: @onConfigSchemaEdited}
+    treemaOptions.readOnly = true unless me.isAdmin()
+    @configSchemaTreema = @$el.find('#config-schema-treema').treema treemaOptions
+    @configSchemaTreema.build()
+    @configSchemaTreema.open()
+    # TODO: schema is not loaded for the first one here?
+    @configSchemaTreema.tv4.addSchema('metaschema', LevelSystem.schema.get('properties').configSchema)
+
+  onConfigSchemaEdited: =>
+    @levelSystem.set 'configSchema', @configSchemaTreema.data
+    Backbone.Mediator.publish 'level-system-edited', levelSystem: @levelSystem
+
+  buildCodeEditor: ->
+    editorEl = @$el.find '#system-code-editor'
+    editorEl.text @levelSystem.get('code')
+    @editor = ace.edit(editorEl[0])
+    @editor.setReadOnly(not me.isAdmin())
+    session = @editor.getSession()
+    session.setMode 'ace/mode/coffee'
+    session.setTabSize 2
+    session.setNewLineMode = 'unix'
+    session.setUseSoftTabs true
+    @editor.on 'change', @onEditorChange
+
+  onEditorChange: =>
+    @levelSystem.set 'code', @editor.getValue()
+    Backbone.Mediator.publish 'level-system-edited', levelSystem: @levelSystem
+    null
+
   endEditing: (e) ->
     Backbone.Mediator.publish 'level-system-editing-ended', levelSystem: @levelSystem
     null