Merge branch 'main' into mrtango-fix-addon-template-permissions-order-in-zcml

Author: MrTango

CHANGES.rst

@@ -18,6 +18,12 @@ Bug fixes:
 - 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)
 ------------------

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()

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,

bobtemplates/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()

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" />

bobtemplates/plone/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"
-        },
+        }
     ]
 

tox.ini

@@ -1,4 +1,5 @@
 [tox]
+
 min_version = 4.11.0
 
 envlist =