From 7c63be00a3b0ec97a9d4b4e7f9c3a635c59c61fe Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Wed, 24 Apr 2024 09:57:14 -0700 Subject: [PATCH 01/10] Start Plone 6.1 upgrade guide --- .../version-specific-migration/index.md | 1 + .../upgrade-to-61.md | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 docs/backend/upgrading/version-specific-migration/upgrade-to-61.md diff --git a/docs/backend/upgrading/version-specific-migration/index.md b/docs/backend/upgrading/version-specific-migration/index.md index c210c3af0..c8cb485cd 100644 --- a/docs/backend/upgrading/version-specific-migration/index.md +++ b/docs/backend/upgrading/version-specific-migration/index.md @@ -26,5 +26,6 @@ upgrade-to-52 upgrade-to-python3 upgrade-zodb-to-python3 upgrade-to-60 +upgrade-to-61 migrate-to-volto ``` diff --git a/docs/backend/upgrading/version-specific-migration/upgrade-to-61.md b/docs/backend/upgrading/version-specific-migration/upgrade-to-61.md new file mode 100644 index 000000000..8ff1567f7 --- /dev/null +++ b/docs/backend/upgrading/version-specific-migration/upgrade-to-61.md @@ -0,0 +1,27 @@ +--- +myst: + html_meta: + "description": "How to upgrade to Plone 6.1" + "property=og:description": "How to upgrade to Plone 6.1" + "property=og:title": "How to upgrade to Plone 6.1" + "keywords": "Upgrade, Plone 6" +--- + +(backend-upgrade-plone-v61-label)= + +# Upgrade Plone 6.0 to 6.1 + +Plone 6.1 has seen the following major changes. +Some may require changes in your setup. + + +## TinyMCE upgraded + +Plone 6.0 uses TinyMCE, a rich text editor for websites. +TinyMCE 5 reached its end of support on April 20, 2023. +For Plone 6.1, TinyMCE has been upgraded from version 5 to 7. + +```{seealse} +- [How to upgrade TinyMCE 5 to TinyMCE 6](https://www.tiny.cloud/blog/upgrade-to-tinymce-6/) +- [Upgrading TinyMCE](https://www.tiny.cloud/docs/tinymce/latest/upgrading/) +``` From a966bb9a8dfe96769d9595e4aae857ee62565637 Mon Sep 17 00:00:00 2001 From: 1letter <1letter@gmx.de> Date: Wed, 24 Apr 2024 20:14:41 +0200 Subject: [PATCH 02/10] Fix typo --- .../upgrading/version-specific-migration/upgrade-to-61.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/backend/upgrading/version-specific-migration/upgrade-to-61.md b/docs/backend/upgrading/version-specific-migration/upgrade-to-61.md index 8ff1567f7..bcbe81199 100644 --- a/docs/backend/upgrading/version-specific-migration/upgrade-to-61.md +++ b/docs/backend/upgrading/version-specific-migration/upgrade-to-61.md @@ -21,7 +21,7 @@ Plone 6.0 uses TinyMCE, a rich text editor for websites. TinyMCE 5 reached its end of support on April 20, 2023. For Plone 6.1, TinyMCE has been upgraded from version 5 to 7. -```{seealse} +```{seealso} - [How to upgrade TinyMCE 5 to TinyMCE 6](https://www.tiny.cloud/blog/upgrade-to-tinymce-6/) - [Upgrading TinyMCE](https://www.tiny.cloud/docs/tinymce/latest/upgrading/) ``` From 191eb53e4bb4b5e191cf18241a4806338da56239 Mon Sep 17 00:00:00 2001 From: 1letter <1letter@gmx.de> Date: Wed, 24 Apr 2024 20:16:12 +0200 Subject: [PATCH 03/10] Add a description to use the TinyMCE accordion plugin --- .../upgrade-to-61.md | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/docs/backend/upgrading/version-specific-migration/upgrade-to-61.md b/docs/backend/upgrading/version-specific-migration/upgrade-to-61.md index bcbe81199..30667e0e6 100644 --- a/docs/backend/upgrading/version-specific-migration/upgrade-to-61.md +++ b/docs/backend/upgrading/version-specific-migration/upgrade-to-61.md @@ -25,3 +25,37 @@ For Plone 6.1, TinyMCE has been upgraded from version 5 to 7. - [How to upgrade TinyMCE 5 to TinyMCE 6](https://www.tiny.cloud/blog/upgrade-to-tinymce-6/) - [Upgrading TinyMCE](https://www.tiny.cloud/docs/tinymce/latest/upgrading/) ``` + +### Enable the TinyMCE accordion plugin + +Go to the controlpanel to manage TinyMCE settings + +Enable the Plugin in the controlpanel + +Add a menu entry `accordion` for TinyMCE in the controlpanel + +```{code-block} json +{ + "insert": { + "title": "Insert", + "items": "link media | template hr | accordion" + }, +} +``` + +Check your settings in the HTML filter controlpanel + +add two new tags to `valid tags` + +- `summary` +- `details` + +add a new attribute to `custom_attributes` + +- `open` + +for a transform to valid bootstrap5 accordion markup use an outputfilter + +```{seealso} +- [Addon collective.outputfilters.tinymceaccordion](https://github.com/collective/collective.outputfilters.tinymceaccordion) +``` \ No newline at end of file From ba0fb2d614a4c828809d7de7a024b71c41c22408 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Wed, 24 Apr 2024 13:32:28 -0700 Subject: [PATCH 04/10] Convert narrative to an enumerated list of steps, add guilabel MyST markup --- .../upgrade-to-61.md | 45 +++++++++---------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/docs/backend/upgrading/version-specific-migration/upgrade-to-61.md b/docs/backend/upgrading/version-specific-migration/upgrade-to-61.md index 30667e0e6..0f55d14e8 100644 --- a/docs/backend/upgrading/version-specific-migration/upgrade-to-61.md +++ b/docs/backend/upgrading/version-specific-migration/upgrade-to-61.md @@ -28,34 +28,31 @@ For Plone 6.1, TinyMCE has been upgraded from version 5 to 7. ### Enable the TinyMCE accordion plugin -Go to the controlpanel to manage TinyMCE settings +1. Go to the {guilabel}`Site Setup > General > TinyMCE` control panel to manage TinyMCE settings. +1. Under the {guilabel}`Plugins and Toolbar` tab, check {guilabel}`accordion` to enable the accordion plugin. +1. Under the same tab, add a menu entry `accordion` for TinyMCE in the control panel by editing the `items` key as shown. -Enable the Plugin in the controlpanel + ```json + { + "insert": { + "title": "Insert", + "items": "link media | template hr | accordion" + }, + } + ``` -Add a menu entry `accordion` for TinyMCE in the controlpanel +1. Click the {guilabel}`Save` button to save your settings. +1. In the {guilabel}`Security > HTML filtering` control panel, add two new tags to {guilabel}`Valid tags`. -```{code-block} json -{ - "insert": { - "title": "Insert", - "items": "link media | template hr | accordion" - }, -} -``` - -Check your settings in the HTML filter controlpanel - -add two new tags to `valid tags` + - `summary` + - `details` -- `summary` -- `details` +1. Also in the {guilabel}`Security > HTML filtering` control panel, add a new attribute to {guilabel}`Custom attributes`. -add a new attribute to `custom_attributes` + - `open` -- `open` +1. For a transform to valid markup of the Bootstrap 5 accordion, use an output filter. -for a transform to valid bootstrap5 accordion markup use an outputfilter - -```{seealso} -- [Addon collective.outputfilters.tinymceaccordion](https://github.com/collective/collective.outputfilters.tinymceaccordion) -``` \ No newline at end of file + ```{seealso} + - [Addon collective.outputfilters.tinymceaccordion](https://github.com/collective/collective.outputfilters.tinymceaccordion) + ``` From 2b66e7ad90476ae38058db08d4f002798e45a67b Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Mon, 29 Apr 2024 14:22:29 -0700 Subject: [PATCH 05/10] Clarify what needs to be upgraded in regards to TinyMCE --- .../version-specific-migration/upgrade-to-61.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/docs/backend/upgrading/version-specific-migration/upgrade-to-61.md b/docs/backend/upgrading/version-specific-migration/upgrade-to-61.md index 0f55d14e8..b5b604b76 100644 --- a/docs/backend/upgrading/version-specific-migration/upgrade-to-61.md +++ b/docs/backend/upgrading/version-specific-migration/upgrade-to-61.md @@ -15,16 +15,15 @@ Plone 6.1 has seen the following major changes. Some may require changes in your setup. -## TinyMCE upgraded +## TinyMCE upgraded in Classic UI -Plone 6.0 uses TinyMCE, a rich text editor for websites. +In Plone 6.0, the Classic UI frontend uses TinyMCE 5, a rich text editor for websites. TinyMCE 5 reached its end of support on April 20, 2023. -For Plone 6.1, TinyMCE has been upgraded from version 5 to 7. +For Plone 6.1, Classic UI upgraded TinyMCE from version 5 to 7. + +If you upgrade a site using Classic UI from Plone 6.0 to 6.1, you do not need to take any action, unless you implemented custom plugins, or you use a plugin which got removed or moved to premium in TinyMCE versions 6 or 7. +To upgrade your plugin implementation to TinyMCE 7, see the [upgrade guides](https://www.tiny.cloud/docs/tinymce/6/migration-from-5x/#plugins). -```{seealso} -- [How to upgrade TinyMCE 5 to TinyMCE 6](https://www.tiny.cloud/blog/upgrade-to-tinymce-6/) -- [Upgrading TinyMCE](https://www.tiny.cloud/docs/tinymce/latest/upgrading/) -``` ### Enable the TinyMCE accordion plugin From 758177296d8be7f901b9bcd059b8f9c973f2aa2d Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Mon, 29 Apr 2024 22:53:42 -0700 Subject: [PATCH 06/10] Update tips submodules/plone.api submodules/plone.restapi submodules/volto --- submodules/plone.api | 2 +- submodules/plone.restapi | 2 +- submodules/volto | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/submodules/plone.api b/submodules/plone.api index 7cb48160d..f2ac29ae8 160000 --- a/submodules/plone.api +++ b/submodules/plone.api @@ -1 +1 @@ -Subproject commit 7cb48160d570d7fad0a4c3bd67c306e23299382b +Subproject commit f2ac29ae8fe9509f877a01a3f12898792f2864cf diff --git a/submodules/plone.restapi b/submodules/plone.restapi index c03a8c14d..f2e365394 160000 --- a/submodules/plone.restapi +++ b/submodules/plone.restapi @@ -1 +1 @@ -Subproject commit c03a8c14d903555d2e80e070c57e0b66e417d40b +Subproject commit f2e365394f19d2841cf0417bc69b89b18cdcacb9 diff --git a/submodules/volto b/submodules/volto index e7d6f1c0b..01cbe72d7 160000 --- a/submodules/volto +++ b/submodules/volto @@ -1 +1 @@ -Subproject commit e7d6f1c0be483c6560a552bae615b3f80ec21c1e +Subproject commit 01cbe72d7fc711c8521fbaec55f7ca45d843e3d8 From e71f735bdbc17d8942e8f1c1214996a59c264080 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Tue, 30 Apr 2024 00:54:47 -0700 Subject: [PATCH 07/10] Add placeholder for `z3c.form` and `plone.app.z3cform` --- .../version-specific-migration/upgrade-to-61.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/docs/backend/upgrading/version-specific-migration/upgrade-to-61.md b/docs/backend/upgrading/version-specific-migration/upgrade-to-61.md index b5b604b76..99a66aa99 100644 --- a/docs/backend/upgrading/version-specific-migration/upgrade-to-61.md +++ b/docs/backend/upgrading/version-specific-migration/upgrade-to-61.md @@ -55,3 +55,17 @@ To upgrade your plugin implementation to TinyMCE 7, see the [upgrade guides](htt ```{seealso} - [Addon collective.outputfilters.tinymceaccordion](https://github.com/collective/collective.outputfilters.tinymceaccordion) ``` + + +## `z3c.form` and `plone.app.z3cform` + +````{todo} +This is a placeholder. + +- Update deprecated imports +- New widget templates + +```{seealso} +https://github.com/plone/plone.app.z3cform/pull/181 +``` +```` \ No newline at end of file From 953bc414a08ca318721a30a8e2eff080313973ea Mon Sep 17 00:00:00 2001 From: Maurits van Rees Date: Sat, 4 May 2024 22:01:16 +0200 Subject: [PATCH 08/10] Upgrade: drop py 3.8/3.9. p.a.multilingual is core add-on. --- .../upgrade-to-61.md | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/docs/backend/upgrading/version-specific-migration/upgrade-to-61.md b/docs/backend/upgrading/version-specific-migration/upgrade-to-61.md index 99a66aa99..6cdd363d1 100644 --- a/docs/backend/upgrading/version-specific-migration/upgrade-to-61.md +++ b/docs/backend/upgrading/version-specific-migration/upgrade-to-61.md @@ -68,4 +68,20 @@ This is a placeholder. ```{seealso} https://github.com/plone/plone.app.z3cform/pull/181 ``` -```` \ No newline at end of file +```` + +## Drop Python 3.8 and 3.9 + +We only support Python 3.10, 3.11, and 3.12. + + +## `plone.app.multilingual` is a core add-on + +`plone.app.multilingual` is the package that adds multilingual support to Plone, so for having content in multiple languages. +Until Plone 6.0 this was a dependency of `Products.CMFPlone`, so it was available for installation in all Plone sites. +In Plone 6.1 it has become a dependency of the `Plone` package. + +If your project or your add-on needs this package, and you only depend on `Products.CMFPlone` until now, you should add `plone.app.multilingual` as dependency. +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. From 3fb7301a7cb936ec5bd071a186b9290e3be1c371 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sat, 4 May 2024 21:32:58 -0700 Subject: [PATCH 09/10] Move Python support to the first item. Nitpicky grammar fixes. --- .../upgrade-to-61.md | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/docs/backend/upgrading/version-specific-migration/upgrade-to-61.md b/docs/backend/upgrading/version-specific-migration/upgrade-to-61.md index 6cdd363d1..1f1f11a09 100644 --- a/docs/backend/upgrading/version-specific-migration/upgrade-to-61.md +++ b/docs/backend/upgrading/version-specific-migration/upgrade-to-61.md @@ -15,6 +15,11 @@ Plone 6.1 has seen the following major changes. Some may require changes in your setup. +## Drop Python 3.8 and 3.9 + +We only support Python 3.10, 3.11, and 3.12. + + ## TinyMCE upgraded in Classic UI In Plone 6.0, the Classic UI frontend uses TinyMCE 5, a rich text editor for websites. @@ -70,18 +75,14 @@ https://github.com/plone/plone.app.z3cform/pull/181 ``` ```` -## Drop Python 3.8 and 3.9 - -We only support Python 3.10, 3.11, and 3.12. - ## `plone.app.multilingual` is a core add-on -`plone.app.multilingual` is the package that adds multilingual support to Plone, so for having content in multiple languages. -Until Plone 6.0 this was a dependency of `Products.CMFPlone`, so it was available for installation in all Plone sites. -In Plone 6.1 it has become a dependency of the `Plone` package. +`plone.app.multilingual` is the package that adds multilingual support to Plone, allowing the storage and display of content in multiple languages. +In Plone 6.0 and earlier, this was a dependency of `Products.CMFPlone`, making it available for installation in all Plone sites. +In Plone 6.1 it is now a dependency of the `Plone` package. -If your project or your add-on needs this package, and you only depend on `Products.CMFPlone` until now, you should add `plone.app.multilingual` as dependency. +If your project or your add-on needs this package, and you only depend on `Products.CMFPlone` until now, you should add `plone.app.multilingual` as a dependency. 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. +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. From 6468ee67d6a3f35a2a36c3ab32b3824968239c72 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sat, 4 May 2024 21:36:24 -0700 Subject: [PATCH 10/10] Revert "Update tips submodules/plone.api submodules/plone.restapi submodules/volto" This reverts commit 758177296d8be7f901b9bcd059b8f9c973f2aa2d. --- submodules/plone.api | 2 +- submodules/plone.restapi | 2 +- submodules/volto | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/submodules/plone.api b/submodules/plone.api index f2ac29ae8..7cb48160d 160000 --- a/submodules/plone.api +++ b/submodules/plone.api @@ -1 +1 @@ -Subproject commit f2ac29ae8fe9509f877a01a3f12898792f2864cf +Subproject commit 7cb48160d570d7fad0a4c3bd67c306e23299382b diff --git a/submodules/plone.restapi b/submodules/plone.restapi index f2e365394..c03a8c14d 160000 --- a/submodules/plone.restapi +++ b/submodules/plone.restapi @@ -1 +1 @@ -Subproject commit f2e365394f19d2841cf0417bc69b89b18cdcacb9 +Subproject commit c03a8c14d903555d2e80e070c57e0b66e417d40b diff --git a/submodules/volto b/submodules/volto index 01cbe72d7..e7d6f1c0b 160000 --- a/submodules/volto +++ b/submodules/volto @@ -1 +1 @@ -Subproject commit 01cbe72d7fc711c8521fbaec55f7ca45d843e3d8 +Subproject commit e7d6f1c0be483c6560a552bae615b3f80ec21c1e