From d41c82b003ab9e8d4464adc4bf45453ec6183b83 Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@c9.io>
Date: Wed, 1 Apr 2015 00:07:23 +0000
Subject: [PATCH] Fully integrated installer back into cloud9

---
 configs/client-default.js                  | 12 +++++++++---
 package.json                               |  6 +++---
 plugins/c9.core/c9.js                      |  6 ++++++
 plugins/c9.ide.ui/widgets.list.js          |  2 +-
 plugins/c9.vfs.standalone/www/install.html |  1 +
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/configs/client-default.js b/configs/client-default.js
index e6bdcd70..042f7642 100644
--- a/configs/client-default.js
+++ b/configs/client-default.js
@@ -46,7 +46,7 @@ module.exports = function(options) {
             env: options.env || "devel",
             home: options.home,
             platform: options.platform,
-            architecture: options.architecture,
+            arch: options.arch,
             installed: options.installed,
             projectId: options.project.id,
             projectName: options.projectName || "Project",
@@ -222,7 +222,10 @@ module.exports = function(options) {
             autoInit: !options.local
         },
         "plugins/c9.ide.ui/forms",
-        "plugins/c9.ide.ui/widgets.list",
+        {
+            packagePath: "plugins/c9.ide.ui/widgets.list",
+            staticPrefix: staticPrefix + "/plugins/c9.ide.layout.classic"
+        },
         "plugins/c9.ide.ui/widgets.tree",
         "plugins/c9.ide.ui/widgets.datagrid",
         "plugins/c9.ide.ui/focus",
@@ -496,7 +499,10 @@ module.exports = function(options) {
         "plugins/c9.ide.panels/area",
         
         // Installer
-        "plugins/c9.ide.installer/gui",
+        {
+            packagePath: "plugins/c9.ide.installer/gui",
+            staticPrefix: staticPrefix + "/plugins/c9.ide.layout.classic",
+        },
         "plugins/c9.ide.installer/automate",
         "plugins/c9.ide.installer/commands/centos",
         "plugins/c9.ide.installer/commands/bash",
diff --git a/package.json b/package.json
index 2d17ee3d..3823e6fb 100644
--- a/package.json
+++ b/package.json
@@ -60,9 +60,9 @@
         "c9.ide.language.javascript.tern": "#7aab8b0b6a",
         "c9.ide.language.javascript.infer": "#ebb2daf81a",
         "c9.ide.language.jsonalyzer": "#efa4426f1f",
-        "c9.ide.collab": "#7009f69cb0",
+        "c9.ide.collab": "#ce60175443",
         "c9.ide.local": "#2bfd7ff051",
-        "c9.ide.find": "#989c06e6a7",
+        "c9.ide.find": "#9fc6f4cfa5",
         "c9.ide.find.infiles": "#1b83cf12f1",
         "c9.ide.find.replace": "#e4daf722b8",
         "c9.ide.run.debug": "#638e6b00b3",
@@ -83,7 +83,7 @@
         "c9.ide.help.support": "#60e88f5680",
         "c9.ide.imgeditor": "#08bbc53578",
         "c9.ide.immediate": "#6845a93705",
-        "c9.ide.installer": "#cb5f4d70c6",
+        "c9.ide.installer": "#d9153a0489",
         "c9.ide.mount": "#32e79866ee",
         "c9.ide.navigate": "#64156c7f4a",
         "c9.ide.newresource": "#9a7464cc47",
diff --git a/plugins/c9.core/c9.js b/plugins/c9.core/c9.js
index 502871af..0e310961 100644
--- a/plugins/c9.core/c9.js
+++ b/plugins/c9.core/c9.js
@@ -24,6 +24,7 @@ define(function(require, module, exports) {
 
         var loaded = false;
         var loggedIn = false;
+        var isReady = false;
         var state = 0;
         
         var STORAGE = 1 << 1;
@@ -109,6 +110,7 @@ define(function(require, module, exports) {
         }
 
         function ready(){
+            isReady = true;
             emit.sticky("ready");
         }
         
@@ -284,6 +286,10 @@ define(function(require, module, exports) {
              */
             get startLoadTime(){ return startLoadTime; },
             set startLoadTime(v){ startLoadTime = v; },
+            /**
+             * 
+             */
+            get isReady(){ return isReady; },
             
             _events: [
                 /**
diff --git a/plugins/c9.ide.ui/widgets.list.js b/plugins/c9.ide.ui/widgets.list.js
index 22333c6f..87fc71b8 100644
--- a/plugins/c9.ide.ui/widgets.list.js
+++ b/plugins/c9.ide.ui/widgets.list.js
@@ -19,7 +19,7 @@ define(function(require, exports, module) {
         };
         
         ui.on("load", function(){
-            ui.insertCss(require("text!./widgets.less"), ui);
+            ui.insertCss(require("text!./widgets.less"), options.staticPrefix, ui);
         });
         
         /***** Constructors *****/
diff --git a/plugins/c9.vfs.standalone/www/install.html b/plugins/c9.vfs.standalone/www/install.html
index d7e3dce9..0cee36a6 100644
--- a/plugins/c9.vfs.standalone/www/install.html
+++ b/plugins/c9.vfs.standalone/www/install.html
@@ -35,6 +35,7 @@
                 app.on("ready", function(){
                     // if (app.services.c9.debug)
                         window.app = app.services;
+                    app.services.c9.ready();
                 });
             });
         });