Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO

1 files changed, 12 insertions, 9 deletions

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 6630f4a8..9a1a6b97 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -232,7 +232,7 @@
             },
 
             "documentController1": {
-                "module": "js/io/document/document-controller",
+                "module": "js/controllers/document-controller",
                 "name": "DocumentController"
             },
 
@@ -269,13 +269,18 @@
                 "name": "CoreIoApi"
             },
 
+            "mainMenuController": {
+                "module": "js/controllers/main-menu-controller",
+                "name": "MainMenuController"
+            },
+
             "owner": {
                 "module": "js/ninja.reel",
                 "name": "Ninja",
                 "properties": {
                     "element":              {"#": "main"},
-                    "rulerTop":        {"#": "rulerTop"},
-                    "rulerLeft":        {"#": "rulerLeft"},
+                    "rulerTop":                 {"#": "rulerTop"},
+                    "rulerLeft":                {"#": "rulerLeft"},
                     "appModel":             {"@": "appModel"},
                     "toolsData":            {"@": "toolsData1"},
                     "toolsList":            {"@": "toolsList1"},
@@ -293,10 +298,11 @@
                     "newFileController":    {"@": "newFileController"},
                     "coreIoApi":                {"@": "coreIoApi1"},
                     "documentBar":          {"@": "documentBar"},
-                    "ioMediator":           {"@": "ioMediator"}
+                    "ioMediator":           {"@": "ioMediator"},
+                    "timeline":             {"@": "timeline"},
+                    "mainMenuController":   {"@": "mainMenuController"}
                 }
             }
-
         }
     </script>
 
@@ -358,13 +364,10 @@
                         </section>
 
                         <section id="timelineResizer" class="timelineResizer resizeBar"></section>
-
-                        <section id="bottomPanelContainer" class="panelContainer">
-
                             <section id="breadCrumbTrail">
                                 <div id="breadCrumbComponent"></div>
                             </section>
-
+                        <section id="bottomPanelContainer" class="panelContainer">
                             <section id="timelinePanel" class="panel">
                                 <div id="timelinePanelComponent"></div>
                             </section>