From e7e659cabcf2a5928ab58e73715c0959c78cc997 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Tue, 28 Nov 2017 16:34:45 -0500 Subject: [PATCH] Better dataset loading description. --- client/galaxy/scripts/mvc/history/hdca-li.js | 8 ++++---- client/galaxy/style/less/dataset.less | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/client/galaxy/scripts/mvc/history/hdca-li.js b/client/galaxy/scripts/mvc/history/hdca-li.js index ec3f6e443fb..cd207ea15de 100644 --- a/client/galaxy/scripts/mvc/history/hdca-li.js +++ b/client/galaxy/scripts/mvc/history/hdca-li.js @@ -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()) { @@ -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; } @@ -101,7 +101,7 @@ var HDCAListItemView = _super.extend( } else if (!jobStatesSummary || !jobStatesSummary.hasDetails()) { return `
- Loading job data for ${collectionTypeDescription}... + Loading job data for ${collectionTypeDescription}...
`; } else { @@ -110,7 +110,7 @@ var HDCAListItemView = _super.extend( if (isNew) { return `
- Creating jobs... + Creating jobs...
`; } else if (jobStatesSummary.errored()) { diff --git a/client/galaxy/style/less/dataset.less b/client/galaxy/style/less/dataset.less index 3b88fa3b5ad..196a4451ed3 100644 --- a/client/galaxy/style/less/dataset.less +++ b/client/galaxy/style/less/dataset.less @@ -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