X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=templates%2Fwebpages%2Freport_generator%2Fhtml_report_master.html;h=59101774ac83fe02b678301ca79991f3c83b2312;hb=1cd85a06d6541f15f8f080c215ae46d39d19a2db;hp=e59d5df18564ea067872feba71a0d6884a665b3c;hpb=84ba8214f6f1e68de5fa317b8239a7888a4aac03;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 e59d5df18..59101774a 100644
--- a/templates/webpages/report_generator/html_report_master.html
+++ b/templates/webpages/report_generator/html_report_master.html
@@ -41,7 +41,15 @@
    [%- FOREACH row = HEADER_ROWS %]
    <tr>
     [% FOREACH col = row %]
-     <th class="listheading">[% IF col.link %]<a href="[% col.link %]">[% END %][% col.text %][% IF col.link %][% IF col.show_sort_indicator %]<img border="0" src="image/[% IF col.sort_indicator_direction %]down[% ELSE %]up[% END %].png">[% END %]</a>[% ELSE %][% IF col.show_sort_indicator %]<img src="image/[% IF col.sort_indicator_direction %]down[% ELSE %]up[% END %].png">[% END %][% END %]</th>
+     <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 -%]
+      [%- IF col.link -%]</a>[%- END -%]
+     </th>
     [% END %]
    </tr>
    [%- END %]
@@ -54,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 %]