Merge branch '6.0' into maurits-6011-1

Author: stevepiercy

coredev/packages-dependencies.md

@@ -23,7 +23,7 @@ This document shows the current state as an orientation.
 
 There are multiple level of dependencies:
 
--   package level (`setup.py`/`setup.cfg`)
+-   package level (`setup.py`/`setup.cfg`/`pyproject.toml`)
 -   Python level (imports)
 -   ZCML level (includes)
 -   testing (need for layers, such as functional testing)
@@ -41,22 +41,35 @@ A base mental model for how Plone is organized in Plone 6 since alpha 4 is shown
 
 ```
 ┌────────────────────────────┐
-│                            │
-│ On top of Products.CMFPlone│
-│ like:                      │
-│ - Plone                    │
-│ - plone.api                │
-│ - plone.volto              │
+│ "Plone"                    |
+| The Integration of both    |
+| distributions in one       |
+| Release                    |
+├────────────────────────────┤
+| Distributions:             |
+| - plone.volto              |
+| - plone.classicui          |
+├────────────────────────────┤
+│ Core-Addons                │
+│ - plone.distribution       │
+│ - plone.app.exportimport   │
+│ - plone.app.discussion     │
+│ - plone.app.multilingual   │
+│ - plone.app.caching        │
 │ - plone.app.iterate        │
 │ - plone.app.update         │
 │                            │
 ├────────────────────────────┤
+│ Core-APIs                  │
+│ - plone.restapi            │
+│ - plone.api                │
+├────────────────────────────┤
 │                            │
 │     Products.CMFPlone      │
 │                            │
 ├────────────────────────────┤
 │                            │
-│ The space between          │
+│ The space between (core )  │
 │                            │
 │ - most of plone.app.*      │
 │ - but also some other      │
@@ -75,6 +88,7 @@ A base mental model for how Plone is organized in Plone 6 since alpha 4 is shown
 │ - plone.registry           │
 │ - plone.dexterity          │
 │ - plone.behavior           │
+│ - plone.rest               │
 │ - ....                     │
 │                            │
 └────────────────────────────┘

docs/backend/fields.md

@@ -103,6 +103,25 @@ See [`plone.namedfile`](https://pypi.org/project/plone.namedfile/) and [plone.fo
 | `NamedBlobFile` | `NamedBlobFile` | A binary uploaded file stored as a ZODB blob. Requires the `blobs` extra to `plone.namedfile`. Otherwise identical to `NamedFile`. | `IField` |
 | `NamedBlobImage` | `NamedBlobImage` | A binary uploaded image stored as a ZODB blob. Requires the `blobs` extra to `plone.namedfile`. Otherwise identical to `NamedImage`. | `IField` |
 
+#### `NamedBlobImage`
+
+The following example shows how to create an `Image` object, and attach the image file to it.
+
+```python
+img_obj = api.content.create(
+    container=ww_article,
+    type="Image",
+    id="test.jpg",
+    image=NamedBlobImage(
+        data=img_file,
+        filename="test.jpg",
+    )
+)
+```
+
+
+
+
 
 ### Fields in `z3c.relationfield.schema`
 
@@ -115,6 +134,8 @@ See [`z3c.relationfield`](https://pypi.org/project/z3c.relationfield/) for more
 | `RelationChoice` | `RelationValue` | A `Choice` field intended to store `RelationValue`s | See {ref}`Choice <fields-in-zope-schema-label>` |
 
 
+(backend-fields-richtext-label)=
+
 ### Fields in `plone.app.textfield`
 
 See [`plone.app.textfield`](https://pypi.org/project/plone.app.textfield/) for more details.
@@ -124,6 +145,172 @@ See [`plone.app.textfield`](https://pypi.org/project/plone.app.textfield/) for m
 | `RichText` | `RichTextValue` | Stores a `RichTextValue`, which encapsulates a raw text value, the source MIME type, and a cached copy of the raw text transformed to the default output MIME type. | `IField`, `IRichText` |
 
 
+The `RichText` field allows for alternative markups and content filtering.
+The following code sample shows how to create a schema with a `RichText` field.
+
+```python
+from plone.app.textfield import RichText
+from plone.supermodel import model
+
+class ITestSchema(model.Schema):
+
+    body = RichText(title="Body text")
+```
+
+The `RichText` field constructor can take the following arguments, in addition to the usual arguments for a `Text` field.
+
+`default_mime_type`
+:   A string representing the default MIME type of the input markup.
+    This defaults to `text/html`.
+
+`output_mime_type`
+:   A string representing the default output MIME type.
+    This defaults to `text/x-html-safe`, which is a Plone-specific MIME type that disallows certain tags.
+    Use the {guilabel}`HTML Filtering` control panel in Plone to control the tags.
+
+`allowed_mime_types`
+:   A tuple of strings giving a vocabulary of allowed input MIME types.
+    If this is `None` (the default), the allowable types will be restricted to those set in Plone's {guilabel}`Markup` control panel.
+
+The *default* field can be set to either a Unicode object (in which case it will be assumed to be a string of the default MIME type) or a {ref}`backend-fields-richtextvalue-label`.
+
+
+#### reStructuredText transformation
+
+Below is an example of a field that allows StructuredText and reStructuredText, transformed to HTML by default.
+
+```python
+from plone.app.textfield import RichText
+from plone.supermodel import model
+
+defaultBody = """\
+Background
+==========
+
+Please fill this in
+
+Details
+-------
+
+And this
+"""
+
+class ITestSchema(model.Schema):
+
+    body = RichText(
+        title="Body text",
+        default_mime_type="text/x-rst",
+        output_mime_type="text/x-html",
+        allowed_mime_types=("text/x-rst", "text/structured",),
+        default=defaultBody,
+    )
+```
+
+
+(backend-fields-richtextvalue-label)=
+
+#### `RichTextValue`
+
+The `RichText` field usually does not store a string.
+Instead, it stores a `RichTextValue` object.
+This is an immutable object that has the following properties.
+
+`raw`
+:   A Unicode string with the original input markup.
+
+`mimeType`
+:   The MIME type of the original markup, for example, `text/html` or `text/structured`.
+
+`encoding`
+:   The default character encoding used when transforming the input markup.
+    Most likely, this will be UTF-8.
+
+`raw_encoded`
+:   The raw input encoded in the given encoding.
+
+`outputMimeType`
+:   The MIME type of the default output, taken from the field at the time of instantiation.
+
+`output`
+:   A Unicode object representing the transformed output.
+    If possible, this is cached persistently, until the `RichTextValue` is replaced with a new one (as happens when an edit form is saved, for example).
+
+The storage of the `RichTextValue` object is optimized for the case where the transformed output will be read frequently (for example, on the view screen of the content object) and the raw value will be read infrequently (for example, on the edit screen).
+Because the output value is cached indefinitely, you will need to replace the `RichTextValue` object with a new one if any of the transformation parameters change.
+However, as we will see below, it is possible to apply a different transformation on demand, if you need to.
+
+The code snippet below shows how a `RichTextValue` object can be constructed in code.
+In this case, we have a raw input string of type `text/plain` that will be transformed to a default output of `text/html`.
+Note that we would normally look up the default output type from the field instance.
+
+```python
+from plone.app.textfield.value import RichTextValue
+
+context.body = RichTextValue("Some input text", mimeType="text/html", outputMimeType="text/x-html-safe")
+```
+
+The standard widget used for a `RichText` field will correctly store this type of object for you, so it is rarely necessary to create one yourself.
+
+
+##### `RichText` fields in templates
+
+If you use a `DisplayForm`, the display widget for the `RichText` field will render the transformed output markup automatically.
+If you write TAL manually, you may try something like the following.
+
+```xml
+<div tal:content="structure context/body" />
+```
+
+This, however, will render a string as follows.
+
+```html
+RichTextValue object. (Did you mean <attribute>.raw or <attribute>.output?)
+```
+
+The correct syntax is:
+
+```xml
+<div tal:content="structure context/body/output" />
+```
+
+This will render the cached, transformed output.
+This operation is approximately as efficient as rendering a simple `Text` field, since the transformation is only applied once, when the value is first saved.
+
+
+##### Alternative transformations
+
+Sometimes, you may want to invoke alternative transformations.
+Under the hood, the default implementation uses the `portal_transforms` tool to calculate a transform chain from the raw value's input MIME type to the desired output MIME type.
+If you need to write your own transforms, take a look at [Changing Portal Transforms Settings via Python](https://5.docs.plone.org/develop/plone/misc/portal_transforms.html).
+This is abstracted behind an `ITransformer` adapter to allow alternative implementations.
+
+To invoke a transformation in code, you can use the following syntax.
+
+```python
+from plone.app.textfield.interfaces import ITransformer
+
+transformer = ITransformer(context)
+transformedValue = transformer(context.body, "text/plain")
+```
+
+The `__call__()` method of the `ITransformer` adapter takes a `RichTextValue` object and an output MIME type as parameters.
+
+If you write a page template, there is an even more convenient syntax.
+
+```xml
+<div tal:content="structure context/@@text-transform/body/text/plain" />
+```
+
+The first traversal name segment gives the name of the field on the context (`body` in this case).
+The second and third segments give the output MIME type.
+If the MIME type is omitted, the default output MIME type will be used.
+
+```{note}
+Unlike the `output` property, the value is not cached, and so will be calculated each time the page is rendered.
+```
+
+
+
 ### Fields in `plone.schema`
 
 See {ref}`backend-ploneschema-label` for more details.

docs/backend/upgrading/version-specific-migration/upgrade-to-61.md

@@ -86,3 +86,21 @@ If your project or your add-on needs this package, and you only depend on `Produ
 Then your project or add-on will keep working in both Plone 6.0 and 6.1.
 
 The goal of turning more of the current core packages into core add-ons is to make the core smaller, and in some cases solve circular dependencies.
+
+
+(backend-upgrade-plone-v61-discussion-label)=
+
+## Discussion is disabled by default
+
+Discussion is a feature that allows your site visitors to comment on web pages for any content object.
+Discussion is disabled by default in Plone 6.1 and later.
+To enable discussion, you need to perform the following tasks.
+
+% Please add sufficient details for how to do this task, then delete this comment.
+% Also consider that there might be different approaches between Classic UI and Volto that need to be mentioned.
+
+1.  In your Python {file}`requirements.txt` or {file}`pyproject.toml` file, add the core add-on `plone.app.discussion` to your dependencies.
+1.  Run pip to install `plone.app.discussion`.
+1.  Restart the Plone backend to load `plone.app.discussion`.
+1.  Enable the {guilabel}`Discussion` add-on in the Plone control panel under {menuselection}`Site Setup --> General`.
+1.  🍻

docs/conf.py

@@ -49,6 +49,7 @@
     "sphinx.ext.todo",
     "sphinx_copybutton",
     "sphinx_design",
+    "sphinx_examples",
     "sphinx_reredirects",
     "sphinx_sitemap",
     "sphinxcontrib.httpdomain",  # plone.restapi

docs/contributing/documentation/authors.md

@@ -127,14 +127,10 @@ When authors add a link to the documentation, it must be a valid public URL with
 
 If it is not a valid link, or is private or local, then you must exclude it from `linkcheck` by wrapping it in single backticks.
 
-```md
+```{example}
 Visit the URL `http://www.example.com` for an example.
 ```
 
-This will render as follows.
-
-> Visit the URL `http://www.example.com` for an example.
-
 If a link has succumbed to bit rot, then try finding the most recently scraped version on the [Internet Archive Wayback Machine](https://web.archive.org/), and update the link.
 
 To validate links, run the following command.
@@ -240,6 +236,8 @@ Authors should include at least `description`, `property=og:description`, `prope
 The following is an example of `html_meta`.
 Note that the content of the two tags `description` and `property=og:description` should be identical.
 
+% Cannot use sphinx-examples for this one.
+
 ```md
 ---
 myst: