Merge branch '6.0' into classic-ui-autoforms

Author: stevepiercy

.github/workflows/build_deploy.yml

@@ -15,13 +15,13 @@ jobs:
       name: docs.plone.org
       url: https://docs.plone.org
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Graphviz
-        uses: ts-graphviz/setup-graphviz@v1
-      - name: Set up Python 3.10
-        uses: actions/setup-python@v4
+        uses: ts-graphviz/setup-graphviz@v2
+      - name: Set up Python 3.12
+        uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
+          python-version: '3.12'
           cache: 'pip'
       - name: Install dependencies
         run: |
@@ -39,11 +39,11 @@ jobs:
         run: make deploy
 
       - name: Use Node.js ${{ env.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ env.node-version }}
 
-      - uses: pnpm/action-setup@v2
+      - uses: pnpm/action-setup@v3
         name: Install pnpm
         with:
           version: 8

.github/workflows/test.yml

@@ -6,12 +6,12 @@ jobs:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.12"
 
       - name: Install dependencies
         run: |

.github/workflows/update_submodule.yml

@@ -1,3 +1,4 @@
+# See https://github.com/plone/documentation/issues/1214 for current status
 name: Get latest version of submodules and push back to 6.0 branch
 
 on:

Makefile

@@ -35,7 +35,7 @@ distclean:  ## Clean docs build directory and Python virtual environment
 
 
 bin/python:
-	python3 -m venv . || virtualenv --clear --python=python3 .
+	python3 -m venv .
 	bin/pip install -r requirements-initial.txt
 	bin/pip install -r requirements.txt
 

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

@@ -602,3 +602,57 @@ Please make sure you write valid JSON for the `template` option.
 ```{seealso}
 See also the [TinyMCE 4 to 5 upgrade guide](https://www.tiny.cloud/docs/migration-from-4x/).
 ```
+
+## Viewlets
+
+Plone 6.0 renames various viewlets or moves them to a different viewlet manager.
+This is because some viewlet names contained the name of a viewlet manager.
+This didn't always match the name of their actual viewlet manager, especially after moving them.
+Plone 6.0 removes such references from the viewlet names to avoid confusion.
+
+-   Plone 6.0 removes the `plone.header` viewlet from `plone.portaltop` manager, making it empty.
+-   Plone 6.0 renames the `plone.abovecontenttitle.documentactions` viewlet to `plone.documentactions`, and moves it from manager `plone.belowcontentbody` to `plone.belowcontent`.
+-   Plone 6.0 renames the `plone.abovecontenttitle.socialtags` viewlet to `plone.socialtags`.
+    It remains in manager `plone.abovecontenttitle`.
+-   Plone 6.0 renames the `plone.belowcontentbody.relateditems` viewlet to `plone.relateditems`.
+    It remains in manager `plone.belowcontentbody`.
+-   Plone 6.0 removes the `plone.manage_portlets_fallback` viewlet from the `plone.belowcontent` manager.
+-   Plone 6.0 renames the `plone.belowcontenttitle.documentbyline` viewlet to `plone.documentbyline`.
+    It remains in manager `plone.belowcontenttitle`.
+-   Plone 6.0 renames the `plone.belowcontenttitle.keywords` viewlet to `plone.keywords`, and moves it from manager `plone.belowcontent` to `plone.belowcontentbody`.
+-   Plone 6.0 adds the `plone.rights` viewlet in manager `plone.belowcontentbody`.
+
+The names in the following table have had the namespace `plone.` removed from them for display purposes only.
+In your code, you should use the object's `plone.` namespace as a prefix.
+This table shows the same information, but in tabular form.
+
+```{table} Viewlet changes from 5.2 to 6.0
+
+| 5.2 viewlet name | 5.2 viewlet manager | 6.0 viewlet name | 6.0 viewlet manager |
+| ---------------- | ------------------- | ---------------- | ------------------- |
+| `header` | `portaltop` | | `portaltop` |
+| `abovecontenttitle.documentactions` | `belowcontentbody` | `documentactions` | `belowcontent` |
+| `abovecontenttitle.socialtags` | `abovecontenttitle` | `socialtags` | `abovecontenttitle` |
+| `belowcontentbody.relateditems` | `belowcontentbody` | `relateditems` | `belowcontentbody` |
+| `manage_portlets_fallback` | `belowcontent` | | `belowcontent` |
+| `belowcontenttitle.documentbyline` | `belowcontenttitle` | `documentbyline` | `belowcontenttitle` |
+| `belowcontenttitle.keywords` | `belowcontent` | `keywords` | `belowcontentbody` |
+| | `belowcontentbody` | `rights` | `belowcontentbody` |
+```
+
+Plone 6.0 makes changes to two viewlet managers:
+
+-   Plone 6.0 removes the `plone.documentactions` (`IDocumentActions`) viewlet manager.
+    In Plone 5.2 it was already empty.
+-   Plone 6.0 adds the `plone.belowcontentdescription` (`IBelowContentDescription`) viewlet manager.
+    By default this has no viewlets.
+
+One final change is that Plone 6.0 moves the `plone.footer` viewlet from `plone.app.layout/viewlets` to `plone.app.portlets`.
+The viewlet remains in manager `plone.portalfooter`.
+It renders the portlets from the `plone.footerportlets` portlet manager.
+
+## Boolean fields
+
+Since `zope.schema==6.1.0`, all `zope.schema.Bool` fields must have a `required=False` attribute.
+This allows you to either tick or not tick the checkbox, submit the form, and process the field with either its value when ticked or `None` when unticked.
+Otherwise, you can't save the form without ticking the checkbox, which effectively makes the field value always `True`.

docs/classic-ui/icons.md

@@ -67,13 +67,14 @@ To use a different icon than the system default, you can override the registrati
 
 ## Icon expression
 
-```{todo}
-How does this work? We need an example here!
-```
-
-- The field `icon_expression` is used again to define icons for actions, content types, and other purposes.
+- The field `icon_expr` is used again to define icons for actions, content types, and other purposes.
 - Use the icon name for icon expressions.
 
+Example:
+
+```xml
+<property name="icon_expr">string:list-check</property>
+```
 
 (classic-ui-icons-icon-resolver-label)=
 

docs/classic-ui/theming/from-scratch.md

@@ -66,6 +66,8 @@ prefix = /++theme++plonetheme.munich
 doctype = <!DOCTYPE html>
 ```
 
+(classic-ui-from-scratch-bundle-registration-label)=
+
 ### Bundle registration
 
 ```xml
@@ -120,7 +122,61 @@ yarn dist
 -   Tweak basic settings like rounded corners, shadows, and so on.
 -   Set custom fonts
 -   Define your own stuff
--   Import Boostrap (as basis)
+-   Import Bootstrap (as basis)
+
+
+#### Minimal backend styling
+
+When you create a theme from scratch, it is convenient to reuse the Barceloneta theme for:
+
+-   Plone toolbar
+-   add and edit forms
+-   control panels
+
+To do so, follow this guide.
+
+-   Create a new CSS file in your theme, such as the following.
+
+    ```scss
+    @import "@plone/plonetheme-barceloneta-base/scss/variables.colors.plone";
+    @import "@plone/plonetheme-barceloneta-base/scss/variables.colors.dark.plone";
+    @import "@plone/plonetheme-barceloneta-base/scss/root_variables";
+    @import "bootstrap/scss/bootstrap";
+    
+    @import "@plone/plonetheme-barceloneta-base/scss/toolbar";
+    @import "@plone/plonetheme-barceloneta-base/scss/controlpanels";
+    @import "@plone/plonetheme-barceloneta-base/scss/forms";
+    ```
+
+    ```{tip}
+    See all the available [Barceloneta SCSS files](https://github.com/plone/plonetheme.barceloneta/tree/master/scss), and import the ones that you want to use.
+    ```
+
+-   Add `@plone/plonetheme-barceloneta-base` as a dependency.
+
+    ```shell
+    yarn add @plone/plonetheme-barceloneta-base
+    ```
+
+-   Add a script in {file}`package.json` to compile the CSS.
+
+    ```json
+      "css-compile-main": "sass --load-path=node_modules --style expanded --source-map --embed-sources --no-error-css plone.scss:../static/plone.css"
+    ```
+
+    ```{tip}
+    Look at [`plonetheme.barcelonta`'s {file}`package.json`](https://github.com/plone/plonetheme.barceloneta/blob/master/package.json) for a few more scripts that can prefix and minify your CSS and get a bundle for use in production.
+    ```
+
+-   Run the compilation.
+
+    ```shell
+    yarn run css-compile-main
+    ```
+
+-   Finally, {ref}`register the bundle <classic-ui-from-scratch-bundle-registration-label>`.
+
+With this guide, you will save yourself quite some work on styling the toolbar, the add and edit forms, and control panels, while keeping the rest of your theming separate.
 
 
 #### Templates

docs/contributing/index.md

@@ -86,8 +86,10 @@ When a package is released with a new version, the release manager runs `towncri
 Because the log file is automatically generated, you should not edit it directly, except to make corrections, such as broken links.
 
 To create a change log entry or news item, create a file in the `news` directory, located in the root of the package.
+
 For Volto, its repository is in a monorepo structure, consisting of several packages in the `packages` folder.
 Thus for Volto and its packages, change log entries should be created in `packages/PACKAGE_NAME/news/`, which is the root of the package.
+When making a change to its documentation, set up, continuous integration, or other repository-wide items, place a change log entry in `packages/volto/news/` as a default.
 
 The change log entry's format must be `###.type`, where `###` is the referenced GitHub issue or pull request number, `.` is the literal extension delimiter, and `type` is one of the following strings.
 

docs/glossary.md

@@ -701,4 +701,33 @@ Nick
 predicate
 predicates
     In programming, a predicate is a test which returns `true` or `false`.
+
+pnpm workspace
+workspace
+    pnpm has built-in support for monorepositories (also known as multi-package repositories, multi-project repositories, or monolithic repositories).
+    Workspaces provide support to manage multiple packages from your local file system from within a singular top-level, root package.
+
+    When you run `pnpm install` at the root of the repository, pnpm installs dependencies for all workspaces, ensuring consistency across the entire project.
+    This centralized approach streamlines development, facilitates code sharing, and simplifies the maintenance of complex projects.
+
+ESLint
+    [ESLint](https://eslint.org/) statically analyzes your code to quickly find problems.
+    It is built into most text editors and you can run ESLint as part of your continuous integration pipeline.
+
+Stylelint
+    [Stylelint](https://stylelint.io/) is a CSS linter that helps you avoid errors and enforce conventions.
+
+Prettier
+    [Prettier](https://prettier.io/) is an opinionated code formatter.
+
+GitHub workflow
+GitHub workflows
+    A [GitHub workflow](https://docs.github.com/en/actions/using-workflows) is a configurable automated process that will run one or more jobs.
+
+husky
+    [Husky](https://typicode.github.io/husky/) automatically lints your commit messages, code, and runs tests upon committing or pushing commits to a remote repository.
+
+Jest
+    [Jest](https://jestjs.io/) is a JavaScript testing framework.
+    Volto uses Jest for unit tests.
 ```

docs/install/create-project.md

@@ -228,6 +228,10 @@ You will be presented with a series of prompts.
 You can accept the default values in square brackets (`[default-option]`) by hitting the {kbd}`Enter` key, or enter your preferred values.
 For ease of documentation, we will use the default values.
 
+```{tip}
+See the cookiecutter's README for how to [Use options to avoid prompts](https://github.com/collective/cookiecutter-plone-starter/?tab=readme-ov-file#use-options-to-avoid-prompts).
+```
+
 (avoid-plone-core-package-names)=
 
 ```{important}