diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index c1a280bd8..e2cf312ce 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -376,6 +376,7 @@ Contributors * Michael Bunsen * Dillen Meijboom * George Hickman +* Eric Dyken Translators =========== diff --git a/docs/_static/images/collections_add_to_collection.png b/docs/_static/images/collections_add_to_collection.png new file mode 100644 index 000000000..a81f11785 Binary files /dev/null and b/docs/_static/images/collections_add_to_collection.png differ diff --git a/docs/_static/images/collections_create_collection.png b/docs/_static/images/collections_create_collection.png new file mode 100644 index 000000000..b7e0eb635 Binary files /dev/null and b/docs/_static/images/collections_create_collection.png differ diff --git a/docs/_static/images/collections_create_collection_upload_images.png b/docs/_static/images/collections_create_collection_upload_images.png new file mode 100644 index 000000000..1ce4e91ac Binary files /dev/null and b/docs/_static/images/collections_create_collection_upload_images.png differ diff --git a/docs/_static/images/collections_edit_img_view.png b/docs/_static/images/collections_edit_img_view.png new file mode 100644 index 000000000..30e988652 Binary files /dev/null and b/docs/_static/images/collections_edit_img_view.png differ diff --git a/docs/_static/images/collections_list.png b/docs/_static/images/collections_list.png new file mode 100644 index 000000000..fd121afe3 Binary files /dev/null and b/docs/_static/images/collections_list.png differ diff --git a/docs/_static/images/collections_privacy_button.png b/docs/_static/images/collections_privacy_button.png new file mode 100644 index 000000000..8766d5141 Binary files /dev/null and b/docs/_static/images/collections_privacy_button.png differ diff --git a/docs/_static/images/collections_privacy_overlay.png b/docs/_static/images/collections_privacy_overlay.png new file mode 100644 index 000000000..ff859517f Binary files /dev/null and b/docs/_static/images/collections_privacy_overlay.png differ diff --git a/docs/editor_manual/documents_images_snippets/collections.rst b/docs/editor_manual/documents_images_snippets/collections.rst new file mode 100644 index 000000000..f8387a5d0 --- /dev/null +++ b/docs/editor_manual/documents_images_snippets/collections.rst @@ -0,0 +1,40 @@ +Collections +~~~~~~~~~~~ + +Access to specific sets of images and documents can be controlled by setting up ‘collections’. By default all images and documents belong to the ‘root’ collection, but new collections can be created through the **Settings -> Collections** area of the admin interface. + +.. image:: ../../_static/images/collections_list.png + +Add a collection +________________ + +* Clicking the **add a collection** button will allow you to create a collection. Name your collection and click **save** . + +.. image:: ../../_static/images/collections_create_collection.png + +Add images / documents to a collection +______________________________________ + +* Navigate to the **Images** or **Documents** section and select a collection from the dropdown menu. + +.. image:: ../../_static/images/collections_create_collection_upload_images.png + +.. image:: ../../_static/images/collections_add_to_collection.png + +* You can also edit an image or document directly by clicking on it to assign it to a collection. + +.. image:: ../../_static/images/collections_edit_img_view.png + +Privacy settings +________________ + +* To set permissions determining who is able to view documents within a collection, navigate to **Settings > Collections** and select a collection. Then click the privacy button above the collection name. + +.. image:: ../../_static/images/collections_privacy_button.png + +* Within the privacy settings overlay, select the level of privacy for the collection. + +.. image:: ../../_static/images/collections_privacy_overlay.png + +.. Note:: + Permissions set on ‘root’ apply to all collections, so a user with ‘edit’ permission for images on root can edit all images; permissions set on other collections apply to that collection only. diff --git a/docs/editor_manual/documents_images_snippets/documents.rst b/docs/editor_manual/documents_images_snippets/documents.rst index 07ef30183..72404e8f9 100644 --- a/docs/editor_manual/documents_images_snippets/documents.rst +++ b/docs/editor_manual/documents_images_snippets/documents.rst @@ -17,4 +17,4 @@ Documents such as PDFs can be managed from the Documents interface, available in * Save or delete documents using the buttons at the bottom of the interface. .. Warning:: - Deleted documents cannot be recovered. + Deleted documents cannot be recovered. diff --git a/docs/editor_manual/documents_images_snippets/images.rst b/docs/editor_manual/documents_images_snippets/images.rst index 1fb15b63a..c3dce97fd 100644 --- a/docs/editor_manual/documents_images_snippets/images.rst +++ b/docs/editor_manual/documents_images_snippets/images.rst @@ -27,4 +27,4 @@ ___________ * If your images are cropped in some way to make them fit to a specific shape, then the focal area will define the centre point from which the image is cropped. * To set the focal area, drag a marquee around the most important element of the image. * To remove the focal area, hit the button below the image. -* If the feature is set up in your website, then on the front-end you will see the crop of this image focusing on your selection. +* If the feature is set up in your website, then on the front-end you will see the crop of this image focusing on your selection. diff --git a/docs/editor_manual/documents_images_snippets/index.rst b/docs/editor_manual/documents_images_snippets/index.rst index 35817aa79..ed491affe 100644 --- a/docs/editor_manual/documents_images_snippets/index.rst +++ b/docs/editor_manual/documents_images_snippets/index.rst @@ -1,13 +1,14 @@ -Managing documents and images -============================= +Managing documents, images, snippets and collections +==================================================== Wagtail allows you to manage all of your documents and images through their own dedicated interfaces. See below for information on each of these elements. .. NEED TO ADD IN DETAILS ABOUT SNIPPETS HERE .. toctree:: - :maxdepth: 3 + :maxdepth: 4 documents images snippets + collections diff --git a/docs/editor_manual/documents_images_snippets/snippets.rst b/docs/editor_manual/documents_images_snippets/snippets.rst index 09a8fbd5f..d55847eba 100644 --- a/docs/editor_manual/documents_images_snippets/snippets.rst +++ b/docs/editor_manual/documents_images_snippets/snippets.rst @@ -36,4 +36,4 @@ If you are editing a page, and you find yourself in need of a new snippet, do no * You should now see your new snippet, even though you didn't leave the edit page. .. Note:: - Even though this is possible, it is worth saving your page as a draft as often as possible, to avoid your changes being lost by navigating away from the edit page accidentally. + Even though this is possible, it is worth saving your page as a draft as often as possible, to avoid your changes being lost by navigating away from the edit page accidentally.