Merge branch 'refs/heads/FileIO-jose' into FileIO

Conflicts:
	css/ninja.css
	js/controllers/document-controller.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

2 files changed, 8 insertions, 2 deletions

diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.html b/js/io/ui/cloudpopup.reel/cloudpopup.html
index 2c1c169a..e58041ec 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.html
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.html
@@ -36,7 +36,7 @@
                         
                         <p>Connection to the Cloud Server was not detected. Please verify <br />that the server is running and the URL below is correct.</p>
                         
-                        <label for="cloud_url">Cloud Server URL:</label><input type="text" id="cloud_url" class="cloud_url" value="http://localhost:16380" />
+                        <label for="cloud_url">Cloud Server URL:</label><input type="text" id="cloud_url" class="cloud_url" value="" />
                         
                         <button class="btn_test nj-skinned">Test</button>
                         
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.js b/js/io/ui/cloudpopup.reel/cloudpopup.js
index e5bad98e..a2283d46 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.js
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.js
@@ -88,7 +88,13 @@ exports.CloudPopup = Montage.create(Component, {
     downloadCloudApp: {
         enumerable: false,
         value: function() {
-                console.log(this._os);
+                if(this._os === 'mac') {
+                        location.href = '/ninja_localcloud_for_mac.zip';
+                } else if (this._os === 'windows') {
+                        location.href = '/ninja_localcloud_for_windows.zip';
+                } else {
+                        alert('Your operating system is not supported by the Ninja Local Cloud App.');
+                }
         }
     },
     ////////////////////////////////////////////////////////////////////