From 9cb58655455507942efd285142f82817dc2f8a45 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Wed, 5 Jul 2017 10:28:28 +0100 Subject: [PATCH 1/3] Use loading spinner of adminlte when starting app --- frontend/user/vue-components/ApplicationListView.vue | 2 +- frontend/user/vue-components/ApplicationView.vue | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/frontend/user/vue-components/ApplicationListView.vue b/frontend/user/vue-components/ApplicationListView.vue index 21046a163..3de524578 100644 --- a/frontend/user/vue-components/ApplicationListView.vue +++ b/frontend/user/vue-components/ApplicationListView.vue @@ -16,7 +16,7 @@
  • - + Loading
  • diff --git a/frontend/user/vue-components/ApplicationView.vue b/frontend/user/vue-components/ApplicationView.vue index d05d3f59c..d40ee398b 100644 --- a/frontend/user/vue-components/ApplicationView.vue +++ b/frontend/user/vue-components/ApplicationView.vue @@ -54,9 +54,12 @@ + + +
    +
    From 844514867859e4b34ac8d47fcd178e8bd1d73e4c Mon Sep 17 00:00:00 2001 From: martinRenou Date: Wed, 5 Jul 2017 11:13:05 +0100 Subject: [PATCH 2/3] Fix jstest --- frontend/tests/tests/user/test_application_view.js | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/frontend/tests/tests/user/test_application_view.js b/frontend/tests/tests/user/test_application_view.js index 6157830c3..a6226edcb 100644 --- a/frontend/tests/tests/user/test_application_view.js +++ b/frontend/tests/tests/user/test_application_view.js @@ -131,11 +131,6 @@ QUnit.test("rendering start button", function (assert) { model.appList[0].status = 'STARTING'; Vue.nextTick(function() { - assert.equal( - appView.$el.querySelector('.start-button').innerHTML.trim(), - 'Starting' - ); - assert.ok( appView.$el.querySelector('.start-button').disabled ); @@ -144,11 +139,6 @@ QUnit.test("rendering start button", function (assert) { model.appList[0].status = 'STOPPING'; Vue.nextTick(function() { - assert.equal( - appView.$el.querySelector('.start-button').innerHTML.trim(), - 'Stopping' - ); - assert.ok( appView.$el.querySelector('.start-button').disabled ); From 843064d8e6b2708c48177c05feab2c5fc1904af2 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Wed, 5 Jul 2017 14:48:04 +0100 Subject: [PATCH 3/3] Remove unused CSS --- frontend/user/vue-components/ApplicationView.vue | 4 ---- 1 file changed, 4 deletions(-) diff --git a/frontend/user/vue-components/ApplicationView.vue b/frontend/user/vue-components/ApplicationView.vue index d40ee398b..333a7ffa7 100644 --- a/frontend/user/vue-components/ApplicationView.vue +++ b/frontend/user/vue-components/ApplicationView.vue @@ -139,10 +139,6 @@ padding: 0px; } - .start-button { - min-width: 80px; - } - #application { width: 100%; height: 100%;