Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
erp5
Commits
adfb2a16
Commit
adfb2a16
authored
Dec 31, 2014
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ods_style: minor simplifications
parent
a42081b0
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
15 deletions
+11
-15
bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/field_ods_macro.xml
...plateItem/portal_skins/erp5_ods_style/field_ods_macro.xml
+2
-3
bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_view.xml
...kinTemplateItem/portal_skins/erp5_ods_style/form_view.xml
+1
-3
bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/listbox_ods_macro.xml
...ateItem/portal_skins/erp5_ods_style/listbox_ods_macro.xml
+8
-9
No files found.
bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/field_ods_macro.xml
View file @
adfb2a16
...
...
@@ -226,7 +226,7 @@
<text:p
tal:content=
"python: field.render_pdf(value)"
/>
\n
</table:table-cell>
\n
</tal:block>
\n
<tal:block
tal:condition=
"python:
field.get_value(\'date_only\')==0
"
>
\n
<tal:block
tal:condition=
"python:
not field.get_value(\'date_only\')
"
>
\n
<table:table-cell
tal:attributes=
"office:date-value python: context.ERP5Site_formatDateForODF(value);\n
table:style-name string:${style_prefix}date_with_time;"
\n
table:style-name=
"date_with_time"
\n
...
...
@@ -261,8 +261,7 @@
<tal:block
tal:condition=
"python: value is None"
>
\n
<table:table-cell
office:value-type=
\'string\'\n
tal:attributes=
"table:style-name string:${style_prefix}text"
\n
table:style-name=
\'text\'\n
table:number-columns-spanned=
\'1\'
>
\n
table:style-name=
\'text\'
>
\n
<text:p
tal:content=
"python: \'\'"
>
\n
</text:p>
\n
</table:table-cell>
\n
...
...
bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/form_view.xml
View file @
adfb2a16
...
...
@@ -70,9 +70,7 @@ dQEAAAAA</string> </value>
<tal:block
tal:condition=
"python:field.meta_type != \'HiddenStringField\'\n
and field.meta_type == \'OOoChart\' or (field.meta_type == \'ProxyField\' and field.getRecursiveTemplateField().meta_type == \'OOoChart\')"
>
\n
<table:table-row
table:style-name=
\'ro2\'
>
\n
<table:table-cell
table:number-rows-spanned=
\'1\'\n
table:style-name=
\'report-column-title\'\n
table:number-columns-spanned=
\'1\'\n
<table:table-cell
table:style-name=
\'report-column-title\'\n
office:value-type=
\'string\'
>
\n
<text:p
tal:content=
"python:here.Localizer.erp5_ui.gettext(field.get_value (\'title\')).encode(\'utf-8\')"
>
\n
</text:p>
\n
...
...
bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_style/listbox_ods_macro.xml
View file @
adfb2a16
...
...
@@ -92,7 +92,7 @@
</table:table-cell>
\n
</tal:block>
\n
<tal:block
tal:condition=
"python: column_property is None"
>
\n
<table:table-cell
table:number-rows-spanned=
\'1\'
table:style-name=
\'report-column-title\'
table:number-col
withdrawn
umns-spanned=
\'1\'
office:value-type=
\'string\'
>
\n
<table:table-cell
table:number-rows-spanned=
\'1\'
table:style-name=
\'report-column-title\'
table:number-columns-spanned=
\'1\'
office:value-type=
\'string\'
>
\n
<text:p
tal:content=
"python: \'\'"
>
\n
</text:p>
\n
</table:table-cell>
\n
...
...
@@ -129,10 +129,9 @@
</tal:block>
\n
\n
<tal:block
metal:use-macro=
"here/listbox_line_ods_macro/macros/listbox_line"
/>
\n
\n
\n
<table:table-row
metal:define-slot=
"table_bottom_line"
>
\n
<tal:block
tal:repeat=
"listboxline python: listboxline_list"
>
\n
<tal:block
tal:condition=
"listboxline/isTitleLine"
>
\n
<tal:block
tal:define=
"listboxline python: listboxline_list[0]"
>
\n
<tal:block
tal:repeat=
"column_item listboxline/getColumnItemList"
>
\n
<tal:block
tal:define=
"column_property python: column_item[1]; "
>
\n
<tal:block
tal:condition=
"python: column_property is not None"
>
\n
...
...
@@ -141,8 +140,8 @@
</tal:block>
\n
</tal:block>
\n
</tal:block>
\n
</tal:block>
\n
</table:table-row>
\n
\n
</tal:block>
\n
</tal:block>
\n
</office:spreadsheet>
\n
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment