Skip to content

Commit 70c388e

Browse files
committed
Introduce the ajax_load theme parameter and skip diazo theming, if set.
1 parent e5206eb commit 70c388e

File tree

8 files changed

+40
-10
lines changed

8 files changed

+40
-10
lines changed

news/+ajax_load.feature.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Introduce the ajax_load theme parameter and skip diazo theming, if set.

plonetheme/barceloneta/configure.zcml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
<include package="plone.resource" />
99
<include package="plone.app.theming" />
10+
<include package=".upgrades" />
1011

1112
<!-- Diazo themes -->
1213
<plone:static
@@ -23,13 +24,4 @@
2324
directory="profiles/default"
2425
/>
2526

26-
<!-- upgrade step -->
27-
<genericsetup:upgradeDepends
28-
title="Upgrade registry"
29-
profile="plonetheme.barceloneta:default"
30-
source="1"
31-
destination="2"
32-
import_steps="plone.app.registry"
33-
/>
34-
3527
</configure>

plonetheme/barceloneta/profiles/default/metadata.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<metadata>
3-
<version>2</version>
3+
<version>3</version>
44
<dependencies>
55
<dependency>profile-plone.app.theming:default</dependency>
66
</dependencies>

plonetheme/barceloneta/theme/manifest.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ development-js =
1616
production-js =
1717

1818
[theme:parameters]
19+
ajax_load = python:request.get('ajax_load')
1920
portal_url = portal_state/portal_url

plonetheme/barceloneta/theme/rules.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<!-- <xi:include href="++theme++barceloneta/grid-col-marker.xml"/> -->
1010

1111
<theme href="index.html" />
12+
<notheme if="$ajax_load" /><!-- don't theme ajax requests -->
1213
<notheme css:if-not-content="#visual-portal-wrapper" />
1314
<notheme css:if-content=".template-manage-viewlets" />
1415

plonetheme/barceloneta/upgrades/__init__.py

Whitespace-only changes.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<configure
2+
xmlns="http://namespaces.zope.org/zope"
3+
xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
4+
>
5+
6+
<genericsetup:upgradeDepends
7+
title="Upgrade registry"
8+
profile="plonetheme.barceloneta:default"
9+
source="1"
10+
destination="2"
11+
import_steps="plone.app.registry"
12+
/>
13+
14+
<genericsetup:upgradeStep
15+
title="Add ajax_load theme parameter."
16+
profile="plonetheme.barceloneta:default"
17+
source="2"
18+
destination="3"
19+
handler=".upgrades.reload_theme"
20+
/>
21+
22+
</configure>
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
from plone.app.theming import utils as theme_utils
2+
3+
import logging
4+
5+
logger = logging.getLogger(__name__)
6+
7+
8+
def reload_theme(context):
9+
# Reload theme to add ajax_load theme parameter.
10+
if theme_utils.getCurrentTheme() == "barceloneta":
11+
theme = theme_utils.getTheme("barceloneta")
12+
theme_utils.applyTheme(theme)
13+
logger.info("Reloaded Barceloneta.")

0 commit comments

Comments
 (0)