Skip to content

Commit

Permalink
Better dataset loading description.
Browse files Browse the repository at this point in the history
  • Loading branch information
jmchilton committed Nov 30, 2017
1 parent 5a9f0dd commit e7e659c
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 4 deletions.
8 changes: 4 additions & 4 deletions client/galaxy/scripts/mvc/history/hdca-li.js
Expand Up @@ -51,7 +51,7 @@ var HDCAListItemView = _super.extend(
var jobStatesSummary = this.model.jobStatesSummary;
if (jobStatesSummary) {
if (jobStatesSummary.new()) {
state = "new";
state = "loading";
} else if (jobStatesSummary.errored()) {
state = "error";
} else if (jobStatesSummary.terminal()) {
Expand All @@ -63,7 +63,7 @@ var HDCAListItemView = _super.extend(
}
} else if (this.model.get("job_source_id")) {
// Initial rendering - polling will fill in more details in a bit.
state = STATES.NEW;
state = "loading";
} else {
state = this.model.get("populated_state") ? STATES.OK : STATES.RUNNING;
}
Expand Down Expand Up @@ -101,7 +101,7 @@ var HDCAListItemView = _super.extend(
} else if (!jobStatesSummary || !jobStatesSummary.hasDetails()) {
return `
<div class="progress state-progress">
<span class="note">Loading job data for ${collectionTypeDescription}...</span>
<span class="note">Loading job data for ${collectionTypeDescription}.<span class="blinking">..</span></span>
<div class="progress-bar info" style="width:100%">
</div>`;
} else {
Expand All @@ -110,7 +110,7 @@ var HDCAListItemView = _super.extend(
if (isNew) {
return `
<div class="progress state-progress">
<span class="note">Creating jobs...</span>
<span class="note">Creating jobs.<span class="blinking">..</span></span>
<div class="progress-bar info" style="width:100%">
</div>`;
} else if (jobStatesSummary.errored()) {
Expand Down
16 changes: 16 additions & 0 deletions client/galaxy/style/less/dataset.less
Expand Up @@ -176,6 +176,22 @@
}
}
}

&.state-loading {
background: @state-default-bg;
.state-icon {
.state-icon-running;
}
}

}

.blinking {
animation: blinker 500ms linear infinite;
}

@keyframes blinker {
50% { opacity: 0; }
}

// ---------------------------------------------------------------------------- datasets as list-items
Expand Down

0 comments on commit e7e659c

Please sign in to comment.