diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f46057158..f7e490f752 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,10 +6,19 @@ ### Bugs fixed -- GLS-228 - invert market guides experiment to hide stats by default - ### Enhancements +- GLS-231 - Specify 'exports' for highlight stats +- GLS-238 - Clarify 'total trade' for line chart + +## [2.8.2](https://github.com/uktrade/great-cms/releases/tag/2.8.2) + +[Full Changelog](https://github.com/uktrade/great-cms/compare/2.8.1...2.8.2) + +### Bugs fixed + +- GLS-228 - invert market guides experiment to hide stats by default + ## [2.8.1](https://github.com/uktrade/great-cms/releases/tag/2.8.1) [Full Changelog](https://github.com/uktrade/great-cms/compare/2.8.0...2.8.1) diff --git a/core/templates/core/includes/data_source.html b/core/templates/core/includes/data_source.html index 9ca103f982..3341ac241e 100644 --- a/core/templates/core/includes/data_source.html +++ b/core/templates/core/includes/data_source.html @@ -10,9 +10,7 @@
Next release: {{ source.next_release }} {% endif %} {% if source.notes %} - {% for note in source.notes %} -
{{ note }} - {% endfor %} +
{{ source.notes|join:" " }} {% endif %} {% endspaceless %}

diff --git a/domestic/fixtures/market_guide_stats.json b/domestic/fixtures/market_guide_stats.json index dd981866e7..b9dcaea2bc 100644 --- a/domestic/fixtures/market_guide_stats.json +++ b/domestic/fixtures/market_guide_stats.json @@ -33,6 +33,7 @@ "url": "https://www.ons.gov.uk/economy/nationalaccounts/balanceofpayments/datasets/uktotaltradeallcountriesseasonallyadjusted ", "next_release": "To be announced", "notes": [ + "Total trade is the sum of all exports and imports over the same time period.", "Data includes goods and services combined." ] } @@ -197,6 +198,7 @@ "url": "https://www.ons.gov.uk/economy/nationalaccounts/balanceofpayments/datasets/uktotaltradeallcountriesseasonallyadjusted ", "next_release": "To be announced", "notes": [ + "Total trade is the sum of all exports and imports over the same time period.", "Data includes goods and services combined." ] } @@ -361,6 +363,7 @@ "url": "https://www.ons.gov.uk/economy/nationalaccounts/balanceofpayments/datasets/uktotaltradeallcountriesseasonallyadjusted ", "next_release": "To be announced", "notes": [ + "Total trade is the sum of all exports and imports over the same time period.", "Data includes goods and services combined." ] } @@ -525,6 +528,7 @@ "url": "https://www.ons.gov.uk/economy/nationalaccounts/balanceofpayments/datasets/uktotaltradeallcountriesseasonallyadjusted ", "next_release": "To be announced", "notes": [ + "Total trade is the sum of all exports and imports over the same time period.", "Data includes goods and services combined." ] } @@ -689,6 +693,7 @@ "url": "https://www.ons.gov.uk/economy/nationalaccounts/balanceofpayments/datasets/uktotaltradeallcountriesseasonallyadjusted ", "next_release": "To be announced", "notes": [ + "Total trade is the sum of all exports and imports over the same time period.", "Data includes goods and services combined." ] } @@ -853,6 +858,7 @@ "url": "https://www.ons.gov.uk/economy/nationalaccounts/balanceofpayments/datasets/uktotaltradeallcountriesseasonallyadjusted ", "next_release": "To be announced", "notes": [ + "Total trade is the sum of all exports and imports over the same time period.", "Data includes goods and services combined." ] } @@ -1017,6 +1023,7 @@ "url": "https://www.ons.gov.uk/economy/nationalaccounts/balanceofpayments/datasets/uktotaltradeallcountriesseasonallyadjusted ", "next_release": "To be announced", "notes": [ + "Total trade is the sum of all exports and imports over the same time period.", "Data includes goods and services combined." ] } diff --git a/domestic/templates/domestic/country_guide.html b/domestic/templates/domestic/country_guide.html index dc617d7e1d..1b9659edb2 100644 --- a/domestic/templates/domestic/country_guide.html +++ b/domestic/templates/domestic/country_guide.html @@ -73,7 +73,7 @@

The UK's

- largest trading partner + largest export market {% endif %} @@ -87,7 +87,7 @@

Accounting for

- of total UK trade + of total UK exports {% endif %} @@ -192,7 +192,7 @@

Total import and export values between {{ page.headin Year Imports (£{% if unit %}{{ unit }}{% endif %}) Exports (£{% if unit %}{{ unit }}{% endif %}) - Total (£{% if unit %}{{ unit }}{% endif %}) + Total trade (£{% if unit %}{{ unit }}{% endif %})