--- a/src/pyams_content/shared/site/zmi/container.py Fri Sep 21 12:16:39 2018 +0200
+++ b/src/pyams_content/shared/site/zmi/container.py Fri Sep 21 14:51:25 2018 +0200
@@ -15,63 +15,61 @@
# import standard library
import json
-
from datetime import datetime
+from pyramid.exceptions import NotFound
+from pyramid.location import lineage
+from pyramid.view import view_config
+from z3c.form import field
+from z3c.table.column import GetAttrColumn
+from z3c.table.interfaces import IColumn, IValues
+from zope.interface import implementer
+from zope.intid.interfaces import IIntIds
+from zope.lifecycleevent import ObjectMovedEvent
+
+from pyams_content import _
# import interfaces
-from pyams_content.interfaces import MANAGE_SITE_PERMISSION, MANAGE_CONTENT_PERMISSION
+from pyams_content.interfaces import MANAGE_CONTENT_PERMISSION, MANAGE_SITE_PERMISSION
from pyams_content.shared.common.interfaces import ISharedContent
from pyams_content.shared.common.interfaces.zmi import IDashboardTable
-from pyams_content.shared.site.interfaces import ISiteContainer, ISiteManager, IContentLink
+from pyams_content.shared.common.zmi.dashboard import SharedToolDashboardOwnerColumn, SharedToolDashboardSequenceColumn, \
+ SharedToolDashboardStatusColumn, SharedToolDashboardStatusDateColumn, SharedToolDashboardStatusPrincipalColumn, \
+ SharedToolDashboardVersionColumn
+# import packages
+from pyams_content.shared.site import WfSiteTopic
+from pyams_content.shared.site.interfaces import IContentLink, ISiteContainer, ISiteManager
+from pyams_content.skin import pyams_content
from pyams_content.skin.zmi.interfaces import ISiteTreeMenu, ISiteTreeTable, IUserAddingsMenuLabel
+from pyams_form.form import ajax_config
from pyams_i18n.interfaces import II18n
+from pyams_pagelet.pagelet import pagelet_config
+from pyams_skin.container import ContainerView, delete_container_element
+from pyams_skin.event import get_json_table_cell_refresh_event
from pyams_skin.interfaces import IInnerPage, IPageHeader
from pyams_skin.interfaces.container import ITableElementEditor, ITableElementName, ITableWithActions
from pyams_skin.interfaces.viewlet import IBreadcrumbItem, ITableItemColumnActionsMenu
from pyams_skin.layer import IPyAMSLayer
-from pyams_utils.interfaces import VIEW_SYSTEM_PERMISSION
-from pyams_utils.interfaces.traversing import IPathElements
-from pyams_workflow.interfaces import IWorkflowVersions, IWorkflowPublicationInfo
-from pyams_zmi.interfaces.menu import ISiteManagementMenu, IPropertiesMenu
-from pyams_zmi.layer import IAdminLayer
-from z3c.table.interfaces import IColumn, IValues
-from zope.intid.interfaces import IIntIds
-
-# import packages
-from pyams_content.shared.site import WfTopic
-from pyams_content.shared.common.zmi.dashboard import SharedToolDashboardSequenceColumn, \
- SharedToolDashboardStatusColumn, SharedToolDashboardVersionColumn, SharedToolDashboardStatusDateColumn, \
- SharedToolDashboardStatusPrincipalColumn, SharedToolDashboardOwnerColumn
-from pyams_content.skin import pyams_content
-from pyams_form.form import ajax_config
-from pyams_pagelet.pagelet import pagelet_config
-from pyams_skin.container import ContainerView, delete_container_element
-from pyams_skin.event import get_json_table_cell_refresh_event
from pyams_skin.page import DefaultPageHeaderAdapter
-from pyams_skin.table import BaseTable, TrashColumn, DefaultElementEditorAdapter, NameColumn, SorterColumn, \
- JsActionColumn, I18nColumn
+from pyams_skin.table import BaseTable, DefaultElementEditorAdapter, I18nColumn, JsActionColumn, NameColumn, \
+ SorterColumn, TrashColumn
from pyams_skin.viewlet.breadcrumb import BreadcrumbAdminLayerItem
from pyams_skin.viewlet.menu import MenuItem
from pyams_skin.viewlet.toolbar import ToolbarMenuItem
-from pyams_utils.adapter import adapter_config, ContextRequestViewAdapter, ContextRequestAdapter
+from pyams_utils.adapter import ContextRequestAdapter, ContextRequestViewAdapter, adapter_config
from pyams_utils.fanstatic import get_resource_path
+from pyams_utils.interfaces import VIEW_SYSTEM_PERMISSION
+from pyams_utils.interfaces.traversing import IPathElements
from pyams_utils.registry import get_utility
from pyams_utils.timezone import tztime
from pyams_utils.traversing import get_parent
from pyams_utils.url import absolute_url
from pyams_viewlet.manager import viewletmanager_config
from pyams_viewlet.viewlet import viewlet_config
+from pyams_workflow.interfaces import IWorkflowPublicationInfo, IWorkflowVersions
from pyams_zmi.form import AdminDialogEditForm
+from pyams_zmi.interfaces.menu import IPropertiesMenu, ISiteManagementMenu
+from pyams_zmi.layer import IAdminLayer
from pyams_zmi.view import AdminView
-from pyramid.exceptions import NotFound
-from pyramid.location import lineage
-from pyramid.view import view_config
-from z3c.form import field
-from z3c.table.column import GetAttrColumn
-from zope.interface import implementer
-from zope.lifecycleevent import ObjectMovedEvent
-
-from pyams_content import _
@adapter_config(context=(ISiteContainer, IAdminLayer), provides=IBreadcrumbItem)
@@ -90,7 +88,7 @@
@property
def label(self):
return '{content} ({blog})'.format(
- content=self.request.localizer.translate(WfTopic.content_name),
+ content=self.request.localizer.translate(WfSiteTopic.content_name),
blog=II18n(self.context).query_attribute('title', request=self.request))