[Checkins] SVN: plone.z3cform/trunk/ use chameleon page templates from five.pt if available

David Glick davidglick at onenw.org
Sat Dec 20 06:46:48 EST 2008


Log message for revision 94210:
  use chameleon page templates from five.pt if available

Changed:
  U   plone.z3cform/trunk/docs/HISTORY.txt
  U   plone.z3cform/trunk/plone/z3cform/templates.py

-=-
Modified: plone.z3cform/trunk/docs/HISTORY.txt
===================================================================
--- plone.z3cform/trunk/docs/HISTORY.txt	2008-12-20 09:49:33 UTC (rev 94209)
+++ plone.z3cform/trunk/docs/HISTORY.txt	2008-12-20 11:46:48 UTC (rev 94210)
@@ -4,6 +4,9 @@
 0.5.4 - unreleased
 ------------------
 
+* Use chameleon-based page templates from five.pt if available.
+  [davisagli]
+
 * Copied the basic textlines widget from z3c.form trunk for use until
   it is released.
   [davisagli]

Modified: plone.z3cform/trunk/plone/z3cform/templates.py
===================================================================
--- plone.z3cform/trunk/plone/z3cform/templates.py	2008-12-20 09:49:33 UTC (rev 94209)
+++ plone.z3cform/trunk/plone/z3cform/templates.py	2008-12-20 11:46:48 UTC (rev 94210)
@@ -11,7 +11,10 @@
 import z3c.form.interfaces
 from z3c.form.form import FormTemplateFactory
 
-from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
+try:
+    from five.pt.pagetemplate import ViewPageTemplateFile
+except ImportError:
+    from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 
 import plone.z3cform
 import plone.z3cform.layout



More information about the Checkins mailing list