[kupu-checkins] r55123 - in kupu/trunk/kupu: doc plone/kupu_plone_layer

Thu May 22 12:12:35 CEST 2008

Author: duncan
Date: Thu May 22 12:12:32 2008
New Revision: 55123

Modified:
   kupu/trunk/kupu/doc/CHANGES.txt
   kupu/trunk/kupu/plone/kupu_plone_layer/emptypage.pt
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_kjax_support.xml.pt
Log:
Merged in wiggy's changes revisions 53252, 53279 from branch/kupu-1.4.

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================

--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Thu May 22 12:12:32 2008
@@ -4,6 +4,9 @@
 
 - 1.4.10
 
+  - Update emptypage.pt to include a hint for deliverance that edited
+    pages should not be themed. [wiggy]
+
   - Purged old Zope2 Interface interfaces for compatibility with Zope 2.12 and Plone 4, while maintaining compatibility
     with pre Plone 4 versions of Products.PortalTransforms.
     [elro]

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/emptypage.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/emptypage.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/emptypage.pt	Thu May 22 12:12:32 2008
@@ -1,6 +1,7 @@
 <html class="kupu-html">
   <head>
     <title i18n:translate="emptypage_title">Kupu contentarea</title>
+    <meta http-equiv="x-deliverance-no-theme" content="1" />
     <link rel="stylesheet" type="text/css" href="#" tal:attributes="href string:${here/portal_url}/kupuplone.css" />
     <tal:plone21 condition="exists:here/portal_css">
        <tal:plone25 condition="exists:here/renderAllTheStylesheets">

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupu_kjax_support.xml.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupu_kjax_support.xml.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupu_kjax_support.xml.pt	Thu May 22 12:12:32 2008
@@ -18,7 +18,7 @@
          length python:len(context.portal_catalog.searchResults(**query));"
          id="query_length"
          kj:mode="replace">
-         <div tal:content="string: $length objects in catalog" />
+         <div tal:content="string:$length objects in catalog" />
     </div>
     <div tal:condition="nothing">
       <metal:edit_macro define-macro="edit">
