From a227c0175f01bc4614a8d82b79902bd3b0c8afa3 Mon Sep 17 00:00:00 2001
From: Dallon Feldner <dallonfdev@gmail.com>
Date: Tue, 4 Dec 2012 17:12:03 -0700
Subject: [PATCH 1/7] Fixed bug where changing a property type from "number" to
 "string" made existing properties uneditable.

---
 HISTORY.md                                    | 3 +++
 README.md                                     | 2 +-
 lib/resources/collection/dashboard/js/data.js | 2 +-
 lib/resources/dashboard/bootstrap             | 2 +-
 package.json                                  | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 89216ea..2e3b03a 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,8 @@
 # History
 
+## 0.6.10
+- Fixed bug where changing a property type from "number" to "string" made existing properties uneditable.
+
 ## 0.6.9 
 
 - Fixed bug where `internal-client` was not accessible from modules
diff --git a/README.md b/README.md
index 2f71f41..084bfb6 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# deployd v0.6.9
+# deployd v0.6.10
 
 [![Build Status](https://secure.travis-ci.org/deployd/deployd.png)](http://travis-ci.org/deployd/deployd)
 
diff --git a/lib/resources/collection/dashboard/js/data.js b/lib/resources/collection/dashboard/js/data.js
index b4c3b2d..ce588ca 100644
--- a/lib/resources/collection/dashboard/js/data.js
+++ b/lib/resources/collection/dashboard/js/data.js
@@ -207,7 +207,7 @@
     var val = vm.selectedRow()[vm.selectedProp().name]();
 
     if (type === 'string') {
-      return !val || val.indexOf('\n') === -1;  
+      return !val || val.toString().indexOf('\n') === -1;  
     }
 
     return true;
diff --git a/lib/resources/dashboard/bootstrap b/lib/resources/dashboard/bootstrap
index bb57155..357154b 160000
--- a/lib/resources/dashboard/bootstrap
+++ b/lib/resources/dashboard/bootstrap
@@ -1 +1 @@
-Subproject commit bb57155a7b66f9f784e4db6f420333e328159533
+Subproject commit 357154b78e474e3a2b893d3bf3804697814bcb57
diff --git a/package.json b/package.json
index 28f9027..811f0ae 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "author": "Ritchie Martori", 
   "name": "deployd",
-  "version": "0.6.9",
+  "version": "0.6.10",
   "description": "the simplest way to build realtime APIs for web and mobile apps",
   "repository": {
     "url": "git://github.com/deployd/deployd.git"

From 3ea33a19556e853695ef521dc640d575c7f22405 Mon Sep 17 00:00:00 2001
From: Ritchie Martori <skawful@gmail.com>
Date: Mon, 10 Dec 2012 18:30:39 -0800
Subject: [PATCH 2/7] updated urls for deployment

---
 bin/dpd              | 2 +-
 lib/client/deploy.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/dpd b/bin/dpd
index 871cb02..04451dd 100755
--- a/bin/dpd
+++ b/bin/dpd
@@ -328,7 +328,7 @@ program
           d.package(tar, function (err) {
             if(err) return console.error(err);
             console.log('pushing...');
-            d.publish('http://deploy.deploydapp.com:3003', tar, key, function (err) {
+            d.publish('http://cloud.deployd.com', tar, key, function (err) {
               if(err) return console.error('failed to push:', err.message || 'could not push app to ' + DPDAPP_URL);
               console.log('deployd app to http://' + d.subdomain + '.deploydapp.com!');
             });
diff --git a/lib/client/deploy.js b/lib/client/deploy.js
index b4aaef4..a8eb7e7 100644
--- a/lib/client/deploy.js
+++ b/lib/client/deploy.js
@@ -15,8 +15,8 @@ var path = require('path')
 function Deployment(appPath, user, subdomain) { 
   var remote = this.remote = 'deploydapp.com';
 
-  this.api = "http://api.deploydapp.com:3000";
-  this.deployUrl = "http://deploy.deploydapp.com:3003";
+  this.api = "http://api.deployd.com";
+  this.deployUrl = "http://cloud.deployd.com";
 
   this.path = path.resolve(appPath);
   

From 9b8f6a06898fe087c21a02a9d1cbb8ce9c52a349 Mon Sep 17 00:00:00 2001
From: Dallon Feldner <dallonfdev@gmail.com>
Date: Tue, 11 Dec 2012 11:16:47 -0700
Subject: [PATCH 3/7] Fixed some minor bugs in deployment

---
 bin/dpd                                   |  8 +++++++-
 lib/client/deploy.js                      | 14 +++++++-------
 lib/resources/dashboard/deployments.html  |  2 +-
 lib/resources/dashboard/js/deployments.js |  2 ++
 lib/resources/internal-deployments.js     | 18 +++++++++++++++++-
 5 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/bin/dpd b/bin/dpd
index 04451dd..b1451ef 100755
--- a/bin/dpd
+++ b/bin/dpd
@@ -329,7 +329,13 @@ program
             if(err) return console.error(err);
             console.log('pushing...');
             d.publish('http://cloud.deployd.com', tar, key, function (err) {
-              if(err) return console.error('failed to push:', err.message || 'could not push app to ' + DPDAPP_URL);
+              if(err) {
+                if (err.statusCode === 401) {
+                  d.setConfig('sid', undefined);
+                  d.setConfig('user', undefined);
+                }
+                return console.error('failed to push:', err.message || 'could not push app to ' + DPDAPP_URL);
+              } 
               console.log('deployd app to http://' + d.subdomain + '.deploydapp.com!');
             });
           });
diff --git a/lib/client/deploy.js b/lib/client/deploy.js
index 16f554f..7117269 100644
--- a/lib/client/deploy.js
+++ b/lib/client/deploy.js
@@ -100,7 +100,12 @@ Deployment.prototype.publish = function (url, tar, key, callback) {
 
   function done(err, res, body) {
     if(err) return callback(err);
-    if(res.statusCode >= 400) return callback(new Error(body));
+
+    if(res.statusCode >= 400) {
+      var error = new Error(body);
+      error.statusCode = res.statusCode;
+      return callback(error);
+    } 
     callback(null, deployment.getConfig(deployment.configKey()));
   }
 
@@ -119,12 +124,7 @@ Deployment.prototype.publish = function (url, tar, key, callback) {
         return callback(err);
       }
 
-      if(res.statusCode !== 200) {
-        deployment.setConfig('sid', undefined);
-        deployment.setConfig('user', undefined);
-        delete deployment.sid;
-        delete deployment.user;
-      } else {
+      if(res.statusCode === 200) {
 
         try {
           body = JSON.parse(body);
diff --git a/lib/resources/dashboard/deployments.html b/lib/resources/dashboard/deployments.html
index 0273474..da93a3e 100644
--- a/lib/resources/dashboard/deployments.html
+++ b/lib/resources/dashboard/deployments.html
@@ -89,7 +89,7 @@
 <script type="text/html" id="deployment-template">
   <li id="deployment-<%= deployment.appId %>" class="component-item <%= deployment.deploying ? 'deploying' : '' %>" data-index="<%= index %>">
     <div class="component-item-header">
-      <span class="code deploymentname"><%= deployment.name %> <i class="icon-white icon-external-link open-icon"></i></span>
+      <span class="code deploymentname"><%= deployment.name %> <% if (!deployment.deploying) { %><i class="icon-white icon-external-link open-icon"></i><% } %></span>
       <% if (deployment.deploying) { %>
         <div class="pull-right deploy-status">
           <span class="deploy-status-text">Deploying...</span>
diff --git a/lib/resources/dashboard/js/deployments.js b/lib/resources/dashboard/js/deployments.js
index 2496e73..3439660 100644
--- a/lib/resources/dashboard/js/deployments.js
+++ b/lib/resources/dashboard/js/deployments.js
@@ -114,6 +114,7 @@
         Object.keys(result).forEach(function(k) {
           deployment[k] = result[k];
         });
+        deployment.id = result.appId;
         deployment.__deployed = true;
       }
 
@@ -152,6 +153,7 @@
   function onClickDeployment(e) {
     if ($(e.target).is('a')) return true;
     var deployment = getDeployment(e.currentTarget);
+    if (deployment.deploying) return true;
     var href = "http://" + deployment.name + ".deploydapp.com";
     window.open(href, "_blank");
     window.focus();
diff --git a/lib/resources/internal-deployments.js b/lib/resources/internal-deployments.js
index 05c4a23..68858e9 100644
--- a/lib/resources/internal-deployments.js
+++ b/lib/resources/internal-deployments.js
@@ -4,6 +4,8 @@ var util = require('util')
   , path = require('path')
   , q = require('q')
   , qutil = require('../util/qutil')
+  , Keys = require('../keys')
+  , keys = new Keys()
   , Deployment = require('../client/deploy').Deployment;
 
 function InternalDeployments() {
@@ -119,9 +121,23 @@ InternalDeployments.prototype.deploy = function(ctx, next) {
 
   var d = new Deployment('.', null, subdomain);
 
+  var keyGenQ = q.nfcall(function(fn) {
+    keys.getLocal(function (err, key) {
+      if(err) return fn(err);
+      if(key) {
+        fn(null, key);
+      } else {
+        keys.create(function(err, key) {
+          if(err) return fn(err);
+          fn(null, key);
+        });
+      }
+    });
+  });
+
   var authQ = qutil.cinvoke(d, 'authenticate');
 
-  var packageQ = authQ.then(function(ok) {
+  var packageQ = q.spread([authQ, keyGenQ], function(ok) {
     if (ok) {
       return q.ninvoke(d, 'package', self.packageFile);
     } else {

From ed545bad72cb4368cf09cf62844b77440c1fdd8e Mon Sep 17 00:00:00 2001
From: Dallon Feldner <dallonfdev@gmail.com>
Date: Tue, 11 Dec 2012 12:56:53 -0700
Subject: [PATCH 4/7] Made some usability changes to the initial deployment
 workflow

---
 lib/client/deploy.js                          |  1 +
 lib/resources/dashboard/deployments.html      | 74 +++++++++++------
 lib/resources/dashboard/js/deployments.js     | 80 ++++++++++---------
 .../dashboard/stylesheets/deployments.less    | 23 +++++-
 .../dashboard/stylesheets/layout.less         |  7 +-
 lib/resources/dashboard/stylesheets/style.css | 72 ++++++++---------
 .../dashboard/stylesheets/style.less          |  8 +-
 7 files changed, 158 insertions(+), 107 deletions(-)

diff --git a/lib/client/deploy.js b/lib/client/deploy.js
index 7117269..d3fcdd8 100644
--- a/lib/client/deploy.js
+++ b/lib/client/deploy.js
@@ -227,6 +227,7 @@ Deployment.prototype.getCurrentUser = function(fn) {
     jar: false
   }, function(err, res, user) {
     if (err) return fn(err);
+    if (res.statusCode === 404) return fn(new Error("Could not connect"));
     if (user) user = JSON.parse(user);  
     if (!user) return fn(new Error("Not authenticated"));
     fn(null, user);
diff --git a/lib/resources/dashboard/deployments.html b/lib/resources/dashboard/deployments.html
index da93a3e..32b54c2 100644
--- a/lib/resources/dashboard/deployments.html
+++ b/lib/resources/dashboard/deployments.html
@@ -1,9 +1,15 @@
 <div id="deployments">
-  <div class="well hide" id="deployments-connection-error">
-    <h3>Deployments</h3>
-    <div class="">
-      <p>Could not connect to <a target="_blank" href="http://cloud.deployd.com">cloud.deployd.com</a></p>
-      <a href="">Refresh</a>
+  <div class="modal hide" id="deployments-connection-error">
+    <div class="modal-header">
+      <h3>Deployments</h3>
+    </div>
+    <div class="modal-body">
+      <p>Could not connect to <a target="_blank" href="http://cloud.deployd.com">cloud.deployd.com</a>.</p>
+      
+    </div>
+    <div class="modal-footer">
+      <a href="" class="btn">Refresh</a>
+      <a href="/dashboard" class="cancel-btn">cancel</a>
     </div>
   </div>
   <div class="well hide" id="inner-deployments">
@@ -16,36 +22,40 @@
     
     <div class="clearfix"></div>
 
-    
-
-    <div id="deployments-empty" class="hide">
-
-      <hr />
-      
-      <p>Create your first Deployment to host your app on <a href="http://cloud.deployd.com">cloud.deployd.com</a>:</p>
-    </div>
-
     <div id="deployment-list-container">
 
       <ul class="component-list" id="deployment-list">
       </ul>
 
       <hr />
+
+      <div class="form-placeholder">
+      </div>
     </div>
 
-    <form class="form-inline" id="deploy-new-form">
-      <input type="text" class="input-large deployment-name" placeholder="new-deployment" />
-      <span class="help-inline">.deploydapp.com</span>
+  </div>
 
-      <button class="pull-right btn btn-success">
-        <i class="icon-plus icon-white"></i>
-        Add and Deploy
-      </button>
-      <br />
+  <div id="deployments-empty" class="modal hide">
+    <div class="modal-header clearfix">
+      <h3>
+        Create a Deployment 
+        <div class="header-link pull-right">
+          <span class="username">USERNAME</span>
+          | <a href="#" class="logout-btn">log out</a>
+        </div>
+      </h3>
 
-      <select id="existing-deployment-dropdown" class="empty hide">
-      </select>
-    </form>
+    </div>
+    <div class="modal-body">
+      <p>Create your first Deployment to host your app on <a href="http://cloud.deployd.com">cloud.deployd.com</a>:</p>
+      <hr />
+      <div class="form-placeholder">
+      </div>
+    </div>
+   <!--  <div class="modal-footer">
+      <a href="#" class="cancel-btn logout-btn">log out</a>
+      <a href="/dashboard" class="cancel-btn">cancel</a>
+    </div> -->
   </div>
 </div>
 
@@ -86,6 +96,20 @@
   </div>
 </div>
 
+<form class="form-inline hide" id="deploy-new-form">
+  <input type="text" class="input-large deployment-name" placeholder="new-deployment" />
+  <span class="help-inline">.deploydapp.com</span>
+
+  <button class="pull-right btn btn-success">
+    <i class="icon-plus icon-white"></i>
+    Add and Deploy
+  </button>
+  <br />
+
+  <select id="existing-deployment-dropdown" class="empty hide">
+  </select>
+</form>
+
 <script type="text/html" id="deployment-template">
   <li id="deployment-<%= deployment.appId %>" class="component-item <%= deployment.deploying ? 'deploying' : '' %>" data-index="<%= index %>">
     <div class="component-item-header">
diff --git a/lib/resources/dashboard/js/deployments.js b/lib/resources/dashboard/js/deployments.js
index 3439660..8878fba 100644
--- a/lib/resources/dashboard/js/deployments.js
+++ b/lib/resources/dashboard/js/deployments.js
@@ -12,7 +12,7 @@
   var dpdDeployments = dpd('__deployments');
   var deploymentTemplate = _.template($('#deployment-template').html());
   var $modal = $('#deployAuthModal').modal({
-    backdrop: 'static',
+    backdrop: false,
     keyboard: false,
     show: false
   });
@@ -27,7 +27,7 @@
   $('#deployment-list').on('click', '.deploy-btn', onClickDeployBtn);
   $('#deployment-list').on('click', '.remove-btn', onClickRemoveBtn);
 
-  $('#inner-deployments h3 .logout-btn').click(function() {
+  $('#deployments h3 .logout-btn').click(function() {
     onClickLogoutBtn();
     return false;
   });
@@ -215,14 +215,13 @@
   }
 
   function showLogin(error) {
+    renderDeployments();
     if (scope.user) {
       $modal.modal('hide');
-      $('#inner-deployments').show();
       $('#deployments h3 .username').text(scope.user.username);
       $('#deploy-new-form .deployment-name').focus();
     } else {
       $modal.modal('show');
-      $('#inner-deployments').hide();
       if (error) {
         $('#auth-error').show();
       } else {
@@ -233,40 +232,47 @@
   }
 
   function renderDeployments() {
-    if (scope.deployments === null || scope.deployments.length) {
-      $('#deployments-empty').hide();
-      $('#deployment-list-container').show();
+    if (scope.user) {
+     if (scope.deployments === null || scope.deployments.length) {
+       $('#deployments-empty').hide();
+       $('#inner-deployments').show();
+      $('#deploy-new-form').appendTo('#inner-deployments .form-placeholder').show();
+     } else {
+       $('#deployments-empty').show();
+       $('#inner-deployments').hide();
+       $('#deploy-new-form').appendTo('#deployments-empty .form-placeholder').show();
+       var $input = $('#deploy-new-form .deployment-name');
+       if (!$input.val()) $input.val(Context.appName);
+     }
+
+     if (scope.deployments) {
+       $('#deployment-list').empty();
+
+       // clean up orphaned tooltips
+       $('body > .tooltip').each(function() {
+         var $tooltip = $(this);
+         $tooltip.fadeOut(function() {
+           $tooltip.remove();
+         });
+       });
+
+       scope.deployments.forEach(function(d, i) {
+         $('#deployment-list').append(deploymentTemplate({
+           deployment: d,
+           index: i
+         }));
+
+         if (d.__deployed) {
+           showDeploymentTooltip(d);
+           d.__deployed = false;
+         }
+
+
+       });
+     }
     } else {
-      $('#deployments-empty').show();
-      $('#deployment-list-container').hide();
-      var $input = $('#deploy-new-form .deployment-name');
-      if (!$input.val()) $input.val(Context.appName);
-    }
-
-    if (scope.deployments) {
-      $('#deployment-list').empty();
-
-      // clean up orphaned tooltips
-      $('body > .tooltip').each(function() {
-        var $tooltip = $(this);
-        $tooltip.fadeOut(function() {
-          $tooltip.remove();
-        });
-      });
-
-      scope.deployments.forEach(function(d, i) {
-        $('#deployment-list').append(deploymentTemplate({
-          deployment: d,
-          index: i
-        }));
-
-        if (d.__deployed) {
-          showDeploymentTooltip(d);
-          d.__deployed = false;
-        }
-
-
-      });
+      $('#deployments-empty').hide();
+      $('#deployments-empty').hide();
     }
   }
 
diff --git a/lib/resources/dashboard/stylesheets/deployments.less b/lib/resources/dashboard/stylesheets/deployments.less
index 692f5e4..f2b4ee7 100644
--- a/lib/resources/dashboard/stylesheets/deployments.less
+++ b/lib/resources/dashboard/stylesheets/deployments.less
@@ -50,6 +50,10 @@
       color: #fff;
     }
 
+    hr {
+      border-top-color: #ccc; 
+    }
+
   }
 
   .component-item.deploying .component-item-header {
@@ -101,16 +105,25 @@
     }
   }
 
+
+
   #existing-deployment-dropdown {
     margin-top: 10px;
     color: #999;
 
-    option {
-      &:first-child {
-        color: #999;
-      }
+  }
 
+  #deployments-empty #existing-deployment-dropdown {
+    option {
+      color: @black;
+    }
+
+  }
+
+  #inner-deployments #existing-deployment-dropdown {
+    option {
       color: white;
+
     }
   }
 }
@@ -141,7 +154,9 @@
       color: @textColor !important;
     }
   }
+}
 
+.modal {
   .cancel-btn {
     display: inline-block;
     margin-left: 8px;
diff --git a/lib/resources/dashboard/stylesheets/layout.less b/lib/resources/dashboard/stylesheets/layout.less
index 305fcbb..6cdbb9a 100644
--- a/lib/resources/dashboard/stylesheets/layout.less
+++ b/lib/resources/dashboard/stylesheets/layout.less
@@ -34,15 +34,20 @@ body {
     color: white;
     display: inline-block;
     margin: 0;
-    font-size: 11pt;
+    font-size: 16px;
     line-height: 38px;
 
+    > i {
+      margin-top: 2px;
+    }
+
     &:hover, &.active {
       background: rgba(255,255,255, 0.1);
       text-decoration: none;
     }
 
     .caret {
+      opacity: 1;
       border-top-color: white;
       margin-top: 18px;
     }
diff --git a/lib/resources/dashboard/stylesheets/style.css b/lib/resources/dashboard/stylesheets/style.css
index ffb251e..fabf763 100644
--- a/lib/resources/dashboard/stylesheets/style.css
+++ b/lib/resources/dashboard/stylesheets/style.css
@@ -125,11 +125,8 @@ textarea {
 
   /* Makes inputs behave like true block-level elements */
 
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
   -ms-box-sizing: border-box;
   box-sizing: border-box;
-  box-sizing: border-box;
   -moz-box-sizing: border-box;
   -webkit-box-sizing: border-box;
 }
@@ -1995,7 +1992,7 @@ table .span24 {
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
   border-color: #e6e6e6 #e6e6e6 #bfbfbf;
   border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
   border: 1px solid #cccccc;
   border-bottom-color: #b3b3b3;
   -webkit-border-radius: 4px;
@@ -2108,7 +2105,7 @@ table .span24 {
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#429e96', endColorstr='#428f9e', GradientType=0);
   border-color: #428f9e #428f9e #2b5e68;
   border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
 }
 .btn-primary:hover,
 .btn-primary:active,
@@ -2133,7 +2130,7 @@ table .span24 {
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fe7f1c', endColorstr='#cc5a01', GradientType=0);
   border-color: #cc5a01 #cc5a01 #803801;
   border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
 }
 .btn-warning:hover,
 .btn-warning:active,
@@ -2158,7 +2155,7 @@ table .span24 {
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#8b0e0c', endColorstr='#8b0e0c', GradientType=0);
   border-color: #8b0e0c #8b0e0c #450706;
   border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
 }
 .btn-danger:hover,
 .btn-danger:active,
@@ -2183,7 +2180,7 @@ table .span24 {
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#668731', endColorstr='#82ac3f', GradientType=0);
   border-color: #82ac3f #82ac3f #58742a;
   border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
 }
 .btn-success:hover,
 .btn-success:active,
@@ -2208,7 +2205,7 @@ table .span24 {
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#429e96', endColorstr='#59bab1', GradientType=0);
   border-color: #59bab1 #59bab1 #3a8c85;
   border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
 }
 .btn-info:hover,
 .btn-info:active,
@@ -2233,7 +2230,7 @@ table .span24 {
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0);
   border-color: #222222 #222222 #000000;
   border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
 }
 .btn-inverse:hover,
 .btn-inverse:active,
@@ -2849,7 +2846,7 @@ input[type="submit"].btn.btn-mini {
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#363535', endColorstr='#363535', GradientType=0);
   border-color: #363535 #363535 #0f0f0f;
   border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
   -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
   -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
   box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
@@ -3764,11 +3761,8 @@ a.thumbnail:hover {
   -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
   -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
   -ms-box-sizing: border-box;
   box-sizing: border-box;
-  box-sizing: border-box;
   -moz-box-sizing: border-box;
   -webkit-box-sizing: border-box;
   -webkit-transition: width 0.6s ease;
@@ -4077,15 +4071,19 @@ body {
   color: white;
   display: inline-block;
   margin: 0;
-  font-size: 11pt;
+  font-size: 16px;
   line-height: 38px;
 }
+#header .header-link > i {
+  margin-top: 2px;
+}
 #header .header-link:hover,
 #header .header-link.active {
   background: rgba(255, 255, 255, 0.1);
   text-decoration: none;
 }
 #header .header-link .caret {
+  opacity: 1;
   border-top-color: white;
   margin-top: 18px;
 }
@@ -4113,11 +4111,8 @@ body {
   min-height: 100%;
   width: 100%;
   min-width: 1000px;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
   -ms-box-sizing: border-box;
   box-sizing: border-box;
-  box-sizing: border-box;
   -moz-box-sizing: border-box;
   -webkit-box-sizing: border-box;
   box-flex: 1;
@@ -4208,11 +4203,8 @@ body {
   display: -ms-box;
   display: -o-box;
   width: 100%;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
   -ms-box-sizing: border-box;
   box-sizing: border-box;
-  box-sizing: border-box;
   -moz-box-sizing: border-box;
   -webkit-box-sizing: border-box;
 }
@@ -4283,6 +4275,9 @@ body {
   padding: 20px;
   color: #fff;
 }
+#deployments #deployments-empty hr {
+  border-top-color: #ccc;
+}
 #deployments .component-item.deploying .component-item-header {
   box-shadow: inset 0 0 10px 0px #429e96;
   animation: deploying 0.5s infinite alternate;
@@ -4323,11 +4318,11 @@ body {
   margin-top: 10px;
   color: #999;
 }
-#deployments #existing-deployment-dropdown option {
-  color: white;
+#deployments #deployments-empty #existing-deployment-dropdown option {
+  color: #363535;
 }
-#deployments #existing-deployment-dropdown option:first-child {
-  color: #999;
+#deployments #inner-deployments #existing-deployment-dropdown option {
+  color: white;
 }
 #deployAuthModal .row {
   margin-top: 20px;
@@ -4344,7 +4339,7 @@ body {
 #deployAuthModal .form-vertical label {
   color: #666666 !important;
 }
-#deployAuthModal .cancel-btn {
+.modal .cancel-btn {
   display: inline-block;
   margin-left: 8px;
   vertical-align: middle;
@@ -4701,7 +4696,7 @@ li.L9 {
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
   border-color: #e6e6e6 #e6e6e6 #bfbfbf;
   border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
   border: 1px solid #cccccc;
   border-bottom-color: #b3b3b3;
   -webkit-border-radius: 4px;
@@ -4748,11 +4743,8 @@ li.L9 {
   background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
   background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
   background-image: linear-gradient(top, #ffffff, #e6e6e6);
-  background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
   border-color: #e6e6e6 #e6e6e6 #bfbfbf;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
   border: 1px solid #cccccc;
   border-bottom-color: #b3b3b3;
   -webkit-border-radius: 4px;
@@ -4776,7 +4768,7 @@ li.L9 {
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#429e96', endColorstr='#428f9e', GradientType=0);
   border-color: #428f9e #428f9e #2b5e68;
   border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
 }
 .confirmation .actions button.ok:hover,
 .confirmation .actions button.ok:active,
@@ -5003,12 +4995,12 @@ li.L9 {
   -moz-backface-visibility: hidden;
 }
 .card .back {
-  -webkit-transform: rotatey(180deg);
-  -moz-transform: rotatey(180deg);
+  -webkit-transform: rotateY(180deg);
+  -moz-transform: rotateY(180deg);
 }
 .card.flipped .wrapper {
-  -webkit-transform: rotatey(180deg);
-  -moz-transform: rotatey(180deg);
+  -webkit-transform: rotateY(180deg);
+  -moz-transform: rotateY(180deg);
 }
 /* sideflip effect */
 .card.sideflip .wrapper {
@@ -5016,8 +5008,8 @@ li.L9 {
   -moz-transform-origin: right center;
 }
 .card.sideflip.flipped .wrapper {
-  -webkit-transform: translatex(-100%) rotatey(180deg);
-  -moz-transform: translatex(-100%) rotatey(180deg);
+  -webkit-transform: translateX(-100%) rotateY(180deg);
+  -moz-transform: translateX(-100%) rotateY(180deg);
 }
 body {
   background: url(../img/outlets.png) #030202;
@@ -5118,7 +5110,9 @@ select {
 #dialog input,
 .modal input,
 #dialog textarea,
-.modal textarea {
+.modal textarea,
+#dialog select,
+.modal select {
   background-color: #ffffff;
   color: #666666;
 }
@@ -5735,6 +5729,8 @@ table input[type=number] {
 }
 .modal-header h3 {
   color: #363535;
+  line-height: 22px;
+  margin: 2px 0 2px 0;
 }
 #api table {
   margin-bottom: 0;
diff --git a/lib/resources/dashboard/stylesheets/style.less b/lib/resources/dashboard/stylesheets/style.less
index 6636fe1..611ff24 100644
--- a/lib/resources/dashboard/stylesheets/style.less
+++ b/lib/resources/dashboard/stylesheets/style.less
@@ -100,7 +100,7 @@ background-color: darken(@black, 10%);
 
 input, textarea, select {background: darken(@black, 10%); color: @white; border: solid 1px @black;}
 #dialog, .modal {
-  input, textarea {
+  input, textarea, select {
     background-color: #ffffff;
     color: @textColor; 
   }
@@ -787,7 +787,11 @@ table input {
 }
 
 .modal-header {
-  h3 {color: @black;}
+  h3 {
+    color: @black;
+    line-height: 22px;
+    margin: 2px 0 2px 0;
+  }
 }
 
 #api {

From af6f7ed33c5e49705e53f71347c46bae96a702ba Mon Sep 17 00:00:00 2001
From: Dallon Feldner <dallonfdev@gmail.com>
Date: Tue, 11 Dec 2012 13:31:25 -0700
Subject: [PATCH 5/7] Swapped add existing deployment dropdown for a bootstrap
 dropdown button

---
 lib/resources/dashboard/deployments.html      | 16 +++++++-
 lib/resources/dashboard/js/deployments.js     | 24 +++++------
 .../dashboard/stylesheets/deployments.less    | 17 +++++---
 lib/resources/dashboard/stylesheets/style.css | 41 +++++++++++++------
 4 files changed, 65 insertions(+), 33 deletions(-)

diff --git a/lib/resources/dashboard/deployments.html b/lib/resources/dashboard/deployments.html
index 32b54c2..5c6c79d 100644
--- a/lib/resources/dashboard/deployments.html
+++ b/lib/resources/dashboard/deployments.html
@@ -106,8 +106,20 @@
   </button>
   <br />
 
-  <select id="existing-deployment-dropdown" class="empty hide">
-  </select>
+  <div id="existing-deployment-dropdown-btn" class="hide btn-group pull-right" style="margin-top: 10px">
+    <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+      <i class="icon-plus"></i>
+      Add Existing Deployment
+      <span class="caret"></span>
+    </a>
+    <ul class="dropdown-menu" id="existing-deployment-dropdown">
+      
+    </ul>
+  </div>
+  <div class="clearfix"></div>
+
+  <!-- <select id="existing-deployment-dropdown" class="empty hide">
+  </select> -->
 </form>
 
 <script type="text/html" id="deployment-template">
diff --git a/lib/resources/dashboard/js/deployments.js b/lib/resources/dashboard/js/deployments.js
index 8878fba..e452e0e 100644
--- a/lib/resources/dashboard/js/deployments.js
+++ b/lib/resources/dashboard/js/deployments.js
@@ -38,7 +38,7 @@
     deployNew();
     return false;
   });
-  $('#existing-deployment-dropdown').change(onSelectExistingDeployment);
+  $('#existing-deployment-dropdown').on('click', 'li a', onSelectExistingDeployment);
 
   function loadDeployments() {
     dpdDeployments.get(function(deployments, error) {
@@ -196,16 +196,12 @@
   }
 
   function onSelectExistingDeployment(e) {
-    var $dropdown = $(this);
-    var name = $dropdown.val();
-    if (name === "__") return true;
+    var $link = $(this);
+    var name = $link.attr('data-value');
 
-    $dropdown.attr('disabled', true);
+    deployNew(name);
 
-    deployNew(name, function() {
-      $dropdown.removeAttr('disabled');
-      $dropdown.val("__");
-    });
+    e.preventDefault();
   }
 
   function onClickLogoutBtn() {
@@ -277,15 +273,17 @@
   }
 
   function renderOnlineDeployments() {
+    var $dropdownBtn = $('#existing-deployment-dropdown-btn');
     var $dropdown = $('#existing-deployment-dropdown');
     if (scope.onlineDeployments && scope.onlineDeployments.length) {
-      $dropdown.show().empty();
-      $dropdown.append('<option value="__">or add an existing deployment...</option>');
+      $dropdownBtn.show();
+      $dropdown.empty();
+      // $dropdown.append('<option value="__">or add an existing deployment...</option>');
       scope.onlineDeployments.forEach(function(o) {
-        $dropdown.append('<option value="' + o.name + '">' + o.name + "</option>");
+        $dropdown.append('<li><a href="#" data-value="' + o.name + '">' + o.name + "</a></li>");
       });
     } else {
-      $dropdown.hide();
+      $dropdownBtn.hide();
     }
   }
 
diff --git a/lib/resources/dashboard/stylesheets/deployments.less b/lib/resources/dashboard/stylesheets/deployments.less
index f2b4ee7..e50b632 100644
--- a/lib/resources/dashboard/stylesheets/deployments.less
+++ b/lib/resources/dashboard/stylesheets/deployments.less
@@ -37,6 +37,10 @@
   width: 585px;
   max-width: 585px;
 
+  #deploy-new-form {
+    margin-bottom: 0;
+  }
+
   hr {
     border-bottom: none;
     border-width: 1px;
@@ -45,11 +49,14 @@
 
   #deployments-empty {
 
-    .well {
-      padding: 20px;
-      color: #fff;
+    overflow: visible;
+
+    .modal-body {
+      overflow-y: visible;
     }
 
+    
+
     hr {
       border-top-color: #ccc; 
     }
@@ -107,7 +114,7 @@
 
 
 
-  #existing-deployment-dropdown {
+  /*#existing-deployment-dropdown {
     margin-top: 10px;
     color: #999;
 
@@ -125,7 +132,7 @@
       color: white;
 
     }
-  }
+  }*/
 }
 
 #deployAuthModal {
diff --git a/lib/resources/dashboard/stylesheets/style.css b/lib/resources/dashboard/stylesheets/style.css
index fabf763..720f4ec 100644
--- a/lib/resources/dashboard/stylesheets/style.css
+++ b/lib/resources/dashboard/stylesheets/style.css
@@ -4265,15 +4265,40 @@ body {
 #deployments {
   width: 585px;
   max-width: 585px;
+  /*#existing-deployment-dropdown {
+    margin-top: 10px;
+    color: #999;
+
+  }
+
+  #deployments-empty #existing-deployment-dropdown {
+    option {
+      color: @black;
+    }
+
+  }
+
+  #inner-deployments #existing-deployment-dropdown {
+    option {
+      color: white;
+
+    }
+  }*/
+
+}
+#deployments #deploy-new-form {
+  margin-bottom: 0;
 }
 #deployments hr {
   border-bottom: none;
   border-width: 1px;
   border-top-color: #555555;
 }
-#deployments #deployments-empty .well {
-  padding: 20px;
-  color: #fff;
+#deployments #deployments-empty {
+  overflow: visible;
+}
+#deployments #deployments-empty .modal-body {
+  overflow-y: visible;
 }
 #deployments #deployments-empty hr {
   border-top-color: #ccc;
@@ -4314,16 +4339,6 @@ body {
 #deployments .component-item-header:hover .open-icon {
   visibility: visible;
 }
-#deployments #existing-deployment-dropdown {
-  margin-top: 10px;
-  color: #999;
-}
-#deployments #deployments-empty #existing-deployment-dropdown option {
-  color: #363535;
-}
-#deployments #inner-deployments #existing-deployment-dropdown option {
-  color: white;
-}
 #deployAuthModal .row {
   margin-top: 20px;
 }

From cb67083963a0ba63c78f7850ea1f9ace4e8f2893 Mon Sep 17 00:00:00 2001
From: Ritchie Martori <skawful@gmail.com>
Date: Wed, 19 Dec 2012 15:35:04 -0800
Subject: [PATCH 6/7] additional changed() fixes

---
 lib/resources/collection/index.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/resources/collection/index.js b/lib/resources/collection/index.js
index 3887009..8555b26 100644
--- a/lib/resources/collection/index.js
+++ b/lib/resources/collection/index.js
@@ -467,9 +467,13 @@ Collection.prototype.save = function (ctx, fn) {
       } 
       if(err) return done(err);
 
+      // copy previous obj
+      Object.keys(obj).forEach(function (key) {
+        prev[key] = obj[key];
+      });
+
       // merge changes
       Object.keys(item).forEach(function (key) {
-        prev[key] = obj[key];
         obj[key] = item[key];
       });
       

From 8826c6e553021bcd8bac9000b359de99764773eb Mon Sep 17 00:00:00 2001
From: DallonF <dallonfdev@gmail.com>
Date: Thu, 20 Dec 2012 10:43:44 -0700
Subject: [PATCH 7/7] Dashboard bug fixes

---
 HISTORY.md                                    |  4 +
 lib/resources/collection/dashboard/data.html  |  6 +-
 .../dashboard/js/util/knockout-util.js        | 79 ++++++++++++++++---
 lib/resources/collection/dashboard/style.css  |  7 +-
 lib/resources/collection/dashboard/style.less |  4 +-
 5 files changed, 76 insertions(+), 24 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index b3c75bc..8358c21 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -6,6 +6,10 @@
  - Fixed bug where changing a property type from "number" to "string" made existing properties uneditable.
  - Fixed bug where `changed()` was returning true for values that had not changed.
  - Fixed certain error's returned as HTML rather than JSON.
+ - Data editor
+   - Fixed bug where data editor would expand as the page scrolls
+   - Fixed bug where the cursor would randomly move around while editing text
+   - Removed overlay for inline editing
 
 ## 0.6.9 
 
diff --git a/lib/resources/collection/dashboard/data.html b/lib/resources/collection/dashboard/data.html
index a0fc24d..0b523b3 100644
--- a/lib/resources/collection/dashboard/data.html
+++ b/lib/resources/collection/dashboard/data.html
@@ -1,5 +1,5 @@
 <div data-bind="scrollbarWidth: view.scrollWidth"></div>
-<div id="data" class="well full-page">
+<div id="data" class="well">
   <h3>Data</h3>
 
   <div id="no-property-warning" class="alert alert-info hide">
@@ -7,7 +7,7 @@
     <a href="../properties">Add some now</a> before editing data.
   </div>
 
-  <div id="table-container" data-bind="scrollY: view.scrollY, scrollX: view.scrollX, screenDimensions: view.dimensions, reflow: view.init">      
+  <div id="table-container" data-bind="scrollY: view.scrollY, scrollX: view.scrollX, screenDimensions: view.dimensions, reflow: view.init, style: {height: view.dimensions().height + 'px'}">      
 
     <div id="editor-modal" class="modal hide" data-bind="if: propertiesLoaded, bootstrapModal: edit.editingModal">
       <div class="modal-header">
@@ -29,7 +29,7 @@
         <div class="mini-edit" data-bind="style: {top: view.selectedCellPos().top + 'px', left: view.selectedCellPos().left + 'px'}, if: edit.editingInline, click: view.noOp, clickBubble: false">
           <!-- ko if: selectedProp().type === 'string' -->
             <a href="#" title="Edit in modal" data-bind="click: edit.openModal"><i class="icon-edit icon-white"></i></a>
-            <input type="text" data-bind="hasfocus: edit.focusInput, select: 'selectEditor', value: edit.editValue, valueUpdate: 'afterkeydown', typeahead: edit.typeahead" />
+            <input type="text" class="inline-editor-input" data-bind="hasfocus: edit.focusInput, select: 'selectEditor', customValue: edit.editValue, valueUpdate: 'afterkeydown', typeahead: edit.typeahead" />
           <!-- /ko -->
           <!-- ko if: selectedProp().type === 'number' -->
             <input type="text" class="number" data-bind="hasfocus: edit.focusInput, select: 'selectEditor', numberValue: edit.editValue, valueUpdate: 'afterkeydown'" />
diff --git a/lib/resources/collection/dashboard/js/util/knockout-util.js b/lib/resources/collection/dashboard/js/util/knockout-util.js
index 40c0357..77e83da 100644
--- a/lib/resources/collection/dashboard/js/util/knockout-util.js
+++ b/lib/resources/collection/dashboard/js/util/knockout-util.js
@@ -159,22 +159,28 @@ ko.bindingHandlers.screenDimensions = {
 function calculateScreenDimensions(element) {
   var $element = $(element)
     , $window = $(window)
-    , top = $element.offset().top - $window.scrollTop()
+    , windowHeight = $window.height()
+    , windowWidth = $window.width()
+    , staticTop = $element.offset().top
+    , top = staticTop - $window.scrollTop()
     , left = $element.offset().left - $window.scrollLeft()
-    , height = $element.height()
+    , height = windowHeight - staticTop - 60 // 60 is bottom padding - probably shouldn't be hardcoded
     , width = $element.width()
     , bottom = top + height
     , right = left + width
-    , bottomRelative = $(window).height() - bottom
-    , rightRelative = $(window).width() - right;
+    , bottomRelative = windowHeight - bottom
+    , rightRelative = windowWidth - right;
 
   return {
-      top: top
+      staticTop: staticTop
+    , top: top
     , left: left
     , bottom: bottom
     , right: right
     , height: height
     , width: width
+    , windowHeight: windowHeight
+    , windowWidth: windowWidth
     , bottomRelative: bottomRelative
     , rightRelative: rightRelative
   };
@@ -220,13 +226,46 @@ ko.bindingHandlers.element = {
   }
 };
 
+// I don't know why I have to do this; seems like Knock's built-in version is bugged
+ko.bindingHandlers.customValue = {
+  init: function(element, valueAccessor, allBindingsAccessor, vm) {
+    var prop = valueAccessor()
+      , allBindings = allBindingsAccessor()
+      , updateMode = allBindings.valueUpdate || 'blur';
+
+    if (typeof prop === 'function') {
+
+      if (updateMode === 'afterkeydown') {
+
+        $(element).on('keydown', function(e) {
+          setTimeout(function() {
+            prop($(element).val());
+          }, 0);
+        });
+      }
+
+      $(element).blur(function() {
+        prop($(element).val());
+      });
+    }
+  }, update: function(element, valueAccessor) {
+    var newVal = ko.utils.unwrapObservable(valueAccessor());
+
+    if (newVal !== $(element).val()) {
+      $(element).val(newVal);  
+    }
+  }
+};
+
 ko.bindingHandlers.numberValue = {
   init: function(element, valueAccessor, allBindingsAccessor, vm) {
     var prop = valueAccessor()
       , allBindings = allBindingsAccessor()
       , updateMode = allBindings.valueUpdate || 'blur';
 
-    $(element).val(ko.utils.unwrapObservable(prop));
+    if (parseFloat($(element).val()) !== ko.utils.unwrapObservable(prop)) {
+      $(element).val(ko.utils.unwrapObservable(prop));
+    }
 
     if (typeof prop === 'function') {
 
@@ -234,7 +273,7 @@ ko.bindingHandlers.numberValue = {
 
         $(element).on('keydown', function(e) {
           var num = parseFloat($(element).val());
-          if (isNaN(num)) return;
+          if (isNaN(num)) return true;
 
           if (e.which == 38) { // up 
             prop(num + 1);
@@ -266,7 +305,7 @@ ko.bindingHandlers.numberValue = {
 
 function setNumberProp(element, prop) {
   var num = parseFloat($(element).val());
-  if (!isNaN(num)) prop(num);
+  if (!isNaN(num) && prop() != num) prop(num);
 }
 
 ko.bindingHandlers.select = {
@@ -323,10 +362,10 @@ ko.bindingHandlers.aceEditor = {
     $(element).data('aceEditor', editor);
 
     editor.getSession().on('change', function(e) {
-        var newVal = editor.getValue();
-        if (newVal !== val()) {
-          val(newVal);  
-        }
+      var newVal = editor.getValue();
+      if (newVal !== val() && $(element).is(':visible')) {
+        val(newVal);  
+      }
     });
   }, update: function(element, valueAccessor) {
     var editor = $(element).data('aceEditor')
@@ -338,7 +377,6 @@ ko.bindingHandlers.aceEditor = {
       val = val.toString(); 
     }
     
-
     if (val !== editor.getValue()) {
       editor.setValue(val);
     }
@@ -358,6 +396,21 @@ ko.bindingHandlers.aceEditorResize = {
   }
 };
 
+// ko.bindingHandlers.customHasFocus = {
+//   update: function(element, valueAccessor) {
+//     var $el = $(element)
+//       , val = ko.utils.unwrapObservable(valueAccessor());
+
+//     setTimeout(function() {
+//       if (val && !$el.is(':focus')) {
+//         $el.focus();  
+//       } else if (!val && $el.is(':focus')) {
+//         $el.blur();
+//       }
+//     }, 5);
+//   }
+// };
+
 ko.bindingHandlers.aceEditorFocus = {
   update: function(element, valueAccessor) {
     var editor = $(element).data('aceEditor')
diff --git a/lib/resources/collection/dashboard/style.css b/lib/resources/collection/dashboard/style.css
index 65e2973..ed43f3b 100644
--- a/lib/resources/collection/dashboard/style.css
+++ b/lib/resources/collection/dashboard/style.css
@@ -15,7 +15,7 @@
   bottom: 0;
   right: 0;
   left: 0;
-  background: rgba(0, 0, 0, 0.5);
+  background: rgba(0, 0, 0, 0);
   z-index: 100;
 }
 #inline-editor #inline-editor-table-overlay {
@@ -65,11 +65,6 @@
 }
 #table-container {
   position: relative;
-  box-flex: 1;
-  -moz-box-flex: 1;
-  -webkit-box-flex: 1;
-  -ms-box-flex: 1;
-  -o-box-flex: 1;
   height: 0px;
   overflow: scroll;
 }
diff --git a/lib/resources/collection/dashboard/style.less b/lib/resources/collection/dashboard/style.less
index 915dafd..283ae1a 100644
--- a/lib/resources/collection/dashboard/style.less
+++ b/lib/resources/collection/dashboard/style.less
@@ -29,7 +29,7 @@
   right: 0;
   left: 0;
 
-  background: rgba(0, 0, 0, 0.5);
+  background: rgba(0, 0, 0, 0);
   z-index: 100;
 
   #inline-editor-table-overlay {
@@ -78,7 +78,7 @@
 
 #table-container {
   position: relative;
-  .box-flex(1);
+  // .box-flex(1);
   height: 0px;
   
   overflow: scroll;