X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Freport_generator%2Fhtml_report_master.html;h=59101774ac83fe02b678301ca79991f3c83b2312;hb=4f82ce002979fbe9a59d5e69a53e3697b7df20c1;hp=68c1cdc8933cb0e7c2abe9286b97fd9bea936482;hpb=1756e2a2f7bc289abee00b85dd516241b0d49326;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 68c1cdc89..59101774a 100644
--- a/templates/webpages/report_generator/html_report_master.html
+++ b/templates/webpages/report_generator/html_report_master.html
@@ -41,7 +41,10 @@
    [%- FOREACH row = HEADER_ROWS %]
    <tr>
     [% FOREACH col = row %]
-     <th class="listheading">
+     <th class="listheading"
+     [%- IF col.align %] align="[% HTML.escape(col.align) %]" style="text-align: [% HTML.escape(col.align) %]"[% END -%]
+     [%- IF col.colspan && col.colspan > 1 %] colspan="[% HTML.escape(col.colspan) %]"[% END -%]
+     >
       [%- IF col.link -%]<a href="[% col.link %]">[%- END -%]
       [%- col.text -%]
       [%- IF col.show_sort_indicator -%]<img border="0" src="image/[% IF col.sort_indicator_direction %]down[% ELSE %]up[% END %].png">[%- END -%]
@@ -59,6 +62,7 @@
       [%- FOREACH col = row.COLUMNS %]
       <td[% IF col.align %] align="[% col.align %]"[% END %]
          [%- IF col.valign %] valign="[% col.valign %]"[%- END %]
+         [%- IF col.colspan && col.colspan > 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 %]