--- a/src/pyams_content/shared/site/interfaces/__init__.py Fri Sep 21 12:16:39 2018 +0200
+++ b/src/pyams_content/shared/site/interfaces/__init__.py Fri Sep 21 14:51:25 2018 +0200
@@ -16,19 +16,19 @@
from zope.annotation.interfaces import IAttributeAnnotatable
from zope.container.constraints import containers, contains
-from zope.container.interfaces import IContainer, IContained
-from zope.interface import Interface, Attribute
-from zope.schema import Text, Bool, Choice
-from zope.schema.vocabulary import SimpleVocabulary, SimpleTerm
-
-from pyams_content.interfaces import IBaseContent
-from pyams_content.shared.common.interfaces import ISharedSite, ISharedContent, \
- IBaseContentManagerRoles, IBaseSharedTool, IDeletableElement, IWfSharedContentPortalContext
-from pyams_i18n.schema import I18nTextLineField, I18nTextField
-from pyams_sequence.interfaces import ISequentialIdTarget, IInternalReference
-from pyams_workflow.interfaces import IWorkflowPublicationSupport
+from zope.container.interfaces import IContained, IContainer
+from zope.interface import Attribute, Interface
+from zope.schema import Bool, Choice, Text
+from zope.schema.vocabulary import SimpleTerm, SimpleVocabulary
from pyams_content import _
+from pyams_content.interfaces import IBaseContent
+from pyams_content.shared.common.interfaces import IBaseContentManagerRoles, IBaseSharedTool, IDeletableElement, \
+ ISharedSite
+from pyams_content.shared.topic.interfaces import ITopic, IWfTopic, IWfTopicFactory
+from pyams_i18n.schema import I18nTextField, I18nTextLineField
+from pyams_sequence.interfaces import IInternalReference, ISequentialIdTarget
+from pyams_workflow.interfaces import IWorkflowPublicationSupport
FOLDER_REDIRECT_DISPLAY_MODE = 'redirect'
@@ -129,20 +129,20 @@
"""Site manager factory interface"""
-TOPIC_CONTENT_TYPE = 'topic'
-TOPIC_CONTENT_NAME = _("Topic")
+SITE_TOPIC_CONTENT_TYPE = 'site-topic'
+SITE_TOPIC_CONTENT_NAME = _("Site topic")
-class IWfTopic(IWfSharedContentPortalContext):
- """Topic interface"""
+class IWfSiteTopic(IWfTopic):
+ """Site topic interface"""
-class IWfTopicFactory(Interface):
+class IWfSiteTopicFactory(IWfTopicFactory):
"""Topic factory interface"""
-class ITopic(ISharedContent, ISiteElement):
- """Workflow managed topic interface"""
+class ISiteTopic(ITopic, ISiteElement):
+ """Workflow managed site topic interface"""
class IContentLink(ISiteElement, IInternalReference, IAttributeAnnotatable):