[Plone-cvs] plone.app.theming/master: Make template theme do what it claims

[Steve M. <svn...@pl...>]

Repository: plone.app.theming
Branch: refs/heads/master
Date: 2013-03-30T17:40:00-07:00
Author: Steve McMahon (smcmahon) <st...@dc...>
Commit: https://github.com/plone/plone.app.theming/commit/bfa346bb42451d23886bd4e622b0b76c2afcd116

Make template theme do what it claims

Files changed:
M docs/HISTORY.txt
M src/plone/app/theming/themes/template/rules.xml

diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
index b09ff52..bb137fc 100644
--- a/docs/HISTORY.txt
+++ b/docs/HISTORY.txt
@@ -4,6 +4,10 @@ Changelog
 1.1 (unreleased)
 ----------------
 
+- Make the template theme do what it claims to do: copy styles as
+  well as scripts.
+  [smcmahon]
+
 - Change the label and description for the example theme to supply useful
   information.
   [smcmahon]
diff --git a/src/plone/app/theming/themes/template/rules.xml b/src/plone/app/theming/themes/template/rules.xml
index 9de44b5..0e8da00 100644
--- a/src/plone/app/theming/themes/template/rules.xml
+++ b/src/plone/app/theming/themes/template/rules.xml
@@ -12,9 +12,18 @@
         <!-- Replace title with Plone's page title  -->
         <replace css:theme="html head title" css:content="html head title" />
 
-        <!-- Copy base tag and script tags from Plone -->
-        <after css:theme-children="html head" css:content="html head base" />
-        <after css:theme-children="html head" css:content="html head script" />
+        <!-- Copy base tag from Plone -->
+        <before css:theme-children="html head" css:content="html head base" />
+
+        <!-- Copy link, style, meta tags from Plone head -->
+        <after css:theme-children="html head"
+               content="/html/head/link | /html/head/style | /html/head/meta" />
+
+        <!-- merge classes from Plone body with theme body -->
+        <merge attributes="class" css:theme="body" css:content="body" />
+
+        <!-- Copy script tags from Plone head to end of body -->
+        <after css:theme-children="html body" css:content="html head script" />
 
         <!-- Insert your own rules here -->