From c23e176a3f5b40d5f61a54220737bbc584277a27 Mon Sep 17 00:00:00 2001 From: Seven Du Date: Sun, 9 Mar 2014 19:31:58 +0800 Subject: [PATCH] use bootstrap-for-ember from the last commit, see https://github.com/ember-addons/bootstrap-for-ember --- htdocs/portal/assets/js/fsportal.js | 2 +- htdocs/portal/index.html | 64 +++++++++++++++++++---------- 2 files changed, 43 insertions(+), 23 deletions(-) diff --git a/htdocs/portal/assets/js/fsportal.js b/htdocs/portal/assets/js/fsportal.js index d002cac4d1..32f36ae519 100644 --- a/htdocs/portal/assets/js/fsportal.js +++ b/htdocs/portal/assets/js/fsportal.js @@ -714,7 +714,7 @@ App.usersController = Ember.ArrayController.create({ } }); -App.initialize(); +// App.initialize(); var global_debug_event = false; var global_background_job = false; diff --git a/htdocs/portal/index.html b/htdocs/portal/index.html index 495d26d6b1..770f03d673 100644 --- a/htdocs/portal/index.html +++ b/htdocs/portal/index.html @@ -41,7 +41,8 @@ - + +