diff -r 23ee41f44161 -r 17740c96ce40 src/pyams_content/shared/common/zmi/dashboard.py --- a/src/pyams_content/shared/common/zmi/dashboard.py Tue Oct 11 16:00:27 2016 +0200 +++ b/src/pyams_content/shared/common/zmi/dashboard.py Mon Oct 24 15:53:43 2016 +0200 @@ -25,7 +25,7 @@ from pyams_i18n.interfaces import II18n from pyams_security.interfaces import ISecurityManager from pyams_sequence.interfaces import ISequentialIdInfo, ISequentialIdTarget, ISequentialIntIds -from pyams_skin.interfaces import IInnerPage, IPageHeader +from pyams_skin.interfaces import IPageHeader from pyams_skin.interfaces.container import ITableElementName from pyams_skin.layer import IPyAMSLayer from pyams_utils.interfaces import VIEW_SYSTEM_PERMISSION @@ -54,7 +54,7 @@ from pyams_utils.traversing import get_parent from pyams_viewlet.manager import viewletmanager_config from pyams_viewlet.viewlet import viewlet_config -from pyams_zmi.view import AdminView +from pyams_zmi.view import InnerAdminView from z3c.table.column import GetAttrColumn from zope.interface import implementer, Interface @@ -228,8 +228,7 @@ @pagelet_config(name='dashboard.html', context=ISharedTool, layer=IPyAMSLayer, permission=VIEW_SYSTEM_PERMISSION) @template_config(template='templates/dashboard.pt', layer=IAdminLayer) -@implementer(IInnerPage) -class SharedToolDashboardView(AdminView): +class SharedToolDashboardView(InnerAdminView): """Shared tool dashboard view""" title = _("Contents dashboard") @@ -458,8 +457,7 @@ @pagelet_config(name='my-favorites.html', context=ISharedTool, layer=IPyAMSLayer, permission=VIEW_SYSTEM_PERMISSION) -@implementer(IInnerPage) -class SharedToolFavoritesView(AdminView, ContainerView): +class SharedToolFavoritesView(InnerAdminView, ContainerView): """Shared tool favorites view""" table_class = SharedToolFavoritesTable @@ -520,8 +518,7 @@ @pagelet_config(name='my-preparations.html', context=ISharedTool, layer=IPyAMSLayer, permission=VIEW_SYSTEM_PERMISSION) -@implementer(IInnerPage) -class SharedToolPreparationsView(AdminView, ContainerView): +class SharedToolPreparationsView(InnerAdminView, ContainerView): """Shared tool preparations view""" table_class = SharedToolPreparationsTable @@ -582,8 +579,7 @@ @pagelet_config(name='my-submissions.html', context=ISharedTool, layer=IPyAMSLayer, permission=VIEW_SYSTEM_PERMISSION) -@implementer(IInnerPage) -class SharedToolSubmissionsView(AdminView, ContainerView): +class SharedToolSubmissionsView(InnerAdminView, ContainerView): """Shared tool submissions view""" table_class = SharedToolSubmissionsTable @@ -644,8 +640,7 @@ @pagelet_config(name='my-publications.html', context=ISharedTool, layer=IPyAMSLayer, permission=VIEW_SYSTEM_PERMISSION) -@implementer(IInnerPage) -class SharedToolPublicationsView(AdminView, ContainerView): +class SharedToolPublicationsView(InnerAdminView, ContainerView): """Shared tool publications view""" table_class = SharedToolPublicationsTable @@ -707,8 +702,7 @@ @pagelet_config(name='my-retired-contents.html', context=ISharedTool, layer=IPyAMSLayer, permission=VIEW_SYSTEM_PERMISSION) -@implementer(IInnerPage) -class SharedToolRetiredContentsView(AdminView, ContainerView): +class SharedToolRetiredContentsView(InnerAdminView, ContainerView): """Shared tool retired contents view""" table_class = SharedToolRetiredContentsTable @@ -776,8 +770,7 @@ @pagelet_config(name='my-archived-contents.html', context=ISharedTool, layer=IPyAMSLayer, permission=VIEW_SYSTEM_PERMISSION) -@implementer(IInnerPage) -class SharedToolArchivedContentsView(AdminView, ContainerView): +class SharedToolArchivedContentsView(InnerAdminView, ContainerView): """Shared tool archived contents view""" table_class = SharedToolArchivedContentsTable @@ -860,8 +853,7 @@ @pagelet_config(name='all-publications.html', context=ISharedTool, layer=IPyAMSLayer, permission=VIEW_SYSTEM_PERMISSION) -@implementer(IInnerPage) -class SharedToolAllPublicationsView(AdminView, ContainerView): +class SharedToolAllPublicationsView(InnerAdminView, ContainerView): """Shared tool published contents view""" table_class = SharedToolAllPublicationsTable @@ -926,8 +918,7 @@ @pagelet_config(name='all-updates.html', context=ISharedTool, layer=IPyAMSLayer, permission=VIEW_SYSTEM_PERMISSION) -@implementer(IInnerPage) -class SharedToolAllUpdatesView(AdminView, ContainerView): +class SharedToolAllUpdatesView(InnerAdminView, ContainerView): """Shared tool updated contents view""" table_class = SharedToolAllUpdatesTable