From 2355aaf5e473ceb046a4db55b2a4d0f7b7c1066d Mon Sep 17 00:00:00 2001 From: mauritsvanrees Date: Tue, 23 Apr 2024 09:53:17 +0200 Subject: [PATCH] [fc] Repository: plone.base Branch: refs/heads/main Date: 2024-03-26T11:41:28Z Author: Jean-Paul Ladage (jladage) Commit: https://github.com/plone/plone.base/commit/febc7beb78eb5ff87859430decaae539a69ef3d8 Allow including js in head section Files changed: M src/plone/base/interfaces/controlpanel.py Repository: plone.base Branch: refs/heads/main Date: 2024-03-28T13:05:59Z Author: Jean-Paul Ladage (jladage) Commit: https://github.com/plone/plone.base/commit/317376ea0f7f3d604f6f657f2bb28e626bdd10f3 Update src/plone/base/interfaces/controlpanel.py spelling and grammar fixes Co-authored-by: Steve Piercy <web@stevepiercy.com> Files changed: M src/plone/base/interfaces/controlpanel.py Repository: plone.base Branch: refs/heads/main Date: 2024-03-28T13:06:08Z Author: Jean-Paul Ladage (jladage) Commit: https://github.com/plone/plone.base/commit/8ebeb3f7b7fa0a7f2b28b5f19ce5c8d00dc7bcf3 Update src/plone/base/interfaces/controlpanel.py spelling and grammar fixes Co-authored-by: Steve Piercy <web@stevepiercy.com> Files changed: M src/plone/base/interfaces/controlpanel.py Repository: plone.base Branch: refs/heads/main Date: 2024-03-28T13:06:15Z Author: Jean-Paul Ladage (jladage) Commit: https://github.com/plone/plone.base/commit/5f660ace77b1330fd242ad236eceddf7a6208337 Update src/plone/base/interfaces/controlpanel.py spelling and grammar fixes Co-authored-by: Steve Piercy <web@stevepiercy.com> Files changed: M src/plone/base/interfaces/controlpanel.py Repository: plone.base Branch: refs/heads/main Date: 2024-03-28T13:06:34Z Author: Jean-Paul Ladage (jladage) Commit: https://github.com/plone/plone.base/commit/340e4f62104306065360cc779deca44f76bbbb8a Update src/plone/base/interfaces/controlpanel.py spelling and grammar fixes Co-authored-by: Steve Piercy <web@stevepiercy.com> Files changed: M src/plone/base/interfaces/controlpanel.py Repository: plone.base Branch: refs/heads/main Date: 2024-03-28T13:09:31Z Author: Jean-Paul Ladage (jladage) Commit: https://github.com/plone/plone.base/commit/6466ef655307b6709163398941055f198e960e29 Add changelog entry. Files changed: A news/3931.feature Repository: plone.base Branch: refs/heads/main Date: 2024-03-28T13:15:29Z Author: Jean-Paul Ladage (jladage) Commit: https://github.com/plone/plone.base/commit/ad6e778051bf7275c4b13e613a0908974dca30a6 Update changelog entry to refer to correct viewlet manager. Files changed: M news/3931.feature Repository: plone.base Branch: refs/heads/main Date: 2024-04-23T09:53:17+02:00 Author: Maurits van Rees (mauritsvanrees) Commit: https://github.com/plone/plone.base/commit/a618799cbfc5d45269eb7c80b12b89be7fbf0559 Merge pull request #60 from plone/3931.feature Allow including js in head section Files changed: A news/3931.feature M src/plone/base/interfaces/controlpanel.py --- last_commit.txt | 143 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 117 insertions(+), 26 deletions(-) diff --git a/last_commit.txt b/last_commit.txt index e9cc4afc19..58e4b1658f 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,48 +1,139 @@ -Repository: plone.resource +Repository: plone.base -Branch: refs/heads/master -Date: 2024-04-19T09:40:38-06:00 -Author: David Glick (davisagli) -Commit: https://github.com/plone/plone.resource/commit/6f981ca73609f55220da75826743cfbe3623f127 +Branch: refs/heads/main +Date: 2024-03-26T11:41:28Z +Author: Jean-Paul Ladage (jladage) +Commit: https://github.com/plone/plone.base/commit/febc7beb78eb5ff87859430decaae539a69ef3d8 -Import IPloneSiteRoot from plone.base +Allow including js in head section Files changed: -M plone/resource/profiles.zcml +M src/plone/base/interfaces/controlpanel.py -b'diff --git a/plone/resource/profiles.zcml b/plone/resource/profiles.zcml\nindex e0e92e9..29a1d3e 100644\n--- a/plone/resource/profiles.zcml\n+++ b/plone/resource/profiles.zcml\n@@ -10,7 +10,7 @@\n title="Static resource storage"\n description="A folder for storing and serving static resource files"\n provides="Products.GenericSetup.interfaces.EXTENSION"\n- for="Products.CMFPlone.interfaces.IPloneSiteRoot"\n+ for="plone.base.interfaces.IPloneSiteRoot"\n directory="profiles/default"\n />\n \n' +b'diff --git a/src/plone/base/interfaces/controlpanel.py b/src/plone/base/interfaces/controlpanel.py\nindex 6163126..91165c9 100644\n--- a/src/plone/base/interfaces/controlpanel.py\n+++ b/src/plone/base/interfaces/controlpanel.py\n@@ -1195,10 +1195,23 @@ class ISiteSchema(Interface):\n required=False,\n )\n \n+ webstats_head_js = schema.SourceText(\n+ title=_("JavaScript integrations included in head section"),\n+ description=_(\n+ "For enabling thrid party javascript integrations "\n+ "from external providers (e.g. Google "\n+ "Analytics). Paste the provided code snippet here. "\n+ "It will be rendered as "\n+ "entered at the end of the head section of the page."\n+ ),\n+ default="",\n+ required=False,\n+ )\n+\n webstats_js = schema.SourceText(\n- title=_("JavaScript for web statistics support"),\n+ title=_("JavaScript integrations included after the footer"),\n description=_(\n- "For enabling web statistics support "\n+ "For enabling third-party javascript integrations "\n "from external providers (e.g. Google "\n "Analytics). Paste the provided code snippet here. "\n "It will be rendered as "\n' -Repository: plone.resource +Repository: plone.base -Branch: refs/heads/master -Date: 2024-04-19T09:41:31-06:00 -Author: David Glick (davisagli) -Commit: https://github.com/plone/plone.resource/commit/9c11f4aa7c2541109fdf099f7b88ebbac8ffdc8b +Branch: refs/heads/main +Date: 2024-03-28T13:05:59Z +Author: Jean-Paul Ladage (jladage) +Commit: https://github.com/plone/plone.base/commit/317376ea0f7f3d604f6f657f2bb28e626bdd10f3 -changelog +Update src/plone/base/interfaces/controlpanel.py + +spelling and grammar fixes + +Co-authored-by: Steve Piercy <web@stevepiercy.com> + +Files changed: +M src/plone/base/interfaces/controlpanel.py + +b'diff --git a/src/plone/base/interfaces/controlpanel.py b/src/plone/base/interfaces/controlpanel.py\nindex 91165c9..4192949 100644\n--- a/src/plone/base/interfaces/controlpanel.py\n+++ b/src/plone/base/interfaces/controlpanel.py\n@@ -1198,7 +1198,7 @@ class ISiteSchema(Interface):\n webstats_head_js = schema.SourceText(\n title=_("JavaScript integrations included in head section"),\n description=_(\n- "For enabling thrid party javascript integrations "\n+ "For enabling third-party JavaScript integrations "\n "from external providers (e.g. Google "\n "Analytics). Paste the provided code snippet here. "\n "It will be rendered as "\n' + +Repository: plone.base + + +Branch: refs/heads/main +Date: 2024-03-28T13:06:08Z +Author: Jean-Paul Ladage (jladage) +Commit: https://github.com/plone/plone.base/commit/8ebeb3f7b7fa0a7f2b28b5f19ce5c8d00dc7bcf3 + +Update src/plone/base/interfaces/controlpanel.py + +spelling and grammar fixes + +Co-authored-by: Steve Piercy <web@stevepiercy.com> + +Files changed: +M src/plone/base/interfaces/controlpanel.py + +b'diff --git a/src/plone/base/interfaces/controlpanel.py b/src/plone/base/interfaces/controlpanel.py\nindex 4192949..685ca63 100644\n--- a/src/plone/base/interfaces/controlpanel.py\n+++ b/src/plone/base/interfaces/controlpanel.py\n@@ -1200,7 +1200,7 @@ class ISiteSchema(Interface):\n description=_(\n "For enabling third-party JavaScript integrations "\n "from external providers (e.g. Google "\n- "Analytics). Paste the provided code snippet here. "\n+ "Analytics), paste the provided code snippet here. "\n "It will be rendered as "\n "entered at the end of the head section of the page."\n ),\n' + +Repository: plone.base + + +Branch: refs/heads/main +Date: 2024-03-28T13:06:15Z +Author: Jean-Paul Ladage (jladage) +Commit: https://github.com/plone/plone.base/commit/5f660ace77b1330fd242ad236eceddf7a6208337 + +Update src/plone/base/interfaces/controlpanel.py + +spelling and grammar fixes + +Co-authored-by: Steve Piercy <web@stevepiercy.com> + +Files changed: +M src/plone/base/interfaces/controlpanel.py + +b'diff --git a/src/plone/base/interfaces/controlpanel.py b/src/plone/base/interfaces/controlpanel.py\nindex 685ca63..6b5b8aa 100644\n--- a/src/plone/base/interfaces/controlpanel.py\n+++ b/src/plone/base/interfaces/controlpanel.py\n@@ -1211,7 +1211,7 @@ class ISiteSchema(Interface):\n webstats_js = schema.SourceText(\n title=_("JavaScript integrations included after the footer"),\n description=_(\n- "For enabling third-party javascript integrations "\n+ "For enabling third-party JavaScript integrations "\n "from external providers (e.g. Google "\n "Analytics). Paste the provided code snippet here. "\n "It will be rendered as "\n' + +Repository: plone.base + + +Branch: refs/heads/main +Date: 2024-03-28T13:06:34Z +Author: Jean-Paul Ladage (jladage) +Commit: https://github.com/plone/plone.base/commit/340e4f62104306065360cc779deca44f76bbbb8a + +Update src/plone/base/interfaces/controlpanel.py + +spelling and grammar fixes + +Co-authored-by: Steve Piercy <web@stevepiercy.com> + +Files changed: +M src/plone/base/interfaces/controlpanel.py + +b'diff --git a/src/plone/base/interfaces/controlpanel.py b/src/plone/base/interfaces/controlpanel.py\nindex 6b5b8aa..75fac7d 100644\n--- a/src/plone/base/interfaces/controlpanel.py\n+++ b/src/plone/base/interfaces/controlpanel.py\n@@ -1199,7 +1199,7 @@ class ISiteSchema(Interface):\n title=_("JavaScript integrations included in head section"),\n description=_(\n "For enabling third-party JavaScript integrations "\n- "from external providers (e.g. Google "\n+ "from external providers (e.g., Google "\n "Analytics), paste the provided code snippet here. "\n "It will be rendered as "\n "entered at the end of the head section of the page."\n' + +Repository: plone.base + + +Branch: refs/heads/main +Date: 2024-03-28T13:09:31Z +Author: Jean-Paul Ladage (jladage) +Commit: https://github.com/plone/plone.base/commit/6466ef655307b6709163398941055f198e960e29 + +Add changelog entry. + +Files changed: +A news/3931.feature + +b'diff --git a/news/3931.feature b/news/3931.feature\nnew file mode 100644\nindex 0000000..709da78\n--- /dev/null\n+++ b/news/3931.feature\n@@ -0,0 +1,6 @@\n+Add a field ``webstats_head_js`` to the Site controlpanel and render its\n+contents in the head section using ``IScripts`` viewlet manager.\n+See `issue 3931 `_:\n+some javascript needs to be loaded at the bottom of the page, and some in the head section.\n+[jladage]\n+\n' + +Repository: plone.base + + +Branch: refs/heads/main +Date: 2024-03-28T13:15:29Z +Author: Jean-Paul Ladage (jladage) +Commit: https://github.com/plone/plone.base/commit/ad6e778051bf7275c4b13e613a0908974dca30a6 + +Update changelog entry to refer to correct viewlet manager. Files changed: -A news/45.bugfix +M news/3931.feature -b'diff --git a/news/45.bugfix b/news/45.bugfix\nnew file mode 100644\nindex 0000000..58fef0e\n--- /dev/null\n+++ b/news/45.bugfix\n@@ -0,0 +1 @@\n+Import IPloneSiteRoot from plone.base. @davisagli\n' +b'diff --git a/news/3931.feature b/news/3931.feature\nindex 709da78..d0d8beb 100644\n--- a/news/3931.feature\n+++ b/news/3931.feature\n@@ -1,5 +1,5 @@\n Add a field ``webstats_head_js`` to the Site controlpanel and render its\n-contents in the head section using ``IScripts`` viewlet manager.\n+contents in the head section using ``IHtmlHeadLinks`` viewlet manager.\n See `issue 3931 `_:\n some javascript needs to be loaded at the bottom of the page, and some in the head section.\n [jladage]\n' -Repository: plone.resource +Repository: plone.base -Branch: refs/heads/master -Date: 2024-04-22T18:09:39+02:00 -Author: Jens W. Klein (jensens) -Commit: https://github.com/plone/plone.resource/commit/72725663b48f951a4555b98058c69188c91bf54b +Branch: refs/heads/main +Date: 2024-04-23T09:53:17+02:00 +Author: Maurits van Rees (mauritsvanrees) +Commit: https://github.com/plone/plone.base/commit/a618799cbfc5d45269eb7c80b12b89be7fbf0559 -Merge pull request #45 from plone/update-import +Merge pull request #60 from plone/3931.feature -Import IPloneSiteRoot from plone.base +Allow including js in head section Files changed: -A news/45.bugfix -M plone/resource/profiles.zcml +A news/3931.feature +M src/plone/base/interfaces/controlpanel.py -b'diff --git a/news/45.bugfix b/news/45.bugfix\nnew file mode 100644\nindex 0000000..58fef0e\n--- /dev/null\n+++ b/news/45.bugfix\n@@ -0,0 +1 @@\n+Import IPloneSiteRoot from plone.base. @davisagli\ndiff --git a/plone/resource/profiles.zcml b/plone/resource/profiles.zcml\nindex e0e92e9..29a1d3e 100644\n--- a/plone/resource/profiles.zcml\n+++ b/plone/resource/profiles.zcml\n@@ -10,7 +10,7 @@\n title="Static resource storage"\n description="A folder for storing and serving static resource files"\n provides="Products.GenericSetup.interfaces.EXTENSION"\n- for="Products.CMFPlone.interfaces.IPloneSiteRoot"\n+ for="plone.base.interfaces.IPloneSiteRoot"\n directory="profiles/default"\n />\n \n' +b'diff --git a/news/3931.feature b/news/3931.feature\nnew file mode 100644\nindex 0000000..d0d8beb\n--- /dev/null\n+++ b/news/3931.feature\n@@ -0,0 +1,6 @@\n+Add a field ``webstats_head_js`` to the Site controlpanel and render its\n+contents in the head section using ``IHtmlHeadLinks`` viewlet manager.\n+See `issue 3931 `_:\n+some javascript needs to be loaded at the bottom of the page, and some in the head section.\n+[jladage]\n+\ndiff --git a/src/plone/base/interfaces/controlpanel.py b/src/plone/base/interfaces/controlpanel.py\nindex e885166..73941ce 100644\n--- a/src/plone/base/interfaces/controlpanel.py\n+++ b/src/plone/base/interfaces/controlpanel.py\n@@ -1198,10 +1198,23 @@ class ISiteSchema(Interface):\n required=False,\n )\n \n+ webstats_head_js = schema.SourceText(\n+ title=_("JavaScript integrations included in head section"),\n+ description=_(\n+ "For enabling third-party JavaScript integrations "\n+ "from external providers (e.g., Google "\n+ "Analytics), paste the provided code snippet here. "\n+ "It will be rendered as "\n+ "entered at the end of the head section of the page."\n+ ),\n+ default="",\n+ required=False,\n+ )\n+\n webstats_js = schema.SourceText(\n- title=_("JavaScript for web statistics support"),\n+ title=_("JavaScript integrations included after the footer"),\n description=_(\n- "For enabling web statistics support "\n+ "For enabling third-party JavaScript integrations "\n "from external providers (e.g. Google "\n "Analytics). Paste the provided code snippet here. "\n "It will be rendered as "\n'