diff --git a/Makefile b/Makefile index 7a1adebf8..08696b6d2 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ bootstrap: generate-version-file ## Set up everything to run the app .PHONY: watch-frontend watch-frontend: ## Build frontend and watch for changes - npm run watch + source $(NVMSH) && npm run watch .PHONY: run-flask run-flask: ## Run flask diff --git a/app/assets/stylesheets/app.scss b/app/assets/stylesheets/app.scss index 958e9d43c..d571f63d9 100644 --- a/app/assets/stylesheets/app.scss +++ b/app/assets/stylesheets/app.scss @@ -233,3 +233,23 @@ details .arrow { input:-webkit-autofill::first-line { @include core-19; } + +.pilot-disabled { + a { + background-color: gray; + border-color: gray; + + span { + color: lightgray; + } + } + .big-number-status { + background-color: gray; + border-color: gray; + color: lightgray; + } + + & > * { + color: gray; + } +} diff --git a/app/templates/components/table.html b/app/templates/components/table.html index 4da7ebc3f..76617b775 100644 --- a/app/templates/components/table.html +++ b/app/templates/components/table.html @@ -183,8 +183,19 @@ id=None ) %} {% call field(align='right') %} + - + {{ '{:,.0f}'.format(count) }} diff --git a/app/templates/components/uk_components/header/template.njk b/app/templates/components/uk_components/header/template.njk index c7bc9d30f..1cd625c83 100644 --- a/app/templates/components/uk_components/header/template.njk +++ b/app/templates/components/uk_components/header/template.njk @@ -5,7 +5,7 @@
- - + + - 0 - emails sent + 0 + emails sent - No failures + No failures
diff --git a/app/templates/views/dashboard/_usage.html b/app/templates/views/dashboard/_usage.html index 8f2896454..35600dbe0 100644 --- a/app/templates/views/dashboard/_usage.html +++ b/app/templates/views/dashboard/_usage.html @@ -15,8 +15,8 @@ {% endif %} -
-
+
+
{{ big_number("0", 'email disabled during SMS pilot', smaller=True) }}
diff --git a/app/templates/views/dashboard/all-template-statistics.html b/app/templates/views/dashboard/all-template-statistics.html index e297be264..0bbf57cfb 100644 --- a/app/templates/views/dashboard/all-template-statistics.html +++ b/app/templates/views/dashboard/all-template-statistics.html @@ -46,7 +46,7 @@ {{ 1|message_count_label(item.type, suffix='template')|capitalize }} {% endcall %} - {{ spark_bar_field(item.requested_count, most_used_template_count) }} + {{ spark_bar_field(item.requested_count, most_used_template_count, id=item.id) }} {% endcall %}
{% endif %} diff --git a/app/templates/views/templates/template.html b/app/templates/views/templates/template.html index 93be5ecd0..5a9415306 100644 --- a/app/templates/views/templates/template.html +++ b/app/templates/views/templates/template.html @@ -80,8 +80,8 @@ {% endif %}
- -
-

Emails

-
+
+

Emails

+
{{ big_number(emails_sent, 'email disabled during SMS pilot', smaller=True) }} {{ big_number("", '', smaller=True) }}
diff --git a/tests/app/main/views/test_templates.py b/tests/app/main/views/test_templates.py index be1e71d39..39b864ea0 100644 --- a/tests/app/main/views/test_templates.py +++ b/tests/app/main/views/test_templates.py @@ -574,6 +574,7 @@ def test_should_be_able_to_view_a_template_with_links( ) +@pytest.mark.skip(reason="Hiding the copy-to-clipboard widget until API access is opened up") def test_should_show_template_id_on_template_page( client_request, mock_get_service_template,