10 files changed, 149 insertions, 33 deletions

diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
index 9c85c6b5..796c283f 100644
--- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
+++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
@@ -6,7 +6,7 @@
 
 .picker{
     font-size:12px;
-    width:510px;
+    width:523px;
     height:500px;
     padding-top:15px;
     padding-left:15px;
@@ -53,6 +53,7 @@
     height:75%;
     width:auto;
     border-right: none;
+    margin: 8px 0px 0px 8px;
 }
 
 .picker .right-bottom{
diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.css b/js/components/ui/icon-list-basic/icon.reel/icon.css
index 4d71f6b8..9fb180d2 100644
--- a/js/components/ui/icon-list-basic/icon.reel/icon.css
+++ b/js/components/ui/icon-list-basic/icon.reel/icon.css
@@ -5,14 +5,14 @@
  </copyright> */
 
 .icon{
-    width:90px;
-    height:80px;
+    width:88px;
+    height:78px;
     display: inline;
     float: left;
     -moz-border-radius: 8px;
     border-radius: 8px;
-    margin-bottom: 5px;
-    margin-right: 5px;
+    margin-bottom: 8px;
+    margin-right: 8px;
     background-color: #5f5f5f;
 }
 
@@ -29,17 +29,17 @@
 .icon .iconImg{
     width:35px;
     height:35px;
-    margin-left: 20px;
+    margin-left: 26px;
     margin-top: 10px;
 }
 
 .icon .iconLabel{
     margin-top:8px;
     white-space: nowrap;
-    text-overflow:ellipsis;
+    text-overflow: ellipsis;
     line-height:15px;
     overflow: hidden;
-    max-width:80%;
+    width: 72px;
+    padding: 0px 8px;
     text-align: center;
-    padding-left: 2px;
 }
\ No newline at end of file
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 25f60cc5..f397ace7 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -9,8 +9,8 @@ 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,
-    HTMLDocument =      require("js/document/models/html-document").HTMLDocument,
-    BaseDocument =      require("js/document/models/base-document").BaseDocument,
+    HTMLDocument =      require("js/document/html-document").HTMLDocument,
+    TextDocument =      require("js/document/text-document").TextDocument,
     DocumentController;
 ////////////////////////////////////////////////////////////////////////
 //
@@ -28,13 +28,7 @@ DocumentController = exports.DocumentController = Montage.create(Component, {
     _iframeHolder: { value: null, enumerable: false },
     _textHolder: { value: null, enumerable: false },
     _codeMirrorCounter: {value: 1, enumerable: false},
-
-    tmpSourceForTesting: {
-        value: "function CodeMirror(place, givenOptions) {" +
-                "// Determine effective options based on given values and defaults." +
-                "var options = {}, defaults = CodeMirror.defaults; }"
-            },
-
+    
     activeDocument: {
         get: function() {
             return this._activeDocument;
@@ -62,21 +56,12 @@ DocumentController = exports.DocumentController = Montage.create(Component, {
             this.eventManager.addEventListener("executeSave", this, false);
 
             this.eventManager.addEventListener("recordStyleChanged", this, false);
-
-                        // Temporary testing opening a new file after Ninja has loaded
-                        this.eventManager.addEventListener("executeNewProject", this, false);
         }
     },
 
     handleAppLoaded: {
         value: function() {
-            //this.openDocument({"type": "html"});
-        }
-    },
-        
-        handleExecuteNewProject: {
-        value: function() {
-            this.openDocument({"type": "html"});
+            //
         }
     },
 
@@ -203,7 +188,7 @@ DocumentController = exports.DocumentController = Montage.create(Component, {
                                         break;
                                 default:
                                         //Open in code view
-                                        var code = Montage.create(BaseDocument, {"source": {value: doc.content}}), docuuid = Uuid.generate(), textArea;
+                                        var code = Montage.create(TextDocument, {"source": {value: doc.content}}), docuuid = Uuid.generate(), textArea;
                                         textArea = this.application.ninja.stage.stageView.createTextAreaElement(docuuid);
                                         code.initialize(doc, docuuid, textArea, textArea.parentNode);
                                         //code.init(doc.name, doc.uri, doc.extension, null, docuuid);
diff --git a/js/document/controllers/base-controller.js b/js/document/controllers/base-controller.js
new file mode 100755
index 00000000..be441da2
--- /dev/null
+++ b/js/document/controllers/base-controller.js
@@ -0,0 +1,32 @@
+/* <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
+
+////////////////////////////////////////////////////////////////////////
+//
+var Montage = require("montage/core/core").Montage,
+        Component = require("montage/ui/component").Component;
+////////////////////////////////////////////////////////////////////////
+//      
+exports.ENTERNAME = Montage.create(Montage, {
+        ////////////////////////////////////////////////////////////////////
+        //
+        hasTemplate: {
+                enumerable: false,
+        value: false
+    },
+        ////////////////////////////////////////////////////////////////////
+    //
+        deserializedFromTemplate: {
+                enumerable: false,
+                value: function () {
+                        //
+                }
+        }
+        ////////////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////////////
+});
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
\ No newline at end of file
diff --git a/js/document/models/html-document.js b/js/document/html-document.js
index cb399f04..d0b63dcc 100755
--- a/js/document/models/html-document.js
+++ b/js/document/html-document.js
@@ -7,11 +7,11 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 ////////////////////////////////////////////////////////////////////////
 //
 var Montage =           require("montage/core/core").Montage,
-    BaseDocument =      require("js/document/models/base-document").BaseDocument,
+    TextDocument =      require("js/document/text-document").TextDocument,
     NJUtils =           require("js/lib/NJUtils").NJUtils;
 ////////////////////////////////////////////////////////////////////////
 //
-exports.HTMLDocument = Montage.create(BaseDocument, {
+exports.HTMLDocument = Montage.create(TextDocument, {
     // PRIVATE MEMBERS
     _selectionExclude: { value: null, enumerable: false },
     _htmlTemplateUrl: { value: "user-document-templates/montage-application-cloud/index.html", enumerable: false},
diff --git a/js/document/mediators/base-mediator.js b/js/document/mediators/base-mediator.js
new file mode 100755
index 00000000..be441da2
--- /dev/null
+++ b/js/document/mediators/base-mediator.js
@@ -0,0 +1,32 @@
+/* <copyright>