ReportGenerator: Unterstützung für raw_header_data-Attribut in Spaltendefinitionen

[kivitendo-erp.git] / templates / webpages / report_generator / html_report.html

diff --git a/templates/webpages/report_generator/html_report.html b/templates/webpages/report_generator/html_report.html
index a35cfb6..9a3d934 100644 (file)
--- a/templates/webpages/report_generator/html_report.html
+++ b/templates/webpages/report_generator/html_report.html
@@ -1,6 +1,5 @@
 [%- USE T8 %]
-[% USE HTML %]<body[% IF onload %] onload="[% onload %]"[% END %]>
-
+[%- USE HTML %]
  <style type="text/css">
   <!--
 .top_border {
@@ -18,7 +17,7 @@
   <p>[% MESSAGE %]</p>
  [% END %]
 
- <div class="listtop" width="100%">[% TITLE %]</div>
+ <h1>[% TITLE %]</h1>
 
  [% IF TOP_INFO_TEXT %]
   <p>[% TOP_INFO_TEXT %]</p>
@@ -28,7 +27,7 @@
 
  [% IF DATA_PRESENT %]
  <p>
-  <table width="100%">
+  <table [% IF TABLE_CLASS %]class="[% TABLE_CLASS %]"[% END %] width="100%">
    [%- FOREACH row = HEADER_ROWS %]
    <tr>
     [% FOREACH col = row %]
@@ -36,10 +35,14 @@
      [%- 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 class='report-generator-header-link' 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 -%]
+      [%- IF col.raw_header_data %]
+       [% col.raw_header_data %]
+      [% ELSE %]
+       [%- IF col.link -%]<a class="[% col.link_class ? col.link_class : 'report-generator-header-link' %]" href="[% HTML.escape(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 -%]
+      [%- END %]
      </th>
     [% END %]
    </tr>
@@ -64,7 +67,7 @@
        [%- ELSE %]
         [%- USE iterator(col.CELL_ROWS) %][%- FOREACH cell_row = iterator %]
          [%- IF cell_row.data != '' %]
-          [%- IF cell_row.link %]<a href="[% cell_row.link %]">[%- END %]
+          [%- IF cell_row.link %]<a href="[% HTML.escape(cell_row.link) %]"[% IF cell_row.link_class %] class="[% cell_row.link_class %]"[% END %]>[%- END %]
           [%- cell_row.data %]
           [%- IF cell_row.link %]</a>[%- END %]
          [%- END %]
@@ -77,9 +80,8 @@
     [% END %]
    [% END %]
 
-   <tr><td colspan="[% NUM_COLUMNS %]"><hr size="3" noshade></td></tr>
-
   </table>
+  <hr size="3" noshade>
  </p>
  [% ELSE %]
   <p class="message_hint">[% 'No data was found.' | $T8 %]</p>
@@ -128,5 +130,3 @@
 
   </form>
  [% END %]
-
-</body>