11 files changed, 195 insertions, 161 deletions

diff --git a/js/io/document/document-controller.js b/js/io/document/document-controller.js
index d7a19e35..7cc0eeeb 100755
--- a/js/io/document/document-controller.js
+++ b/js/io/document/document-controller.js
@@ -15,7 +15,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 var Montage = require("montage/core/core").Montage,
     Component = require("montage/ui/component").Component,
     Uuid = require("montage/core/uuid").Uuid,
-    //nj= ("js/lib/NJUtils.js").NJUtils,
     HTMLDocument = require("js/io/document/html-document").HTMLDocument,
     TextDocument = require("js/io/document/text-document").TextDocument;
 
@@ -71,8 +70,8 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
     deserializedFromTemplate: {
         value: function() {
             this.eventManager.addEventListener("appLoaded", this, false);
-
             this.eventManager.addEventListener("executeFileOpen", this, false);
+            this.eventManager.addEventListener("executeNewFile", this, false);
         }
     },
 
@@ -93,6 +92,21 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         }
     },
 
+    handleExecuteNewFile: {
+            value: function(event) {
+                var newFileSettings = event._event.settings || {};
+                newFileSettings.callback = this.createNewFile;
+                newFileSettings.callbackScope = this;
+                this.application.ninja.newFileController.showNewFileDialog(newFileSettings);
+            }
+    },
+
+    createNewFile:{
+        value:function(newFileObj){
+            //console.log(newFileObj);
+        }
+    },
+
     openFileWithURI: {
         value: function(uriArrayObj) {
             var uri = "", fileContent = "", response=null, filename="", fileType="js";
@@ -108,7 +122,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
                 }
 
                 //console.log("$$$ "+uri+"\n content = \n\n\n"+ fileContent+"\n\n\n");
-                filename = nj.getFileNameFromPath(uri);
+                filename = this.getFileNameFromPath(uri);
                 if(uri.indexOf('.') != -1){
                     fileType = uri.substr(uri.lastIndexOf('.') + 1);
                 }
@@ -415,5 +429,14 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         value: function() {
             return "userDocument_" + (this._iframeCounter++);
         }
-    }
+    },
+
+    ///// Return the last part of a path (e.g. filename)
+        getFileNameFromPath : {
+            value: function(path) {
+                path = path.replace(/[/\\]$/g,"");
+                path = path.replace(/\\/g,"/");
+                return path.substr(path.lastIndexOf('/') + 1);
+            }
+        }
 });
\ No newline at end of file
diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js
index 99f46fd7..5379cbfc 100755
--- a/js/io/system/coreioapi.js
+++ b/js/io/system/coreioapi.js
@@ -1086,7 +1086,7 @@ exports.CoreIoApi = Montage.create(Component, {
      * check if the file exists
      */
     checkFileExists:{
-        value: function(fileUri, folderUri, fileType){
+        value: function(fileName, folderUri, fileType){
             var uri = "", response=null, status=true;
 
             //prepare absolute uri
@@ -1094,9 +1094,11 @@ exports.CoreIoApi = Montage.create(Component, {
                 folderUri = folderUri + "/";
             }
 
-            //todo:add file extension check if fileType present
+            if(!!fileType && (fileName.lastIndexOf(fileType) !== (fileName.length - fileType.length))){
+                fileName = fileName+fileType;
+            }
 
-            uri = ""+folderUri+fileUri;
+            uri = ""+folderUri+fileName;
 
             response = this.fileExists({"uri":uri});
             if(!!response && response.success && (response.status === 204)){
diff --git a/js/io/templates/descriptor.json b/js/io/templates/descriptor.json
index 3d8391c5..d8fb7da4 100644
--- a/js/io/templates/descriptor.json
+++ b/js/io/templates/descriptor.json
@@ -1,51 +1,73 @@
 {
         "categories":{
-                "children":["newFile"]
+                "children":["/"]
         },
-        "newFile":{
-                "name":"Blank Template",
+        "/":{
+                "name":"Blank File",
                 "uri":"/",
                 "type":"directory",
-                "children":["html", "js", "css", "json", "php", "pl", "py", "rb"]
+                "children":["files/html.txt", "files/js.txt", "files/css.txt", "files/json.txt", "files/php.txt", "files/pl.txt", "files/py.txt", "files/rb.txt"]
         },
-        "html":{
+        "files/html.txt":{
                 "name":"HTML",
                 "uri":"files/html.txt",
-                "type":"file"
+                "type":"file",
+        "fileExtension":".html",
+        "children":["defaultTemplate"]
         },
-        "js":{
+        "files/js.txt":{
                 "name":"JavaScript",
                 "uri":"files/js.txt",
-                "type":"file"
+                "type":"file",
+        "fileExtension":".js",
+        "children":["defaultTemplate"]
         },
-        "css":{
+        "files/css.txt":{
                 "name":"Cascading Style Sheets",
                 "uri":"files/css.txt",
-                "type":"file"
+                "type":"file",
+        "fileExtension":".css",
+        "children":["defaultTemplate"]
         },
-        "json":{
+        "files/json.txt":{
                 "name":"JSON",
                 "uri":"files/json.txt",
-                "type":"file"
+                "type":"file",
+        "fileExtension":".json",
+        "children":["defaultTemplate"]
         },
-        "php":{
+        "files/php.txt":{
                 "name":"PHP",
                 "uri":"files/php.txt",
-                "type":"file"
+                "type":"file",
+        "fileExtension":".php",
+        "children":["defaultTemplate"]
         },
-        "pl":{
+        "files/pl.txt":{
                 "name":"Perl",
                 "uri":"files/pl.txt",
-                "type":"file"
+                "type":"file",
+        "fileExtension":".pl",
+        "children":["defaultTemplate"]
         },
-        "py":{
+        "files/py.txt":{
                 "name":"Python",
                 "uri":"files/py.txt",
-                "type":"file"
+                "type":"file",
+        "fileExtension":".py",
+        "children":["defaultTemplate"]
         },
-        "rb":{
+        "files/rb.txt":{
                 "name":"Ruby",
                 "uri":"files/rb.txt",
-                "type":"file"
-        }
+                "type":"file",
+        "fileExtension":".rb",
+        "children":["defaultTemplate"]
+        },
+    "defaultTemplate":{
+        "name": "Basic",
+        "uri": "defaultTemplate",
+        "type":"file"
+    }
+
 }
\ No newline at end of file
diff --git a/js/io/ui/new-file-dialog/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..092ca626 100755
--- a/