Skip to content

Use adminlte loading spinner when starting/stopping application #539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
martinRenou merged 4 commits into from
Jul 5, 2017
Merged

Use adminlte loading spinner when starting/stopping application #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9cb5865
Use loading spinner of adminlte when starting app
martinRenou Jul 5, 2017
8445148
Fix jstest
martinRenou Jul 5, 2017
843064d
Remove unused CSS
martinRenou Jul 5, 2017
7d5e7a6
Merge branch 'master' into use_adminlte_loading_spinner
martinRenou Jul 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions frontend/tests/tests/user/test_application_view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
);
Expand All @@ -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
);
Expand Down
2 changes: 1 addition & 1 deletion frontend/user/vue-components/ApplicationListView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<!-- Loading spinner -->
<li v-show="model.loading" id="loading-spinner">
<a href="#">
<i class="fa fa-spinner fa-spin"></i>
<i class="fa fa-refresh fa-spin"></i>
<span>Loading</span>
</a>
</li>
Expand Down
13 changes: 6 additions & 7 deletions frontend/user/vue-components/ApplicationView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,12 @@
<div class="box-footer">
<button id="start-button" class="btn btn-primary pull-right start-button"
@click="startApplication()"
:disabled="!currentApp.isStopped()">
{{ {STOPPED: 'Start', STARTING: 'Starting', STOPPING: 'Stopping'}[currentApp.status] }}
</button>
:disabled="!currentApp.isStopped()"> Start </button>
</div>

<!-- Loading spinner -->
<div class="overlay" v-show="!currentApp.isStopped()">
<i class="fa fa-refresh fa-spin"></i>
</div>
</div>
</div>
Expand Down Expand Up @@ -136,10 +139,6 @@
padding: 0px;
}

.start-button {
min-width: 80px;
}

.app-logo {
border-radius: 20%;
}
Expand Down