--- a/src/pyams_content/component/illustration/__init__.py Thu Sep 06 17:43:49 2018 +0200
+++ b/src/pyams_content/component/illustration/__init__.py Thu Sep 06 18:06:14 2018 +0200
@@ -52,9 +52,10 @@
class BasicIllustration(Persistent, Contained):
"""Illustration persistent class"""
- _data = I18nFileProperty(IIllustration['data'])
- title = FieldProperty(IIllustration['title'])
- alt_title = FieldProperty(IIllustration['alt_title'])
+ _data = I18nFileProperty(IBasicIllustration['data'])
+ title = FieldProperty(IBasicIllustration['title'])
+ alt_title = FieldProperty(IBasicIllustration['alt_title'])
+ author = FieldProperty(IBasicIllustration['author'])
@property
def data(self):
@@ -94,7 +95,6 @@
"""Illustration persistent class"""
description = FieldProperty(IIllustration['description'])
- author = FieldProperty(IIllustration['author'])
renderer = FieldProperty(IIllustration['renderer'])
--- a/src/pyams_content/component/illustration/interfaces/__init__.py Thu Sep 06 17:43:49 2018 +0200
+++ b/src/pyams_content/component/illustration/interfaces/__init__.py Thu Sep 06 18:06:14 2018 +0200
@@ -57,6 +57,10 @@
description=_("Alternate title used to describe image content"),
required=False)
+ author = TextLine(title=_("Author"),
+ description=_("Name of picture's author"),
+ required=False)
+
class IIllustration(IBasicIllustration, IRenderedContent):
"""Illustration paragraph"""
@@ -65,10 +69,6 @@
description=_("Illustration description displayed in front-office templates"),
required=False)
- author = TextLine(title=_("Author"),
- description=_("Name of picture's author"),
- required=False)
-
renderer = Choice(title=_("Illustration template"),
description=_("Presentation template used for illustration"),
vocabulary=ILLUSTRATION_RENDERERS,
--- a/src/pyams_content/component/paragraph/verbatim.py Thu Sep 06 17:43:49 2018 +0200
+++ b/src/pyams_content/component/paragraph/verbatim.py Thu Sep 06 18:06:14 2018 +0200
@@ -16,7 +16,7 @@
# import standard library
# import interfaces
-from pyams_content.component.illustration.interfaces import IIllustrationTarget
+from pyams_content.component.illustration.interfaces import IIllustrationTarget, IBasicIllustrationTarget
from pyams_content.component.paragraph.interfaces import IParagraphFactory
from pyams_content.component.paragraph.interfaces.verbatim import IVerbatimParagraph, VERBATIM_PARAGRAPH_TYPE, \
VERBATIM_PARAGRAPH_RENDERERS, VERBATIM_PARAGRAPH_NAME
@@ -39,7 +39,7 @@
# Frame paragraph
#
-@implementer(IVerbatimParagraph, IIllustrationTarget)
+@implementer(IVerbatimParagraph, IBasicIllustrationTarget)
@factory_config(provided=IVerbatimParagraph)
class VerbatimParagraph(BaseParagraph):
"""Verbatim paragraph"""