--- a/src/pyams_content/component/paragraph/zmi/pictogram.py Wed Apr 04 15:35:44 2018 +0200
+++ b/src/pyams_content/component/paragraph/zmi/pictogram.py Thu Apr 05 15:30:06 2018 +0200
@@ -35,6 +35,7 @@
from z3c.table.interfaces import IValues, IColumn
# import packages
+from pyams_content.component.paragraph import BaseParagraph
from pyams_content.component.paragraph.pictogram import PictogramParagraph, PictogramItem
from pyams_content.component.paragraph.zmi import BaseParagraphAddMenu, BaseParagraphAJAXAddForm, \
BaseParagraphPropertiesEditForm, BaseParagraphAJAXEditForm
@@ -269,7 +270,7 @@
if pictogram is not None:
image = II18n(pictogram).query_attribute('image', request=self.request)
if image:
- return '<img src="{0}" />'.format(absolute_url(image, self.request, '++thumb++32x32'))
+ return '<img src="{0}" />'.format(absolute_url(image, self.request, '++thumb++48x48'))
return '--'
@@ -318,29 +319,29 @@
class PictogramsTableNameColumn(I18nColumn, I18nAttrColumn):
"""Pictograms table name column"""
- _header = _("Label")
+ _header = _("pictogram-item-header", default="Header")
attrName = 'label'
weight = 10
def getValue(self, obj):
value = super(PictogramsTableNameColumn, self).getValue(obj)
if not value:
- value = II18n(obj.pictogram).query_attribute('title', request=self.request)
- return value
+ value = II18n(obj.pictogram).query_attribute('header', request=self.request)
+ return value or BaseParagraph.empty_title
@adapter_config(name='body', context=(IPictogramContainerTarget, IPyAMSLayer, PictogramsTable), provides=IColumn)
class PictogramsTableBodyColumn(I18nColumn, I18nAttrColumn):
"""Pictograms table body column"""
- _header = _("Body")
+ _header = _("Associated text")
attrName = 'body'
weight = 20
def getValue(self, obj):
value = super(PictogramsTableBodyColumn, self).getValue(obj)
if not value:
- return '--'
+ return BaseParagraph.empty_title
return get_text_start(value, 40, 10)