X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Freport_generator%2Fhtml_report_de.html;h=8547b2812bd17b49838dcce1b10adc98e844a547;hb=73a404b58ebe0de883558b898ee07ae3499461b7;hp=9ed2bf02c934c10c8d9fdf57917a1e42872f6b76;hpb=43c22d1ce7f8553219dc7347117bd9b54361b632;p=kivitendo-erp.git

diff --git a/templates/webpages/report_generator/html_report_de.html b/templates/webpages/report_generator/html_report_de.html
index 9ed2bf02c..8547b2812 100644
--- a/templates/webpages/report_generator/html_report_de.html
+++ b/templates/webpages/report_generator/html_report_de.html
@@ -10,6 +10,19 @@
     -->
  </script>
 
+ <style type="text/css">
+  <!--
+.top_border {
+  border-top: solid black;
+  border-width: 4px;
+}
+.bottom_border {
+  border-bottom: solid black;
+  border-width: 4px;
+}
+    -->
+ </style>
+
  [% IF MESSAGE %]
   <p>[% MESSAGE %]</p>
  [% END %]
@@ -25,19 +38,50 @@
  [% IF DATA_PRESENT %]
  <p>
   <table width="100%">
+   [%- FOREACH row = HEADER_ROWS %]
    <tr>
-    [% FOREACH col = COLUMN_HEADERS %]
-     <th class="listheading">[% IF col.link %]<a href="[% col.link %]">[% END %][% HTML.escape(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>
+    [% FOREACH col = row %]
+     <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 %]
 
    [% FOREACH row = ROWS %]
     [% IF row.IS_CONTROL %]
-     [% IF row.IS_SEPARATOR %]<tr><td colspan="[% row.NUM_COLUMNS %]"><hr size="3" noshade></td></tr>[% END %][% IF row.IS_COLSPAN_DATA %]<tr><td colspan="[% row.NUM_COLUMNS %]">[% row.data %]</td></tr>[% END %]
+     [% IF row.IS_COLSPAN_DATA %]<tr><td colspan="[% row.NUM_COLUMNS %]">[% row.data %]</td></tr>[% END %]
      [% ELSE %]
      <tr class="listrow[% row.outer_idx_odd %]">
-      [% FOREACH col = row.COLUMNS %]<td[% IF col.align %] align="[% col.align %]"[% END %][% IF col.valign %] valign="[% col.valign %]"[% END %][% IF col.class %] class="[% col.class %]"[% 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 %]<a href="[% cell_row.link %]">[% END %][% cell_row.data %][% IF cell_row.link %]</a>[% END %][% END %][% UNLESS iterator.last %]<br>aa[% END %][% END %]</td>
-      [% END %]
+      [%- 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 %]
+         [%- IF col.class %][%- SET tdclass = "$tdclass $col.class" %][%- END %]
+         [%- IF tdclass %] class="[% tdclass %]"[%- 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 %]<a href="[% cell_row.link %]">[%- END %]
+          [%- cell_row.data %]
+          [%- IF cell_row.link %]</a>[%- END %]
+         [%- END %]
+        [%- UNLESS iterator.last %]<br>[%- END %]
+        [%- END %]
+       [%- END %]
+      </td>
+      [%- END %]
      </tr>
     [% END %]
    [% END %]
@@ -58,9 +102,6 @@
 
  [% IF SHOW_EXPORT_BUTTONS %]
   <form action="[% HTML.escape(script) %]" name="report_generator_form" method="post">
-   <input type="hidden" name="login" value="[% HTML.escape(login) %]">
-   <input type="hidden" name="password" value="[% HTML.escape(password) %]">
-
    [% FOREACH var = EXPORT_VARIABLES %]<input type="hidden" name="report_generator_hidden_[% var.key %]" value="[% HTML.escape(var.value) %]">
    [% END %]
 
@@ -70,9 +111,9 @@
    <input type="hidden" name="action" value="report_generator_dispatcher">
 
    <p>
-    Listenexport<br>
-    [% IF ALLOW_PDF_EXPORT %]<button type="button" class="submit" onclick="submit_report_generator_form('report_generator_export_as_pdf')">Als PDF exportieren</button>[% END %]
-    [% IF ALLOW_CSV_EXPORT %]<button type="button" class="submit" onclick="submit_report_generator_form('report_generator_export_as_csv')">Als CSV exportieren</button>[% END %]
+    Export anzeigen<br>
+    [% IF ALLOW_PDF_EXPORT %]<input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_export_as_pdf')" value="Als PDF exportieren">[% END %]
+    [% IF ALLOW_CSV_EXPORT %]<input type="submit" class="submit" onclick="submit_report_generator_form('report_generator_export_as_csv')" value="Als CSV exportieren">[% END %]
    </p>
   </form>
  [% END %]