diff --git a/batch/batch/front_end/templates/batch.html b/batch/batch/front_end/templates/batch.html index 19f855895a4..1e0dadc8174 100644 --- a/batch/batch/front_end/templates/batch.html +++ b/batch/batch/front_end/templates/batch.html @@ -46,7 +46,7 @@ {% call collapsible_li(true, 'Jobs', batch['n_jobs']) %} {{ kv_table({ - 'Pending': batch['n_jobs'] - batch['n_completed'], + 'Incomplete (Blocked, Queued or Running)': batch['n_jobs'] - batch['n_completed'], 'Succeeded': batch['n_succeeded'], 'Failed': batch['n_failed'], 'Cancelled': batch['n_cancelled'] diff --git a/batch/batch/front_end/templates/batches.html b/batch/batch/front_end/templates/batches.html index 46bddd4342f..095c6605554 100644 --- a/batch/batch/front_end/templates/batches.html +++ b/batch/batch/front_end/templates/batches.html @@ -1,5 +1,5 @@ {% from "table_search.html" import table_search with context %} -{% from "utils.html" import batch_state_indicator, submit_button, link %} +{% from "utils.html" import batch_state_indicator, submit_button, link, truncated_link %} {% extends "layout.html" %} {% block title %}Batches{% endblock %} {% block head %} @@ -9,43 +9,42 @@

Batches

{{ table_search("batch-search", base_path ~ "/batches") }} - +
- - - - - - + + + + + + + + + {% for batch in batches %} + + + diff --git a/web_common/input.css b/web_common/input.css index 80c2b553627..9a5f1bc942b 100644 --- a/web_common/input.css +++ b/web_common/input.css @@ -8,3 +8,11 @@ left: 50vw; transform: translate(-50%, -50%); } + +.truncating-text { + text-wrap:nowrap; + white-space:nowrap; + text-overflow:ellipsis; + overflow:hidden; + x-overflow: hidden; +} diff --git a/web_common/web_common/templates/utils.html b/web_common/web_common/templates/utils.html index 135e8c66947..1379483e2da 100644 --- a/web_common/web_common/templates/utils.html +++ b/web_common/web_common/templates/utils.html @@ -63,9 +63,13 @@ {% macro link(href, text) %} - -
- {{ text }} -
+
+ {{ text }} + +{% endmacro %} + +{% macro truncated_link(href, text) %} + + {{ text }} {% endmacro %}
- IDBatch - IDBatch Name
+ {{ batch_state_indicator(batch) }} +
{{ link(base_path ~ "/batches/" ~ batch['id'], batch['id']) }}
-
-
- {% if 'attributes' in batch and 'name' in batch['attributes'] %} -
- {{ link(base_path ~ "/batches/" ~ batch['id'], batch['attributes']['name']) }} -
- {% else %} -
- {{ link(base_path ~ "/batches/" ~ batch['id'], 'no name') }} -
- {% endif %} - {{ batch_state_indicator(batch) }} +
+ {% if 'attributes' in batch and 'name' in batch['attributes'] %} + {{ truncated_link(base_path ~ "/batches/" ~ batch['id'], batch['attributes']['name']) }} + {% else %} +
+ {{ truncated_link(base_path ~ "/batches/" ~ batch['id'], 'no name') }}
+ {% endif %}