Merge pull request #556 from plone/use-portal_url

use portal_url to root links
plone · Oct 31, 2023 · 36f775e · 36f775e
2 parents 0b96d40 + 95b0791
commit 36f775e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -18,6 +18,9 @@ Bug fixes:
 - 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/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" />