Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use portal_url to root all CSS and rules file links #341

Open
wants to merge 2 commits into
base: 3.0.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions news/340.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Use portal_url to root all CSS and rules file links
[erral]
8 changes: 4 additions & 4 deletions plonetheme/barceloneta/theme/backend.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
xmlns:xhtml="http://www.w3.org/1999/xhtml"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="++theme++barceloneta/backend.xml" />
<xi:include href="{$portal_url}/++theme++barceloneta/backend.xml" />
<rules css:if-content="body.viewpermission-view, body.viewpermission-none">
<theme href="index.html" />
... your rules
Expand All @@ -25,7 +25,7 @@
all your backend pages such as site setup and edit.
-->

<!-- <xi:include href="++theme++barceloneta/grid-col-marker.xml"/> -->
<!-- <xi:include href="{$portal_url}/++theme++barceloneta/grid-col-marker.xml"/> -->

<!-- Toolbar -->
<before css:content="#edit-bar"
Expand All @@ -47,12 +47,12 @@
<!-- Cut down barceloneta without just for backend UI -->
<rules css:if-not-content="body.viewpermission-view, body.viewpermission-none">

<theme href="../++theme++barceloneta/index.html" />
<theme href="{$portal_url}/++theme++barceloneta/index.html" />
<notheme css:if-not-content="#visual-portal-wrapper" />

<!-- We can't control the bundle from here due to include. Just hard code -->
<after css:theme-children="head">
<link href="++theme++barceloneta/css/barceloneta.css"
<link href="{$portal_url}/++theme++barceloneta/css/barceloneta.css"
rel="stylesheet"
/>
</after>
Expand Down
3 changes: 3 additions & 0 deletions plonetheme/barceloneta/theme/manifest.cfg
yurj marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,6 @@ production-css = ++theme++barceloneta/css/barceloneta.min.css
tinymce-content-css = /++theme++barceloneta/css/barceloneta.min.css
development-js =
production-js =

[theme:parameters]
portal_url = python: portal.absolute_url()