From 428bc36564ef6e0030fdac1052a2e87c7a2cf11e Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 23 Apr 2013 09:13:47 +0200
Subject: [PATCH] =?utf8?q?Bericht=20Ansprechpersonen:=20weitere=20Spalten?=
 =?utf8?q?=20ausgeben=20k=C3=B6nnen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 bin/mozilla/ct.pl                         | 12 +++++++++---
 templates/webpages/ct/search_contact.html | 21 +++++++++++++--------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index 8a30094fa..d3e09dc73 100644
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -305,8 +305,8 @@ sub list_contacts {
   my $cvar_configs = CVar->get_configs('module' => 'Contacts');
 
   my @columns      = qw(
-    cp_id vcname vcnumber cp_name cp_givenname cp_street cp_zipcode cp_city cp_phone1 cp_phone2
-    cp_mobile1 cp_mobile2 cp_email cp_abteilung cp_position cp_birthday cp_gender
+    cp_id vcname vcnumber cp_name cp_givenname cp_street cp_zipcode cp_city cp_phone1 cp_phone2 cp_privatphone
+    cp_mobile1 cp_mobile2 cp_fax cp_email cp_privatemail cp_abteilung cp_position cp_birthday cp_gender
   );
 
   my @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs };
@@ -342,6 +342,9 @@ sub list_contacts {
     'cp_position'  => { 'text' => $::locale->text('Function/position'), },
     'cp_birthday'  => { 'text' => $::locale->text('Birthday'), },
     'cp_gender'    => { 'text' => $::locale->text('Gender'), },
+    'cp_fax'       => { 'text' => $::locale->text('Fax'), },
+    'cp_privatphone' => { 'text' => $::locale->text('Private Phone') },
+    'cp_privatemail' => { 'text' => $::locale->text('Private E-Mail') },
     %column_defs_cvars,
   );
 
@@ -399,7 +402,10 @@ sub list_contacts {
 
     $row->{vcname}->{link}   = build_std_url('action=edit', 'id=' . E($ref->{vcid}), 'db=' . E($ref->{db}), 'callback', @hidden_nondefault);
     $row->{vcnumber}->{link} = $row->{vcname}->{link};
-    $row->{cp_email}->{link} = 'mailto:' . E($ref->{cp_email});
+
+    for (qw(cp_email cp_privatemail)) {
+      $row->{$_}->{link} = 'mailto:' . E($ref->{$_}) if $ref->{$_};
+    }
 
     $report->add_data($row);
   }
diff --git a/templates/webpages/ct/search_contact.html b/templates/webpages/ct/search_contact.html
index fe26d47de..67142418a 100644
--- a/templates/webpages/ct/search_contact.html
+++ b/templates/webpages/ct/search_contact.html
@@ -97,17 +97,17 @@
         <input name="l.cp_mobile" id="l_cp_mobile" type="checkbox" class="checkbox" value="Y" checked>
         <label for="l_cp_mobile">[% 'Mobile' | $T8 %]</label>
        </td>
-       <td>
-        <input name="l.cp_email" id="l_cp_email" type="checkbox" class="checkbox" value="Y" checked>
-        <label for="l_cp_email">[% 'E-mail' | $T8 %]</label>
-       </td>
+
+       <td>[%- L.checkbox_tag('l.cp_privatphone', value='Y', label=LxERP.t8('Private Phone'), class='checkbox', checked=1) %]</td>
+      </tr>
+
+      <tr>
+       <td>[%- L.checkbox_tag('l.cp_fax',         value='Y', label=LxERP.t8('Fax'),            class='checkbox') %]</td>
+       <td>[%- L.checkbox_tag('l.cp_email',       value='Y', label=LxERP.t8('E-Mail'),         class='checkbox', checked=1) %]</td>
+       <td>[%- L.checkbox_tag('l.cp_privatemail', value='Y', label=LxERP.t8('Private E-Mail'), class='checkbox') %]</td>
       </tr>
 
       <tr>
-       <td>
-        <input name="l.cp_birthday" id="l_cp_birthday" type="checkbox" class="checkbox" value="Y">
-        <label for="l_cp_birthday">[% 'Birthday' | $T8 %]</label>
-       </td>
        <td>
         <input name="l.cp_abteilung" id="l_cp_abteilung" type="checkbox" class="checkbox" value="Y">
         <label for="l_cp_abteilung">[% 'Department' | $T8 %]</label>
@@ -121,6 +121,11 @@
         <input name="l.cp_gender" id="l_cp_gender" type="checkbox" class="checkbox" value="Y">
         <label for="l_cp_gender">[% 'Gender' | $T8 %]</label>
        </td>
+
+       <td>
+        <input name="l.cp_birthday" id="l_cp_birthday" type="checkbox" class="checkbox" value="Y">
+        <label for="l_cp_birthday">[% 'Birthday' | $T8 %]</label>
+       </td>
       </tr>
 
       [% CUSTOM_VARIABLES_INCLUSION_CODE %]
-- 
2.20.1