From aab9939131a9eea6d10b0f91b4d90bd9b59bdda1 Mon Sep 17 00:00:00 2001 From: vangheem Date: Fri, 11 Sep 2015 10:37:49 -0500 Subject: [PATCH] rewrite manifest from copied theme with relative paths also --- CHANGES.rst | 3 +- .../theming/tests/another-theme/manifest.cfg | 17 ++++++++ .../app/theming/tests/another-theme/rules.xml | 7 +++ src/plone/app/theming/tests/configure.zcml | 1 + src/plone/app/theming/tests/test_utils.py | 43 +++++++++++++++++++ src/plone/app/theming/utils.py | 6 +-- 6 files changed, 73 insertions(+), 4 deletions(-) create mode 100644 src/plone/app/theming/tests/another-theme/manifest.cfg create mode 100644 src/plone/app/theming/tests/another-theme/rules.xml diff --git a/CHANGES.rst b/CHANGES.rst index 2d3269a8..874aff0d 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,7 +4,8 @@ Changelog 1.2.11 (unreleased) ------------------- -- Nothing changed yet. +- rewrite manifest from copied theme with relative paths also + [vangheem] 1.2.10 (2015-09-08) diff --git a/src/plone/app/theming/tests/another-theme/manifest.cfg b/src/plone/app/theming/tests/another-theme/manifest.cfg new file mode 100644 index 00000000..218a9b08 --- /dev/null +++ b/src/plone/app/theming/tests/another-theme/manifest.cfg @@ -0,0 +1,17 @@ +[theme] +title = Another test theme +description = Another theme for testing +doctype = +prefix = ++theme++another-test-theme +rules = ++theme++another-test-theme/rules.xml + +enabled-bundles = plone +disabled-bundles = foobar + +development-css = ++theme++another-theme/less/barceloneta.plone.less +production-css = ++theme++another-theme/less/barceloneta-compiled.css +tinymce-content-css = ++theme++another-theme/less/barceloneta-compiled.css + +development-js = ++theme++another-theme/script.js +production-js = ++theme++another-theme/script.min.js + diff --git a/src/plone/app/theming/tests/another-theme/rules.xml b/src/plone/app/theming/tests/another-theme/rules.xml new file mode 100644 index 00000000..78ae654f --- /dev/null +++ b/src/plone/app/theming/tests/another-theme/rules.xml @@ -0,0 +1,7 @@ + + + + diff --git a/src/plone/app/theming/tests/configure.zcml b/src/plone/app/theming/tests/configure.zcml index 43f47434..db95820a 100644 --- a/src/plone/app/theming/tests/configure.zcml +++ b/src/plone/app/theming/tests/configure.zcml @@ -7,6 +7,7 @@ +