diff --git a/last_commit.txt b/last_commit.txt index 4ec7370506..10713d1d37 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -2,120 +2,57 @@ Repository: plone.volto Branch: refs/heads/main -Date: 2024-11-14T18:56:40+05:30 -Author: iRohitSingh (iRohitSingh) -Commit: https://github.com/plone/plone.volto/commit/8d69d4006ec2349ba7099f71d37c345ea68d9f5f +Date: 2024-12-11T10:01:37-08:00 +Author: David Glick (davisagli) +Commit: https://github.com/plone/plone.volto/commit/3af904226a2298702d205187e31288968c4c60bc -Replace head_title with Kicker +Remove unnecessary zcml conditions Files changed: -A src/plone/volto/behaviors/kicker.py M src/plone/volto/behaviors/configure.zcml -D src/plone/volto/behaviors/headtitle.py +M src/plone/volto/browser/configure.zcml +M src/plone/volto/configure.zcml +M src/plone/volto/dependencies.zcml +M src/plone/volto/overrides.zcml +M src/plone/volto/patches.zcml -b'diff --git a/src/plone/volto/behaviors/configure.zcml b/src/plone/volto/behaviors/configure.zcml\nindex 47f096e..9b85cf6 100644\n--- a/src/plone/volto/behaviors/configure.zcml\n+++ b/src/plone/volto/behaviors/configure.zcml\n@@ -37,8 +37,14 @@\n \n+ \n \n \ndiff --git a/src/plone/volto/behaviors/headtitle.py b/src/plone/volto/behaviors/kicker.py\nsimilarity index 55%\nrename from src/plone/volto/behaviors/headtitle.py\nrename to src/plone/volto/behaviors/kicker.py\nindex 6085048..07a4bb5 100644\n--- a/src/plone/volto/behaviors/headtitle.py\n+++ b/src/plone/volto/behaviors/kicker.py\n@@ -6,13 +6,16 @@\n \n \n @provider(IFormFieldProvider)\n-class IHeadTitle(model.Schema):\n+class IKicker(model.Schema):\n \n head_title = schema.TextLine(\n- title=_("label_head_title", default="Header title"),\n+ title=_("label_kicker", default="Kicker"),\n required=False,\n description=_(\n- "help_head_title",\n- default="The header title is shown above the title in teasers.",\n+ "help_kicker",\n+ default="The kicker is shown above the title in teasers.",\n ),\n )\n+\n+class IHeadTitle(IKicker):\n+ """alias for backwards-compatibility"""\n\\ No newline at end of file\n' +b'diff --git a/src/plone/volto/behaviors/configure.zcml b/src/plone/volto/behaviors/configure.zcml\nindex 47f096e..f98b9c8 100644\n--- a/src/plone/volto/behaviors/configure.zcml\n+++ b/src/plone/volto/behaviors/configure.zcml\n@@ -1,7 +1,6 @@\n \n \n@@ -17,15 +16,13 @@\n provides=".preview.IPreview"\n />\n \n- \n- \n- \n- \n+ \n+ \n \n \n \n \n \n \n@@ -39,7 +37,6 @@\n class=".migrate_richtext.MigrateRichTextToVoltoBlocks"\n template="migrate_richtext.pt"\n permission="cmf.ManagePortal"\n- zcml:condition="have plone-60"\n />\n \n \n \n \n@@ -59,7 +55,6 @@\n template="voltobackendwarning.pt"\n permission="zope2.View"\n layer="plone.volto.interfaces.IPloneVoltoCoreLayer"\n- zcml:condition="have plone-60"\n />\n \n \ndiff --git a/src/plone/volto/configure.zcml b/src/plone/volto/configure.zcml\nindex 73392f4..f2875b3 100644\n--- a/src/plone/volto/configure.zcml\n+++ b/src/plone/volto/configure.zcml\n@@ -5,7 +5,6 @@\n xmlns:i18n="http://namespaces.zope.org/i18n"\n xmlns:monkey="http://namespaces.plone.org/monkey"\n xmlns:plone="http://namespaces.plone.org/plone"\n- xmlns:zcml="http://namespaces.zope.org/zcml"\n i18n_domain="plone.volto"\n >\n \ndiff --git a/src/plone/volto/dependencies.zcml b/src/plone/volto/dependencies.zcml\nindex 3b4fc84..fce6a2b 100644\n--- a/src/plone/volto/dependencies.zcml\n+++ b/src/plone/volto/dependencies.zcml\n@@ -1,7 +1,4 @@\n-\n+\n \n \n+\n \n \n \n@@ -20,7 +19,6 @@\n class="Products.CMFPlone.browser.login.password_reset.PasswordResetToolView"\n docstringWarning="True"\n description="Patch password reset tool construct URL to cater for different frontend domain"\n- zcml:condition="have plone-52"\n />\n \n \n' Repository: plone.volto Branch: refs/heads/main -Date: 2024-11-14T20:34:02+05:30 -Author: iRohitSingh (iRohitSingh) -Commit: https://github.com/plone/plone.volto/commit/f33c8598739222970f04bcf18a2bc62dae598d8f - -Add changlog - -Files changed: -A news/164.bugfix - -b'diff --git a/news/164.bugfix b/news/164.bugfix\nnew file mode 100644\nindex 0000000..bd68fa0\n--- /dev/null\n+++ b/news/164.bugfix\n@@ -0,0 +1 @@\n+Rename head_title behaviour to Kicker @iRohitSingh\n\\ No newline at end of file\n' - -Repository: plone.volto - - -Branch: refs/heads/main -Date: 2024-12-11T09:28:24-08:00 +Date: 2024-12-11T10:02:44-08:00 Author: David Glick (davisagli) -Commit: https://github.com/plone/plone.volto/commit/652bb1dae25d36e0e648af0735be5330e0a54d0a +Commit: https://github.com/plone/plone.volto/commit/0d9fe86c62dcdc9f557d14e6a15b79e1d5035d47 -Merge remote-tracking branch 'origin/main' into head_title-kicker +changelog Files changed: -M CHANGES.md -M mx.ini -M setup.py -D news/161.bugfix +A news/167.internal -b'diff --git a/CHANGES.md b/CHANGES.md\nindex 97c3dd1..852a19e 100644\n--- a/CHANGES.md\n+++ b/CHANGES.md\n@@ -9,6 +9,13 @@\n \n \n \n+## 5.0.0b2 (2024-11-25)\n+\n+\n+### Bug fixes:\n+\n+- Rename `default` distribution to `volto`. @davisagli #161\n+\n ## 5.0.0b1 (2024-10-30)\n \n \ndiff --git a/mx.ini b/mx.ini\nindex 68c580b..d0999ab 100644\n--- a/mx.ini\n+++ b/mx.ini\n@@ -5,8 +5,8 @@\n \n [settings]\n main-package = -e .[test]\n-version-overrides =\n- plone.volto==5.0.0b2.dev0\n+ignores =\n+ plone.volto\n \n [plone.distribution]\n url = https://github.com/plone/plone.distribution.git\ndiff --git a/news/161.bugfix b/news/161.bugfix\ndeleted file mode 100644\nindex b03d9f4..0000000\n--- a/news/161.bugfix\n+++ /dev/null\n@@ -1 +0,0 @@\n-Rename `default` distribution to `volto`. @davisagli\ndiff --git a/setup.py b/setup.py\nindex 5c51a53..8264775 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -13,7 +13,7 @@\n \n setup(\n name="plone.volto",\n- version="5.0.0b2.dev0",\n+ version="5.0.0b3.dev0",\n description="Volto integration add-on for Plone",\n long_description=long_description,\n long_description_content_type="text/markdown",\n' +b'diff --git a/news/167.internal b/news/167.internal\nnew file mode 100644\nindex 0000000..f842954\n--- /dev/null\n+++ b/news/167.internal\n@@ -0,0 +1 @@\n+Remove unused ZCML conditions. @davisagli\n' Repository: plone.volto Branch: refs/heads/main -Date: 2024-12-11T09:51:50-08:00 +Date: 2024-12-11T10:53:43-08:00 Author: David Glick (davisagli) -Commit: https://github.com/plone/plone.volto/commit/23d79ba4305011a089505661de5792792fa9befc +Commit: https://github.com/plone/plone.volto/commit/32d4a5740fd0821a65973a3a332d092e4211f144 -Update readme and i18n, fix backwards-compat +Merge pull request #167 from plone/cleanup-zcml-conditions -Files changed: -A news/164.breaking -M README.md -M news/164.bugfix -M src/plone/volto/behaviors/kicker.py -M src/plone/volto/locales/de/LC_MESSAGES/plone.volto.po -M src/plone/volto/locales/en/LC_MESSAGES/plone.volto.po -M src/plone/volto/locales/es/LC_MESSAGES/plone.volto.po -M src/plone/volto/locales/eu/LC_MESSAGES/plone.volto.po -M src/plone/volto/locales/it/LC_MESSAGES/plone.volto.po -M src/plone/volto/locales/plone.volto.pot -M src/plone/volto/locales/pt_BR/LC_MESSAGES/plone.volto.po -M src/plone/volto/locales/update.py - -b'diff --git a/README.md b/README.md\nindex a86c4d0..70b6154 100644\n--- a/README.md\n+++ b/README.md\n@@ -206,11 +206,13 @@ The `volto.navtitle` behavior can be enabled in the generic setup XML definition\n \n ```\n \n-### Head title behavior\n+### Kicker behavior\n \n-The `headtitle` behavior makes content types provide a `headtitle` field that can be used by Volto in teasers and other content types.\n+The `volto.kicker` behavior adds a Kicker field that can be used to display a line of text above the title.\n \n-The `volto.head_title` behavior can be enabled in the generic setup XML definition of a content type, for example in `/profiles/default/types/MyContentType.xml`:\n+(The internal name of the field is `head_title`, for backwards-compatibility reasons.)\n+\n+This behavior can be enabled in the generic setup XML definition of a content type, for example in `/profiles/default/types/MyContentType.xml`:\n \n ```xml\n \n@@ -222,12 +224,15 @@ The `volto.head_title` behavior can be enabled in the generic setup XML definiti\n \n \n ...\n- \n+ \n \n ...\n \n ```\n \n+> [!NOTE]\n+> The previous name of this behavior, `volto.head_title`, was deprecated in `plone.volto` 5.0.\n+\n ### Image scales\n \n This package introduces new Plone image scales in Plone and redefines a couple of existing ones.\ndiff --git a/news/164.breaking b/news/164.breaking\nnew file mode 100644\nindex 0000000..bd68fa0\n--- /dev/null\n+++ b/news/164.breaking\n@@ -0,0 +1 @@\n+Rename head_title behaviour to Kicker @iRohitSingh\n\\ No newline at end of file\ndiff --git a/news/164.bugfix b/news/164.bugfix\nindex bd68fa0..b92c3fb 100644\n--- a/news/164.bugfix\n+++ b/news/164.bugfix\n@@ -1 +1,4 @@\n-Rename head_title behaviour to Kicker @iRohitSingh\n\\ No newline at end of file\n+The `volto.head_title` behavior has been renamed to `volto.kicker`.\n+The old name still works, but is deprecated.\n+Content types should be updated to use the new name.\n+@iRohitSingh, @davisagli\ndiff --git a/src/plone/volto/behaviors/kicker.py b/src/plone/volto/behaviors/kicker.py\nindex 07a4bb5..1f1ab37 100644\n--- a/src/plone/volto/behaviors/kicker.py\n+++ b/src/plone/volto/behaviors/kicker.py\n@@ -8,14 +8,17 @@\n @provider(IFormFieldProvider)\n class IKicker(model.Schema):\n \n+ # The field itself is named head_title, for backwards-compatibility.\n head_title = schema.TextLine(\n title=_("label_kicker", default="Kicker"),\n required=False,\n description=_(\n "help_kicker",\n- default="The kicker is shown above the title in teasers.",\n+ default="The kicker is a line of text shown above the title.",\n ),\n )\n \n+\n+@provider(IFormFieldProvider)\n class IHeadTitle(IKicker):\n- """alias for backwards-compatibility"""\n\\ No newline at end of file\n+ """alias for backwards-compatibility"""\ndiff --git a/src/plone/volto/locales/de/LC_MESSAGES/plone.volto.po b/src/plone/volto/locales/de/LC_MESSAGES/plone.volto.po\nindex c95c964..370cfe3 100644\n--- a/src/plone/volto/locales/de/LC_MESSAGES/plone.volto.po\n+++ b/src/plone/volto/locales/de/LC_MESSAGES/plone.volto.po\n@@ -4,7 +4,7 @@\n msgid ""\n msgstr ""\n "Project-Id-Version: PACKAGE VERSION\\n"\n-"POT-Creation-Date: 2024-06-26 17:33+0000\\n"\n+"POT-Creation-Date: 2024-12-11 17:41+0000\\n"\n "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\\n"\n "Last-Translator: FULL NAME \\n"\n "Language-Team: LANGUAGE \\n"\n@@ -21,9 +21,9 @@ msgstr ""\n msgid "A site migrated to Volto in this Plone backend will still be accessible through the Plone Classic User Interface but with limited functionality. The core content types will have all their GUI RichText fields replaced by the blocks behavior for the composition of the main content. So after migration you can only edit this content using the Volto UI."\n msgstr ""\n \n-#: plone/volto/behaviors/configure.zcml:42\n-msgid "Adds Head title field"\n-msgstr "Kopftitel Feld hinzuf\xc3\xbcgen"\n+#: plone/volto/behaviors/configure.zcml:48\n+msgid "Adds kicker field (text to be shown above the headline)"\n+msgstr ""\n \n #: plone/volto/browser/migrate_to_volto.pt:75\n msgid "Advanced settings"\n@@ -57,6 +57,10 @@ msgstr ""\n msgid "Default Pages of Folders are merged with the Folderish Pages that replace the Folder wherever that is possible. This works well with Pages and Collections where the text and/or query are added to the folderish page that replaces the Folder."\n msgstr ""\n \n+#: plone/volto/behaviors/configure.zcml:42\n+msgid "Deprecated (use volto.kicker instead)"\n+msgstr ""\n+\n #: plone/volto/profiles/coresandbox/types/example.xml\n msgid "Example"\n msgstr ""\n@@ -77,6 +81,10 @@ msgstr ""\n msgid "It is recommendet to use the default settings but here you can disable some of the migration-steps."\n msgstr ""\n \n+#: plone/volto/behaviors/configure.zcml:48\n+msgid "Kicker field"\n+msgstr ""\n+\n #: plone/volto/browser/migrate_richtext.pt:130\n msgid "Migrate"\n msgstr ""\n@@ -229,9 +237,9 @@ msgstr ""\n msgid "heading_available_languages"\n msgstr ""\n \n-#. Default: "The header title is shown above the title in teasers."\n-#: plone/volto/behaviors/headtitle.py:14\n-msgid "help_head_title"\n+#. Default: "The kicker is a line of text shown above the title."\n+#: plone/volto/behaviors/kicker.py:14\n+msgid "help_kicker"\n msgstr "Der Kopftitel wird in Teaser-Bl\xc3\xb6cken \xc3\xbcber dem Titel angezeigt."\n \n #. Default: "Insert an image that will be used in listing and teaser blocks."\n@@ -240,9 +248,9 @@ msgstr "Der Kopftitel wird in Teaser-Bl\xc3\xb6cken \xc3\xbcber dem Titel angezeigt."\n msgid "help_previewimage"\n msgstr "Bild einf\xc3\xbcgen welches in Auflistungen und Anrei\xc3\x9fer-Bl\xc3\xb6cken verwendet wird."\n \n-#. Default: "Header title"\n-#: plone/volto/behaviors/headtitle.py:12\n-msgid "label_head_title"\n+#. Default: "Kicker"\n+#: plone/volto/behaviors/kicker.py:12\n+msgid "label_kicker"\n msgstr "Kopftitel"\n \n #. Default: "Preview image"\ndiff --git a/src/plone/volto/locales/en/LC_MESSAGES/plone.volto.po b/src/plone/volto/locales/en/LC_MESSAGES/plone.volto.po\nindex 8e0da6b..98656a6 100644\n--- a/src/plone/volto/locales/en/LC_MESSAGES/plone.volto.po\n+++ b/src/plone/volto/locales/en/LC_MESSAGES/plone.volto.po\n@@ -4,7 +4,7 @@\n msgid ""\n msgstr ""\n "Project-Id-Version: PACKAGE VERSION\\n"\n-"POT-Creation-Date: 2024-06-26 17:33+0000\\n"\n+"POT-Creation-Date: 2024-12-11 17:41+0000\\n"\n "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\\n"\n "Last-Translator: FULL NAME \\n"\n "Language-Team: LANGUAGE \\n"\n@@ -21,8 +21,8 @@ msgstr ""\n msgid "A site migrated to Volto in this Plone backend will still be accessible through the Plone Classic User Interface but with limited functionality. The core content types will have all their GUI RichText fields replaced by the blocks behavior for the composition of the main content. So after migration you can only edit this content using the Volto UI."\n msgstr ""\n \n-#: plone/volto/behaviors/configure.zcml:42\n-msgid "Adds Head title field"\n+#: plone/volto/behaviors/configure.zcml:48\n+msgid "Adds kicker field (text to be shown above the headline)"\n msgstr ""\n \n #: plone/volto/browser/migrate_to_volto.pt:75\n@@ -57,6 +57,10 @@ msgstr ""\n msgid "Default Pages of Folders are merged with the Folderish Pages that replace the Folder wherever that is possible. This works well with Pages and Collections where the text and/or query are added to the folderish page that replaces the Folder."\n msgstr ""\n \n+#: plone/volto/behaviors/configure.zcml:42\n+msgid "Deprecated (use volto.kicker instead)"\n+msgstr ""\n+\n #: plone/volto/profiles/coresandbox/types/example.xml\n msgid "Example"\n msgstr ""\n@@ -77,6 +81,10 @@ msgstr ""\n msgid "It is recommendet to use the default settings but here you can disable some of the migration-steps."\n msgstr ""\n \n+#: plone/volto/behaviors/configure.zcml:48\n+msgid "Kicker field"\n+msgstr ""\n+\n #: plone/volto/browser/migrate_richtext.pt:130\n msgid "Migrate"\n msgstr ""\n@@ -229,9 +237,9 @@ msgstr ""\n msgid "heading_available_languages"\n msgstr ""\n \n-#. Default: "The header title is shown above the title in teasers."\n-#: plone/volto/behaviors/headtitle.py:14\n-msgid "help_head_title"\n+#. Default: "The kicker is a line of text shown above the title."\n+#: plone/volto/behaviors/kicker.py:14\n+msgid "help_kicker"\n msgstr ""\n \n #. Default: "Insert an image that will be used in listing and teaser blocks."\n@@ -240,9 +248,9 @@ msgstr ""\n msgid "help_previewimage"\n msgstr ""\n \n-#. Default: "Header title"\n-#: plone/volto/behaviors/headtitle.py:12\n-msgid "label_head_title"\n+#. Default: "Kicker"\n+#: plone/volto/behaviors/kicker.py:12\n+msgid "label_kicker"\n msgstr ""\n \n #. Default: "Preview image"\ndiff --git a/src/plone/volto/locales/es/LC_MESSAGES/plone.volto.po b/src/plone/volto/locales/es/LC_MESSAGES/plone.volto.po\nindex fa27f43..d255e84 100644\n--- a/src/plone/volto/locales/es/LC_MESSAGES/plone.volto.po\n+++ b/src/plone/volto/locales/es/LC_MESSAGES/plone.volto.po\n@@ -4,7 +4,7 @@\n msgid ""\n msgstr ""\n "Project-Id-Version: \\n"\n-"POT-Creation-Date: 2024-06-26 17:33+0000\\n"\n+"POT-Creation-Date: 2024-12-11 17:41+0000\\n"\n "PO-Revision-Date: 2021-11-21 16:58+0100\\n"\n "Last-Translator: \\n"\n "Language-Team: \\n"\n@@ -23,9 +23,9 @@ msgstr ""\n msgid "A site migrated to Volto in this Plone backend will still be accessible through the Plone Classic User Interface but with limited functionality. The core content types will have all their GUI RichText fields replaced by the blocks behavior for the composition of the main content. So after migration you can only edit this content using the Volto UI."\n msgstr ""\n \n-#: plone/volto/behaviors/configure.zcml:42\n-msgid "Adds Head title field"\n-msgstr "A\xc3\xb1ade el campo de t\xc3\xadtulo de cabecera"\n+#: plone/volto/behaviors/configure.zcml:48\n+msgid "Adds kicker field (text to be shown above the headline)"\n+msgstr ""\n \n #: plone/volto/browser/migrate_to_volto.pt:75\n msgid "Advanced settings"\n@@ -59,6 +59,10 @@ msgstr ""\n msgid "Default Pages of Folders are merged with the Folderish Pages that replace the Folder wherever that is possible. This works well with Pages and Collections where the text and/or query are added to the folderish page that replaces the Folder."\n msgstr ""\n \n+#: plone/volto/behaviors/configure.zcml:42\n+msgid "Deprecated (use volto.kicker instead)"\n+msgstr ""\n+\n #: plone/volto/profiles/coresandbox/types/example.xml\n msgid "Example"\n msgstr ""\n@@ -79,6 +83,10 @@ msgstr ""\n msgid "It is recommendet to use the default settings but here you can disable some of the migration-steps."\n msgstr ""\n \n+#: plone/volto/behaviors/configure.zcml:48\n+msgid "Kicker field"\n+msgstr ""\n+\n #: plone/volto/browser/migrate_richtext.pt:130\n msgid "Migrate"\n msgstr ""\n@@ -231,9 +239,9 @@ msgstr ""\n msgid "heading_available_languages"\n msgstr ""\n \n-#. Default: "The header title is shown above the title in teasers."\n-#: plone/volto/behaviors/headtitle.py:14\n-msgid "help_head_title"\n+#. Default: "The kicker is a line of text shown above the title."\n+#: plone/volto/behaviors/kicker.py:14\n+msgid "help_kicker"\n msgstr "El t\xc3\xadtulo del cabecera se muestra encima del t\xc3\xadtulo en los bloques teaser."\n \n #. Default: "Insert an image that will be used in listing and teaser blocks."\n@@ -242,9 +250,9 @@ msgstr "El t\xc3\xadtulo del cabecera se muestra encima del t\xc3\xadtulo en los bloques tea\n msgid "help_previewimage"\n msgstr "Introduzca la imagen que se utilizar\xc3\xa1 en los listados y otros bloques"\n \n-#. Default: "Header title"\n-#: plone/volto/behaviors/headtitle.py:12\n-msgid "label_head_title"\n+#. Default: "Kicker"\n+#: plone/volto/behaviors/kicker.py:12\n+msgid "label_kicker"\n msgstr "T\xc3\xadtulo de cabecera"\n \n #. Default: "Preview image"\ndiff --git a/src/plone/volto/locales/eu/LC_MESSAGES/plone.volto.po b/src/plone/volto/locales/eu/LC_MESSAGES/plone.volto.po\nindex ec28b5b..1111703 100644\n--- a/src/plone/volto/locales/eu/LC_MESSAGES/plone.volto.po\n+++ b/src/plone/volto/locales/eu/LC_MESSAGES/plone.volto.po\n@@ -4,7 +4,7 @@\n msgid ""\n msgstr ""\n "Project-Id-Version: \\n"\n-"POT-Creation-Date: 2024-06-26 17:33+0000\\n"\n+"POT-Creation-Date: 2024-12-11 17:41+0000\\n"\n "PO-Revision-Date: 2021-11-21 16:50+0100\\n"\n "Last-Translator: \\n"\n "Language-Team: \\n"\n@@ -23,9 +23,9 @@ msgstr ""\n msgid "A site migrated to Volto in this Plone backend will still be accessible through the Plone Classic User Interface but with limited functionality. The core content types will have all their GUI RichText fields replaced by the blocks behavior for the composition of the main content. So after migration you can only edit this content using the Volto UI."\n msgstr ""\n \n-#: plone/volto/behaviors/configure.zcml:42\n-msgid "Adds Head title field"\n-msgstr "Goiburuko izenburua gehitu"\n+#: plone/volto/behaviors/configure.zcml:48\n+msgid "Adds kicker field (text to be shown above the headline)"\n+msgstr ""\n \n #: plone/volto/browser/migrate_to_volto.pt:75\n msgid "Advanced settings"\n@@ -59,6 +59,10 @@ msgstr ""\n msgid "Default Pages of Folders are merged with the Folderish Pages that replace the Folder wherever that is possible. This works well with Pages and Collections where the text and/or query are added to the folderish page that replaces the Folder."\n msgstr ""\n \n+#: plone/volto/behaviors/configure.zcml:42\n+msgid "Deprecated (use volto.kicker instead)"\n+msgstr ""\n+\n #: plone/volto/profiles/coresandbox/types/example.xml\n msgid "Example"\n msgstr ""\n@@ -79,6 +83,10 @@ msgstr ""\n msgid "It is recommendet to use the default settings but here you can disable some of the migration-steps."\n msgstr ""\n \n+#: plone/volto/behaviors/configure.zcml:48\n+msgid "Kicker field"\n+msgstr ""\n+\n #: plone/volto/browser/migrate_richtext.pt:130\n msgid "Migrate"\n msgstr ""\n@@ -231,9 +239,9 @@ msgstr ""\n msgid "heading_available_languages"\n msgstr ""\n \n-#. Default: "The header title is shown above the title in teasers."\n-#: plone/volto/behaviors/headtitle.py:14\n-msgid "help_head_title"\n+#. Default: "The kicker is a line of text shown above the title."\n+#: plone/volto/behaviors/kicker.py:14\n+msgid "help_kicker"\n msgstr "Goiburukoan erabiliko den izenburua"\n \n #. Default: "Insert an image that will be used in listing and teaser blocks."\n@@ -242,9 +250,9 @@ msgstr "Goiburukoan erabiliko den izenburua"\n msgid "help_previewimage"\n msgstr "Kargatu zerrendetan eta destakatuen blokeetan defektuz erabiliko den irudia"\n \n-#. Default: "Header title"\n-#: plone/volto/behaviors/headtitle.py:12\n-msgid "label_head_title"\n+#. Default: "Kicker"\n+#: plone/volto/behaviors/kicker.py:12\n+msgid "label_kicker"\n msgstr "Goiburuko izenburua"\n \n #. Default: "Preview image"\ndiff --git a/src/plone/volto/locales/it/LC_MESSAGES/plone.volto.po b/src/plone/volto/locales/it/LC_MESSAGES/plone.volto.po\nindex 1001375..17b4c01 100644\n--- a/src/plone/volto/locales/it/LC_MESSAGES/plone.volto.po\n+++ b/src/plone/volto/locales/it/LC_MESSAGES/plone.volto.po\n@@ -4,7 +4,7 @@\n msgid ""\n msgstr ""\n "Project-Id-Version: PACKAGE VERSION\\n"\n-"POT-Creation-Date: 2024-06-26 17:33+0000\\n"\n+"POT-Creation-Date: 2024-12-11 17:41+0000\\n"\n "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\\n"\n "Last-Translator: FULL NAME \\n"\n "Language-Team: LANGUAGE \\n"\n@@ -21,8 +21,8 @@ msgstr ""\n msgid "A site migrated to Volto in this Plone backend will still be accessible through the Plone Classic User Interface but with limited functionality. The core content types will have all their GUI RichText fields replaced by the blocks behavior for the composition of the main content. So after migration you can only edit this content using the Volto UI."\n msgstr ""\n \n-#: plone/volto/behaviors/configure.zcml:42\n-msgid "Adds Head title field"\n+#: plone/volto/behaviors/configure.zcml:48\n+msgid "Adds kicker field (text to be shown above the headline)"\n msgstr ""\n \n #: plone/volto/browser/migrate_to_volto.pt:75\n@@ -57,6 +57,10 @@ msgstr ""\n msgid "Default Pages of Folders are merged with the Folderish Pages that replace the Folder wherever that is possible. This works well with Pages and Collections where the text and/or query are added to the folderish page that replaces the Folder."\n msgstr ""\n \n+#: plone/volto/behaviors/configure.zcml:42\n+msgid "Deprecated (use volto.kicker instead)"\n+msgstr ""\n+\n #: plone/volto/profiles/coresandbox/types/example.xml\n msgid "Example"\n msgstr ""\n@@ -77,6 +81,10 @@ msgstr ""\n msgid "It is recommendet to use the default settings but here you can disable some of the migration-steps."\n msgstr ""\n \n+#: plone/volto/behaviors/configure.zcml:48\n+msgid "Kicker field"\n+msgstr ""\n+\n #: plone/volto/browser/migrate_richtext.pt:130\n msgid "Migrate"\n msgstr ""\n@@ -229,9 +237,9 @@ msgstr ""\n msgid "heading_available_languages"\n msgstr ""\n \n-#. Default: "The header title is shown above the title in teasers."\n-#: plone/volto/behaviors/headtitle.py:14\n-msgid "help_head_title"\n+#. Default: "The kicker is a line of text shown above the title."\n+#: plone/volto/behaviors/kicker.py:14\n+msgid "help_kicker"\n msgstr ""\n \n #. Default: "Insert an image that will be used in listing and teaser blocks."\n@@ -240,9 +248,9 @@ msgstr ""\n msgid "help_previewimage"\n msgstr "Immagine che verr\xc3\xa0 utilizzata nei blocchi listing e teaser."\n \n-#. Default: "Header title"\n-#: plone/volto/behaviors/headtitle.py:12\n-msgid "label_head_title"\n+#. Default: "Kicker"\n+#: plone/volto/behaviors/kicker.py:12\n+msgid "label_kicker"\n msgstr ""\n \n #. Default: "Preview image"\ndiff --git a/src/plone/volto/locales/plone.volto.pot b/src/plone/volto/locales/plone.volto.pot\nindex 9ff74a1..2da16c4 100644\n--- a/src/plone/volto/locales/plone.volto.pot\n+++ b/src/plone/volto/locales/plone.volto.pot\n@@ -4,7 +4,7 @@\n msgid ""\n msgstr ""\n "Project-Id-Version: PACKAGE VERSION\\n"\n-"POT-Creation-Date: 2024-06-26 17:33+0000\\n"\n+"POT-Creation-Date: 2024-12-11 17:41+0000\\n"\n "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\\n"\n "Last-Translator: FULL NAME \\n"\n "Language-Team: LANGUAGE \\n"\n@@ -21,8 +21,8 @@ msgstr ""\n msgid "A site migrated to Volto in this Plone backend will still be accessible through the Plone Classic User Interface but with limited functionality. The core content types will have all their GUI RichText fields replaced by the blocks behavior for the composition of the main content. So after migration you can only edit this content using the Volto UI."\n msgstr ""\n \n-#: plone/volto/behaviors/configure.zcml:42\n-msgid "Adds Head title field"\n+#: plone/volto/behaviors/configure.zcml:48\n+msgid "Adds kicker field (text to be shown above the headline)"\n msgstr ""\n \n #: plone/volto/browser/migrate_to_volto.pt:75\n@@ -57,6 +57,10 @@ msgstr ""\n msgid "Default Pages of Folders are merged with the Folderish Pages that replace the Folder wherever that is possible. This works well with Pages and Collections where the text and/or query are added to the folderish page that replaces the Folder."\n msgstr ""\n \n+#: plone/volto/behaviors/configure.zcml:42\n+msgid "Deprecated (use volto.kicker instead)"\n+msgstr ""\n+\n #: plone/volto/profiles/coresandbox/types/example.xml\n msgid "Example"\n msgstr ""\n@@ -77,6 +81,10 @@ msgstr ""\n msgid "It is recommendet to use the default settings but here you can disable some of the migration-steps."\n msgstr ""\n \n+#: plone/volto/behaviors/configure.zcml:48\n+msgid "Kicker field"\n+msgstr ""\n+\n #: plone/volto/browser/migrate_richtext.pt:130\n msgid "Migrate"\n msgstr ""\n@@ -229,9 +237,9 @@ msgstr ""\n msgid "heading_available_languages"\n msgstr ""\n \n-#. Default: "The header title is shown above the title in teasers."\n-#: plone/volto/behaviors/headtitle.py:14\n-msgid "help_head_title"\n+#. Default: "The kicker is a line of text shown above the title."\n+#: plone/volto/behaviors/kicker.py:14\n+msgid "help_kicker"\n msgstr ""\n \n #. Default: "Insert an image that will be used in listing and teaser blocks."\n@@ -240,9 +248,9 @@ msgstr ""\n msgid "help_previewimage"\n msgstr ""\n \n-#. Default: "Header title"\n-#: plone/volto/behaviors/headtitle.py:12\n-msgid "label_head_title"\n+#. Default: "Kicker"\n+#: plone/volto/behaviors/kicker.py:12\n+msgid "label_kicker"\n msgstr ""\n \n #. Default: "Preview image"\ndiff --git a/src/plone/volto/locales/pt_BR/LC_MESSAGES/plone.volto.po b/src/plone/volto/locales/pt_BR/LC_MESSAGES/plone.volto.po\nindex 4e32dbe..eecba65 100644\n--- a/src/plone/volto/locales/pt_BR/LC_MESSAGES/plone.volto.po\n+++ b/src/plone/volto/locales/pt_BR/LC_MESSAGES/plone.volto.po\n@@ -3,7 +3,7 @@\n msgid ""\n msgstr ""\n "Project-Id-Version: \\n"\n-"POT-Creation-Date: 2024-06-26 17:33+0000\\n"\n+"POT-Creation-Date: 2024-12-11 17:41+0000\\n"\n "PO-Revision-Date: 2021-11-21 16:58+0100\\n"\n "Last-Translator: \\n"\n "Language-Team: \\n"\n@@ -22,9 +22,9 @@ msgstr ""\n msgid "A site migrated to Volto in this Plone backend will still be accessible through the Plone Classic User Interface but with limited functionality. The core content types will have all their GUI RichText fields replaced by the blocks behavior for the composition of the main content. So after migration you can only edit this content using the Volto UI."\n msgstr ""\n \n-#: plone/volto/behaviors/configure.zcml:42\n-msgid "Adds Head title field"\n-msgstr "Adiciona campo T\xc3\xadtulo de cabe\xc3\xa7alho"\n+#: plone/volto/behaviors/configure.zcml:48\n+msgid "Adds kicker field (text to be shown above the headline)"\n+msgstr ""\n \n #: plone/volto/browser/migrate_to_volto.pt:75\n msgid "Advanced settings"\n@@ -58,6 +58,10 @@ msgstr ""\n msgid "Default Pages of Folders are merged with the Folderish Pages that replace the Folder wherever that is possible. This works well with Pages and Collections where the text and/or query are added to the folderish page that replaces the Folder."\n msgstr ""\n \n+#: plone/volto/behaviors/configure.zcml:42\n+msgid "Deprecated (use volto.kicker instead)"\n+msgstr ""\n+\n #: plone/volto/profiles/coresandbox/types/example.xml\n msgid "Example"\n msgstr ""\n@@ -78,6 +82,10 @@ msgstr ""\n msgid "It is recommendet to use the default settings but here you can disable some of the migration-steps."\n msgstr ""\n \n+#: plone/volto/behaviors/configure.zcml:48\n+msgid "Kicker field"\n+msgstr ""\n+\n #: plone/volto/browser/migrate_richtext.pt:130\n msgid "Migrate"\n msgstr ""\n@@ -230,9 +238,9 @@ msgstr "Idiomas nos quais o site deve ser traduz\xc3\xadvel."\n msgid "heading_available_languages"\n msgstr "Idiomas dispon\xc3\xadveis"\n \n-#. Default: "The header title is shown above the title in teasers."\n-#: plone/volto/behaviors/headtitle.py:14\n-msgid "help_head_title"\n+#. Default: "The kicker is a line of text shown above the title."\n+#: plone/volto/behaviors/kicker.py:14\n+msgid "help_kicker"\n msgstr "O t\xc3\xadtulo de cabe\xc3\xa7alho \xc3\xa9 exibido acima do t\xc3\xadtulo nos teasers"\n \n #. Default: "Insert an image that will be used in listing and teaser blocks."\n@@ -241,9 +249,9 @@ msgstr "O t\xc3\xadtulo de cabe\xc3\xa7alho \xc3\xa9 exibido acima do t\xc3\xadtulo nos teasers"\n msgid "help_previewimage"\n msgstr "Inserir uma imagem que ser\xc3\xa1 utilizada em blocos de listagem e teaser"\n \n-#. Default: "Header title"\n-#: plone/volto/behaviors/headtitle.py:12\n-msgid "label_head_title"\n+#. Default: "Kicker"\n+#: plone/volto/behaviors/kicker.py:12\n+msgid "label_kicker"\n msgstr "T\xc3\xadtulo de cabe\xc3\xa7alho"\n \n #. Default: "Preview image"\ndiff --git a/src/plone/volto/locales/update.py b/src/plone/volto/locales/update.py\nindex 5da5a48..dcd993e 100644\n--- a/src/plone/volto/locales/update.py\n+++ b/src/plone/volto/locales/update.py\n@@ -14,7 +14,7 @@\n \n PATTERN = r"^[a-z]{2}.*"\n cwd = Path.cwd()\n-target_path = Path(__file__).parent.parent.resolve()\n+target_path = Path(__file__).parent.parent.relative_to(cwd)\n locale_path = target_path / "locales"\n \n \n' - -Repository: plone.volto - - -Branch: refs/heads/main -Date: 2024-12-11T09:54:54-08:00 -Author: David Glick (davisagli) -Commit: https://github.com/plone/plone.volto/commit/344571a2da8c37e2993d0fcc7f7b2660a9b1cfb6 - -lint +Remove unnecessary zcml conditions Files changed: +A news/167.internal M src/plone/volto/behaviors/configure.zcml +M src/plone/volto/browser/configure.zcml +M src/plone/volto/configure.zcml +M src/plone/volto/dependencies.zcml +M src/plone/volto/overrides.zcml +M src/plone/volto/patches.zcml -b'diff --git a/src/plone/volto/behaviors/configure.zcml b/src/plone/volto/behaviors/configure.zcml\nindex 9b85cf6..4e46f6a 100644\n--- a/src/plone/volto/behaviors/configure.zcml\n+++ b/src/plone/volto/behaviors/configure.zcml\n@@ -44,7 +44,7 @@\n name="volto.kicker"\n title="Kicker field"\n description="Adds kicker field (text to be shown above the headline)"\n- provides=".kicker.IKicker"\n+ provides=".kicker.IKicker"\n />\n \n \n' - -Repository: plone.volto - - -Branch: refs/heads/main -Date: 2024-12-11T10:26:06-08:00 -Author: David Glick (davisagli) -Commit: https://github.com/plone/plone.volto/commit/6e26cbfe1b7f9aa5b64d4912b9fbec1a693692d1 - -Merge pull request #163 from plone/head_title-kicker - -Replace head_title with Kicker - -Files changed: -A news/164.breaking -A news/164.bugfix -A src/plone/volto/behaviors/kicker.py -M README.md -M src/plone/volto/behaviors/configure.zcml -M src/plone/volto/locales/de/LC_MESSAGES/plone.volto.po -M src/plone/volto/locales/en/LC_MESSAGES/plone.volto.po -M src/plone/volto/locales/es/LC_MESSAGES/plone.volto.po -M src/plone/volto/locales/eu/LC_MESSAGES/plone.volto.po -M src/plone/volto/locales/it/LC_MESSAGES/plone.volto.po -M src/plone/volto/locales/plone.volto.pot -M src/plone/volto/locales/pt_BR/LC_MESSAGES/plone.volto.po -M src/plone/volto/locales/update.py -D src/plone/volto/behaviors/headtitle.py - -b'diff --git a/README.md b/README.md\nindex a86c4d0..70b6154 100644\n--- a/README.md\n+++ b/README.md\n@@ -206,11 +206,13 @@ The `volto.navtitle` behavior can be enabled in the generic setup XML definition\n \n ```\n \n-### Head title behavior\n+### Kicker behavior\n \n-The `headtitle` behavior makes content types provide a `headtitle` field that can be used by Volto in teasers and other content types.\n+The `volto.kicker` behavior adds a Kicker field that can be used to display a line of text above the title.\n \n-The `volto.head_title` behavior can be enabled in the generic setup XML definition of a content type, for example in `/profiles/default/types/MyContentType.xml`:\n+(The internal name of the field is `head_title`, for backwards-compatibility reasons.)\n+\n+This behavior can be enabled in the generic setup XML definition of a content type, for example in `/profiles/default/types/MyContentType.xml`:\n \n ```xml\n \n@@ -222,12 +224,15 @@ The `volto.head_title` behavior can be enabled in the generic setup XML definiti\n \n \n ...\n- \n+ \n \n ...\n \n ```\n \n+> [!NOTE]\n+> The previous name of this behavior, `volto.head_title`, was deprecated in `plone.volto` 5.0.\n+\n ### Image scales\n \n This package introduces new Plone image scales in Plone and redefines a couple of existing ones.\ndiff --git a/news/164.breaking b/news/164.breaking\nnew file mode 100644\nindex 0000000..bd68fa0\n--- /dev/null\n+++ b/news/164.breaking\n@@ -0,0 +1 @@\n+Rename head_title behaviour to Kicker @iRohitSingh\n\\ No newline at end of file\ndiff --git a/news/164.bugfix b/news/164.bugfix\nnew file mode 100644\nindex 0000000..b92c3fb\n--- /dev/null\n+++ b/news/164.bugfix\n@@ -0,0 +1,4 @@\n+The `volto.head_title` behavior has been renamed to `volto.kicker`.\n+The old name still works, but is deprecated.\n+Content types should be updated to use the new name.\n+@iRohitSingh, @davisagli\ndiff --git a/src/plone/volto/behaviors/configure.zcml b/src/plone/volto/behaviors/configure.zcml\nindex 47f096e..4e46f6a 100644\n--- a/src/plone/volto/behaviors/configure.zcml\n+++ b/src/plone/volto/behaviors/configure.zcml\n@@ -37,8 +37,14 @@\n \n+ \n \n \ndiff --git a/src/plone/volto/behaviors/headtitle.py b/src/plone/volto/behaviors/headtitle.py\ndeleted file mode 100644\nindex 6085048..0000000\n--- a/src/plone/volto/behaviors/headtitle.py\n+++ /dev/null\n@@ -1,18 +0,0 @@\n-from plone.autoform.interfaces import IFormFieldProvider\n-from plone.supermodel import model\n-from plone.volto import _\n-from zope import schema\n-from zope.interface import provider\n-\n-\n-@provider(IFormFieldProvider)\n-class IHeadTitle(model.Schema):\n-\n- head_title = schema.TextLine(\n- title=_("label_head_title", default="Header title"),\n- required=False,\n- description=_(\n- "help_head_title",\n- default="The header title is shown above the title in teasers.",\n- ),\n- )\ndiff --git a/src/plone/volto/behaviors/kicker.py b/src/plone/volto/behaviors/kicker.py\nnew file mode 100644\nindex 0000000..1f1ab37\n--- /dev/null\n+++ b/src/plone/volto/behaviors/kicker.py\n@@ -0,0 +1,24 @@\n+from plone.autoform.interfaces import IFormFieldProvider\n+from plone.supermodel import model\n+from plone.volto import _\n+from zope import schema\n+from zope.interface import provider\n+\n+\n+@provider(IFormFieldProvider)\n+class IKicker(model.Schema):\n+\n+ # The field itself is named head_title, for backwards-compatibility.\n+ head_title = schema.TextLine(\n+ title=_("label_kicker", default="Kicker"),\n+ required=False,\n+ description=_(\n+ "help_kicker",\n+ default="The kicker is a line of text shown above the title.",\n+ ),\n+ )\n+\n+\n+@provider(IFormFieldProvider)\n+class IHeadTitle(IKicker):\n+ """alias for backwards-compatibility"""\ndiff --git a/src/plone/volto/locales/de/LC_MESSAGES/plone.volto.po b/src/plone/volto/locales/de/LC_MESSAGES/plone.volto.po\nindex c95c964..370cfe3 100644\n--- a/src/plone/volto/locales/de/LC_MESSAGES/plone.volto.po\n+++ b/src/plone/volto/locales/de/LC_MESSAGES/plone.volto.po\n@@ -4,7 +4,7 @@\n msgid ""\n msgstr ""\n "Project-Id-Version: PACKAGE VERSION\\n"\n-"POT-Creation-Date: 2024-06-26 17:33+0000\\n"\n+"POT-Creation-Date: 2024-12-11 17:41+0000\\n"\n "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\\n"\n "Last-Translator: FULL NAME \\n"\n "Language-Team: LANGUAGE \\n"\n@@ -21,9 +21,9 @@ msgstr ""\n msgid "A site migrated to Volto in this Plone backend will still be accessible through the Plone Classic User Interface but with limited functionality. The core content types will have all their GUI RichText fields replaced by the blocks behavior for the composition of the main content. So after migration you can only edit this content using the Volto UI."\n msgstr ""\n \n-#: plone/volto/behaviors/configure.zcml:42\n-msgid "Adds Head title field"\n-msgstr "Kopftitel Feld hinzuf\xc3\xbcgen"\n+#: plone/volto/behaviors/configure.zcml:48\n+msgid "Adds kicker field (text to be shown above the headline)"\n+msgstr ""\n \n #: plone/volto/browser/migrate_to_volto.pt:75\n msgid "Advanced settings"\n@@ -57,6 +57,10 @@ msgstr ""\n msgid "Default Pages of Folders are merged with the Folderish Pages that replace the Folder wherever that is possible. This works well with Pages and Collections where the text and/or query are added to the folderish page that replaces the Folder."\n msgstr ""\n \n+#: plone/volto/behaviors/configure.zcml:42\n+msgid "Deprecated (use volto.kicker instead)"\n+msgstr ""\n+\n #: plone/volto/profiles/coresandbox/types/example.xml\n msgid "Example"\n msgstr ""\n@@ -77,6 +81,10 @@ msgstr ""\n msgid "It is recommendet to use the default settings but here you can disable some of the migration-steps."\n msgstr ""\n \n+#: plone/volto/behaviors/configure.zcml:48\n+msgid "Kicker field"\n+msgstr ""\n+\n #: plone/volto/browser/migrate_richtext.pt:130\n msgid "Migrate"\n msgstr ""\n@@ -229,9 +237,9 @@ msgstr ""\n msgid "heading_available_languages"\n msgstr ""\n \n-#. Default: "The header title is shown above the title in teasers."\n-#: plone/volto/behaviors/headtitle.py:14\n-msgid "help_head_title"\n+#. Default: "The kicker is a line of text shown above the title."\n+#: plone/volto/behaviors/kicker.py:14\n+msgid "help_kicker"\n msgstr "Der Kopftitel wird in Teaser-Bl\xc3\xb6cken \xc3\xbcber dem Titel angezeigt."\n \n #. Default: "Insert an image that will be used in listing and teaser blocks."\n@@ -240,9 +248,9 @@ msgstr "Der Kopftitel wird in Teaser-Bl\xc3\xb6cken \xc3\xbcber dem Titel angezeigt."\n msgid "help_previewimage"\n msgstr "Bild einf\xc3\xbcgen welches in Auflistungen und Anrei\xc3\x9fer-Bl\xc3\xb6cken verwendet wird."\n \n-#. Default: "Header title"\n-#: plone/volto/behaviors/headtitle.py:12\n-msgid "label_head_title"\n+#. Default: "Kicker"\n+#: plone/volto/behaviors/kicker.py:12\n+msgid "label_kicker"\n msgstr "Kopftitel"\n \n #. Default: "Preview image"\ndiff --git a/src/plone/volto/locales/en/LC_MESSAGES/plone.volto.po b/src/plone/volto/locales/en/LC_MESSAGES/plone.volto.po\nindex 8e0da6b..98656a6 100644\n--- a/src/plone/volto/locales/en/LC_MESSAGES/plone.volto.po\n+++ b/src/plone/volto/locales/en/LC_MESSAGES/plone.volto.po\n@@ -4,7 +4,7 @@\n msgid ""\n msgstr ""\n "Project-Id-Version: PACKAGE VERSION\\n"\n-"POT-Creation-Date: 2024-06-26 17:33+0000\\n"\n+"POT-Creation-Date: 2024-12-11 17:41+0000\\n"\n "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\\n"\n "Last-Translator: FULL NAME \\n"\n "Language-Team: LANGUAGE \\n"\n@@ -21,8 +21,8 @@ msgstr ""\n msgid "A site migrated to Volto in this Plone backend will still be accessible through the Plone Classic User Interface but with limited functionality. The core content types will have all their GUI RichText fields replaced by the blocks behavior for the composition of the main content. So after migration you can only edit this content using the Volto UI."\n msgstr ""\n \n-#: plone/volto/behaviors/configure.zcml:42\n-msgid "Adds Head title field"\n+#: plone/volto/behaviors/configure.zcml:48\n+msgid "Adds kicker field (text to be shown above the headline)"\n msgstr ""\n \n #: plone/volto/browser/migrate_to_volto.pt:75\n@@ -57,6 +57,10 @@ msgstr ""\n msgid "Default Pages of Folders are merged with the Folderish Pages that replace the Folder wherever that is possible. This works well with Pages and Collections where the text and/or query are added to the folderish page that replaces the Folder."\n msgstr ""\n \n+#: plone/volto/behaviors/configure.zcml:42\n+msgid "Deprecated (use volto.kicker instead)"\n+msgstr ""\n+\n #: plone/volto/profiles/coresandbox/types/example.xml\n msgid "Example"\n msgstr ""\n@@ -77,6 +81,10 @@ msgstr ""\n msgid "It is recommendet to use the default settings but here you can disable some of the migration-steps."\n msgstr ""\n \n+#: plone/volto/behaviors/configure.zcml:48\n+msgid "Kicker field"\n+msgstr ""\n+\n #: plone/volto/browser/migrate_richtext.pt:130\n msgid "Migrate"\n msgstr ""\n@@ -229,9 +237,9 @@ msgstr ""\n msgid "heading_available_languages"\n msgstr ""\n \n-#. Default: "The header title is shown above the title in teasers."\n-#: plone/volto/behaviors/headtitle.py:14\n-msgid "help_head_title"\n+#. Default: "The kicker is a line of text shown above the title."\n+#: plone/volto/behaviors/kicker.py:14\n+msgid "help_kicker"\n msgstr ""\n \n #. Default: "Insert an image that will be used in listing and teaser blocks."\n@@ -240,9 +248,9 @@ msgstr ""\n msgid "help_previewimage"\n msgstr ""\n \n-#. Default: "Header title"\n-#: plone/volto/behaviors/headtitle.py:12\n-msgid "label_head_title"\n+#. Default: "Kicker"\n+#: plone/volto/behaviors/kicker.py:12\n+msgid "label_kicker"\n msgstr ""\n \n #. Default: "Preview image"\ndiff --git a/src/plone/volto/locales/es/LC_MESSAGES/plone.volto.po b/src/plone/volto/locales/es/LC_MESSAGES/plone.volto.po\nindex fa27f43..d255e84 100644\n--- a/src/plone/volto/locales/es/LC_MESSAGES/plone.volto.po\n+++ b/src/plone/volto/locales/es/LC_MESSAGES/plone.volto.po\n@@ -4,7 +4,7 @@\n msgid ""\n msgstr ""\n "Project-Id-Version: \\n"\n-"POT-Creation-Date: 2024-06-26 17:33+0000\\n"\n+"POT-Creation-Date: 2024-12-11 17:41+0000\\n"\n "PO-Revision-Date: 2021-11-21 16:58+0100\\n"\n "Last-Translator: \\n"\n "Language-Team: \\n"\n@@ -23,9 +23,9 @@ msgstr ""\n msgid "A site migrated to Volto in this Plone backend will still be accessible through the Plone Classic User Interface but with limited functionality. The core content types will have all their GUI RichText fields replaced by the blocks behavior for the composition of the main content. So after migration you can only edit this content using the Volto UI."\n msgstr ""\n \n-#: plone/volto/behaviors/configure.zcml:42\n-msgid "Adds Head title field"\n-msgstr "A\xc3\xb1ade el campo de t\xc3\xadtulo de cabecera"\n+#: plone/volto/behaviors/configure.zcml:48\n+msgid "Adds kicker field (text to be shown above the headline)"\n+msgstr ""\n \n #: plone/volto/browser/migrate_to_volto.pt:75\n msgid "Advanced settings"\n@@ -59,6 +59,10 @@ msgstr ""\n msgid "Default Pages of Folders are merged with the Folderish Pages that replace the Folder wherever that is possible. This works well with Pages and Collections where the text and/or query are added to the folderish page that replaces the Folder."\n msgstr ""\n \n+#: plone/volto/behaviors/configure.zcml:42\n+msgid "Deprecated (use volto.kicker instead)"\n+msgstr ""\n+\n #: plone/volto/profiles/coresandbox/types/example.xml\n msgid "Example"\n msgstr ""\n@@ -79,6 +83,10 @@ msgstr ""\n msgid "It is recommendet to use the default settings but here you can disable some of the migration-steps."\n msgstr ""\n \n+#: plone/volto/behaviors/configure.zcml:48\n+msgid "Kicker field"\n+msgstr ""\n+\n #: plone/volto/browser/migrate_richtext.pt:130\n msgid "Migrate"\n msgstr ""\n@@ -231,9 +239,9 @@ msgstr ""\n msgid "heading_available_languages"\n msgstr ""\n \n-#. Default: "The header title is shown above the title in teasers."\n-#: plone/volto/behaviors/headtitle.py:14\n-msgid "help_head_title"\n+#. Default: "The kicker is a line of text shown above the title."\n+#: plone/volto/behaviors/kicker.py:14\n+msgid "help_kicker"\n msgstr "El t\xc3\xadtulo del cabecera se muestra encima del t\xc3\xadtulo en los bloques teaser."\n \n #. Default: "Insert an image that will be used in listing and teaser blocks."\n@@ -242,9 +250,9 @@ msgstr "El t\xc3\xadtulo del cabecera se muestra encima del t\xc3\xadtulo en los bloques tea\n msgid "help_previewimage"\n msgstr "Introduzca la imagen que se utilizar\xc3\xa1 en los listados y otros bloques"\n \n-#. Default: "Header title"\n-#: plone/volto/behaviors/headtitle.py:12\n-msgid "label_head_title"\n+#. Default: "Kicker"\n+#: plone/volto/behaviors/kicker.py:12\n+msgid "label_kicker"\n msgstr "T\xc3\xadtulo de cabecera"\n \n #. Default: "Preview image"\ndiff --git a/src/plone/volto/locales/eu/LC_MESSAGES/plone.volto.po b/src/plone/volto/locales/eu/LC_MESSAGES/plone.volto.po\nindex ec28b5b..1111703 100644\n--- a/src/plone/volto/locales/eu/LC_MESSAGES/plone.volto.po\n+++ b/src/plone/volto/locales/eu/LC_MESSAGES/plone.volto.po\n@@ -4,7 +4,7 @@\n msgid ""\n msgstr ""\n "Project-Id-Version: \\n"\n-"POT-Creation-Date: 2024-06-26 17:33+0000\\n"\n+"POT-Creation-Date: 2024-12-11 17:41+0000\\n"\n "PO-Revision-Date: 2021-11-21 16:50+0100\\n"\n "Last-Translator: \\n"\n "Language-Team: \\n"\n@@ -23,9 +23,9 @@ msgstr ""\n msgid "A site migrated to Volto in this Plone backend will still be accessible through the Plone Classic User Interface but with limited functionality. The core content types will have all their GUI RichText fields replaced by the blocks behavior for the composition of the main content. So after migration you can only edit this content using the Volto UI."\n msgstr ""\n \n-#: plone/volto/behaviors/configure.zcml:42\n-msgid "Adds Head title field"\n-msgstr "Goiburuko izenburua gehitu"\n+#: plone/volto/behaviors/configure.zcml:48\n+msgid "Adds kicker field (text to be shown above the headline)"\n+msgstr ""\n \n #: plone/volto/browser/migrate_to_volto.pt:75\n msgid "Advanced settings"\n@@ -59,6 +59,10 @@ msgstr ""\n msgid "Default Pages of Folders are merged with the Folderish Pages that replace the Folder wherever that is possible. This works well with Pages and Collections where the text and/or query are added to the folderish page that replaces the Folder."\n msgstr ""\n \n+#: plone/volto/behaviors/configure.zcml:42\n+msgid "Deprecated (use volto.kicker instead)"\n+msgstr ""\n+\n #: plone/volto/profiles/coresandbox/types/example.xml\n msgid "Example"\n msgstr ""\n@@ -79,6 +83,10 @@ msgstr ""\n msgid "It is recommendet to use the default settings but here you can disable some of the migration-steps."\n msgstr ""\n \n+#: plone/volto/behaviors/configure.zcml:48\n+msgid "Kicker field"\n+msgstr ""\n+\n #: plone/volto/browser/migrate_richtext.pt:130\n msgid "Migrate"\n msgstr ""\n@@ -231,9 +239,9 @@ msgstr ""\n msgid "heading_available_languages"\n msgstr ""\n \n-#. Default: "The header title is shown above the title in teasers."\n-#: plone/volto/behaviors/headtitle.py:14\n-msgid "help_head_title"\n+#. Default: "The kicker is a line of text shown above the title."\n+#: plone/volto/behaviors/kicker.py:14\n+msgid "help_kicker"\n msgstr "Goiburukoan erabiliko den izenburua"\n \n #. Default: "Insert an image that will be used in listing and teaser blocks."\n@@ -242,9 +250,9 @@ msgstr "Goiburukoan erabiliko den izenburua"\n msgid "help_previewimage"\n msgstr "Kargatu zerrendetan eta destakatuen blokeetan defektuz erabiliko den irudia"\n \n-#. Default: "Header title"\n-#: plone/volto/behaviors/headtitle.py:12\n-msgid "label_head_title"\n+#. Default: "Kicker"\n+#: plone/volto/behaviors/kicker.py:12\n+msgid "label_kicker"\n msgstr "Goiburuko izenburua"\n \n #. Default: "Preview image"\ndiff --git a/src/plone/volto/locales/it/LC_MESSAGES/plone.volto.po b/src/plone/volto/locales/it/LC_MESSAGES/plone.volto.po\nindex 1001375..17b4c01 100644\n--- a/src/plone/volto/locales/it/LC_MESSAGES/plone.volto.po\n+++ b/src/plone/volto/locales/it/LC_MESSAGES/plone.volto.po\n@@ -4,7 +4,7 @@\n msgid ""\n msgstr ""\n "Project-Id-Version: PACKAGE VERSION\\n"\n-"POT-Creation-Date: 2024-06-26 17:33+0000\\n"\n+"POT-Creation-Date: 2024-12-11 17:41+0000\\n"\n "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\\n"\n "Last-Translator: FULL NAME \\n"\n "Language-Team: LANGUAGE \\n"\n@@ -21,8 +21,8 @@ msgstr ""\n msgid "A site migrated to Volto in this Plone backend will still be accessible through the Plone Classic User Interface but with limited functionality. The core content types will have all their GUI RichText fields replaced by the blocks behavior for the composition of the main content. So after migration you can only edit this content using the Volto UI."\n msgstr ""\n \n-#: plone/volto/behaviors/configure.zcml:42\n-msgid "Adds Head title field"\n+#: plone/volto/behaviors/configure.zcml:48\n+msgid "Adds kicker field (text to be shown above the headline)"\n msgstr ""\n \n #: plone/volto/browser/migrate_to_volto.pt:75\n@@ -57,6 +57,10 @@ msgstr ""\n msgid "Default Pages of Folders are merged with the Folderish Pages that replace the Folder wherever that is possible. This works well with Pages and Collections where the text and/or query are added to the folderish page that replaces the Folder."\n msgstr ""\n \n+#: plone/volto/behaviors/configure.zcml:42\n+msgid "Deprecated (use volto.kicker instead)"\n+msgstr ""\n+\n #: plone/volto/profiles/coresandbox/types/example.xml\n msgid "Example"\n msgstr ""\n@@ -77,6 +81,10 @@ msgstr ""\n msgid "It is recommendet to use the default settings but here you can disable some of the migration-steps."\n msgstr ""\n \n+#: plone/volto/behaviors/configure.zcml:48\n+msgid "Kicker field"\n+msgstr ""\n+\n #: plone/volto/browser/migrate_richtext.pt:130\n msgid "Migrate"\n msgstr ""\n@@ -229,9 +237,9 @@ msgstr ""\n msgid "heading_available_languages"\n msgstr ""\n \n-#. Default: "The header title is shown above the title in teasers."\n-#: plone/volto/behaviors/headtitle.py:14\n-msgid "help_head_title"\n+#. Default: "The kicker is a line of text shown above the title."\n+#: plone/volto/behaviors/kicker.py:14\n+msgid "help_kicker"\n msgstr ""\n \n #. Default: "Insert an image that will be used in listing and teaser blocks."\n@@ -240,9 +248,9 @@ msgstr ""\n msgid "help_previewimage"\n msgstr "Immagine che verr\xc3\xa0 utilizzata nei blocchi listing e teaser."\n \n-#. Default: "Header title"\n-#: plone/volto/behaviors/headtitle.py:12\n-msgid "label_head_title"\n+#. Default: "Kicker"\n+#: plone/volto/behaviors/kicker.py:12\n+msgid "label_kicker"\n msgstr ""\n \n #. Default: "Preview image"\ndiff --git a/src/plone/volto/locales/plone.volto.pot b/src/plone/volto/locales/plone.volto.pot\nindex 9ff74a1..2da16c4 100644\n--- a/src/plone/volto/locales/plone.volto.pot\n+++ b/src/plone/volto/locales/plone.volto.pot\n@@ -4,7 +4,7 @@\n msgid ""\n msgstr ""\n "Project-Id-Version: PACKAGE VERSION\\n"\n-"POT-Creation-Date: 2024-06-26 17:33+0000\\n"\n+"POT-Creation-Date: 2024-12-11 17:41+0000\\n"\n "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\\n"\n "Last-Translator: FULL NAME \\n"\n "Language-Team: LANGUAGE \\n"\n@@ -21,8 +21,8 @@ msgstr ""\n msgid "A site migrated to Volto in this Plone backend will still be accessible through the Plone Classic User Interface but with limited functionality. The core content types will have all their GUI RichText fields replaced by the blocks behavior for the composition of the main content. So after migration you can only edit this content using the Volto UI."\n msgstr ""\n \n-#: plone/volto/behaviors/configure.zcml:42\n-msgid "Adds Head title field"\n+#: plone/volto/behaviors/configure.zcml:48\n+msgid "Adds kicker field (text to be shown above the headline)"\n msgstr ""\n \n #: plone/volto/browser/migrate_to_volto.pt:75\n@@ -57,6 +57,10 @@ msgstr ""\n msgid "Default Pages of Folders are merged with the Folderish Pages that replace the Folder wherever that is possible. This works well with Pages and Collections where the text and/or query are added to the folderish page that replaces the Folder."\n msgstr ""\n \n+#: plone/volto/behaviors/configure.zcml:42\n+msgid "Deprecated (use volto.kicker instead)"\n+msgstr ""\n+\n #: plone/volto/profiles/coresandbox/types/example.xml\n msgid "Example"\n msgstr ""\n@@ -77,6 +81,10 @@ msgstr ""\n msgid "It is recommendet to use the default settings but here you can disable some of the migration-steps."\n msgstr ""\n \n+#: plone/volto/behaviors/configure.zcml:48\n+msgid "Kicker field"\n+msgstr ""\n+\n #: plone/volto/browser/migrate_richtext.pt:130\n msgid "Migrate"\n msgstr ""\n@@ -229,9 +237,9 @@ msgstr ""\n msgid "heading_available_languages"\n msgstr ""\n \n-#. Default: "The header title is shown above the title in teasers."\n-#: plone/volto/behaviors/headtitle.py:14\n-msgid "help_head_title"\n+#. Default: "The kicker is a line of text shown above the title."\n+#: plone/volto/behaviors/kicker.py:14\n+msgid "help_kicker"\n msgstr ""\n \n #. Default: "Insert an image that will be used in listing and teaser blocks."\n@@ -240,9 +248,9 @@ msgstr ""\n msgid "help_previewimage"\n msgstr ""\n \n-#. Default: "Header title"\n-#: plone/volto/behaviors/headtitle.py:12\n-msgid "label_head_title"\n+#. Default: "Kicker"\n+#: plone/volto/behaviors/kicker.py:12\n+msgid "label_kicker"\n msgstr ""\n \n #. Default: "Preview image"\ndiff --git a/src/plone/volto/locales/pt_BR/LC_MESSAGES/plone.volto.po b/src/plone/volto/locales/pt_BR/LC_MESSAGES/plone.volto.po\nindex 4e32dbe..eecba65 100644\n--- a/src/plone/volto/locales/pt_BR/LC_MESSAGES/plone.volto.po\n+++ b/src/plone/volto/locales/pt_BR/LC_MESSAGES/plone.volto.po\n@@ -3,7 +3,7 @@\n msgid ""\n msgstr ""\n "Project-Id-Version: \\n"\n-"POT-Creation-Date: 2024-06-26 17:33+0000\\n"\n+"POT-Creation-Date: 2024-12-11 17:41+0000\\n"\n "PO-Revision-Date: 2021-11-21 16:58+0100\\n"\n "Last-Translator: \\n"\n "Language-Team: \\n"\n@@ -22,9 +22,9 @@ msgstr ""\n msgid "A site migrated to Volto in this Plone backend will still be accessible through the Plone Classic User Interface but with limited functionality. The core content types will have all their GUI RichText fields replaced by the blocks behavior for the composition of the main content. So after migration you can only edit this content using the Volto UI."\n msgstr ""\n \n-#: plone/volto/behaviors/configure.zcml:42\n-msgid "Adds Head title field"\n-msgstr "Adiciona campo T\xc3\xadtulo de cabe\xc3\xa7alho"\n+#: plone/volto/behaviors/configure.zcml:48\n+msgid "Adds kicker field (text to be shown above the headline)"\n+msgstr ""\n \n #: plone/volto/browser/migrate_to_volto.pt:75\n msgid "Advanced settings"\n@@ -58,6 +58,10 @@ msgstr ""\n msgid "Default Pages of Folders are merged with the Folderish Pages that replace the Folder wherever that is possible. This works well with Pages and Collections where the text and/or query are added to the folderish page that replaces the Folder."\n msgstr ""\n \n+#: plone/volto/behaviors/configure.zcml:42\n+msgid "Deprecated (use volto.kicker instead)"\n+msgstr ""\n+\n #: plone/volto/profiles/coresandbox/types/example.xml\n msgid "Example"\n msgstr ""\n@@ -78,6 +82,10 @@ msgstr ""\n msgid "It is recommendet to use the default settings but here you can disable some of the migration-steps."\n msgstr ""\n \n+#: plone/volto/behaviors/configure.zcml:48\n+msgid "Kicker field"\n+msgstr ""\n+\n #: plone/volto/browser/migrate_richtext.pt:130\n msgid "Migrate"\n msgstr ""\n@@ -230,9 +238,9 @@ msgstr "Idiomas nos quais o site deve ser traduz\xc3\xadvel."\n msgid "heading_available_languages"\n msgstr "Idiomas dispon\xc3\xadveis"\n \n-#. Default: "The header title is shown above the title in teasers."\n-#: plone/volto/behaviors/headtitle.py:14\n-msgid "help_head_title"\n+#. Default: "The kicker is a line of text shown above the title."\n+#: plone/volto/behaviors/kicker.py:14\n+msgid "help_kicker"\n msgstr "O t\xc3\xadtulo de cabe\xc3\xa7alho \xc3\xa9 exibido acima do t\xc3\xadtulo nos teasers"\n \n #. Default: "Insert an image that will be used in listing and teaser blocks."\n@@ -241,9 +249,9 @@ msgstr "O t\xc3\xadtulo de cabe\xc3\xa7alho \xc3\xa9 exibido acima do t\xc3\xadtulo nos teasers"\n msgid "help_previewimage"\n msgstr "Inserir uma imagem que ser\xc3\xa1 utilizada em blocos de listagem e teaser"\n \n-#. Default: "Header title"\n-#: plone/volto/behaviors/headtitle.py:12\n-msgid "label_head_title"\n+#. Default: "Kicker"\n+#: plone/volto/behaviors/kicker.py:12\n+msgid "label_kicker"\n msgstr "T\xc3\xadtulo de cabe\xc3\xa7alho"\n \n #. Default: "Preview image"\ndiff --git a/src/plone/volto/locales/update.py b/src/plone/volto/locales/update.py\nindex 5da5a48..dcd993e 100644\n--- a/src/plone/volto/locales/update.py\n+++ b/src/plone/volto/locales/update.py\n@@ -14,7 +14,7 @@\n \n PATTERN = r"^[a-z]{2}.*"\n cwd = Path.cwd()\n-target_path = Path(__file__).parent.parent.resolve()\n+target_path = Path(__file__).parent.parent.relative_to(cwd)\n locale_path = target_path / "locales"\n \n \n' +b'diff --git a/news/167.internal b/news/167.internal\nnew file mode 100644\nindex 0000000..f842954\n--- /dev/null\n+++ b/news/167.internal\n@@ -0,0 +1 @@\n+Remove unused ZCML conditions. @davisagli\ndiff --git a/src/plone/volto/behaviors/configure.zcml b/src/plone/volto/behaviors/configure.zcml\nindex 4e46f6a..fdb4df6 100644\n--- a/src/plone/volto/behaviors/configure.zcml\n+++ b/src/plone/volto/behaviors/configure.zcml\n@@ -1,7 +1,6 @@\n \n \n@@ -17,15 +16,13 @@\n provides=".preview.IPreview"\n />\n \n- \n- \n- \n- \n+ \n+ \n \n \n \n \n \n \n@@ -39,7 +37,6 @@\n class=".migrate_richtext.MigrateRichTextToVoltoBlocks"\n template="migrate_richtext.pt"\n permission="cmf.ManagePortal"\n- zcml:condition="have plone-60"\n />\n \n \n \n \n@@ -59,7 +55,6 @@\n template="voltobackendwarning.pt"\n permission="zope2.View"\n layer="plone.volto.interfaces.IPloneVoltoCoreLayer"\n- zcml:condition="have plone-60"\n />\n \n \ndiff --git a/src/plone/volto/configure.zcml b/src/plone/volto/configure.zcml\nindex 73392f4..f2875b3 100644\n--- a/src/plone/volto/configure.zcml\n+++ b/src/plone/volto/configure.zcml\n@@ -5,7 +5,6 @@\n xmlns:i18n="http://namespaces.zope.org/i18n"\n xmlns:monkey="http://namespaces.plone.org/monkey"\n xmlns:plone="http://namespaces.plone.org/plone"\n- xmlns:zcml="http://namespaces.zope.org/zcml"\n i18n_domain="plone.volto"\n >\n \ndiff --git a/src/plone/volto/dependencies.zcml b/src/plone/volto/dependencies.zcml\nindex 3b4fc84..fce6a2b 100644\n--- a/src/plone/volto/dependencies.zcml\n+++ b/src/plone/volto/dependencies.zcml\n@@ -1,7 +1,4 @@\n-\n+\n \n \n+\n \n \n \n@@ -20,7 +19,6 @@\n class="Products.CMFPlone.browser.login.password_reset.PasswordResetToolView"\n docstringWarning="True"\n description="Patch password reset tool construct URL to cater for different frontend domain"\n- zcml:condition="have plone-52"\n />\n \n \n'