3 files changed, 100 insertions, 14 deletions

diff --git a/js/io/workflow/newFileDialog/new-file-location.reel/new-file-location.css b/js/io/workflow/newFileDialog/new-file-location.reel/new-file-location.css
index 1e857874..7f11c225 100644..100755
--- a/js/io/workflow/newFileDialog/new-file-location.reel/new-file-location.css
+++ b/js/io/workflow/newFileDialog/new-file-location.reel/new-file-location.css
@@ -38,13 +38,22 @@
     padding-bottom: 5px;
 }
 
-.newfileLocation .locationSelection span{
-    padding-right: 5px;
+.newfileLocation .locationSelection input{
+    margin-left: 5px;
     white-space: nowrap;
 }
 
-.newfileLocation .findDirectory{
-    width: 17px;
-    height:17px;
-    vertical-align: bottom;
-}
\ No newline at end of file
+.newfileLocation .templatePx{
+    padding-left: 5px;
+    white-space: nowrap;
+}
+
+.newfileLocation .nameText{
+    margin-right:31px;
+}
+
+.newfileLocation .hottextunit{
+    float: none;
+    display: inline;
+}
+
diff --git a/js/io/workflow/newFileDialog/new-file-location.reel/new-file-location.html b/js/io/workflow/newFileDialog/new-file-location.reel/new-file-location.html
index 1be4e485..7c271511 100644..100755
--- a/js/io/workflow/newFileDialog/new-file-location.reel/new-file-location.html
+++ b/js/io/workflow/newFileDialog/new-file-location.reel/new-file-location.html
@@ -10,12 +10,61 @@
     <link rel="stylesheet" type="text/css" href="new-file-location.css">
     <script type="text/montage-serialization">
     {
+        "hottextHeight": {
+            "module": "js/components/hottextunit.reel",
+            "name": "HotTextUnit",
+            "properties": {
+                "element": {"#": "templateHeight"},
+                "minValue":25,
+                "maxValue" :2000,
+                "stepSize" :5,
+                "acceptableUnits" : ["px"],
+                "units" : "px"
+            },
+            "bindings": {
+                "value": {
+                    "boundObject": {"@": "owner"},
+                    "boundObjectPropertyPath": "templateHeight",
+                    "oneway": false
+                }
+            }
+        },
+
+        "hottextWidth": {
+            "module": "js/components/hottextunit.reel",
+            "name": "HotTextUnit",
+            "properties": {
+                "element": {"#": "templateWidth"},
+                "minValue":25,
+                "maxValue" :2000,
+                "stepSize" :5,
+                "acceptableUnits" : ["px"],
+                "units" : "px"
+            },
+            "bindings": {
+                "value": {
+                    "boundObject": {"@": "owner"},
+                    "boundObjectPropertyPath": "templateWidth",
+                    "oneway": false
+                }
+            }
+        },
+
+        "fileInputField":{
+            "module": "js/components/ui/FilePicker/file-input-field.reel",
+            "name": "FileInputField",
+            "properties": {
+                "element": {"#": "fileInputField"}
+            }
+        },
 
         "owner":{
             "module": "js/io/workflow/newFileDialog/new-file-location.reel",
             "name": "NewFileLocation",
             "properties": {
-                "element": {"#": "newfileLocation"}
+                "element": {"#": "newfileLocation"},
+                "fileInputField": {"@": "fileInputField"},
+                "newFileName": {"#": "newFileName"}
             }
         }
     }
@@ -27,14 +76,14 @@
         <div class="template"></div>
     </div>
     <div class="locationSelection">
-        <div><span>NAME:</span><input id="newFileName" class="nj-skinned newFileName" type="search" value="" /></div>
+        <div><span class="nameText">NAME:</span><input id="newFileName" class="nj-skinned newFileName" type="search" value="" /></div>
         <div>
             <span>DIRECTORY:</span>
-            <input type="search" id="newFileDirectory" class="nj-skinned newFileDirectory" />
-            <img id="findDirectory" class="findDirectory" src="images/panels/project-panel/icon-button-search.png" />
+            <div id="fileInputField"></div>
         </div>
-        <div><span>HEIGHT:</span><span class="templateHeight" id="templateHeight">176 px</span></div>
-        <div><span>WIDTH:</span><span class="templateWidth" id="templateWidth">220 px</span></div>
+        <br />
+        <div><span>WIDTH:</span><span class="templatePx" id="templateWidth"></span></div>
+        <div><span>HEIGHT:</span><span class="templatePx" id="templateHeight"></span></div>
     </div>
 </div>
 </body>
diff --git a/js/io/workflow/newFileDialog/new-file-location.reel/new-file-location.js b/js/io/workflow/newFileDialog/new-file-location.reel/new-file-location.js
index 4c90d1a1..805b44a4 100644..100755
--- a/js/io/workflow/newFileDialog/new-file-location.reel/new-file-location.js
+++ b/js/io/workflow/newFileDialog/new-file-location.reel/new-file-location.js
@@ -10,6 +10,16 @@ var newFileWorkflowControllerModule = require("js/io/workflow/newFileDialog/new-
 
 var NewFileLocation = exports.NewFileLocation = Montage.create(Component, {
 
+    templateHeight:{
+        enumerable: true,
+        value:"25 px"
+    },
+
+    templateWidth:{
+        enumerable: true,
+        value:"25 px"
+    },
+
     willDraw: {
         enumerable: false,
         value: function() {}
@@ -22,7 +32,25 @@ var NewFileLocation = exports.NewFileLocation = Montage.create(Component, {
 
     didDraw: {
         enumerable: false,
-        value: function() {}
+        value: function() {
+            var that=this;
+
+            this.fileInputField.selectDirectory = true;
+
+            this.newFileName.addEventListener("blur", function(evt){that.handleNewFileNameOnblur(evt);}, false);
+    }
+
+    },
+
+    handleNewFileNameOnblur:{
+          value:function(evt){
+              if(this.newFileName.value !== ""){
+                  var newFileNameSetEvent = document.createEvent("Events");
+                  newFileNameSetEvent.initEvent("newFileNameSet", false, false);
+                  newFileNameSetEvent.newFileName = this.newFileName.value;
+                  this.eventManager.dispatchEvent(newFileNameSetEvent);
+              }
+          }
     }
 
 });
\ No newline at end of file