From 2fc8d05749b73af4dff100c3dcad9fe9a922dbed Mon Sep 17 00:00:00 2001
From: Austin King <shout@ozten.com>
Date: Wed, 9 Jul 2014 16:04:51 -0700
Subject: [PATCH] Couple improvements towards issue#37

---
 docs/AWS.md                                 | 4 ++++
 server/routes/new_app.js                    | 1 +
 server/views/dashboard.html                 | 8 +++++++-
 server/views/includes/_upload_app_form.html | 5 ++---
 www/css/main.css                            | 6 +++++-
 www/js/main.js                              | 7 +++++++
 6 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/docs/AWS.md b/docs/AWS.md
index 93b79e3..0f7cb9d 100644
--- a/docs/AWS.md
+++ b/docs/AWS.md
@@ -1,3 +1,7 @@
+# Mozilla dev is 
+
+    ssh ozten@ec2-54-198-98-151.compute-1.amazonaws.com
+
 # AWS - Easy Deployment of BetaFox
 
 1) Launch medium ec2 instance with Ubuntu 14.10 and not it's Public DNS
diff --git a/server/routes/new_app.js b/server/routes/new_app.js
index 1250bea..ef9b64b 100644
--- a/server/routes/new_app.js
+++ b/server/routes/new_app.js
@@ -21,6 +21,7 @@ module.exports = function(config) {
           console.log(err.stack || err);
           return res.send('DB Error', 500);
         }
+        console.log(req.files);
         if (!req.files || !req.files.app_package || !req.files.app_package.path) {
           return res.send(400, 'Bad upload');
         }
diff --git a/server/views/dashboard.html b/server/views/dashboard.html
index 52b6513..5465845 100644
--- a/server/views/dashboard.html
+++ b/server/views/dashboard.html
@@ -1 +1,7 @@
-{% extends "layout.html" %} {% block title %}BetaFox - Dashboard{% endblock %} {% block template_name %}dashboard.html{% endblock %} {% block content %} {% include "includes/_upload_app_form.html" %} {% endblock %}
+{% extends "layout.html" %}
+{% block title %}BetaFox - Dashboard{% endblock %}
+{% block template_name %}dashboard.html{% endblock %}
+{% block content %}
+<h3>Upload A Packaged App</h3>
+  {% include "includes/_upload_app_form.html" %}
+{% endblock %}
diff --git a/server/views/includes/_upload_app_form.html b/server/views/includes/_upload_app_form.html
index dc7ea15..b752792 100644
--- a/server/views/includes/_upload_app_form.html
+++ b/server/views/includes/_upload_app_form.html
@@ -1,7 +1,6 @@
   <!-- TODO form should be able to POST to either /apps or /app/:appId -->
   <form action="/apps" method="POST" enctype="multipart/form-data">
     <input type="hidden" id="csrf_token" name="_csrf" value="{{ csrf }}" />
-    <label for="app_package">Upload packaged app zip</label>
-    <input type="file" id="app_package" name="app_package" />
-    <input type="submit" name="submit" value="Upload" />
+    <label for="app_package">Choose zip file</label>
+    <input type="file" id="app_package" name="app_package"/>
   </form>
diff --git a/www/css/main.css b/www/css/main.css
index 05dfdcf..7af8f80 100644
--- a/www/css/main.css
+++ b/www/css/main.css
@@ -26,17 +26,21 @@ img {
 
 #main-content {
   display: flex;
+  flex: 1;
   flex-direction: rows;
-  flex: 12;
   align-self: stretch;
 }
 
 #container {
+  padding-top: 25px;
+  padding-bottom: 25px;
   flex: 5;
 }
 
 #sidebar {
   flex: 2;
+  padding-top: 25px;
+  padding-bottom: 25px;
   border-left: solid 1px grey;
   padding-left: 2.5%;
   padding-right: 2.5%;
diff --git a/www/js/main.js b/www/js/main.js
index bfdfaad..d96afd6 100644
--- a/www/js/main.js
+++ b/www/js/main.js
@@ -2,4 +2,11 @@
   $('.logo h1').fitText(0.43, {
     minFontSize: '20px', maxFontSize: '48px'
   });
+
+  $(this).attr('disabled', null);
+  $('#app_package').bind('change', function(e) {
+    $('label[for="app_package"]').text('Uploading');
+    $(this).parent().submit();
+    $(this).attr('disabled', true);
+   });
 })();