diff --git a/CHANGELOG.txt b/CHANGELOG.txt index b43cc186d..848ccbe97 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -21,6 +21,7 @@ Changelog * Add `WAGTAILDOCS_SERVE_METHOD` setting to determine how document downloads will be linked to and served (Tobias McNulty, Matt Westcott) * Add `WAGTAIL_MODERATION_ENABLED` setting to enable / disable the 'Submit for Moderation' option (Jacob Topp-Mugglestone) * Added settings to customise pagination page size for the Images admin area (Brian Whitton) + * Added ARIA role to TableBlock output (Matt Westcott) * Fix: Added line breaks to long filenames on multiple image / document uploader (Kevin Howbrook) * Fix: Added https support for Scribd oEmbed provider (Rodrigo) * Fix: Changed StreamField group labels color so labels are visible (Catherine Farman) diff --git a/docs/releases/2.7.rst b/docs/releases/2.7.rst index 7af5696ba..d4ac1d046 100644 --- a/docs/releases/2.7.rst +++ b/docs/releases/2.7.rst @@ -40,6 +40,7 @@ Other features * Add ``WAGTAILDOCS_SERVE_METHOD`` setting to determine how document downloads will be linked to and served (Tobias McNulty, Matt Westcott) * Add ``WAGTAIL_MODERATION_ENABLED`` setting to enable / disable the 'Submit for Moderation' option (Jacob Topp-Mugglestone) * Added settings to customise pagination page size for the Images admin area (Brian Whitton) + * Added ARIA role to TableBlock output (Matt Westcott) Bug fixes diff --git a/wagtail/contrib/table_block/templates/table_block/blocks/table.html b/wagtail/contrib/table_block/templates/table_block/blocks/table.html index 524eae814..6ac4ec9cd 100644 --- a/wagtail/contrib/table_block/templates/table_block/blocks/table.html +++ b/wagtail/contrib/table_block/templates/table_block/blocks/table.html @@ -1,6 +1,6 @@ {% load table_block_tags %} - +
{% if table_caption %} {% endif %} diff --git a/wagtail/contrib/table_block/tests.py b/wagtail/contrib/table_block/tests.py index 63967d32b..b7b8ab908 100644 --- a/wagtail/contrib/table_block/tests.py +++ b/wagtail/contrib/table_block/tests.py @@ -37,7 +37,7 @@ class TestTableBlock(TestCase): block = TableBlock() result = block.render(value) expected = """ -
{{ table_caption }}
+
@@ -61,7 +61,7 @@ class TestTableBlock(TestCase): block = TableBlock() result = block.render(value) expected = """ -
Test 1Test 2Test 3
+
@@ -90,7 +90,7 @@ class TestTableBlock(TestCase): ] }) expected = """ -
Test 1Test 2Test 3
+
@@ -110,7 +110,7 @@ class TestTableBlock(TestCase): [None, None, None]]} expected = """ -
+
@@ -131,7 +131,7 @@ class TestTableBlock(TestCase): 'data': [['Foo', 'Bar', 'Baz'], [None, None, None], [None, None, None]]} expected = """ -
<p><strong>Test</strong></p>
+
@@ -153,7 +153,7 @@ class TestTableBlock(TestCase): 'data': [['Foo', 'Bar', 'Baz'], ['one', 'two', 'three'], ['four', 'five', 'six']]} expected = """ -
FooBarBaz
+
@@ -173,7 +173,7 @@ class TestTableBlock(TestCase): 'data': [['Foo', 'Bar', 'Baz'], ['one', 'two', 'three'], ['four', 'five', 'six']]} expected = """ -
FooBarBaz
onetwothree
+
@@ -252,7 +252,7 @@ class TestTableBlock(TestCase): block = TableBlock() result = block.render(value) expected = """ -
FooBarBaz
+
caption
Test 1Test 2Test 3