diff --git a/app/assets/html/sapceViewSetting.html b/app/assets/html/spaceViewSetting.html similarity index 100% rename from app/assets/html/sapceViewSetting.html rename to app/assets/html/spaceViewSetting.html diff --git a/app/config/config.json b/app/config/config.json index f135673..67578f1 100644 --- a/app/config/config.json +++ b/app/config/config.json @@ -14,7 +14,7 @@ "dependencies" : { "WindozPluralModel": [ "WindozModel" ] } } ], - "masterController": "EICAppController", + "masterController": "WindozAppController", "defaultMasterTemplate": "templates/EICAppTemplate" }, "logger": { diff --git a/app/controllers/EICAppController.js b/app/controllers/WindozAppController.js similarity index 90% rename from app/controllers/EICAppController.js rename to app/controllers/WindozAppController.js index 6de1690..9b2e9ea 100755 --- a/app/controllers/EICAppController.js +++ b/app/controllers/WindozAppController.js @@ -1,4 +1,4 @@ -class EICAppController extends MasterController { +class WindozAppController extends MasterController { ControllerReady() { // setting up session interactions @@ -32,4 +32,4 @@ class EICAppController extends MasterController { } } -app.registerClass('EICAppController', EICAppController); \ No newline at end of file +app.registerClass('WindozAppController', WindozAppController); \ No newline at end of file diff --git a/app/controllers/EICAppController.json b/app/controllers/WindozAppController.json similarity index 100% rename from app/controllers/EICAppController.json rename to app/controllers/WindozAppController.json diff --git a/app/controllers/editors/EditorsController.js b/app/controllers/editors/EditorsController.js index 071af67..cc62ccd 100644 --- a/app/controllers/editors/EditorsController.js +++ b/app/controllers/editors/EditorsController.js @@ -35,13 +35,13 @@ class EditorsController extends WindozController { this.loadWindow( - 'editors/KeyFameView', + 'editors/KeyframeView', { title: ' Keyframe edito 3D view', static: true, - expanded: true, + expanded: false, withSettings: true, - windowStyle: WindozDomContent.boxFromPrefs('editors.keyframe', { x: 50, y:50, w:1000, h:800 }), + windowStyle: WindozDomContent.boxFromPrefs('editors.keyframeview', { x: 50, y:50, w:1000, h:800 }), }, { models: models, diff --git a/app/controllers/editors/EditorsController.json b/app/controllers/editors/EditorsController.json index 8fe92d2..ffc0e74 100644 --- a/app/controllers/editors/EditorsController.json +++ b/app/controllers/editors/EditorsController.json @@ -38,7 +38,7 @@ "styles": [ ], "html": [ - { "id":"sapceViewSetting", "name": "sapceViewSetting.html"} + { "id":"spaceViewSetting", "name": "spaceViewSetting.html"} ], "json": [ ] diff --git a/app/controllers/live/DashboardsController.json b/app/controllers/live/DashboardsController.json index 9c5ae2a..500e59b 100644 --- a/app/controllers/live/DashboardsController.json +++ b/app/controllers/live/DashboardsController.json @@ -31,7 +31,7 @@ "styles": [ ], "html": [ - { "id":"sapceViewSetting", "name": "sapceViewSetting.html"} + { "id":"spaceViewSetting", "name": "spaceViewSetting.html"} ], "json": [ {"id":"arenaConfig", "name": "arena/arenaConfig1.json"}, diff --git a/app/views/editors/KeyframeView.html b/app/views/editors/KeyframeView.html index 2e0b452..8a54727 100644 --- a/app/views/editors/KeyframeView.html +++ b/app/views/editors/KeyframeView.html @@ -3,6 +3,27 @@ width: 100%; height: 100%; } + .kf-editor{ + grid-template-columns: 15% auto 20%; + } +