# HG changeset patch # User Thierry Florac # Date 1542038175 -3600 # Node ID 6b6a884fa28aa34c99e0aa696ea2e0b8b938f224 # Parent 112b6aa11de418018c89b92cc1ff62a305ac5789 Added illustration marker to illustration paragraph diff -r 112b6aa11de4 -r 6b6a884fa28a src/pyams_content/component/illustration/zmi/__init__.py --- a/src/pyams_content/component/illustration/zmi/__init__.py Mon Nov 12 16:48:29 2018 +0100 +++ b/src/pyams_content/component/illustration/zmi/__init__.py Mon Nov 12 16:56:15 2018 +0100 @@ -18,7 +18,7 @@ from pyams_content.component.illustration.interfaces import IBasicIllustration, IBasicIllustrationTarget, \ IIllustration, IIllustrationTarget, ILinkIllustrationTarget -from pyams_content.component.illustration.zmi.paragraph import ParagraphContainerIllustrationMarker +from pyams_content.component.illustration.zmi.paragraph import ParagraphIllustrationMarker from pyams_content.component.paragraph import IBaseParagraph from pyams_content.component.paragraph.zmi import get_json_paragraph_markers_refresh_event from pyams_content.features.renderer.zmi.widget import RendererFieldWidget @@ -100,12 +100,12 @@ if self.getContent().data: events.append( get_json_paragraph_markers_refresh_event(self.context, self.request, self, - ParagraphContainerIllustrationMarker)) + ParagraphIllustrationMarker)) else: events.append( get_json_paragraph_markers_refresh_event(self.context, self.request, self, EmptyViewlet, - ParagraphContainerIllustrationMarker.marker_type)) + ParagraphIllustrationMarker.marker_type)) events.append(get_json_form_refresh_event(self.context, self.request, self.__class__)) return output diff -r 112b6aa11de4 -r 6b6a884fa28a src/pyams_content/component/illustration/zmi/paragraph.py --- a/src/pyams_content/component/illustration/zmi/paragraph.py Mon Nov 12 16:48:29 2018 +0100 +++ b/src/pyams_content/component/illustration/zmi/paragraph.py Mon Nov 12 16:56:15 2018 +0100 @@ -141,11 +141,13 @@ # Paragraph container illustration marker # +@viewlet_config(name='illustration', context=IIllustrationParagraph, layer=IPyAMSLayer, view=IParagraphContainerTable, + manager=IParagraphTitleToolbar, permission=VIEW_SYSTEM_PERMISSION, weight=5) @viewlet_config(name='illustration', context=IBasicIllustrationTarget, layer=IPyAMSLayer, view=IParagraphContainerTable, manager=IParagraphTitleToolbar, permission=VIEW_SYSTEM_PERMISSION, weight=5) @template_config(template='templates/paragraph-illustration-icon.pt', layer=IPyAMSLayer) -class ParagraphContainerIllustrationMarker(Viewlet): - """Paragraph container illustration marker column""" +class ParagraphIllustrationMarker(Viewlet): + """Paragraph illustration marker column""" weight = 5 action_class = 'action illustration nowrap width-40' @@ -159,5 +161,5 @@ if illustration and illustration.data: for value in illustration.data.values(): if value: - return super(ParagraphContainerIllustrationMarker, self).render() + return super(ParagraphIllustrationMarker, self).render() return ''