diff --git a/CHANGELOG.txt b/CHANGELOG.txt index caacad91d7..16034564da 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -6,6 +6,7 @@ Changelog * Removed leftover Python 2.x compatibility code (Sergey Fedoseev) * Combine flake8 configurations (Sergey Fedoseev) + * Fix: Rename documents listing column 'uploaded' to 'created' (LB (Ben Johnston)) 2.7 LTS (xx.xx.xxxx) - IN DEVELOPMENT ~~~~~~~~~~~~~~~~~~~~ diff --git a/docs/_static/images/screen29_documents_page.png b/docs/_static/images/screen29_documents_page.png index 34ba6230d7..ff51d5f790 100644 Binary files a/docs/_static/images/screen29_documents_page.png and b/docs/_static/images/screen29_documents_page.png differ diff --git a/docs/_static/images/screen30_documents_edit_page.png b/docs/_static/images/screen30_documents_edit_page.png index b6544acb6f..f51451f5f1 100644 Binary files a/docs/_static/images/screen30_documents_edit_page.png and b/docs/_static/images/screen30_documents_edit_page.png differ diff --git a/docs/editor_manual/documents_images_snippets/documents.rst b/docs/editor_manual/documents_images_snippets/documents.rst index 72404e8f97..f637b0577b 100644 --- a/docs/editor_manual/documents_images_snippets/documents.rst +++ b/docs/editor_manual/documents_images_snippets/documents.rst @@ -7,12 +7,13 @@ Documents such as PDFs can be managed from the Documents interface, available in * Add documents by clicking the *Add document* button in the top-right. * Search for documents in the CMS by entering your search term in the search bar. The results will be automatically updated as you type. -* You can also filter the results by *Popular tags*. Click on a tag to update the search results listing. +* You can also filter the results by *Collection* by selecting one from the collections dropdown above the documents list. * Edit the details of a document by clicking the document title. .. image:: ../../_static/images/screen30_documents_edit_page.png * When editing a document you can replace the file associated with that document record. This means you can update documents without having to update the pages on which they are placed. Changing the file will change it on all pages that use the document. +* Change the document's collection using the collection dropdown. * Add or remove tags using the Tags field. * Save or delete documents using the buttons at the bottom of the interface. diff --git a/docs/releases/2.8.rst b/docs/releases/2.8.rst index c2908ca2d7..ec873f2cda 100644 --- a/docs/releases/2.8.rst +++ b/docs/releases/2.8.rst @@ -22,6 +22,7 @@ Bug fixes * Removed leftover Python 2.x compatibility code (Sergey Fedoseev) * Combine flake8 configurations (Sergey Fedoseev) + * Rename documents listing column 'uploaded' to 'created' (LB (Ben Johnston)) Upgrade considerations ====================== diff --git a/wagtail/documents/templates/wagtaildocs/documents/list.html b/wagtail/documents/templates/wagtaildocs/documents/list.html index d660c7c30f..7bf4de209a 100644 --- a/wagtail/documents/templates/wagtaildocs/documents/list.html +++ b/wagtail/documents/templates/wagtaildocs/documents/list.html @@ -24,10 +24,10 @@