[Checkins] SVN: z3ext.preferences/tags/1.0.2/ egg 1.0.2
Nikolay Kim
fafhrd at datacom.kz
Mon Apr 7 02:31:40 EDT 2008
Log message for revision 85138:
egg 1.0.2
Changed:
A z3ext.preferences/tags/1.0.2/
D z3ext.preferences/tags/1.0.2/CHANGES.txt
A z3ext.preferences/tags/1.0.2/CHANGES.txt
U z3ext.preferences/tags/1.0.2/setup.py
D z3ext.preferences/tags/1.0.2/src/z3ext/preferences/browser/navigation.py
A z3ext.preferences/tags/1.0.2/src/z3ext/preferences/browser/navigation.py
-=-
Copied: z3ext.preferences/tags/1.0.2 (from rev 85130, z3ext.preferences/trunk)
Deleted: z3ext.preferences/tags/1.0.2/CHANGES.txt
===================================================================
--- z3ext.preferences/trunk/CHANGES.txt 2008-04-07 02:16:29 UTC (rev 85130)
+++ z3ext.preferences/tags/1.0.2/CHANGES.txt 2008-04-07 06:31:40 UTC (rev 85138)
@@ -1,36 +0,0 @@
-=======
-CHANGES
-=======
-
-1.0.1 (2008-04-04)
-------------------
-
-- Fixed group category layout
-
-
-1.0.0 (2008-03-25)
-------------------
-
-- Tests added
-
-- Code moved to svn.zope.org
-
-
-0.9.2 (2008-02-29)
-------------------
-
-- Use z3c.autoinclude
-
-- Added z3c.baseregistry support
-
-
-0.9.1 (2008-02-20)
-------------------
-
-- Use z3ext.layoutform
-
-
-0.9.0 (2008-02-01)
-------------------
-
-- Initial release.
Copied: z3ext.preferences/tags/1.0.2/CHANGES.txt (from rev 85137, z3ext.preferences/trunk/CHANGES.txt)
===================================================================
--- z3ext.preferences/tags/1.0.2/CHANGES.txt (rev 0)
+++ z3ext.preferences/tags/1.0.2/CHANGES.txt 2008-04-07 06:31:40 UTC (rev 85138)
@@ -0,0 +1,42 @@
+=======
+CHANGES
+=======
+
+1.0.2 (2008-04-07)
+------------------
+
+- Fix UI in navigation
+
+
+1.0.1 (2008-04-04)
+------------------
+
+- Fixed group category layout
+
+
+1.0.0 (2008-03-25)
+------------------
+
+- Tests added
+
+- Code moved to svn.zope.org
+
+
+0.9.2 (2008-02-29)
+------------------
+
+- Use z3c.autoinclude
+
+- Added z3c.baseregistry support
+
+
+0.9.1 (2008-02-20)
+------------------
+
+- Use z3ext.layoutform
+
+
+0.9.0 (2008-02-01)
+------------------
+
+- Initial release.
Modified: z3ext.preferences/tags/1.0.2/setup.py
===================================================================
--- z3ext.preferences/trunk/setup.py 2008-04-07 02:16:29 UTC (rev 85130)
+++ z3ext.preferences/tags/1.0.2/setup.py 2008-04-07 06:31:40 UTC (rev 85138)
@@ -21,7 +21,7 @@
def read(*rnames):
return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
-version='1.0.2dev'
+version='1.0.2'
setup(name = 'z3ext.preferences',
Deleted: z3ext.preferences/tags/1.0.2/src/z3ext/preferences/browser/navigation.py
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/browser/navigation.py 2008-04-07 02:16:29 UTC (rev 85130)
+++ z3ext.preferences/tags/1.0.2/src/z3ext/preferences/browser/navigation.py 2008-04-07 06:31:40 UTC (rev 85138)
@@ -1,79 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2007 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""
-
-$Id$
-"""
-from zope.component import queryMultiAdapter
-from z3ext.preferences.interfaces import IPreferenceGroup, IRootPreferences
-
-
-class Navigation(object):
-
- def __init__(self, context, request):
- self.context = context
- self.request = request
-
- self.isRoot = IRootPreferences.providedBy(context)
- if self.isRoot:
- return
-
- path = []
- parent = context
- while IPreferenceGroup.providedBy(parent):
- path.insert(0, parent)
- parent = parent.__parent__
-
- self.root, path = path[0], path[1:]
-
- self.data = self._process(self.root, path)
-
- def _process(self, context, path, level=1):
- request = self.request
-
- if path:
- data = []
- items = getattr(context, 'items', ())
- if callable(items):
- items = items()
-
- for name, prefs in items:
- if not prefs.isAvailable():
- continue
-
- info = {'name': name,
- 'title': prefs.__title__,
- 'icon': queryMultiAdapter(
- (prefs, request), name='zmi_icon'),
- 'items': (),
- 'selected': False,
- 'prefs': prefs,
- 'level': level}
-
- if prefs.__id__ == path[0].__id__:
- info['items'] = self._process(prefs, path[1:], level+1)
-
- if prefs.__id__ == self.context.__id__:
- info['selected'] = True
- info['items'] = self._process(prefs, [prefs], level+1)
-
- data.append(info)
-
- return data
-
- def __call__(self):
- if self.isRoot:
- return ''
- else:
- return self.index()
Copied: z3ext.preferences/tags/1.0.2/src/z3ext/preferences/browser/navigation.py (from rev 85137, z3ext.preferences/trunk/src/z3ext/preferences/browser/navigation.py)
===================================================================
--- z3ext.preferences/tags/1.0.2/src/z3ext/preferences/browser/navigation.py (rev 0)
+++ z3ext.preferences/tags/1.0.2/src/z3ext/preferences/browser/navigation.py 2008-04-07 06:31:40 UTC (rev 85138)
@@ -0,0 +1,85 @@
+##############################################################################
+#
+# Copyright (c) 2007 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""
+
+$Id$
+"""
+from zope.component import queryMultiAdapter
+from z3ext.preferences.interfaces import IRootPreferences
+from z3ext.preferences.interfaces import IPreferenceGroup
+from z3ext.preferences.interfaces import IPreferenceCategory
+
+
+class Navigation(object):
+
+ def __init__(self, context, request):
+ self.context = context
+ self.request = request
+
+ self.isRoot = IRootPreferences.providedBy(context)
+ if self.isRoot:
+ return
+
+ path = []
+ parent = context
+ while IPreferenceGroup.providedBy(parent):
+ path.insert(0, parent)
+ parent = parent.__parent__
+
+ self.root, path = path[0], path[1:]
+
+ self.data = self._process(self.root, path)
+
+ def _process(self, context, path, level=1):
+ request = self.request
+
+ if path:
+ data = []
+ items = getattr(context, 'items', ())
+ if callable(items):
+ items = items()
+
+ for name, prefs in items:
+ if not prefs.isAvailable():
+ continue
+
+ info = {'name': name,
+ 'title': prefs.__title__,
+ 'icon': queryMultiAdapter(
+ (prefs, request), name='zmi_icon'),
+ 'items': (),
+ 'selected': False,
+ 'prefs': prefs,
+ 'level': level}
+
+ if prefs.__id__ == path[0].__id__:
+ info['items'] = self._process(prefs, path[1:], level+1)
+
+ if prefs.__id__ == self.context.__id__:
+ info['selected'] = True
+ info['items'] = self._process(prefs, [prefs], level+1)
+
+ if IPreferenceCategory.providedBy(prefs) and not info['items']:
+ if not self._process(prefs, [prefs], level+1):
+ continue
+
+ data.append(info)
+
+ return data
+
+ def __call__(self):
+ if self.isRoot:
+ return ''
+ else:
+ return self.index()
More information about the Checkins
mailing list