24 files changed, 137 insertions, 378 deletions
diff --git a/js/components/layout/document-bar.reel/document-bar.css b/js/components/layout/document-bar.reel/document-bar.css
index 588b8952..2a147964 100755
--- a/js/components/layout/document-bar.reel/document-bar.css
+++ b/js/components/layout/document-bar.reel/document-bar.css
@@ -33,7 +33,7 @@
 .documentBar span{
    text-decoration: none;
-    cursor: default;
+    cursor: pointer;
    color: #3a3a3a;
 }
@@ -41,3 +41,10 @@
    color: white;
 }
+.documentBar .enable{
+    color: #d7d7d7;
+}
+.documentBar .disable{
+    color: #3a3a3a;
+}
+\ No newline at end of file
diff --git a/js/components/layout/document-bar.reel/document-bar.html b/js/components/layout/document-bar.reel/document-bar.html
index d58f0d14..48f1423c 100755
--- a/js/components/layout/document-bar.reel/document-bar.html
+++ b/js/components/layout/document-bar.reel/document-bar.html
@@ -51,8 +51,8 @@
 <body>
    <div id="documentBar">
        <input class="zoomHotText label" id="zoomControlHT"/>
-        <span class="design-view" id="design">Design View</span>
+        <span class="design-view disable" id="design">Design View</span>
-        <span class="code-view" id="code">Code View</span>
+        <span class="code-view disable" id="code">Code View</span>
    </div>
 </body>
 </html>
 \ No newline at end of file
diff --git a/js/components/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js
index 3eece273..44f65804 100755
--- a/js/components/layout/document-bar.reel/document-bar.js
+++ b/js/components/layout/document-bar.reel/document-bar.js
@@ -86,7 +86,7 @@ exports.DocumentBar = Montage.create(Component, {
        value: function() {
            this.designView.addEventListener("click", this, false);
            this.codeView.addEventListener("click", this, false);
-         
        }
    },
@@ -95,7 +95,13 @@ exports.DocumentBar = Montage.create(Component, {
            if(event._event.target.id === this.currentView) return;
            this.currentView = event._event.target.id;
-            documentManagerModule.DocumentManager.switchViews();
+            this.application.ninja.documentController.switchViews(event._event.target.id);//switch between design view
+        }
+    },
+    handleOnDocumentChanged:{
+        value:function(event){
        }
    }
 });
diff --git a/js/io/document/document-controller.js b/js/io/document/document-controller.js
index 9be40ccc..8ce43dcc 100755
--- a/js/io/document/document-controller.js
+++ b/js/io/document/document-controller.js
@@ -244,6 +244,9 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
    switchViews: {
        value: function() {
+            //save file if dirty
            this.application.ninja.stage.saveScroll();
            this._hideCurrentDocument();
diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js
index 717606b5..7839acee 100755
--- a/js/io/system/coreioapi.js
+++ b/js/io/system/coreioapi.js
@@ -983,8 +983,35 @@ exports.CoreIoApi = Montage.create(Component, {
                        //
            return retValue;
        }
-    }
+    },
        ////////////////////////////////////////////////////////////////////
+    /***
+     * check if the file exists
+     */
+    checkFileExists:{
+        value: function(fileUri, folderUri, fileType){
+            var uri = "", response=null, status=true;
+            //prepare absolute uri
+            if(/[^/\\]$/g.test(folderUri)){
+                folderUri = folderUri + "/";
+            }
+            //todo:add file extension check if fileType present
+            uri = ""+folderUri+fileUri;
+            response = this.fileExists({"uri":uri});
+            if(!!response && response.success && (response.status === 204)){
+                status = true;
+            }else if(!!response && response.success && (response.status === 404)){
+                status = false;
+            }else{
+                status = false;
+            }
+            return status;
+        }
+    }
        ////////////////////////////////////////////////////////////////////
 });
 ////////////////////////////////////////////////////////////////////////
diff --git a/js/io/workflow/newFileDialog/new-file-location.reel/new-file-location.css b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.css
index 7f11c225..7f11c225 100755
--- a/js/io/workflow/newFileDialog/new-file-location.reel/new-file-location.css
+++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.css
diff --git a/js/io/workflow/newFileDialog/new-file-location.reel/new-file-location.html b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html
index 7c271511..d7fbc235 100755
--- a/js/io/workflow/newFileDialog/new-file-location.reel/new-file-location.html
+++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html
@@ -59,7 +59,7 @@
        },
        "owner":{
-            "module": "js/io/workflow/newFileDialog/new-file-location.reel",
+            "module": "js/io/ui/new-file-dialog/new-file-location.reel",
            "name": "NewFileLocation",
            "properties": {
                "element": {"#": "newfileLocation"},
diff --git a/js/io/workflow/newFileDialog/new-file-location.reel/new-file-location.js b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js
index 805b44a4..7da13dfc 100755
--- a/js/io/workflow/newFileDialog/new-file-location.reel/new-file-location.js
+++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js
@@ -6,7 +6,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 var Montage = require("montage/core/core").Montage;
 var Component = require("montage/ui/component").Component;
-var newFileWorkflowControllerModule = require("js/io/workflow/newFileDialog/new-file-workflow-controller");
+var newFileWorkflowControllerModule = require("js/io/ui/new-file-dialog/new-file-workflow-controller");
 var NewFileLocation = exports.NewFileLocation = Montage.create(Component, {
diff --git a/js/io/workflow/newFileDialog/new-file-options-navigator.reel/new-file-options-navigator.css b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css
index 7ef6d2ce..7ef6d2ce 100755
--- a/js/io/workflow/newFileDialog/new-file-options-navigator.reel/new-file-options-navigator.css
+++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css
diff --git a/js/io/workflow/newFileDialog/new-file-options-navigator.reel/new-file-options-navigator.html b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html
index dc090b99..eb4a8045 100755
--- a/js/io/workflow/newFileDialog/new-file-options-navigator.reel/new-file-options-navigator.html
+++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html
@@ -41,7 +41,7 @@
        },
        "newFileLocation":{
-            "module": "js/io/workflow/newFileDialog/new-file-location.reel",
+            "module": "js/io/ui/new-file-dialog/new-file-location.reel",
            "name": "NewFileLocation",
            "properties": {
                "element": {"#": "right-bottom"}
@@ -49,7 +49,7 @@