From ddd5c494618ce8e95f07690129f7f504a0e2861a Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 22 Apr 2015 15:29:29 -0400 Subject: [PATCH] installer ux fixes --- install/web.js | 18 ++++++------------ public/src/installer/install.js | 4 ++++ src/views/install/index.tpl | 2 +- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/install/web.js b/install/web.js index 9739701de4..f406d3ba35 100644 --- a/install/web.js +++ b/install/web.js @@ -63,17 +63,11 @@ function welcome(req, res) { }); }); - fs.readFile(path.join(__dirname, '../config.json'), function(err, file) { - if (file) { - res.locals.success = true; - } - - res.render('install/index', { - databases: databases, - error: res.locals.error ? true : false, - success: res.locals.success ? true : false, - values: req.body - }); + res.render('install/index', { + databases: databases, + error: res.locals.error ? true : false, + success: res.locals.success ? true : false, + values: req.body }); } @@ -102,7 +96,7 @@ function install(req, res) { } function launch(req, res) { - + res.json({}); } function compileLess(callback) { diff --git a/public/src/installer/install.js b/public/src/installer/install.js index 4fc8677266..26c757ea1f 100644 --- a/public/src/installer/install.js +++ b/public/src/installer/install.js @@ -112,5 +112,9 @@ $('document').ready(function() { function launchForum() { $('#launch .fa-spin').removeClass('hide'); + + $.post('/launch', function() { + console.log('launched'); + }); } }); \ No newline at end of file diff --git a/src/views/install/index.tpl b/src/views/install/index.tpl index 98781e3821..6935a9f3d9 100644 --- a/src/views/install/index.tpl +++ b/src/views/install/index.tpl @@ -103,7 +103,7 @@ -
There was an error connecting to your database. Please try again.
+
There was an error connecting to your database. Please try again.