diff --git a/app/assets/stylesheets/components/table.scss b/app/assets/stylesheets/components/table.scss index 05079605f..6c0c6517e 100644 --- a/app/assets/stylesheets/components/table.scss +++ b/app/assets/stylesheets/components/table.scss @@ -1,7 +1,6 @@ .table { margin-bottom: $gutter; width: 100%; - table-layout: fixed; } .table-heading { @@ -9,24 +8,32 @@ margin: 40px 0 $gutter-half 0; } -.table-field-headings { - th { - padding: 0 0 5px 0; +.dashboard-table { + + .table { + table-layout: fixed; } -} -.table-row { - th { - display: table-cell; - width: 52.5%; - font-weight: normal; - - .hint { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; + .table-field-headings { + th { + padding: 0 0 5px 0; } } + + .table-row { + th { + display: table-cell; + width: 52.5%; + font-weight: normal; + + .hint { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + } + } + } %table-field, @@ -105,7 +112,7 @@ .table-field-heading { - &-first { + .dashboard-table &-first { width: 52.5%; } diff --git a/app/templates/views/dashboard/_jobs.html b/app/templates/views/dashboard/_jobs.html index 4b21598f8..1360bb63a 100644 --- a/app/templates/views/dashboard/_jobs.html +++ b/app/templates/views/dashboard/_jobs.html @@ -1,35 +1,37 @@ {% from "components/table.html" import list_table, field, right_aligned_field_heading, row_heading %} {% from "components/big-number.html" import big_number %} -{% call(item, row_number) list_table( - jobs, - caption="Recent batch jobs", - caption_visible=False, - empty_message='You haven’t sent any batch messages yet', - field_headings=[ - 'File', - 'Sending', - 'Delivered', - 'Failed' - ], - field_headings_visible=True -) %} - {% call row_heading() %} -
+ {{ item.to }} +
++ {% if item.job %} + From {{ item.job.original_file_name }} + {% else %} + {{ item.template.name }} + from an API call + {% endif %} +
+ {% endcall %} + + {{ date_field( + (item.updated_at or item.created_at)|format_datetime_short + ) }} + + {% call field(status=item.status|format_notification_status_as_field_status, align='right') %} + {{ item.status|format_notification_status(item.template.template_type) }} + {% endcall %} - {% call row_heading() %} -- {{ item.to }} -
-- {% if item.job %} - From {{ item.job.original_file_name }} - {% else %} - {{ item.template.name }} - from an API call - {% endif %} -
{% endcall %} - - {{ date_field( - (item.updated_at or item.created_at)|format_datetime_short - ) }} - - {% call field(status=item.status|format_notification_status_as_field_status, align='right') %} - {{ item.status|format_notification_status(item.template.template_type) }} - {% endcall %} - - {% endcall %} +