[Checkins] SVN: z3c.resourceinclude/trunk/z3c/resourceinclude/provider.p Use ViewPageTemplateFile class to be sure that template path is relative to module. This ensures compatibility with z3c.pt 1.0+.

Malthe Borch mborch at gmail.com
Sun Aug 24 08:30:45 EDT 2008


Log message for revision 90172:
  Use ViewPageTemplateFile class to be sure that template path is relative to module. This ensures compatibility with z3c.pt 1.0+.

Changed:
  U   z3c.resourceinclude/trunk/z3c/resourceinclude/provider.pt
  U   z3c.resourceinclude/trunk/z3c/resourceinclude/provider.py

-=-
Modified: z3c.resourceinclude/trunk/z3c/resourceinclude/provider.pt
===================================================================
--- z3c.resourceinclude/trunk/z3c/resourceinclude/provider.pt	2008-08-24 12:26:56 UTC (rev 90171)
+++ z3c.resourceinclude/trunk/z3c/resourceinclude/provider.pt	2008-08-24 12:30:44 UTC (rev 90172)
@@ -2,7 +2,7 @@
      xmlns:tal="http://xml.zope.org/namespaces/tal"
      tal:omit-tag="">
 
-  <tal:resource repeat="resource resources">
+  <tal:resource repeat="resource options.resources">
 
     <script type="text/javascript"
 	    tal:condition="resource.content_type == 'application/x-javascript'"
@@ -11,7 +11,7 @@
 
     <style type="text/css" media="all"
 	   tal:condition="resource.content_type == 'text/css'">
-      ${comment('@import url("%s");' % resource.url)}
+      ${options.comment('@import url("%s");' % resource.url)}
     </style>
 	    
     <link type="text/kss"

Modified: z3c.resourceinclude/trunk/z3c/resourceinclude/provider.py
===================================================================
--- z3c.resourceinclude/trunk/z3c/resourceinclude/provider.py	2008-08-24 12:26:56 UTC (rev 90171)
+++ z3c.resourceinclude/trunk/z3c/resourceinclude/provider.py	2008-08-24 12:30:44 UTC (rev 90172)
@@ -6,7 +6,7 @@
 from zope.contentprovider.interfaces import IContentProvider
 
 from z3c.resourceinclude.interfaces import IResourceCollector
-from z3c.pt import PageTemplateFile
+from z3c.pt import ViewPageTemplateFile
 
 def html_comment(u):
     return u'<!-- %s -->' % u
@@ -22,7 +22,7 @@
     interface.implements(IContentProvider)
     component.adapts(interface.Interface, IBrowserRequest, IBrowserView)
 
-    template = PageTemplateFile("provider.pt")
+    template = ViewPageTemplateFile("provider.pt")
 
     def __init__(self, context, request, view):
         self.context = context



More information about the Checkins mailing list