X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Freport_generator%2Fhtml_report_master.html;h=707657c56a5b55893b7660e990afe1180d1951fa;hb=9bd3030a376850c427c102c6e0c54f19bd19332e;hp=b1bd96d3110800ae83b4f6e975549e4278281d69;hpb=8c7e44938a661e035f62840e1e177353240ace5d;p=kivitendo-erp.git diff --git a/templates/webpages/report_generator/html_report_master.html b/templates/webpages/report_generator/html_report_master.html index b1bd96d31..707657c56 100644 --- a/templates/webpages/report_generator/html_report_master.html +++ b/templates/webpages/report_generator/html_report_master.html @@ -38,11 +38,21 @@ [% IF DATA_PRESENT %]
[% IF col.link %][% END %][% col.text %][% IF col.link %][% IF col.show_sort_indicator %][% END %][% ELSE %][% IF col.show_sort_indicator %][% END %][% END %] | + [% FOREACH col = row %] +1 %] colspan="[% HTML.escape(col.colspan) %]"[% END -%] + > + [%- IF col.link -%][%- END -%] + [%- col.text -%] + [%- IF col.show_sort_indicator -%][%- END -%] + [%- IF col.link -%][%- END -%] + | [% END %] 1 %] colspan="[% HTML.escape(col.colspan) %]"[% END -%]
[%- SET tdclass = '' %]
[%- IF row.BORDER_TOP %][%- SET tdclass = "$tdclass top_border" %][%- END %]
[%- IF row.BORDER_BOTTOM %][%- SET tdclass = "$tdclass bottom_border" %][%- END %]
[%- IF col.class %][%- SET tdclass = "$tdclass $col.class" %][%- END %]
[%- IF tdclass %] class="[% tdclass %]"[%- END %]>
- [%- IF col.raw_data %][%- col.raw_data %][%- END %]
- [%- USE iterator(col.CELL_ROWS) %][%- FOREACH cell_row = iterator %]
- [%- IF cell_row.data %]
- [%- IF cell_row.link %][%- END %]
- [%- cell_row.data %]
- [%- IF cell_row.link %][%- END %]
+ [%- IF col.raw_data %]
+ [%- col.raw_data %]
+ [%- ELSE %]
+ [%- USE iterator(col.CELL_ROWS) %][%- FOREACH cell_row = iterator %]
+ [%- IF cell_row.data != '' %]
+ [%- IF cell_row.link %][%- END %]
+ [%- cell_row.data %]
+ [%- IF cell_row.link %][%- END %]
+ [%- END %]
+ [%- UNLESS iterator.last %] [%- END %] [%- END %] - [%- UNLESS iterator.last %] [%- END %] [%- END %] |
[%- END %]
@@ -97,9 +111,9 @@
---|