PrintOptions-Helper: Ausgabe der Header ermöglichen.

diff --git a/SL/Helper/PrintOptions.pm b/SL/Helper/PrintOptions.pm
index 7e6a87c07fe3f00505198e10990640643d4f1d8f..2d842afc0d1c63bfb59ebb5a1bb9ad724dcdb171 100644 (file)
--- a/SL/Helper/PrintOptions.pm
+++ b/SL/Helper/PrintOptions.pm
@@ -107,16 +107,17 @@ sub get_print_options {
       if ((ref $form->{printers} eq 'ARRAY') && scalar @{ $form->{printers } });
 
   @SELECTS = map {
       if ((ref $form->{printers} eq 'ARRAY') && scalar @{ $form->{printers } });
 
   @SELECTS = map {

-    sname => $_->[1],
-    DATA  => $_->[0],
-    show  => !$options->{"hide_" . $_->[1]} && scalar @{ $_->[0] }
+    sname  => $_->[1],
+    DATA   => $_->[0],
+    show   => !$options->{"hide_" . $_->[1]} && scalar @{ $_->[0]},
+    hname  => $locale->text($_->[2])

   },
   },

-  [ \@FORMNAME,    'formname',    ],
-  [ \@LANGUAGE_ID, 'language_id', ],
-  [ \@FORMAT,      'format',      ],
-  [ \@SENDMODE,    'sendmode',    ],
-  [ \@MEDIA,       'media',       ],
-  [ \@PRINTER_ID,  'printer_id',  ];
+  [ \@FORMNAME,    'formname',    'Formname' ],
+  [ \@LANGUAGE_ID, 'language_id', 'Language' ],
+  [ \@FORMAT,      'format',      'Format'   ],
+  [ \@SENDMODE,    'sendmode',    'Sendmode' ],
+  [ \@MEDIA,       'media',       'Media'    ],
+  [ \@PRINTER_ID,  'printer_id',  'Printer'  ];

 
   my %dont_display_groupitems = (
     'dunning' => 1,
 
   my %dont_display_groupitems = (
     'dunning' => 1,


@@ -125,6 +126,7 @@ sub get_print_options {
 
   my %template_vars = (
     name_prefix          => $prefix || '',
 
   my %template_vars = (
     name_prefix          => $prefix || '',

+    show_headers         => $options->{show_headers},

     display_copies       => scalar @{ $form->{printers} || [] } && $::lx_office_conf{print_templates}->{latex} && $form->{media} ne 'email',
     display_remove_draft => (!$form->{id} && $form->{draft_id}),
     display_groupitems   => !$dont_display_groupitems{$form->{type}},
     display_copies       => scalar @{ $form->{printers} || [] } && $::lx_office_conf{print_templates}->{latex} && $form->{media} ne 'email',
     display_remove_draft => (!$form->{id} && $form->{draft_id}),
     display_groupitems   => !$dont_display_groupitems{$form->{type}},

diff --git a/templates/webpages/generic/print_options.html b/templates/webpages/generic/print_options.html
index 95de1f7621da2ff67d072d733ab10222aa632e17..b5757e1cb7562e0bbdcfaca404e591151cd37ed4 100644 (file)
--- a/templates/webpages/generic/print_options.html
+++ b/templates/webpages/generic/print_options.html
@@ -5,28 +5,48 @@
  <tr>
   <td>
    <table>
  <tr>
   <td>
    <table>

+    [%- IF show_headers %]

     <tr>
     <tr>

+     [%- FOREACH row = SELECTS %]
+     [%- IF row.show %]
+     <th align="left">[%- row.hname %]</th>
+     [%- END %]
+     [%- END %]
+     [%- IF display_copies %]
+     <th align="left">[% 'Copies' | $T8 %]</th>
+     [%- END %]
+     [%- IF display_groupitems %]
+     <th align="left">[% 'Group Items' | $T8 %]</th>
+     [%- END %]
+     [%- IF display_remove_draft %]
+     <th align="left">[% 'Remove Draft' | $T8 %]</th>
+     [%- END %]
+    </tr>
+    [%- END %]
+    <tr>
+     [%- FOREACH row = SELECTS %]
+     [%- IF row.show %]

      <td>
      <td>

-      [%- FOREACH row = SELECTS %]
-      [%- IF row.show %]

       <select name="[%- name_prefix %][%- row.sname %]">
        [%- FOREACH data = row.DATA %]
       <select name="[%- name_prefix %][%- row.sname %]">
        [%- FOREACH data = row.DATA %]

-       <option value="[% data.value %]" [% data.selected %]>[% data.oname %]</option>
+        <option value="[% data.value %]" [% data.selected %]>[% data.oname %]</option>

        [%- END %]
       </select>
        [%- END %]
       </select>

-      [%- END %]
-      [%- END %]

      </td>
      </td>

+     [%- END %]
+     [%- END %]

      [%- IF display_copies %]
      [%- IF display_copies %]

-     <td>[% 'Copies' | $T8 %] <input name="[%- name_prefix %]copies" size="2" value="[% HTML.escape(copies) %]"></td>
+     <td>[%- IF !show_headers %][%- 'Copies' | $T8 %][%- END %]<input name="[%- name_prefix %]copies" size="2" value="[% HTML.escape(copies) %]"></td>

      [%- END %]
      [%- IF display_groupitems %]
      [%- END %]
      [%- IF display_groupitems %]

-     <td>[% 'Group Items' | $T8 %]</td>
-     <td><input name="[%- name_prefix %]groupitems" type="checkbox" class="checkbox" [% groupitems_checked %]></td>
+     <td>[%- IF !show_headers %][% 'Group Items' | $T8 %][%- END %]
+      <input name="[%- name_prefix %]groupitems" type="checkbox" class="checkbox" [% groupitems_checked %]>
+     </td>

      [%- END %]
      [%- IF display_remove_draft %]
      [%- END %]
      [%- IF display_remove_draft %]

-     <td>[% 'Remove Draft' | $T8 %]</td>
-     <td><input name="[%- name_prefix %]remove_draft" type="checkbox" class="checkbox" [% remove_draft_checked %]></td>
+     <td>[%- IF !show_headers %][% 'Remove Draft' | $T8 %][%- END %]
+      <input name="[%- name_prefix %]remove_draft" type="checkbox" class="checkbox" [% remove_draft_checked %]>
+     </td>

      [%- END %]
     </tr>
    </table>
      [%- END %]
     </tr>
    </table>


@@ -36,4 +56,3 @@
   </td>
  </tr>
 </table>
   </td>
  </tr>
 </table>

-