From 61ebc4d15bb0abd685e08f68498fd1077b16e5d1 Mon Sep 17 00:00:00 2001 From: Darredevil Date: Mon, 21 Jul 2014 03:52:34 +0300 Subject: [PATCH 1/4] Docs tab --- app/templates/editor/level/edit.jade | 5 ++++- app/views/editor/level/edit.coffee | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/templates/editor/level/edit.jade b/app/templates/editor/level/edit.jade index c1f372e29..e84ed276c 100644 --- a/app/templates/editor/level/edit.jade +++ b/app/templates/editor/level/edit.jade @@ -33,7 +33,8 @@ block header - var patches = level.get('patches') if patches && patches.length span.badge= patches.length - + li + a(href="#docs-component-view", data-toggle="tab", data-i18n="editor.docs-component-view") Documentation .navbar-header span.navbar-brand #{level.attributes.name} @@ -114,6 +115,8 @@ block outer_content div.tab-pane#editor-level-patches .patches-view + div.tab-pane#docs-component-view + div#error-view block footer \ No newline at end of file diff --git a/app/views/editor/level/edit.coffee b/app/views/editor/level/edit.coffee index 62666f44a..d5321730b 100644 --- a/app/views/editor/level/edit.coffee +++ b/app/views/editor/level/edit.coffee @@ -16,6 +16,7 @@ LevelForkView = require './fork_view' SaveVersionModal = require 'views/modal/save_version_modal' PatchesView = require 'views/editor/patches_view' VersionHistoryView = require './versions_view' +ComponentDocsView = require 'views/docs/components_view' module.exports = class EditorLevelView extends RootView id: 'editor-level-view' @@ -71,6 +72,7 @@ module.exports = class EditorLevelView extends RootView @scriptsTab = @insertSubView new ScriptsTabView world: @world, supermodel: @supermodel, files: @files @componentsTab = @insertSubView new ComponentsTabView supermodel: @supermodel @systemsTab = @insertSubView new SystemsTabView supermodel: @supermodel + @componentDocsTab = @insertSubView new ComponentDocsView supermodel: @supermodel Backbone.Mediator.publish 'level-loaded', level: @level @showReadOnly() if me.get('anonymous') @patchesView = @insertSubView(new PatchesView(@level), @$el.find('.patches-view')) From f78c48c8933fe24d6b2c91022927100e7e749e50 Mon Sep 17 00:00:00 2001 From: Darredevil Date: Fri, 25 Jul 2014 01:26:34 +0300 Subject: [PATCH 2/4] Docs tab v2 --- app/templates/docs/components.jade | 2 +- app/templates/editor/level/edit.jade | 4 ++-- app/views/docs/components_view.coffee | 6 +++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/templates/docs/components.jade b/app/templates/docs/components.jade index 88f442bcc..51fe52c5e 100644 --- a/app/templates/docs/components.jade +++ b/app/templates/docs/components.jade @@ -1,4 +1,4 @@ -extends /templates/base +//extends /templates/base block content diff --git a/app/templates/editor/level/edit.jade b/app/templates/editor/level/edit.jade index e84ed276c..7189d31c5 100644 --- a/app/templates/editor/level/edit.jade +++ b/app/templates/editor/level/edit.jade @@ -34,7 +34,7 @@ block header if patches && patches.length span.badge= patches.length li - a(href="#docs-component-view", data-toggle="tab", data-i18n="editor.docs-component-view") Documentation + a(href="#docs-components-view", data-toggle="tab", data-i18n="editor.level_tab_docs") Documentation .navbar-header span.navbar-brand #{level.attributes.name} @@ -115,7 +115,7 @@ block outer_content div.tab-pane#editor-level-patches .patches-view - div.tab-pane#docs-component-view + div.tab-pane#docs-components-view div#error-view diff --git a/app/views/docs/components_view.coffee b/app/views/docs/components_view.coffee index eedba904e..dc10d91ae 100644 --- a/app/views/docs/components_view.coffee +++ b/app/views/docs/components_view.coffee @@ -1,8 +1,12 @@ -RootView = require 'views/kinds/RootView' +#RootView = require 'views/kinds/RootView' +CocoView = require 'views/kinds/RootView' template = require 'templates/docs/components' CocoCollection = require 'collections/CocoCollection' LevelComponent = require 'models/LevelComponent' +class UnnamedView extends CocoView + className: 'tab-pane' + class ComponentDocsCollection extends CocoCollection url: '/db/level.component?project=name,description,dependencies,propertyDocumentation,code' model: LevelComponent From e3a0ea400c2fb1138c7ddc360f994350a80e2f8b Mon Sep 17 00:00:00 2001 From: Darredevil Date: Fri, 25 Jul 2014 22:33:55 +0300 Subject: [PATCH 3/4] Docs tab v2 --- app/views/docs/components_view.coffee | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/views/docs/components_view.coffee b/app/views/docs/components_view.coffee index dc10d91ae..1df540fbc 100644 --- a/app/views/docs/components_view.coffee +++ b/app/views/docs/components_view.coffee @@ -1,19 +1,18 @@ #RootView = require 'views/kinds/RootView' -CocoView = require 'views/kinds/RootView' +CocoView = require 'views/kinds/CocoView' template = require 'templates/docs/components' CocoCollection = require 'collections/CocoCollection' LevelComponent = require 'models/LevelComponent' -class UnnamedView extends CocoView - className: 'tab-pane' class ComponentDocsCollection extends CocoCollection url: '/db/level.component?project=name,description,dependencies,propertyDocumentation,code' model: LevelComponent -module.exports = class UnnamedView extends RootView +module.exports = class UnnamedView extends CocoView id: 'docs-components-view' template: template + className: 'tab-pane' constructor: (options) -> super(options) From 3b704330d6745113416dadd025a4fce56ad3dce1 Mon Sep 17 00:00:00 2001 From: Darredevil Date: Fri, 25 Jul 2014 23:06:04 +0300 Subject: [PATCH 4/4] Documentation tab for Level Editor --- app/views/docs/ComponentDocumentationView.coffee | 6 ++++-- app/views/editor/level/LevelEditView.coffee | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/views/docs/ComponentDocumentationView.coffee b/app/views/docs/ComponentDocumentationView.coffee index d5e9028a9..b20385618 100644 --- a/app/views/docs/ComponentDocumentationView.coffee +++ b/app/views/docs/ComponentDocumentationView.coffee @@ -1,4 +1,5 @@ -RootView = require 'views/kinds/RootView' +#RootView = require 'views/kinds/RootView' +CocoView = require 'views/kinds/CocoView' template = require 'templates/docs/components' CocoCollection = require 'collections/CocoCollection' LevelComponent = require 'models/LevelComponent' @@ -7,9 +8,10 @@ class ComponentDocsCollection extends CocoCollection url: '/db/level.component?project=name,description,dependencies,propertyDocumentation,code' model: LevelComponent -module.exports = class ComponentDocumentationView extends RootView +module.exports = class ComponentDocumentationView extends CocoView id: 'docs-components-view' template: template + className: 'tab-pane' constructor: (options) -> super(options) diff --git a/app/views/editor/level/LevelEditView.coffee b/app/views/editor/level/LevelEditView.coffee index 7d1b4a57b..a96fefb63 100644 --- a/app/views/editor/level/LevelEditView.coffee +++ b/app/views/editor/level/LevelEditView.coffee @@ -16,6 +16,7 @@ LevelForkView = require './modals/ForkLevelModal' SaveVersionModal = require 'views/modal/SaveVersionModal' PatchesView = require 'views/editor/PatchesView' VersionHistoryView = require './modals/LevelVersionsModal' +ComponentDocsView = require 'views/docs/ComponentDocumentationView' module.exports = class LevelEditView extends RootView id: 'editor-level-view' @@ -71,6 +72,7 @@ module.exports = class LevelEditView extends RootView @scriptsTab = @insertSubView new ScriptsTabView world: @world, supermodel: @supermodel, files: @files @componentsTab = @insertSubView new ComponentsTabView supermodel: @supermodel @systemsTab = @insertSubView new SystemsTabView supermodel: @supermodel + @componentDocsTab = @insertSubView new ComponentDocsView supermodel: @supermodel Backbone.Mediator.publish 'level-loaded', level: @level @showReadOnly() if me.get('anonymous') @patchesView = @insertSubView(new PatchesView(@level), @$el.find('.patches-view'))