${structure:tales:html(description)}
- ${link_info.user_title}
+
-
+
-
+
+
+
- -
-
${structure:tales:html(description)}
- ${item_info.user_title} +- +
diff -r e5d91569642f -r 58c9992cb4dc src/pyams_default_theme/component/association/viewlet.py --- a/src/pyams_default_theme/component/association/viewlet.py Tue Oct 09 17:51:18 2018 +0200 +++ b/src/pyams_default_theme/component/association/viewlet.py Tue Nov 13 14:48:49 2018 +0100 @@ -16,13 +16,14 @@ from pyams_skin.layer import IPyAMSUserLayer from pyams_content.component.association.interfaces import IAssociationContainer, IAssociationInfo -from pyams_content.component.extfile.interfaces import IExtFile +from pyams_content.component.extfile.interfaces import IExtFile, IExtFileManagerInfo from pyams_content.component.links.interfaces import IBaseLink +from pyams_i18n.interfaces import II18n from pyams_template.template import template_config from pyams_viewlet.viewlet import ViewContentProvider, contentprovider_config -@contentprovider_config(name='pyams.association', layer=IPyAMSUserLayer, view=Interface) +@contentprovider_config(name='pyams.associations', layer=IPyAMSUserLayer, view=Interface) @template_config(template='templates/association-viewlet.pt', layer=IPyAMSUserLayer) class AssociationContentProvider(ViewContentProvider): """Association default content provider""" @@ -49,3 +50,9 @@ self.attachments.append(item) elif IBaseLink.providedBy(item): self.links.append(item) + + @property + def attachments_title_prefix(self): + manager_info = IExtFileManagerInfo(self.request.root, None) + if manager_info is not None: + return II18n(manager_info).query_attribute('default_title_prefix', request=self.request) diff -r e5d91569642f -r 58c9992cb4dc src/pyams_default_theme/component/gallery/__init__.py --- a/src/pyams_default_theme/component/gallery/__init__.py Tue Oct 09 17:51:18 2018 +0200 +++ b/src/pyams_default_theme/component/gallery/__init__.py Tue Nov 13 14:48:49 2018 +0100 @@ -12,15 +12,15 @@ __docformat__ = 'restructuredtext' - from pyams_content.component.gallery.interfaces import IBaseGallery from pyams_content.features.renderer.interfaces import IContentRenderer -from pyams_content.features.renderer.skin import BaseContentRenderer -from pyams_default_theme import _ +from pyams_default_theme.features.renderer import BaseContentRenderer from pyams_skin.layer import IPyAMSLayer from pyams_template.template import template_config from pyams_utils.adapter import adapter_config +from pyams_default_theme import _ + class BaseGalleryRenderer(BaseContentRenderer): """Base gallery renderer""" diff -r e5d91569642f -r 58c9992cb4dc src/pyams_default_theme/component/gallery/templates/renderer-default.pt --- a/src/pyams_default_theme/component/gallery/templates/renderer-default.pt Tue Oct 09 17:51:18 2018 +0200 +++ b/src/pyams_default_theme/component/gallery/templates/renderer-default.pt Tue Nov 13 14:48:49 2018 +0100 @@ -2,33 +2,19 @@+
+- - + timestamp tales:timestamp(image);"> + + + + - - - - - + + + diff -r e5d91569642f -r 58c9992cb4dc src/pyams_default_theme/component/illustration/__init__.py --- a/src/pyams_default_theme/component/illustration/__init__.py Tue Oct 09 17:51:18 2018 +0200 +++ b/src/pyams_default_theme/component/illustration/__init__.py Tue Nov 13 14:48:49 2018 +0100 @@ -21,13 +21,15 @@ from pyams_content.component.illustration.interfaces import IIllustration from pyams_content.component.links import IInternalLink from pyams_content.features.renderer.interfaces import IContentRenderer -from pyams_content.features.renderer.skin import BaseContentRenderer from pyams_content.interfaces import IBaseContent from pyams_content.root import ISiteRoot +from pyams_content.shared.common import ISharedContent +from pyams_content.shared.site.interfaces import IContentLink from pyams_default_theme.component.illustration.interfaces import IIllustrationRenderer, IIllustrationWithZoomSettings, \ ILLUSTRATION_AFTER_BODY, ILLUSTRATION_BEFORE_BODY -from pyams_default_theme.interfaces import IContentHeaderIllustration, IContentNavigationIllustration, \ - IContentBannerIllustration +from pyams_default_theme.features.renderer import BaseContentRenderer +from pyams_default_theme.interfaces import IContentBannerIllustration, IContentHeaderIllustration, \ + IContentNavigationIllustration from pyams_skin.layer import IPyAMSLayer from pyams_template.template import template_config from pyams_utils.adapter import ContextRequestViewAdapter, adapter_config, get_annotation_adapter @@ -74,6 +76,22 @@ return None +@adapter_config(context=(ISharedContent, IPyAMSLayer), provides=IContentNavigationIllustration) +def shared_content_illustration_factory(context, request): + """Shared content illustration factory""" + version = context.published_version + if version is not None: + return request.registry.queryMultiAdapter((version, request), IContentNavigationIllustration) + + +@adapter_config(context=(IContentLink, IPyAMSLayer), provides=IContentNavigationIllustration) +def content_link_illustration_factory(context, request): + """Content link illustration factory""" + target = context.target + if target is not None: + return request.registry.queryMultiAdapter((target, request), IContentNavigationIllustration) + + @adapter_config(name='pyams_illustration', context=(Interface, Interface, Interface), provides=ITALESExtension) diff -r e5d91569642f -r 58c9992cb4dc src/pyams_default_theme/component/illustration/templates/illustration-default.pt --- a/src/pyams_default_theme/component/illustration/templates/illustration-default.pt Tue Oct 09 17:51:18 2018 +0200 +++ b/src/pyams_default_theme/component/illustration/templates/illustration-default.pt Tue Nov 13 14:48:49 2018 +0100 @@ -1,36 +1,7 @@
-diff -r e5d91569642f -r 58c9992cb4dc src/pyams_default_theme/component/illustration/templates/illustration-left.pt --- a/src/pyams_default_theme/component/illustration/templates/illustration-left.pt Tue Oct 09 17:51:18 2018 +0200 +++ b/src/pyams_default_theme/component/illustration/templates/illustration-left.pt Tue Nov 13 14:48:49 2018 +0100 @@ -1,13 +1,15 @@ -- - +- - - - - - - - -
+ diff -r e5d91569642f -r 58c9992cb4dc src/pyams_default_theme/component/illustration/templates/illustration-right.pt --- a/src/pyams_default_theme/component/illustration/templates/illustration-right.pt Tue Oct 09 17:51:18 2018 +0200 +++ b/src/pyams_default_theme/component/illustration/templates/illustration-right.pt Tue Nov 13 14:48:49 2018 +0100 @@ -1,13 +1,15 @@ -+ diff -r e5d91569642f -r 58c9992cb4dc src/pyams_default_theme/component/keynumber/__init__.py --- a/src/pyams_default_theme/component/keynumber/__init__.py Tue Oct 09 17:51:18 2018 +0200 +++ b/src/pyams_default_theme/component/keynumber/__init__.py Tue Nov 13 14:48:49 2018 +0100 @@ -12,15 +12,10 @@ __docformat__ = 'restructuredtext' -# import standard library - -# import interfaces from pyams_content.component.keynumber.interfaces import IKeyNumberContainer, IKeyNumberParagraph from pyams_content.features.renderer.interfaces import IContentRenderer +from pyams_default_theme.features.renderer import BaseContentRenderer from pyams_skin.layer import IPyAMSLayer - -# import packages -from pyams_content.features.renderer.skin import BaseContentRenderer from pyams_template.template import template_config from pyams_utils.adapter import adapter_config diff -r e5d91569642f -r 58c9992cb4dc src/pyams_default_theme/component/paragraph/audio.py --- a/src/pyams_default_theme/component/paragraph/audio.py Tue Oct 09 17:51:18 2018 +0200 +++ b/src/pyams_default_theme/component/paragraph/audio.py Tue Nov 13 14:48:49 2018 +0100 @@ -13,15 +13,10 @@ __docformat__ = 'restructuredtext' -# import standard library - -# import interfaces from pyams_content.component.paragraph.interfaces.audio import IAudioParagraph from pyams_content.features.renderer.interfaces import IContentRenderer +from pyams_default_theme.features.renderer import BaseContentRenderer from pyams_skin.layer import IPyAMSLayer - -# import packages -from pyams_content.features.renderer.skin import BaseContentRenderer from pyams_template.template import template_config from pyams_utils.adapter import adapter_config diff -r e5d91569642f -r 58c9992cb4dc src/pyams_default_theme/component/paragraph/contact.py --- a/src/pyams_default_theme/component/paragraph/contact.py Tue Oct 09 17:51:18 2018 +0200 +++ b/src/pyams_default_theme/component/paragraph/contact.py Tue Nov 13 14:48:49 2018 +0100 @@ -12,23 +12,18 @@ __docformat__ = 'restructuredtext' +from persistent import Persistent +from zope.interface import implementer +from zope.location import Location +from zope.schema.fieldproperty import FieldProperty -# import standard library -from persistent import Persistent - -# import interfaces -from pyams_content.component.paragraph.interfaces.contact import have_gis, IContactParagraph +from pyams_content.component.paragraph.interfaces.contact import IContactParagraph, have_gis from pyams_content.features.renderer.interfaces import IContentRenderer from pyams_default_theme.component.paragraph.interfaces.contact import IContactParagraphDefaultRendererSettings +from pyams_default_theme.features.renderer import BaseContentRenderer from pyams_skin.layer import IPyAMSLayer - -# import packages -from pyams_content.features.renderer.skin import BaseContentRenderer from pyams_template.template import template_config from pyams_utils.adapter import adapter_config, get_annotation_adapter -from zope.interface import implementer -from zope.location import locate, Location -from zope.schema.fieldproperty import FieldProperty from pyams_default_theme import _ diff -r e5d91569642f -r 58c9992cb4dc src/pyams_default_theme/component/paragraph/container.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/pyams_default_theme/component/paragraph/container.py Tue Nov 13 14:48:49 2018 +0100 @@ -0,0 +1,50 @@ +# +# Copyright (c) 2008-2018 Thierry Florac+# All Rights Reserved. +# +# This software is subject to the provisions of the Zope Public License, +# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution. +# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED +# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS +# FOR A PARTICULAR PURPOSE. +# + +__docformat__ = 'restructuredtext' + +from pyams_content.component.paragraph import IParagraphContainer, IParagraphContainerTarget +from pyams_content.component.paragraph.interfaces import IParagraphRenderer +from pyams_content.features.renderer.interfaces import ISharedContentRenderer +from pyams_default_theme.features.renderer import BaseContentRenderer +from pyams_skin.layer import IPyAMSLayer +from pyams_utils.adapter import adapter_config + + +@adapter_config(name='paragraphs-render', context=(IParagraphContainerTarget, IPyAMSLayer), + provides=ISharedContentRenderer) +class ParagraphsContainerRenderer(BaseContentRenderer): + """Paragraphs container renderer""" + + weight = 10 + + def __init__(self, context, request): + super(ParagraphsContainerRenderer, self).__init__(context, request) + paragraphs = [para for para in IParagraphContainer(self.context).values() + if para.visible] + registry = self.request.registry + self.renderers = [registry.queryMultiAdapter((paragraph, self.request), IParagraphRenderer) + for paragraph in paragraphs] + + def update(self): + super(ParagraphsContainerRenderer, self).update() + for renderer in self.renderers: + if renderer is not None: + renderer.language = self.language + renderer.update() + + def render(self): + result = '' + for renderer in self.renderers: + if renderer is not None: + result += renderer.render() + return result diff -r e5d91569642f -r 58c9992cb4dc src/pyams_default_theme/component/paragraph/frame.py --- a/src/pyams_default_theme/component/paragraph/frame.py Tue Oct 09 17:51:18 2018 +0200 +++ b/src/pyams_default_theme/component/paragraph/frame.py Tue Nov 13 14:48:49 2018 +0100 @@ -12,31 +12,25 @@ __docformat__ = 'restructuredtext' +from persistent import Persistent +from zope.interface import implementer +from zope.location import Location +from zope.schema.fieldproperty import FieldProperty -# import standard library -from persistent import Persistent - -# import interfaces from pyams_content.component.association.interfaces import IAssociationContainer from pyams_content.component.illustration.interfaces import IIllustration from pyams_content.component.paragraph.interfaces.frame import IFrameParagraph from pyams_content.features.renderer.interfaces import IContentRenderer from pyams_content.reference.pictograms.interfaces import IPictogramTable -from pyams_default_theme.component.paragraph.interfaces.frame import IFrameParagraphRendererSettings, \ - ILateralFrameParagraphRendererSettings, IDefaultFrameParagraphRendererSettings, ILeftFrameParagraphRendererSettings, \ +from pyams_default_theme.component.paragraph.interfaces.frame import IDefaultFrameParagraphRendererSettings, \ + IFrameParagraphRendererSettings, ILateralFrameParagraphRendererSettings, ILeftFrameParagraphRendererSettings, \ IRightFrameParagraphRendererSettings -from pyams_i18n.interfaces import II18n +from pyams_default_theme.features.renderer import BaseContentRenderer from pyams_skin.layer import IPyAMSLayer - -# import packages -from pyams_content.features.renderer.skin import BaseContentRenderer from pyams_template.template import template_config from pyams_utils.adapter import adapter_config, get_annotation_adapter from pyams_utils.registry import query_utility from pyams_utils.zodb import volatile_property -from zope.interface import implementer -from zope.location import Location -from zope.schema.fieldproperty import FieldProperty from pyams_default_theme import _ @@ -54,17 +48,9 @@ class BaseFrameParagraphRendererSettings(Persistent, Location): """Base frame text paragraph renderer settings""" - display_illustration = FieldProperty(IFrameParagraphRendererSettings['display_illustration']) display_associations = FieldProperty(IFrameParagraphRendererSettings['display_associations']) _pictogram_name = FieldProperty(IDefaultFrameParagraphRendererSettings['pictogram_name']) - def can_display_illustration(self): - if not self.display_illustration: - return False - frame = IFrameParagraph(self.__parent__) - illustration = IIllustration(frame, None) - return (illustration is not None) and bool(II18n(illustration).query_attribute('data')) - def can_display_associations(self): if not self.display_associations: return False @@ -144,16 +130,17 @@ """Base frame paragraph renderer""" i18n_context_attrs = ('title', 'body') + + illustration = None illustration_renderer = None def update(self): super(BaseFrameParagraphRenderer, self).update() - if self.settings.can_display_illustration(): - illustration = IIllustration(self.context, None) - renderer = illustration.get_renderer(self.request) + self.illustration = IIllustration(self.context) + if self.illustration.data: + renderer = self.illustration_renderer = self.illustration.get_renderer(self.request) if renderer is not None: renderer.update() - self.illustration_renderer = renderer @adapter_config(name='default', context=(IFrameParagraph, IPyAMSLayer), provides=IContentRenderer) diff -r e5d91569642f -r 58c9992cb4dc src/pyams_default_theme/component/paragraph/html.py --- a/src/pyams_default_theme/component/paragraph/html.py Tue Oct 09 17:51:18 2018 +0200 +++ b/src/pyams_default_theme/component/paragraph/html.py Tue Nov 13 14:48:49 2018 +0100 @@ -12,20 +12,16 @@ __docformat__ = 'restructuredtext' - -# import standard library - -# import interfaces from pyams_content.component.illustration import IIllustration -from pyams_content.component.paragraph.interfaces.html import IRawParagraph, IHTMLParagraph +from pyams_content.component.paragraph.interfaces.html import IHTMLParagraph, IRawParagraph from pyams_content.features.renderer.interfaces import IContentRenderer -# import packages -from pyams_content.features.renderer.skin import BaseContentRenderer -from pyams_default_theme import _ +from pyams_default_theme.features.renderer import BaseContentRenderer from pyams_skin.layer import IPyAMSLayer from pyams_template.template import template_config from pyams_utils.adapter import adapter_config +from pyams_default_theme import _ + # # Raw paragraph default renderer @@ -38,7 +34,7 @@ label = _("Default raw HTML renderer") - i18n_context_attrs = ('title', 'body', ) + i18n_context_attrs = ('title', 'body',) # @@ -52,7 +48,7 @@ label = _("Default rich text renderer") - i18n_context_attrs = ('title', 'body', ) + i18n_context_attrs = ('title', 'body',) illustration = None illustration_renderer = None @@ -64,8 +60,3 @@ renderer = self.illustration_renderer = self.illustration.get_renderer(self.request) if renderer is not None: renderer.update() - - def render_illustration(self): - if not self.illustration_renderer: - return '' - return self.illustration_renderer.render() diff -r e5d91569642f -r 58c9992cb4dc src/pyams_default_theme/component/paragraph/interfaces/frame.py --- a/src/pyams_default_theme/component/paragraph/interfaces/frame.py Tue Oct 09 17:51:18 2018 +0200 +++ b/src/pyams_default_theme/component/paragraph/interfaces/frame.py Tue Nov 13 14:48:49 2018 +0100 @@ -34,14 +34,6 @@ class IFrameParagraphRendererSettings(Interface): """Framed paragraph default renderer settings interface""" - display_illustration = Bool(title=_("Show illustration?"), - description=_("If 'no', illustration will not be displayed"), - required=True, - default=True) - - def can_display_illustration(self): - """Check if illustration can be displayed""" - display_associations = Bool(title=_("Show associations?"), description=_("If 'no', associations will not be displayed"), required=True, diff -r e5d91569642f -r 58c9992cb4dc src/pyams_default_theme/component/paragraph/interfaces/verbatim.py --- a/src/pyams_default_theme/component/paragraph/interfaces/verbatim.py Tue Oct 09 17:51:18 2018 +0200 +++ b/src/pyams_default_theme/component/paragraph/interfaces/verbatim.py Tue Nov 13 14:48:49 2018 +0100 @@ -12,14 +12,8 @@ __docformat__ = 'restructuredtext' - -# import standard library - -# import interfaces - -# import packages from zope.interface import Interface -from zope.schema import Bool, Choice +from zope.schema import Choice from zope.schema.vocabulary import SimpleVocabulary, SimpleTerm from pyams_default_theme import _ @@ -34,23 +28,7 @@ for item in FRAME_POSITIONS]) -class IVerbatimParagraphRendererSettings(Interface): - """Verbatim paragraph default renderer settings interface""" - - display_illustration = Bool(title=_("Show illustration?"), - description=_("If 'no', illustration will not be displayed"), - required=True, - default=True) - - def can_display_illustration(self): - """Check if illustration can be displayed""" - - -class IDefaultVerbatimParagraphRendererSettings(IVerbatimParagraphRendererSettings): - """Verbatim paragraph default renderer settings interface""" - - -class ILateralVerbatimParagraphRendererSettings(IVerbatimParagraphRendererSettings): +class ILateralVerbatimParagraphRendererSettings(Interface): """Verbatim paragraph lateral renderer settings interface""" relative_width = Choice(title=_("Relative width"), diff -r e5d91569642f -r 58c9992cb4dc src/pyams_default_theme/component/paragraph/keypoint.py --- a/src/pyams_default_theme/component/paragraph/keypoint.py Tue Oct 09 17:51:18 2018 +0200 +++ b/src/pyams_default_theme/component/paragraph/keypoint.py Tue Nov 13 14:48:49 2018 +0100 @@ -12,16 +12,10 @@ __docformat__ = 'restructuredtext' - -# import standard library - -# import interfaces from pyams_content.component.paragraph.interfaces.keypoint import IKeypointsParagraph from pyams_content.features.renderer.interfaces import IContentRenderer +from pyams_default_theme.features.renderer import BaseContentRenderer from pyams_skin.layer import IPyAMSLayer - -# import packages -from pyams_content.features.renderer.skin import BaseContentRenderer from pyams_template.template import template_config from pyams_utils.adapter import adapter_config diff -r e5d91569642f -r 58c9992cb4dc src/pyams_default_theme/component/paragraph/map.py --- a/src/pyams_default_theme/component/paragraph/map.py Tue Oct 09 17:51:18 2018 +0200 +++ b/src/pyams_default_theme/component/paragraph/map.py Tue Nov 13 14:48:49 2018 +0100 @@ -16,24 +16,20 @@ from pyams_content.component.paragraph.interfaces.map import have_gis if have_gis: - # import standard library + from zope.interface import implementer + from zope.schema.fieldproperty import FieldProperty - # import interfaces from pyams_content.component.paragraph.interfaces.map import IMapParagraph from pyams_content.features.renderer.interfaces import IContentRenderer from pyams_default_theme.component.paragraph.interfaces.map import IMapParagraphDefaultRendererSettings from pyams_gis.interfaces.configuration import IMapConfiguration from pyams_gis.interfaces.utility import IMapManager from pyams_skin.layer import IPyAMSLayer - - # import packages - from pyams_content.features.renderer.skin import BaseContentRenderer + from pyams_default_theme.features.renderer import BaseContentRenderer from pyams_gis.configuration import MapConfiguration from pyams_template.template import template_config from pyams_utils.adapter import adapter_config, get_annotation_adapter from pyams_utils.registry import get_utility - from zope.interface import implementer - from zope.schema.fieldproperty import FieldProperty from pyams_default_theme import _ diff -r e5d91569642f -r 58c9992cb4dc src/pyams_default_theme/component/paragraph/milestone.py --- a/src/pyams_default_theme/component/paragraph/milestone.py Tue Oct 09 17:51:18 2018 +0200 +++ b/src/pyams_default_theme/component/paragraph/milestone.py Tue Nov 13 14:48:49 2018 +0100 @@ -12,19 +12,15 @@ __docformat__ = 'restructuredtext' - -# import standard library - -# import interfaces from pyams_content.component.paragraph.interfaces.milestone import IMilestoneParagraph from pyams_content.features.renderer.interfaces import IContentRenderer -# import packages -from pyams_content.features.renderer.skin import BaseContentRenderer -from pyams_default_theme import _ +from pyams_default_theme.features.renderer import BaseContentRenderer from pyams_skin.layer import IPyAMSLayer from pyams_template.template import template_config from pyams_utils.adapter import adapter_config +from pyams_default_theme import _ + # # Milestone paragraph default renderer diff -r e5d91569642f -r 58c9992cb4dc src/pyams_default_theme/component/paragraph/pictogram.py --- a/src/pyams_default_theme/component/paragraph/pictogram.py Tue Oct 09 17:51:18 2018 +0200 +++ b/src/pyams_default_theme/component/paragraph/pictogram.py Tue Nov 13 14:48:49 2018 +0100 @@ -14,7 +14,7 @@ from pyams_content.component.paragraph.interfaces.pictogram import IPictogramContainer, IPictogramParagraph from pyams_content.features.renderer.interfaces import IContentRenderer -from pyams_content.features.renderer.skin import BaseContentRenderer +from pyams_default_theme.features.renderer import BaseContentRenderer from pyams_skin.layer import IPyAMSLayer from pyams_template.template import template_config from pyams_utils.adapter import adapter_config diff -r e5d91569642f -r 58c9992cb4dc src/pyams_default_theme/component/paragraph/templates/frame-default.pt --- a/src/pyams_default_theme/component/paragraph/templates/frame-default.pt Tue Oct 09 17:51:18 2018 +0200 +++ b/src/pyams_default_theme/component/paragraph/templates/frame-default.pt Tue Nov 13 14:48:49 2018 +0100 @@ -1,8 +1,15 @@ -diff -r e5d91569642f -r 58c9992cb4dc src/pyams_default_theme/component/paragraph/templates/frame-left.pt --- a/src/pyams_default_theme/component/paragraph/templates/frame-left.pt Tue Oct 09 17:51:18 2018 +0200 +++ b/src/pyams_default_theme/component/paragraph/templates/frame-left.pt Tue Nov 13 14:48:49 2018 +0100 @@ -1,8 +1,16 @@Title
--+ tal:define="settings view.settings; + renderer view.illustration_renderer; + position getattr(renderer, 'position', None) if renderer is not None else None;" + tal:switch="position"> +${view.title}
+body
+-diff -r e5d91569642f -r 58c9992cb4dc src/pyams_default_theme/component/paragraph/templates/frame-right.pt --- a/src/pyams_default_theme/component/paragraph/templates/frame-right.pt Tue Oct 09 17:51:18 2018 +0200 +++ b/src/pyams_default_theme/component/paragraph/templates/frame-right.pt Tue Nov 13 14:48:49 2018 +0100 @@ -1,8 +1,16 @@Title
-+ tal:define="settings view.settings; + renderer view.illustration_renderer; + position getattr(renderer, 'position', None) if renderer is not None else None;" + tal:attributes="class string:${default} col-md-${settings.relative_width}" + tal:switch="position"> +
${view.title}
+body
+-diff -r e5d91569642f -r 58c9992cb4dc src/pyams_default_theme/component/paragraph/templates/html-default.pt --- a/src/pyams_default_theme/component/paragraph/templates/html-default.pt Tue Oct 09 17:51:18 2018 +0200 +++ b/src/pyams_default_theme/component/paragraph/templates/html-default.pt Tue Nov 13 14:48:49 2018 +0100 @@ -1,11 +1,11 @@Title
-+ tal:define="settings view.settings; + renderer view.illustration_renderer; + position getattr(renderer, 'position', None) if renderer is not None else None;" + tal:attributes="class string:${default} col-md-${settings.relative_width}" + tal:switch="position"> +
${view.title}
+body
+${view.title}
-${structure:tales:html(view.body, 'oid_to_href')}-
${structure:provider:pyams.association} + ${structure:provider:pyams.associations}-diff -r e5d91569642f -r 58c9992cb4dc src/pyams_default_theme/component/paragraph/templates/verbatim-left.pt --- a/src/pyams_default_theme/component/paragraph/templates/verbatim-left.pt Tue Oct 09 17:51:18 2018 +0200 +++ b/src/pyams_default_theme/component/paragraph/templates/verbatim-left.pt Tue Nov 13 14:48:49 2018 +0100 @@ -1,17 +1,31 @@+ tal:define="photo i18n:illustration.data; + alt i18n:illustration.alt_title;" + tal:condition="photo"> + ${structure:tales:picture(photo, lg_thumb='portrait', md_thumb='portrait', + sm_thumb='portrait', xs_thumb='portrait', alt=alt)}diff -r e5d91569642f -r 58c9992cb4dc src/pyams_default_theme/component/paragraph/templates/verbatim-right.pt --- a/src/pyams_default_theme/component/paragraph/templates/verbatim-right.pt Tue Oct 09 17:51:18 2018 +0200 +++ b/src/pyams_default_theme/component/paragraph/templates/verbatim-right.pt Tue Nov 13 14:48:49 2018 +0100 @@ -1,17 +1,31 @@Title
---Quote- +Quote+ +Quote+ +diff -r e5d91569642f -r 58c9992cb4dc src/pyams_default_theme/component/paragraph/templates/video-default.pt --- a/src/pyams_default_theme/component/paragraph/templates/video-default.pt Tue Oct 09 17:51:18 2018 +0200 +++ b/src/pyams_default_theme/component/paragraph/templates/video-default.pt Tue Nov 13 14:48:49 2018 +0100 @@ -2,15 +2,9 @@ tal:content="view.title">titleTitle
---Quote- +Quote+ +Quote+ +Description-- - +