[Checkins] SVN: z3ext.controlpanel/trunk/src/z3ext/controlpanel/
Nikolay Kim
fafhrd91 at gmail.com
Thu Aug 12 17:51:53 EDT 2010
Log message for revision 115661:
Changed:
U z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/configure.zcml
U z3ext.controlpanel/trunk/src/z3ext/controlpanel/configure.zcml
U z3ext.controlpanel/trunk/src/z3ext/controlpanel/root.py
U z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/overrides.zcml
-=-
Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/configure.zcml
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/configure.zcml 2010-08-12 20:10:50 UTC (rev 115660)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/configure.zcml 2010-08-12 21:51:52 UTC (rev 115661)
@@ -11,10 +11,10 @@
for="..interfaces.IRootConfiglet"
template="layout.pt" />
- <browser:icon
+ <!--browser:icon
name="zmi_icon"
for="..interfaces.IConfiglet"
- file="preferences-system.png" />
+ file="preferences-system.png" /-->
<browser:defaultView
name="index.html"
@@ -74,10 +74,10 @@
</zcml:configure>
<!-- css styles -->
- <z3ext:resourceinclude
+ <!--z3ext:resourceinclude
name="z3ext-controlpanel.css"
library="z3ext"
type="stylesheet"
- file="styles.css" filetype="zrt" />
+ file="styles.css" filetype="zrt" /-->
</configure>
Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/configure.zcml
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/configure.zcml 2010-08-12 20:10:50 UTC (rev 115660)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/configure.zcml 2010-08-12 21:51:52 UTC (rev 115661)
@@ -2,11 +2,16 @@
xmlns="http://namespaces.zope.org/zope"
xmlns:i18n="http://namespaces.zope.org/i18n"
xmlns:z3ext="http://namespaces.zope.org/z3ext"
+ xmlns:zcml="http://namespaces.zope.org/zcml"
i18n_domain="z3ext.controlpanel">
+ <!--permission
+ id="z3ext.Configure"
+ title="Configure control panel's configlets." /-->
+
<permission
id="z3ext.Configure"
- title="Configure control panel's configlets." />
+ title="View" />
<utility
provides=".interfaces.IConfiglet"
@@ -25,15 +30,15 @@
<adapter factory=".storage.DefaultConfigletDataFactory" />
<class class=".storage.ConfigletData">
- <require
+ <!--require
permission="zope.ManageServices"
- interface="zope.container.interfaces.IContainer" />
+ interface="zope.container.interfaces.IContainer" /-->
</class>
<class class=".storage.ConfigletDataStorage">
- <require
+ <!--require
permission="zope.ManageServices"
- interface="zope.container.interfaces.IContainer" />
+ interface="zope.container.interfaces.IContainer" /-->
</class>
<!-- default categories -->
@@ -71,7 +76,7 @@
<!-- settings view -->
<adapter
name="settings"
- for="zope.component.interfaces.ISite *"
+ for="zope.app.component.interfaces.ISite *"
provides="zope.interface.Interface"
factory=".root.getSettings" />
@@ -91,7 +96,6 @@
<!-- Registering documentation with API doc -->
<configure
xmlns:apidoc="http://namespaces.zope.org/apidoc"
- xmlns:zcml="http://namespaces.zope.org/zcml"
zcml:condition="have apidoc">
<apidoc:bookchapter
@@ -105,7 +109,8 @@
<utility
name="z3ext.controlpanel"
provides="zope.app.generations.interfaces.ISchemaManager"
- component=".generations.schemaManager" />
+ component=".generations.schemaManager"
+ zcml:condition="installed zope.app.generations" />
<!-- translations -->
<i18n:registerTranslations directory="locales"/>
Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/root.py
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/root.py 2010-08-12 20:10:50 UTC (rev 115660)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/root.py 2010-08-12 21:51:52 UTC (rev 115661)
@@ -17,7 +17,7 @@
"""
from zope import interface, component
from zope.component import getUtility
-from zope.component.interfaces import ISite
+from zope.app.component.interfaces import ISite
from zope.security import checkPermission
from zope.security.interfaces import Unauthorized
from zope.site.hooks import getSite
Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/overrides.zcml
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/overrides.zcml 2010-08-12 20:10:50 UTC (rev 115660)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/overrides.zcml 2010-08-12 21:51:52 UTC (rev 115661)
@@ -6,7 +6,7 @@
<z3ext:layout
name="portal"
title="Test layout"
- for="zope.component.interfaces.ISite"
+ for="zope.app.component.interfaces.ISite"
template="layoutportal.pt" />
</configure>
More information about the checkins
mailing list