11 files changed, 147 insertions, 153 deletions

diff --git a/css/ninja.css b/css/ninja.css
index bf71955f..84600f12 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -72,7 +72,7 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
 
 #appWorkspace { display: -webkit-box; -webkit-box-orient: horizontal; -webkit-box-pack: center; -webkit-box-align: center; -webkit-box-sizing: stretch; position: relative; padding: 2px 0px; border: 1px solid #333; overflow: hidden; }
 
-#topMenu { background-color: #474747; position: absolute; height: 28px; width: 100%; top: 0px; left: 0px; z-index: 9999; }
+#topMenu { background-color: #474747; position: absolute; height: 28px; width: 100%; top: 0px; left: 0px; z-index: 6995; }
 
 #topPanelContainer, #leftPanelContainer, #rightPanelContainer, #bottomPanelContainer { background-color: #282828; }
 
diff --git a/js/io/document/document-controller.js b/js/io/document/document-controller.js
index 8ce43dcc..dd62b40b 100755
--- a/js/io/document/document-controller.js
+++ b/js/io/document/document-controller.js
@@ -71,8 +71,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 +93,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";
diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js
index f0ca568f..e448d981 100755
--- a/js/io/system/coreioapi.js
+++ b/js/io/system/coreioapi.js
@@ -1009,7 +1009,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
@@ -1017,9 +1017,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/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
@@ -5,7 +5,7 @@
  </copyright> */
 
 .newfileLocation .newFileName{
-    width:70%;
+    width:65%;
     margin-left:5px;
 }
 
@@ -49,7 +49,7 @@
 }
 
 .newfileLocation .nameText{
-    margin-right:31px;
+    margin-right:28px;
 }
 
 .newfileLocation .hottextunit{
@@ -57,3 +57,6 @@
     display: inline;
 }
 
+.newfileLocation .fileExtension{