[Erp5-report] r19842 - in /erp5/trunk/bt5/erp5_odt_style: SkinTemplateItem/portal_skins/erp...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Mar 13 13:49:20 CET 2008
Author: jerome
Date: Thu Mar 13 13:49:19 2008
New Revision: 19842
URL: http://svn.erp5.org?rev=19842&view=rev
Log:
Support ImageFields in form_view
Added:
erp5/trunk/bt5/erp5_odt_style/bt/template_catalog_datetime_key_list
erp5/trunk/bt5/erp5_odt_style/bt/template_catalog_local_role_key_list
erp5/trunk/bt5/erp5_odt_style/bt/template_catalog_role_key_list
erp5/trunk/bt5/erp5_odt_style/bt/template_catalog_scriptable_key_list
Modified:
erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml
erp5/trunk/bt5/erp5_odt_style/bt/revision
Modified: erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml?rev=19842&r1=19841&r2=19842&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml (original)
+++ erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml Thu Mar 13 13:49:19 2008
@@ -136,7 +136,6 @@
xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n
xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n
tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n
- tal:define="global frame_width python:25.8"\n
office:version=\'1.0\'>\n
<office:scripts/>\n
<office:font-face-decls>\n
@@ -226,39 +225,56 @@
<table:table-column table:style-name=\'field-table.A\'/>\n
<table:table-column table:style-name=\'field-table.A\'/>\n
<tal:block tal:repeat="field field_list">\n
- <tal:block tal:condition="python:field.meta_type != \'HiddenStringField\'">\n
+ <tal:block tal:define="field_type python: field.meta_type == \'ProxyField\' and field.getRecursiveTemplateField().meta_type or field.meta_type">\n
+ <tal:block tal:condition="python:field_type not in (\'HiddenStringField\', \'FileField\')">\n
<table:table-row>\n
<table:table-cell table:style-name=\'field-table.A1\' office:value-type=\'string\'>\n
- <text:p text:style-name=\'field-label\' tal:content="python: here.Localizer.erp5_ui.gettext(field.get_value(\'title\')).encode(\'utf-8\')"/>\n
+ <text:p text:style-name=\'field-label\' \n
+ i18n:domain=\'ui\'\n
+ i18n:translate=\'\'\n
+ tal:content="python: field.get_value(\'title\')"/>\n
</table:table-cell>\n
<tal:block tal:define="item_list python:field.has_value(\'items\') and field.get_value(\'items\') or None">\n
- <table:table-cell table:style-name=\'field-table.B1\' office:value-type=\'string\' tal:define="value python: field.get_value(\'default\')">\n
- <tal:block tal:condition="python: same_type(value,[]) or same_type(value,())">\n
- <tal:block tal:repeat="item value">\n
- <text:p text:style-name=\'field-content\'\n
- tal:content="python: str(item)"\n
- tal:condition="not:item_list"/>\n
- <text:p text:style-name=\'field-content\'\n
- tal:content="python: [i[0] for i in item_list if i[1] == item][0]"\n
- tal:condition="item_list" />\n
+ <table:table-cell table:style-name=\'field-table.B1\' \n
+ office:value-type=\'string\'\n
+ tal:define="value python: field.get_value(\'default\')">\n
+\n
+ <tal:block tal:condition="python: field_type not in (\'ImageField\', )">\n
+ <tal:block tal:condition="python: same_type(value,[]) or same_type(value,())">\n
+ <tal:block tal:repeat="item value">\n
+ <text:p text:style-name=\'field-content\'\n
+ tal:content="python: str(item)"\n
+ tal:condition="not:item_list"/>\n
+ <text:p text:style-name=\'field-content\'\n
+ tal:content="python: [i[0] for i in item_list if i[1] == item][0]"\n
+ tal:condition="item_list" />\n
+ </tal:block>\n
</tal:block>\n
+ <tal:block tal:condition="python: (not (same_type(value,[]) or same_type(value,()) )) and (value != None)">\n
+ <text:p text:style-name=\'field-content\'\n
+ tal:content="python:str(value)"\n
+ tal:condition="not:item_list" />\n
+ <text:p text:style-name=\'field-content\'\n
+ tal:content="python: field.render_pdf(value)"\n
+ tal:condition="item_list" />\n
+ </tal:block>\n
+ <tal:block tal:condition="python: value is None">\n
+ <text:p text:style-name=\'field-content\' tal:content="python: \' \'" />\n
+ </tal:block> \n
</tal:block>\n
- <tal:block tal:condition="python: (not (same_type(value,[]) or same_type(value,()) )) and (value != None)">\n
- <text:p text:style-name=\'field-content\'\n
- tal:content="python:str(value)"\n
- tal:condition="not:item_list" />\n
- <text:p text:style-name=\'field-content\'\n
- tal:content="python: field.render_pdf(value)"\n
- tal:condition="item_list" />\n
- </tal:block> \n
- <tal:block tal:condition="python: value == None">\n
- <text:p text:style-name=\'field-content\' tal:content="python: \' \'" />\n
- </tal:block> \n
+ <tal:block tal:condition="python: field_type == \'ImageField\'">\n
+ <text:p text:style-name=\'field-content\'\n
+ tal:define="size python: modules[\'Products.ERP5.Document.Image\'].getSizeFromImageDisplay(field.get_value(\'image_display\'))">\n
+ <office:include_img tal:attributes="width python: (size and size[0] or 100) / 20.;\n
+ path python: \'/\'.join(request.physicalPathFromURL(field.get_value(\'default\')));"/>\n
+ </text:p>\n
+ </tal:block>\n
</table:table-cell>\n
</tal:block>\n
</table:table-row>\n
</tal:block>\n
</tal:block>\n
+ </tal:block>\n
</table:table> \n
<text:p></text:p>\n
<text:p></text:p>\n
@@ -268,16 +284,25 @@
</tal:block>\n
<tal:block tal:define="field_list python: form.get_fields_in_group(\'bottom\')">\n
<tal:block tal:repeat="field field_list">\n
- <tal:block tal:condition="python: field.meta_type == \'MatrixBox\'">\n
+ <tal:block tal:define="field_type python: field.meta_type == \'ProxyField\' and field.getRecursiveTemplateField().meta_type or field.meta_type">\n
+ <tal:block tal:condition="python: field_type == \'MatrixBox\'">\n
<tal:block tal:define="matrixbox python:field;">\n
<div metal:use-macro="here/matrixbox_odt_macro/macros/matrixbox" />\n
</tal:block>\n
</tal:block>\n
- <tal:block tal:condition="python: field.meta_type == \'ListBox\' or (field.meta_type == \'ProxyField\' and field.getRecursiveTemplateField().meta_type == \'ListBox\')">\n
+ <tal:block tal:condition="python: field_type == \'ListBox\'">\n
<tal:block tal:define="listbox python:field;" >\n
<div metal:use-macro="here/listbox_odt_macro/macros/listbox" />\n
</tal:block>\n
</tal:block>\n
+ <tal:block tal:condition="python: field_type == \'ImageField\'">\n
+ <text:p text:style-name=\'field-content\'\n
+ tal:define="size python: modules[\'Products.ERP5.Document.Image\'].getSizeFromImageDisplay(field.get_value(\'image_display\'))">\n
+ <office:include_img tal:attributes="width python: (size and size[0] or 100) / 20.;\n
+ path python: \'/\'.join(request.physicalPathFromURL(field.get_value(\'default\')));"/>\n
+ </text:p>\n
+ </tal:block>\n
+ </tal:block>\n
</tal:block>\n
</tal:block> \n
</tal:block>\n
Modified: erp5/trunk/bt5/erp5_odt_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_odt_style/bt/revision?rev=19842&r1=19841&r2=19842&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_odt_style/bt/revision (original)
+++ erp5/trunk/bt5/erp5_odt_style/bt/revision Thu Mar 13 13:49:19 2008
@@ -1,1 +1,1 @@
-23
+27
Added: erp5/trunk/bt5/erp5_odt_style/bt/template_catalog_datetime_key_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_odt_style/bt/template_catalog_datetime_key_list?rev=19842&view=auto
==============================================================================
(empty)
Added: erp5/trunk/bt5/erp5_odt_style/bt/template_catalog_local_role_key_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_odt_style/bt/template_catalog_local_role_key_list?rev=19842&view=auto
==============================================================================
(empty)
Added: erp5/trunk/bt5/erp5_odt_style/bt/template_catalog_role_key_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_odt_style/bt/template_catalog_role_key_list?rev=19842&view=auto
==============================================================================
(empty)
Added: erp5/trunk/bt5/erp5_odt_style/bt/template_catalog_scriptable_key_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_odt_style/bt/template_catalog_scriptable_key_list?rev=19842&view=auto
==============================================================================
(empty)
More information about the Erp5-report
mailing list