[Checkins] SVN: z3ext.preferences/trunk/ use new pagelet api

[Nikolay Kim]

Log message for revision 94228:
  use new pagelet api

Changed:
  U   z3ext.preferences/trunk/CHANGES.txt
  U   z3ext.preferences/trunk/src/z3ext/preferences/browser/breadcrumb.py
  U   z3ext.preferences/trunk/src/z3ext/preferences/browser/configure.zcml
  U   z3ext.preferences/trunk/src/z3ext/preferences/browser/group.pt
  U   z3ext.preferences/trunk/src/z3ext/preferences/browser/groupcategory.pt

-=-
Modified: z3ext.preferences/trunk/CHANGES.txt
===================================================================
--- z3ext.preferences/trunk/CHANGES.txt	2008-12-21 18:00:51 UTC (rev 94227)
+++ z3ext.preferences/trunk/CHANGES.txt	2008-12-21 20:05:20 UTC (rev 94228)
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+1.4.4 (2008-12-22)
+------------------
+
+- Use new pagelet api
+
+
 1.4.3 (2008-12-12)
 ------------------
 

Modified: z3ext.preferences/trunk/src/z3ext/preferences/browser/breadcrumb.py
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/browser/breadcrumb.py	2008-12-21 18:00:51 UTC (rev 94227)
+++ z3ext.preferences/trunk/src/z3ext/preferences/browser/breadcrumb.py	2008-12-21 20:05:20 UTC (rev 94228)
@@ -16,12 +16,17 @@
 $Id$
 """
 from zope import interface, component
+from zope.traversing.browser import absoluteURL
 from z3c.breadcrumb.browser import GenericBreadcrumb
 from z3ext.preferences.interfaces import _, IPreferenceGroup
 
 
 class PreferenceGroupBreadcrumb(GenericBreadcrumb):
     component.adapts(IPreferenceGroup, interface.Interface)
+
+    @property
+    def url(self):
+        return '%s/'%(absoluteURL(self.context, self.request))
     
     @property
     def name(self):

Modified: z3ext.preferences/trunk/src/z3ext/preferences/browser/configure.zcml
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/browser/configure.zcml	2008-12-21 18:00:51 UTC (rev 94227)
+++ z3ext.preferences/trunk/src/z3ext/preferences/browser/configure.zcml	2008-12-21 20:05:20 UTC (rev 94228)
@@ -3,7 +3,7 @@
    xmlns:zcml="http://namespaces.zope.org/zcml"
    xmlns:z3ext="http://namespaces.zope.org/z3ext"
    xmlns:browser="http://namespaces.zope.org/browser"
-   i18n_domain="z3ext">
+   i18n_domain="z3ext.preferences">
 
   <!-- layouts -->
   <z3ext:layout
@@ -20,14 +20,12 @@
      hidden="yes" />
 
   <!-- pagelet types -->
-  <interface
+  <z3ext:pageletType
      name="preference.editGroup"
-     type="z3ext.layout.interfaces.IPageletType"
      interface=".interfaces.IEdit" />
 
-  <interface
+  <z3ext:pageletType
      name="preference.previewGroup"
-     type="z3ext.layout.interfaces.IPageletType"
      interface=".interfaces.IPreview" />
 
   <!-- browser view -->
@@ -72,15 +70,13 @@
 
   <z3ext:pagelet
      for="..interfaces.IPreferenceGroup"
-     provides=".interfaces.IEdit"
      class=".group.PreferenceGroupView"
-     permission="zope.Public" />
+     type="preference.editGroup" />
 
   <z3ext:pagelet
      for="..interfaces.IPreferenceGroup"
      template="grouppreview.pt"
-     provides=".interfaces.IPreview"
-     permission="zope.Public" />
+     type="preference.previewGroup" />
 
   <!-- navigation -->
   <browser:viewletManager
@@ -99,8 +95,7 @@
   <!-- styles -->
   <z3ext:resourceinclude
      name="z3ext-preferences.css"
-     library="z3ext"
-     type="stylesheet"
+     library="z3ext" type="stylesheet"
      file="styles.css" filetype="zrt" />
 
 </configure>

Modified: z3ext.preferences/trunk/src/z3ext/preferences/browser/group.pt
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/browser/group.pt	2008-12-21 18:00:51 UTC (rev 94227)
+++ z3ext.preferences/trunk/src/z3ext/preferences/browser/group.pt	2008-12-21 20:05:20 UTC (rev 94228)
@@ -1,4 +1,4 @@
 <tal:block tal:condition="view/hasFields"
-	   tal:content="structure context/@@pagelet/preference.editGroup" />
-<tal:block tal:repeat="group view/subgroups"
-	   tal:content="structure group/@@pagelet/preference.editGroup" />
+	   tal:content="structure pagelet:preference.editGroup" />
+<tal:block tal:repeat="context view/subgroups"
+	   tal:content="structure pagelet:preference.editGroup" />

Modified: z3ext.preferences/trunk/src/z3ext/preferences/browser/groupcategory.pt
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/browser/groupcategory.pt	2008-12-21 18:00:51 UTC (rev 94227)
+++ z3ext.preferences/trunk/src/z3ext/preferences/browser/groupcategory.pt	2008-12-21 20:05:20 UTC (rev 94228)
@@ -1,14 +1,14 @@
 <tal:block tal:condition="view/hasFields"
-	   tal:content="structure context/@@pagelet/preference.editGroup" />
+	   tal:content="structure pagelet:preference.editGroup" />
 
 <tal:block tal:condition="nocall:view/oneSubgroup">
-  <tal:block tal:define="group python:view.subgroups[0]"
-	     tal:content="structure group/@@pagelet/preference.editGroup" />
+  <tal:block tal:define="context python:view.subgroups[0]"
+	     tal:content="structure pagelet:preference.editGroup" />
 </tal:block>
 
 <div class="z-form" tal:condition="python: not view.oneSubgroup and view.subgroups">
-  <tal:block tal:repeat="group view/subgroups">
-    <tal:block tal:content="structure group/@@pagelet/preference.previewGroup" />
+  <tal:block tal:repeat="context view/subgroups">
+    <tal:block tal:content="structure pagelet:preference.previewGroup" />
     <br />
   </tal:block>
 </div>