diff --git a/app/assets/stylesheets/components/big-number.scss b/app/assets/stylesheets/components/big-number.scss new file mode 100644 index 000000000..4beea24df --- /dev/null +++ b/app/assets/stylesheets/components/big-number.scss @@ -0,0 +1,10 @@ +.big-number { + + @include bold-48; + + &-label { + @include core-19; + display: block; + } + +} diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index d6f59934b..3c7ed051b 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -27,6 +27,7 @@ @import '../govuk_elements/public/sass/elements/panels'; @import '../govuk_elements/public/sass/elements/tables'; + // Specific to this application @import 'grids'; @import 'components/template-picker'; @@ -35,6 +36,9 @@ @import 'components/submit-form'; @import 'components/table'; @import 'components/navigation'; +@import 'components/big-number'; + +@import 'views/job'; // TODO: break this up @import 'app'; diff --git a/app/assets/stylesheets/views/job.scss b/app/assets/stylesheets/views/job.scss new file mode 100644 index 000000000..35d54e57d --- /dev/null +++ b/app/assets/stylesheets/views/job.scss @@ -0,0 +1,3 @@ +.job-totals { + margin-bottom: $gutter; +} diff --git a/app/templates/components/big-number.html b/app/templates/components/big-number.html new file mode 100644 index 000000000..089466c25 --- /dev/null +++ b/app/templates/components/big-number.html @@ -0,0 +1,6 @@ +{% macro big_number(number, label) %} +
+ {{ number }} + {{ label }} +
+{% endmacro %} diff --git a/app/templates/components/table.html b/app/templates/components/table.html index 346e9e4c8..ee3c2838f 100644 --- a/app/templates/components/table.html +++ b/app/templates/components/table.html @@ -1,6 +1,6 @@ -{% macro table(items, caption='', field_headings='', field_headings_visible=True) -%} +{% macro table(items, caption='', field_headings='', field_headings_visible=True, caption_visible=True) -%} - diff --git a/app/templates/views/job.html b/app/templates/views/job.html index feec2bd36..bdae79d11 100644 --- a/app/templates/views/job.html +++ b/app/templates/views/job.html @@ -11,21 +11,33 @@ GOV.UK Notify | Notifications activity {{ uploaded_file_name }} sent with {{ template_used }} -

- {{ counts.total }} text messages -

+ -

- {{ counts.failed }} failed deliveries -

- -

- {{ cost }} total cost -

+

+ You uploaded contact-demo.csv today at 13:42 +

{% call(item) table( messages, - caption='', + caption='Messages', caption_visible=False, field_headings=[ 'To',
+ {{ caption }}