# HG changeset patch # User Thierry Florac # Date 1516981166 -3600 # Node ID 6b2f75e600767e1889b0b2f80181fca155d47d52 # Parent 606376dc9d93e00e406b6134af062784c29151fb Refactored ZMI interfaces diff -r 606376dc9d93 -r 6b2f75e60076 src/pyams_content/root/zmi/__init__.py --- a/src/pyams_content/root/zmi/__init__.py Fri Jan 26 16:38:30 2018 +0100 +++ b/src/pyams_content/root/zmi/__init__.py Fri Jan 26 16:39:26 2018 +0100 @@ -22,7 +22,7 @@ from pyams_content.root.interfaces import ISiteRoot from pyams_content.shared.common.interfaces import IBaseSharedTool, IManagerRestrictions from pyams_content.shared.common.interfaces.zmi import ISiteRootDashboardTable -from pyams_content.zmi.interfaces import IDashboardMenu, IMyDashboardMenu, IAllContentsMenu +from pyams_content.skin.zmi.interfaces import IDashboardMenu, IMyDashboardMenu, IAllContentsMenu from pyams_i18n.interfaces import II18n from pyams_skin.interfaces import IInnerPage, IPageHeader from pyams_skin.interfaces.configuration import IBackOfficeConfiguration diff -r 606376dc9d93 -r 6b2f75e60076 src/pyams_content/root/zmi/search.py --- a/src/pyams_content/root/zmi/search.py Fri Jan 26 16:38:30 2018 +0100 +++ b/src/pyams_content/root/zmi/search.py Fri Jan 26 16:39:26 2018 +0100 @@ -20,7 +20,7 @@ from pyams_content.profile.interfaces import IAdminProfile from pyams_content.root import ISiteRoot from pyams_content.shared.common.interfaces.zmi import ISiteRootDashboardTable -from pyams_content.zmi.interfaces import IAllContentsMenu +from pyams_content.skin.zmi.interfaces import IAllContentsMenu from pyams_form.search import ISearchFields, SearchForm, SearchView, SearchResultsView from pyams_i18n.interfaces import INegotiator from pyams_sequence.interfaces import ISequentialIntIds diff -r 606376dc9d93 -r 6b2f75e60076 src/pyams_content/root/zmi/sites.py --- a/src/pyams_content/root/zmi/sites.py Fri Jan 26 16:38:30 2018 +0100 +++ b/src/pyams_content/root/zmi/sites.py Fri Jan 26 16:39:26 2018 +0100 @@ -20,7 +20,7 @@ from pyams_content.root.interfaces import ISiteRoot from pyams_content.shared.common.interfaces import ISharedSite, IBaseSharedTool from pyams_content.shared.common.interfaces.zmi import IDashboardTable -from pyams_content.zmi.interfaces import ISiteTreeMenu, ISiteTreeTable +from pyams_content.skin.zmi.interfaces import ISiteTreeMenu, ISiteTreeTable from pyams_sequence.interfaces import ISequentialIdInfo from pyams_skin.interfaces import IInnerPage, IPageHeader from pyams_skin.interfaces.container import ITableWithActions diff -r 606376dc9d93 -r 6b2f75e60076 src/pyams_content/shared/blog/zmi/manager.py --- a/src/pyams_content/shared/blog/zmi/manager.py Fri Jan 26 16:38:30 2018 +0100 +++ b/src/pyams_content/shared/blog/zmi/manager.py Fri Jan 26 16:39:26 2018 +0100 @@ -17,7 +17,7 @@ from pyams_content.interfaces import MANAGE_SITE_ROOT_PERMISSION, MANAGE_SITE_PERMISSION from pyams_content.root.interfaces import ISiteRoot from pyams_content.shared.blog.interfaces import IBlogManager -from pyams_content.zmi.interfaces import IUserAddingsMenuLabel, ISiteTreeTable +from pyams_content.skin.zmi.interfaces import ISiteTreeTable, IUserAddingsMenuLabel from pyams_i18n.interfaces import II18n, INegotiator from pyams_skin.interfaces.container import ITableElementEditor from pyams_skin.interfaces.viewlet import IToolbarAddingMenu diff -r 606376dc9d93 -r 6b2f75e60076 src/pyams_content/shared/common/zmi/dashboard.py --- a/src/pyams_content/shared/common/zmi/dashboard.py Fri Jan 26 16:38:30 2018 +0100 +++ b/src/pyams_content/shared/common/zmi/dashboard.py Fri Jan 26 16:39:26 2018 +0100 @@ -22,7 +22,7 @@ from pyams_content.shared.common.interfaces import IBaseSharedTool, IWfSharedContent, IManagerRestrictions from pyams_content.shared.common.interfaces.zmi import IDashboardTable, ISharedToolDashboardTable, \ IDashboardSearchHeader -from pyams_content.zmi.interfaces import IDashboardMenu, IMyDashboardMenu, IAllContentsMenu +from pyams_content.skin.zmi.interfaces import IDashboardMenu, IMyDashboardMenu, IAllContentsMenu from pyams_i18n.interfaces import II18n from pyams_security.interfaces import ISecurityManager from pyams_sequence.interfaces import ISequentialIdInfo, ISequentialIdTarget, ISequentialIntIds diff -r 606376dc9d93 -r 6b2f75e60076 src/pyams_content/shared/common/zmi/search.py --- a/src/pyams_content/shared/common/zmi/search.py Fri Jan 26 16:38:30 2018 +0100 +++ b/src/pyams_content/shared/common/zmi/search.py Fri Jan 26 16:39:26 2018 +0100 @@ -20,7 +20,7 @@ from pyams_content.profile.interfaces import IAdminProfile from pyams_content.shared.common.interfaces import IBaseSharedTool from pyams_content.shared.common.interfaces.zmi import ISharedToolDashboardTable -from pyams_content.zmi.interfaces import IAllContentsMenu +from pyams_content.skin.zmi.interfaces import IAllContentsMenu from pyams_i18n.interfaces import INegotiator from pyams_pagelet.interfaces import PageletCreatedEvent from pyams_sequence.interfaces import ISequentialIntIds