[Checkins] SVN: z3ext.controlpanel/trunk/ ZTK support; tests updated; i18n updated
Nikolay Kim
fafhrd91 at gmail.com
Tue Dec 1 22:51:03 EST 2009
Log message for revision 106154:
ZTK support; tests updated; i18n updated
Changed:
U z3ext.controlpanel/trunk/CHANGES.txt
U z3ext.controlpanel/trunk/setup.py
U z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/category.pt
U z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/navigation.pt
U z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/navigation.py
U z3ext.controlpanel/trunk/src/z3ext/controlpanel/locales/nl/LC_MESSAGES/z3ext.controlpanel.po
U z3ext.controlpanel/trunk/src/z3ext/controlpanel/locales/ru/LC_MESSAGES/z3ext.controlpanel.po
U z3ext.controlpanel/trunk/src/z3ext/controlpanel/locales/z3ext.controlpanel.pot
U z3ext.controlpanel/trunk/src/z3ext/controlpanel/root.py
U z3ext.controlpanel/trunk/src/z3ext/controlpanel/storage.py
U z3ext.controlpanel/trunk/src/z3ext/controlpanel/testing.py
U z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/configure.zcml
U z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/ftesting.zcml
A z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/layoutportal.pt
A z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/overrides.zcml
U z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/testbrowser.txt
U z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/tests.py
U z3ext.controlpanel/trunk/src/z3ext/controlpanel/zcml.py
-=-
Modified: z3ext.controlpanel/trunk/CHANGES.txt
===================================================================
--- z3ext.controlpanel/trunk/CHANGES.txt 2009-12-02 01:44:08 UTC (rev 106153)
+++ z3ext.controlpanel/trunk/CHANGES.txt 2009-12-02 03:51:03 UTC (rev 106154)
@@ -2,10 +2,12 @@
CHANGES
=======
-1.5.1 (Unreleased)
+1.6.0 (Unreleased)
------------------
+- ZTK support
+
1.5.0 (2009-08-11)
------------------
Modified: z3ext.controlpanel/trunk/setup.py
===================================================================
--- z3ext.controlpanel/trunk/setup.py 2009-12-02 01:44:08 UTC (rev 106153)
+++ z3ext.controlpanel/trunk/setup.py 2009-12-02 03:51:03 UTC (rev 106154)
@@ -21,7 +21,7 @@
def read(*rnames):
return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
-version='1.5.1dev'
+version='0'
setup(name = 'z3ext.controlpanel',
@@ -67,25 +67,23 @@
'zope.cachedescriptors',
'zope.lifecycleevent',
'zope.configuration',
- 'zope.app.publisher',
- 'zope.app.component',
- 'zope.app.security',
- 'zope.app.container',
+ 'zope.site',
+ 'zope.container',
'z3c.traverser',
'z3ext.layout',
'z3ext.layoutform',
'z3ext.resourcepackage',
],
extras_require = dict(test=['zope.securitypolicy',
- 'zope.app.security',
'zope.app.testing',
'zope.app.zcmlfiles',
- 'zope.app.folder',
- 'zope.traversing',
'zope.testing',
'zope.testbrowser',
- 'z3ext.autoinclude',
+ 'z3c.breadcrumb',
+ 'z3ext.wizard',
'z3ext.security',
+ 'z3ext.autoinclude',
+ 'z3ext.ui.breadcrumbs',
]),
include_package_data = True,
zip_safe = False
Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/category.pt
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/category.pt 2009-12-02 01:44:08 UTC (rev 106153)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/category.pt 2009-12-02 03:51:03 UTC (rev 106154)
@@ -1,8 +1,8 @@
<div class="z-cp-frame" tal:define="configlets view/data"
i18n:domain="z3ext.controlpanel">
- <h1 class="z-cp-title" i18n:translate=""
+ <h1 class="z-cp-title"
tal:content="context/__title__">Configlet category</h1>
- <div class="z-cp-description" i18n:translate=""
+ <div class="z-cp-description"
tal:content="context/__description__">Description</div>
<div tal:condition="not:configlets" i18n:translate="">
@@ -16,9 +16,8 @@
</div>
<div class="z-cp-details">
<a tal:attributes="href string:${configlet/configlet/@@absolute_url}/"
- tal:content="configlet/title" i18n:translate=""></a>
- <div><tal:block tal:content="configlet/description"
- i18n:translate="" /> </div>
+ tal:content="configlet/title"></a>
+ <div><tal:block tal:content="configlet/description" /> </div>
<tal:block define="configlets configlet/items" condition="configlets">
<metal:block use-macro="view/template/macros/configlets" />
</tal:block>
Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/navigation.pt
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/navigation.pt 2009-12-02 01:44:08 UTC (rev 106153)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/navigation.pt 2009-12-02 03:51:03 UTC (rev 106154)
@@ -11,7 +11,7 @@
tal:attributes="class string:z-cp-level${item/level|nothing}">
<a tal:attributes="href string:${item/configlet/@@absolute_url}/">
<tal:block tal:content="structure item/icon" />
- <tal:block tal:content="item/title" i18n:translate="" />
+ <tal:block content="item/title" />
</a>
</div>
</div>
Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/navigation.py
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/navigation.py 2009-12-02 01:44:08 UTC (rev 106153)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/navigation.py 2009-12-02 03:51:03 UTC (rev 106154)
@@ -22,6 +22,9 @@
class Navigation(ViewletManagerBase):
+ data = ()
+ isRoot = True
+
def update(self):
super(Navigation, self).update()
@@ -36,8 +39,6 @@
if context is not None:
self.context = context
else:
- self.data = []
- self.isRoot = True
return
self.isRoot = IRootConfiglet.providedBy(context)
Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/locales/nl/LC_MESSAGES/z3ext.controlpanel.po
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/locales/nl/LC_MESSAGES/z3ext.controlpanel.po 2009-12-02 01:44:08 UTC (rev 106153)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/locales/nl/LC_MESSAGES/z3ext.controlpanel.po 2009-12-02 03:51:03 UTC (rev 106154)
@@ -1,4 +1,4 @@
-###############################################################################
+# ##############################################################################
#
# Copyright (c) 2003-2004 Zope Foundation and Contributors.
# All Rights Reserved.
@@ -14,7 +14,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Development/Unknown\n"
-"POT-Creation-Date: Wed Oct 22 13:17:55 2008\n"
+"POT-Creation-Date: Tue Dec 1 21:47:22 2009\n"
"PO-Revision-Date: 2008-10-14 17:25+0100\n"
"Last-Translator: F. Kooman <fkooman at tuxed.net>\n"
"Language-Team: Zope 3 Developers <zope3-dev at zope.org>\n"
@@ -27,37 +27,69 @@
msgid "There are no configlets in this category."
msgstr ""
-#: src/z3ext/controlpanel/browser/configure.zcml:24
+#: src/z3ext/controlpanel/browser/configure.zcml:23
msgid "View"
msgstr "Bekijk"
+#: src/z3ext/controlpanel/browser/wizard.py:51
+msgid "Configure"
+msgstr ""
+
+#: src/z3ext/controlpanel/browser/wizard.py:52
+#, fuzzy
+msgid "Configure configlet"
+msgstr "Configure bedieningspaneel configlets."
+
+#: src/z3ext/controlpanel/browser/wizard.py:67
+msgid "Next"
+msgstr ""
+
+#: src/z3ext/controlpanel/browser/wizard.py:74
+msgid "Save"
+msgstr ""
+
#: src/z3ext/controlpanel/configlettype.py:193
msgid "Field is readonly"
msgstr ""
-#: src/z3ext/controlpanel/configure.zcml:42
+#: src/z3ext/controlpanel/configure.zcml:40
msgid "This area allows you to configure system."
msgstr "In dit gebied kunt u het systeem configureren."
-#: src/z3ext/controlpanel/configure.zcml:42
+#: src/z3ext/controlpanel/configure.zcml:40
msgid "System configuration"
msgstr "Systeemconfiguratie"
-#: src/z3ext/controlpanel/configure.zcml:50
+#: src/z3ext/controlpanel/configure.zcml:48
msgid "User interface configuration"
msgstr "Uiterlijk configuratie"
-#: src/z3ext/controlpanel/configure.zcml:50
+#: src/z3ext/controlpanel/configure.zcml:48
msgid "This area allows you to configure portal look&feel."
msgstr "Configureren uiterlijk van uw website "
-#: src/z3ext/controlpanel/configure.zcml:9
+#: src/z3ext/controlpanel/configure.zcml:56
+msgid "Content types"
+msgstr ""
+
+#: src/z3ext/controlpanel/configure.zcml:56
+#, fuzzy
+msgid "This area allows you to configure portal content types."
+msgstr "Configureren uiterlijk van uw website "
+
+#: src/z3ext/controlpanel/configure.zcml:64
+msgid "Principals management"
+msgstr ""
+
+#: src/z3ext/controlpanel/configure.zcml:64
+msgid "Portal principals management panel."
+msgstr ""
+
+#: src/z3ext/controlpanel/configure.zcml:7
msgid "Configure control panel's configlets."
msgstr "Configure bedieningspaneel configlets."
-#: src/z3ext/controlpanel/root.py:36
-#: src/z3ext/controlpanel/browser/configure.zcml:53
-#: src/z3ext/controlpanel/browser/configure.zcml:60
+#: src/z3ext/controlpanel/root.py:34
+#: src/z3ext/controlpanel/browser/configure.zcml:52
msgid "System settings"
msgstr "Systeeminstellingen"
-
Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/locales/ru/LC_MESSAGES/z3ext.controlpanel.po
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/locales/ru/LC_MESSAGES/z3ext.controlpanel.po 2009-12-02 01:44:08 UTC (rev 106153)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/locales/ru/LC_MESSAGES/z3ext.controlpanel.po 2009-12-02 03:51:03 UTC (rev 106154)
@@ -14,7 +14,7 @@
msgid ""
msgstr ""
"Project-Id-Version: z3ext.controlpanel\n"
-"POT-Creation-Date: Wed Oct 22 13:17:55 2008\n"
+"POT-Creation-Date: Tue Dec 1 21:47:22 2009\n"
"PO-Revision-Date: 2008-10-22 13:22+0600\n"
"Last-Translator: Nikolay Kim <fafhrd91 at gmail.com>\n"
"Language-Team: Zope 3 Developers <zope3-dev at zope.org>\n"
@@ -27,36 +27,69 @@
msgid "There are no configlets in this category."
msgstr "Ð’ Ñтой категории нет конфиглетов."
-#: src/z3ext/controlpanel/browser/configure.zcml:24
+#: src/z3ext/controlpanel/browser/configure.zcml:23
msgid "View"
msgstr "ПроÑмотр"
+#: src/z3ext/controlpanel/browser/wizard.py:51
+msgid "Configure"
+msgstr "УÑтановки"
+
+#: src/z3ext/controlpanel/browser/wizard.py:52
+msgid "Configure configlet"
+msgstr "Конфигурировать конфиглет."
+
+#: src/z3ext/controlpanel/browser/wizard.py:67
+msgid "Next"
+msgstr "Далее"
+
+#: src/z3ext/controlpanel/browser/wizard.py:74
+msgid "Save"
+msgstr "Сохранить"
+
#: src/z3ext/controlpanel/configlettype.py:193
msgid "Field is readonly"
msgstr "Поле только Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ"
-#: src/z3ext/controlpanel/configure.zcml:42
+#: src/z3ext/controlpanel/configure.zcml:40
msgid "This area allows you to configure system."
msgstr "Конфиглеты в Ñтой категории позволÑÑŽÑ‚ вам конфигурировать ÑиÑтему."
-#: src/z3ext/controlpanel/configure.zcml:42
+#: src/z3ext/controlpanel/configure.zcml:40
msgid "System configuration"
msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ ÑиÑтемы"
-#: src/z3ext/controlpanel/configure.zcml:50
+#: src/z3ext/controlpanel/configure.zcml:48
msgid "User interface configuration"
msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÑкого интерфейÑа"
-#: src/z3ext/controlpanel/configure.zcml:50
+#: src/z3ext/controlpanel/configure.zcml:48
msgid "This area allows you to configure portal look&feel."
-msgstr "Конфиглеты в Ñтой категории позволÑÑŽÑ‚ вам конфигурировать как выглÑдит Ñайт."
+msgstr ""
+"Конфиглеты в Ñтой категории позволÑÑŽÑ‚ вам конфигурировать как выглÑдит Ñайт."
-#: src/z3ext/controlpanel/configure.zcml:9
-msgid "Configure control panel's configlets."
+#: src/z3ext/controlpanel/configure.zcml:56
+msgid "Content types"
+msgstr "Контент"
+
+#: src/z3ext/controlpanel/configure.zcml:56
+msgid "This area allows you to configure portal content types."
msgstr ""
+"Конфиглеты в Ñтой категории позволÑÑŽÑ‚ вам конфигурировать контент типы."
-#: src/z3ext/controlpanel/root.py:36
-#: src/z3ext/controlpanel/browser/configure.zcml:53
-#: src/z3ext/controlpanel/browser/configure.zcml:60
+#: src/z3ext/controlpanel/configure.zcml:64
+msgid "Principals management"
+msgstr "Управление пользователÑми"
+
+#: src/z3ext/controlpanel/configure.zcml:64
+msgid "Portal principals management panel."
+msgstr "Панель ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñми ÑиÑтемы."
+
+#: src/z3ext/controlpanel/configure.zcml:7
+msgid "Configure control panel's configlets."
+msgstr "Разрешить конфигурировать конфиглеты."
+
+#: src/z3ext/controlpanel/root.py:34
+#: src/z3ext/controlpanel/browser/configure.zcml:52
msgid "System settings"
msgstr "СиÑтемные уÑтановки"
Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/locales/z3ext.controlpanel.pot
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/locales/z3ext.controlpanel.pot 2009-12-02 01:44:08 UTC (rev 106153)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/locales/z3ext.controlpanel.pot 2009-12-02 03:51:03 UTC (rev 106154)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2003-2004 Zope Foundation and Contributors.
+# Copyright (c) 2003-2004 Zope Corporation and Contributors.
# All Rights Reserved.
#
# This software is subject to the provisions of the Zope Public License,
@@ -14,7 +14,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Development/Unknown\n"
-"POT-Creation-Date: Wed Oct 22 13:26:20 2008\n"
+"POT-Creation-Date: Tue Dec 1 21:47:22 2009\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Zope 3 Developers <zope3-dev at zope.org>\n"
@@ -27,37 +27,68 @@
msgid "There are no configlets in this category."
msgstr ""
-#: src/z3ext/controlpanel/browser/configure.zcml:24
+#: src/z3ext/controlpanel/browser/configure.zcml:23
msgid "View"
msgstr ""
+#: src/z3ext/controlpanel/browser/wizard.py:51
+msgid "Configure"
+msgstr ""
+
+#: src/z3ext/controlpanel/browser/wizard.py:52
+msgid "Configure configlet"
+msgstr ""
+
+#: src/z3ext/controlpanel/browser/wizard.py:67
+msgid "Next"
+msgstr ""
+
+#: src/z3ext/controlpanel/browser/wizard.py:74
+msgid "Save"
+msgstr ""
+
#: src/z3ext/controlpanel/configlettype.py:193
msgid "Field is readonly"
msgstr ""
-#: src/z3ext/controlpanel/configure.zcml:42
+#: src/z3ext/controlpanel/configure.zcml:40
msgid "This area allows you to configure system."
msgstr ""
-#: src/z3ext/controlpanel/configure.zcml:42
+#: src/z3ext/controlpanel/configure.zcml:40
msgid "System configuration"
msgstr ""
-#: src/z3ext/controlpanel/configure.zcml:50
+#: src/z3ext/controlpanel/configure.zcml:48
msgid "User interface configuration"
msgstr ""
-#: src/z3ext/controlpanel/configure.zcml:50
+#: src/z3ext/controlpanel/configure.zcml:48
msgid "This area allows you to configure portal look&feel."
msgstr ""
-#: src/z3ext/controlpanel/configure.zcml:9
+#: src/z3ext/controlpanel/configure.zcml:56
+msgid "Content types"
+msgstr ""
+
+#: src/z3ext/controlpanel/configure.zcml:56
+msgid "This area allows you to configure portal content types."
+msgstr ""
+
+#: src/z3ext/controlpanel/configure.zcml:64
+msgid "Principals management"
+msgstr ""
+
+#: src/z3ext/controlpanel/configure.zcml:64
+msgid "Portal principals management panel."
+msgstr ""
+
+#: src/z3ext/controlpanel/configure.zcml:7
msgid "Configure control panel's configlets."
msgstr ""
-#: src/z3ext/controlpanel/root.py:36
-#: src/z3ext/controlpanel/browser/configure.zcml:53
-#: src/z3ext/controlpanel/browser/configure.zcml:60
+#: src/z3ext/controlpanel/root.py:34
+#: src/z3ext/controlpanel/browser/configure.zcml:52
msgid "System settings"
msgstr ""
Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/root.py
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/root.py 2009-12-02 01:44:08 UTC (rev 106153)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/root.py 2009-12-02 03:51:03 UTC (rev 106154)
@@ -17,13 +17,11 @@
"""
from zope import interface, component
from zope.component import getUtility
+from zope.component.interfaces import ISite
from zope.security import checkPermission
from zope.security.interfaces import Unauthorized
-from zope.traversing.adapters import DefaultTraversable
+from zope.site.hooks import getSite
-from zope.app.component.hooks import getSite
-from zope.app.component.interfaces import ISite
-
from configlet import Configlet
from interfaces import _, IConfiglet, IRootConfiglet, ICategory
Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/storage.py
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/storage.py 2009-12-02 01:44:08 UTC (rev 106153)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/storage.py 2009-12-02 03:51:03 UTC (rev 106154)
@@ -19,9 +19,9 @@
from zope.security.proxy import removeSecurityProxy
from zope.location.interfaces import ILocation
from zope.lifecycleevent import ObjectCreatedEvent
-from zope.app.container.btree import BTreeContainer
-from zope.app.component.hooks import getSite
-from zope.app.component.interfaces import ILocalSiteManager
+from zope.site.hooks import getSite
+from zope.site.interfaces import ILocalSiteManager
+from zope.container.btree import BTreeContainer
from zope.annotation.interfaces import IAttributeAnnotatable
from interfaces import IConfiglet, IConfigletData, IRootConfiglet
Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/testing.py
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/testing.py 2009-12-02 01:44:08 UTC (rev 106153)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/testing.py 2009-12-02 03:51:03 UTC (rev 106154)
@@ -17,8 +17,8 @@
"""
from zope import component, interface
from zope.app.testing import setup
+from zope.site.hooks import getSite, setSite
from zope.annotation.attribute import AttributeAnnotations
-from zope.app.component.hooks import getSite, setSite
from z3ext.controlpanel import storage, root, interfaces
Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/configure.zcml
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/configure.zcml 2009-12-02 01:44:08 UTC (rev 106153)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/configure.zcml 2009-12-02 03:51:03 UTC (rev 106154)
@@ -38,4 +38,10 @@
tests=".interfaces.notAvailable"
permission="zope.Public" />
+ <z3ext:pagelet
+ name="index.html"
+ for=".interfaces.IConfiglet2"
+ class="z3ext.controlpanel.browser.wizard.ConfigletEditWizard"
+ permission="z3ext.Configure" />
+
</configure>
Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/ftesting.zcml
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/ftesting.zcml 2009-12-02 01:44:08 UTC (rev 106153)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/ftesting.zcml 2009-12-02 03:51:03 UTC (rev 106154)
@@ -7,6 +7,7 @@
<includeAllDependencies package="z3ext.controlpanel" extras="test" />
<include package="z3ext.controlpanel.tests" />
+ <includeOverrides package="z3ext.controlpanel.tests" file="overrides.zcml" />
<securityPolicy
component="z3ext.security.securitypolicy.SecurityPolicy" />
Added: z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/layoutportal.pt
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/layoutportal.pt (rev 0)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/layoutportal.pt 2009-12-02 03:51:03 UTC (rev 106154)
@@ -0,0 +1,10 @@
+<html>
+ <body>
+ <div tal:define="context nocall:maincontext"
+ tal:content="structure provider:portal.breadcrumbs"></div>
+ <div id="z-portal-statusmessage"
+ tal:content="structure provider:statusMessage">
+ </div>
+ <tal:block tal:content="structure view/render" />
+ </body>
+</html>
Added: z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/overrides.zcml
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/overrides.zcml (rev 0)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/overrides.zcml 2009-12-02 03:51:03 UTC (rev 106154)
@@ -0,0 +1,12 @@
+<configure
+ xmlns="http://namespaces.zope.org/zope"
+ xmlns:z3ext="http://namespaces.zope.org/z3ext"
+ i18n_domain="zope">
+
+ <z3ext:layout
+ name="portal"
+ title="Test layout"
+ for="zope.component.interfaces.ISite"
+ template="layoutportal.pt" />
+
+</configure>
Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/testbrowser.txt
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/testbrowser.txt 2009-12-02 01:44:08 UTC (rev 106153)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/testbrowser.txt 2009-12-02 03:51:03 UTC (rev 106154)
@@ -36,9 +36,9 @@
>>> browser.getLink('System settings').click()
>>> print browser.contents
- <!DOCTYPE html PUBLIC...
+ <html>
...System settings...
- <BLANKLINE>
+ </html>
Configlet categories, by default only first level of categories is
shown. And only categories that have visible configlets.
@@ -58,20 +58,20 @@
>>> browser.open("http://localhost/settings/category1/")
>>> print browser.contents
- <!DOCTYPE html PUBLIC...
+ <html>
...Category1...
...Category 1 area...
...There are no configlets in this category...
- <BLANKLINE>
+ </html>
>>> browser.open("http://localhost/settings/category2/")
>>> print browser.contents
- <!DOCTYPE html PUBLIC...
+ <html>
...Category2...
...Category 2 area...
...http://localhost/settings/category2/configlet1/...Configlet1...
...http://localhost/settings/category2/configlet2/...Configlet2...
- <BLANKLINE>
+ </html>
But it should not show not available configlets.
@@ -82,3 +82,17 @@
>>> browser.getLink('Configlet1').click()
>>> browser.getControl(name='form.buttons.save').click()
+
+Wizard for configlet
+
+ >>> browser.getLink('Configlet2').click()
+ >>> browser.getLink('Configure').click()
+ >>> browser.getControl('param1').value = 'value 1'
+ >>> browser.getControl('param2').value = '2'
+ >>> browser.getControl('param3').value = 'value 3'
+ >>> browser.getControl('Save').click()
+
+ >>> 'Data successfully updated.' in browser.contents
+ True
+
+
Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/tests.py
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/tests.py 2009-12-02 01:44:08 UTC (rev 106153)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/tests.py 2009-12-02 03:51:03 UTC (rev 106154)
@@ -22,11 +22,11 @@
from zope.app.testing import setup, functional
from zope.copypastemove import ObjectCopier
from zope.component.event import objectEventNotify
+from zope.component.interfaces import ISite
from zope.location.interfaces import ILocation
-from zope.app.component.site import changeSiteConfigurationAfterMove
-from zope.app.component.interfaces import ISite
-from zope.app.container.interfaces import IObjectMovedEvent
-from zope.app.container.contained import dispatchToSublocations
+from zope.site.site import changeSiteConfigurationAfterMove
+from zope.lifecycleevent.interfaces import IObjectMovedEvent
+from zope.container.contained import dispatchToSublocations
from z3ext.controlpanel.configlet import Configlet
from z3ext.controlpanel.testing import setUpControlPanel
Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/zcml.py
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/zcml.py 2009-12-02 01:44:08 UTC (rev 106153)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/zcml.py 2009-12-02 03:51:03 UTC (rev 106154)
@@ -29,12 +29,11 @@
from zope.security import checkPermission
from zope.security.zcml import Permission
from zope.security.checker import Checker, CheckerPublic
+from zope.security.protectclass import protectName, protectSetAttribute
from zope.configuration import fields
from zope.configuration.exceptions import ConfigurationError
-from zope.app.security.protectclass import protectName, protectSetAttribute
-
from configlet import Configlet
from configlettype import ConfigletType
from interfaces import IConfiglet
More information about the checkins
mailing list