Merge branch 'main' into svelte-app-upgrade

plone · Feb 22, 2024 · b901286 · b901286
2 parents 80c1ae3 + 39de6b8
commit b901286
Show file tree

Hide file tree

Showing 11 changed files with 62 additions and 14 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,12 +1,29 @@
 Changelog
 =========
 
-6.3.1 (unreleased)
+6.3.2 (unreleased)
 ------------------
 
 Breaking changes:
 
-- *add item here*
+-
+
+New features:
+
+-
+
+Bug fixes:
+
+- add min_version = 4.11.0 to addon tempalte tox.ini
+  [MrTango]
+
+
+6.3.1 (2023-10-31)
+------------------
+
+Breaking changes:
+
+-
 
 New features:
 
@@ -15,7 +32,14 @@ New features:
 
 Bug fixes:
 
-- *add item here*
+- Fix permissions.zcml loaded too late
+  [MrTango]
+
+- Fix TinyMCE templates readme to work on Plone 6.
+  [maurits]
+
+- Use portal_url to root all CSS and rules file links
+  [erral]
 
 
 6.3.0 (2023-06-19)

diff --git a/bobtemplates/plone/addon/src/+package.namespace+/+package.name+/configure.zcml.bob b/bobtemplates/plone/addon/src/+package.namespace+/+package.name+/configure.zcml.bob
@@ -13,10 +13,11 @@
   -->
   <!--<includeDependencies package="." />-->
 
-  <include package=".browser" />
-
+  <!-- has to be loaded before permissions are used, so keep above views aso. -->
   <include file="permissions.zcml" />
 
+  <include package=".browser" />
+
   <genericsetup:registerProfile
       name="default"
       title="{{{ package.distributionname }}}"

diff --git a/bobtemplates/plone/addon/tox.ini b/bobtemplates/plone/addon/tox.ini
@@ -1,4 +1,7 @@
 [tox]
+
+min_version = 4.11.0
+
 envlist =
     py37-lint,
     py38-lint,

diff --git a/bobtemplates/plone/theme/theme/manifest.cfg.bob b/bobtemplates/plone/theme/theme/manifest.cfg.bob
@@ -11,4 +11,4 @@ tinymce-content-css = ++theme++{{{ theme.normalized_name }}}/styles/theme.min.cs
 # production-js = ++theme++{{{ theme.normalized_name }}}/js/theme.min.js
 
 [theme:parameters]
-# portal_url = python: portal.absolute_url()
+portal_url = python: portal.absolute_url()
diff --git a/bobtemplates/plone/theme/theme/rules.xml.bob b/bobtemplates/plone/theme/theme/rules.xml.bob
@@ -7,7 +7,7 @@
 
 
   <!-- Include barceloneta's backend.xml for backend theming. -->
-  <xi:include href="++theme++barceloneta/backend.xml"><xi:fallback /></xi:include>
+  <xi:include href="{$portal_url}/++theme++barceloneta/backend.xml"><xi:fallback /></xi:include>
   <!--
     The backend.xml it self uses the following rules condition, to exclude the frontend
     If you want to include anything just for the backend, you can do the same,

diff --git a/...tes/plone/theme_barceloneta/src/+package.namespace+/+package.name+/theme/manifest.cfg.bob b/...tes/plone/theme_barceloneta/src/+package.namespace+/+package.name+/theme/manifest.cfg.bob
@@ -18,4 +18,4 @@ tinymce-content-css = /++theme++{{{ theme.normalized_name }}}/styles/theme.min.c
 #directory = template-overrides
 
 [theme:parameters]
-# portal_url = python: portal.absolute_url()
+portal_url = python: portal.absolute_url()
diff --git a/bobtemplates/plone/theme_barceloneta/src/+package.namespace+/+package.name+/theme/rules.xml b/bobtemplates/plone/theme_barceloneta/src/+package.namespace+/+package.name+/theme/rules.xml
@@ -5,7 +5,7 @@
        xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
        xmlns:xi="http://www.w3.org/2001/XInclude">
 
-  <!-- <xi:include href="++theme++barceloneta/grid-col-marker.xml"/> -->
+  <!-- <xi:include href="{$portal_url}/++theme++barceloneta/grid-col-marker.xml"/> -->
 
   <theme href="index.html" />
   <notheme css:if-not-content="#visual-portal-wrapper" />

diff --git a/...theme_basic/src/+package.namespace+/+package.name+/theme/tinymce-templates/README.rst.bob b/...theme_basic/src/+package.namespace+/+package.name+/theme/tinymce-templates/README.rst.bob
@@ -7,9 +7,24 @@ configure the templates within the TinyMCE controlpanel of your Plone site.
 Activate TinyMCE Templates Plugin
 ---------------------------------
 
-.. code-block::
+Go to the Plugins and Toolbar tab.
+Under "Editor plugins" locate the "template" plugin and enable it.
 
-    template|++plone++static/components/tinymce-builded/js/tinymce/plugins/template
+In ``registry.xml`` in a ``GenericSetup`` profile you would do it like this:
+
+.. code-block:: xml
+
+    <?xml version="1.0" encoding="utf-8"?>
+    <registry>
+      <records interface="Products.CMFPlone.interfaces.controlpanel.ITinyMCESchema"
+              prefix="plone"
+      >
+        <value key="plugins"
+              purge="false"
+        >
+          <element>template</element>
+        </value>
+    </registry>
 
 
 Configure TinyMCE Templates
@@ -20,11 +35,13 @@ Configure TinyMCE Templates
     [
         {
           "title": "List",
+          "description": "List of group items",
           "url": "++theme++{{{ theme.normalized_name }}}/tinymce-templates/list.html"
         },
         {
           "title": "Card Group",
+          "description": "Group of cards",
           "url": "++theme++{{{ theme.normalized_name }}}/tinymce-templates/card-group.html"
-        },
+        }
     ]
 
diff --git a/constraints.txt b/constraints.txt
@@ -2,7 +2,7 @@
 # -----------------------------------------------
 # Pin Versions / Version Ranges if necessary.
 setuptools==57.0.0
-tox==4.3.5
+tox==4.11.3
 isort>=5
 flake8==5.0.4
 flake8-html==0.4.2

diff --git a/setup.py b/setup.py
@@ -4,7 +4,7 @@
 from setuptools import setup
 
 
-version = "6.3.1.dev0"
+version = "6.3.2.dev0"
 
 
 long_description = "\n\n".join(

diff --git a/tox.ini b/tox.ini
@@ -1,4 +1,7 @@
 [tox]
+
+min_version = 4.11.0
+
 envlist =
     py38-lint
     py39-lint