# HG changeset patch # User Thierry Florac # Date 1539356690 -7200 # Node ID ac47f95d7bd6146310918b3a7fc52bb86f72c1d4 # Parent 6cdae82405f717498ed6021ca9651ab7ea3db2b8 Updated frame and verbatim paragraphs diff -r 6cdae82405f7 -r ac47f95d7bd6 src/pyams_content/component/paragraph/frame.py --- a/src/pyams_content/component/paragraph/frame.py Thu Oct 11 17:16:15 2018 +0200 +++ b/src/pyams_content/component/paragraph/frame.py Fri Oct 12 17:04:50 2018 +0200 @@ -16,7 +16,7 @@ from zope.schema.fieldproperty import FieldProperty from pyams_content.component.extfile.interfaces import IExtFileContainerTarget -from pyams_content.component.illustration.interfaces import IBasicIllustrationTarget +from pyams_content.component.illustration.interfaces import IIllustrationTarget from pyams_content.component.links.interfaces import ILinkContainerTarget from pyams_content.component.paragraph import BaseParagraph, BaseParagraphContentChecker, BaseParagraphFactory from pyams_content.component.paragraph.interfaces import IParagraphFactory @@ -36,7 +36,7 @@ # Frame paragraph # -@implementer(IFrameParagraph, IBasicIllustrationTarget, IExtFileContainerTarget, ILinkContainerTarget) +@implementer(IFrameParagraph, IIllustrationTarget, IExtFileContainerTarget, ILinkContainerTarget) @factory_config(provided=IFrameParagraph) class FrameParagraph(BaseParagraph): """Framed text paragraph""" diff -r 6cdae82405f7 -r ac47f95d7bd6 src/pyams_content/component/paragraph/zmi/verbatim.py --- a/src/pyams_content/component/paragraph/zmi/verbatim.py Thu Oct 11 17:16:15 2018 +0200 +++ b/src/pyams_content/component/paragraph/zmi/verbatim.py Fri Oct 12 17:04:50 2018 +0200 @@ -9,8 +9,6 @@ # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS # FOR A PARTICULAR PURPOSE. # -from pyams_content.component.paragraph import IBaseParagraph - __docformat__ = 'restructuredtext' @@ -19,6 +17,7 @@ from zope.interface import implementer from pyams_content.component.association.zmi.interfaces import IAssociationsParentForm +from pyams_content.component.paragraph import IBaseParagraph from pyams_content.component.paragraph.interfaces import IParagraphContainer, IParagraphContainerTarget, \ PARAGRAPH_HIDDEN_FIELDS from pyams_content.component.paragraph.interfaces.verbatim import IVerbatimParagraph, VERBATIM_PARAGRAPH_TYPE @@ -33,7 +32,6 @@ from pyams_form.interfaces.form import IInnerForm from pyams_i18n.interfaces import II18n from pyams_pagelet.pagelet import pagelet_config -from pyams_skin.event import get_json_widget_refresh_event from pyams_skin.interfaces.viewlet import IToolbarAddingMenu from pyams_skin.layer import IPyAMSLayer from pyams_utils.adapter import adapter_config @@ -73,6 +71,11 @@ fields = field.Fields(IVerbatimParagraph).omit(*PARAGRAPH_HIDDEN_FIELDS) edit_permission = MANAGE_CONTENT_PERMISSION + def updateWidgets(self, prefix=None): + super(VerbatimParagraphAddForm, self).updateWidgets(prefix) + if 'quote' in self.widgets: + self.widgets['quote'].widget_css_class = 'input height-100' + def create(self, data): return VerbatimParagraph() @@ -109,6 +112,11 @@ edit_permission = MANAGE_CONTENT_PERMISSION + def updateWidgets(self, prefix=None): + super(VerbatimParagraphPropertiesEditForm, self).updateWidgets(prefix) + if 'quote' in self.widgets: + self.widgets['quote'].widget_css_class = 'input height-100' + def get_ajax_output(self, changes): output = super(self.__class__, self).get_ajax_output(changes) if 'quote' in changes.get(IVerbatimParagraph, ()):