X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fct%2F_contact.html;h=a7d395e96334784e1043c865725b12b09486dc11;hb=22519cf64d2afdbd3482a324b8e4c9d1a641d4b0;hp=2e61458b55726ddcbcce36e1dc3a9ecfc6c49b4d;hpb=5012aacc30fef055db86adfce748799c976222bc;p=kivitendo-erp.git

diff --git a/templates/webpages/ct/_contact.html b/templates/webpages/ct/_contact.html
index 2e61458b5..a7d395e96 100644
--- a/templates/webpages/ct/_contact.html
+++ b/templates/webpages/ct/_contact.html
@@ -4,8 +4,8 @@
      <tr>
       <th align="left">[% 'Contacts' | $T8 %]</th>
       <td>
-       [%- L.select_tag('cp_id', L.options_for_select(CONTACTS, default => cp_id, with_empty => 1, empty_title => LxERP.t8('New contact'), value => 'cp_id', title_sub => \contacts_label),
-                        onchange => "\$('#contacts').load('ct.pl?action=get_contact&id=' + \$('#cvid').attr('value') + '&db=' + \$('#db').attr('value') + '&cp_id=' + \$('#cp_id').attr('value'))") %]
+       [%- L.select_tag('cp_id', CONTACTS, default = cp_id, with_empty = 1, empty_title = LxERP.t8('New contact'), value_key = 'cp_id', title_sub = \contacts_label,
+                        onchange = "\$('#contacts').load('ct.pl?action=get_contact&id=' + \$('#cvid').val() + '&db=' + \$('#db').val() + '&cp_id=' + \$('#cp_id').val())") %]
       </td>
      </tr>
 
@@ -23,7 +23,7 @@
       <th align="left" nowrap>[% 'Title' | $T8 %]</th>
       <td>
        <input id="cp_title" name="cp_title" size="40" maxlength="75" value="[% HTML.escape(cp_title) %]">&nbsp;
-       [% L.select_tag('selected_cp_title', L.options_for_select(TITLES, with_empty => 1)) %]
+       [% L.select_tag('selected_cp_title', TITLES, with_empty = 1) %]
       </td>
      </tr>
 
@@ -31,10 +31,15 @@
       <th align="left" nowrap>[% 'Department' | $T8 %]</th>
       <td>
        <input id="cp_abteilung" name="cp_abteilung" size="40" value="[% HTML.escape(cp_abteilung) %]">&nbsp;
-       [% L.select_tag('selected_cp_abteilung', L.options_for_select(DEPARTMENT, with_empty => 1)) %]
+       [% L.select_tag('selected_cp_abteilung', DEPARTMENT, with_empty = 1) %]
       </td>
      </tr>
 
+     <tr>
+      <th align="left" nowrap>[% 'Function/position' | $T8 %]</th>
+      <td>[% L.input_tag('cp_position', cp_position, size=40, maxlength=75) %]</td>
+     </tr>
+
      <tr>
       <th align="left" nowrap>[% 'Given Name' | $T8 %]</th>
       <td><input id="cp_givenname" name="cp_givenname" size="40" maxlength="75" value="[% HTML.escape(cp_givenname) %]"></td>
@@ -91,28 +96,35 @@
      </tr>
 
      <tr>
-      <th align="left" nowrap>[% 'Private Phone' | $T8 %]</th>
-      <td><input id="cp_privatphone" name="cp_privatphone" size="40" value="[% HTML.escape(cp_privatphone) %]"></td>
+      <th align="left" nowrap>[% 'Street' | $T8 %]</th>
+      <td><input id="cp_street" name="cp_street" size="40" maxlength="75" value="[% HTML.escape(cp_street) %]"></td>
      </tr>
 
      <tr>
-      <th align="left" nowrap>[% 'Private E-mail' | $T8 %]</th>
-      <td><input id="cp_privatemail" name="cp_privatemail" size="40" value="[% HTML.escape(cp_privatemail) %]"></td>
+      <th align="left" nowrap>[% 'Zip, City' | $T8 %]</th>
+      <td>
+       <input id="cp_zipcode" name="cp_zipcode" size="5" maxlength="10" value="[% HTML.escape(cp_zipcode) %]">
+       <input id="cp_city" name="cp_city" size="25" maxlength="75" value="[% HTML.escape(cp_city) %]">
+      </td>
      </tr>
 
      <tr>
-      <th align="left" nowrap>[% 'Birthday' | $T8 %]</th>
-      <td><input id="cp_birthday" name="cp_birthday" size="40" value="[% HTML.escape(cp_birthday) %]"></td>
+      <th align="left" nowrap>[% 'Private Phone' | $T8 %]</th>
+      <td><input id="cp_privatphone" name="cp_privatphone" size="40" value="[% HTML.escape(cp_privatphone) %]"></td>
      </tr>
 
      <tr>
-      <td colspan="2"><hr></td>
+      <th align="left" nowrap>[% 'Private E-mail' | $T8 %]</th>
+      <td><input id="cp_privatemail" name="cp_privatemail" size="40" value="[% HTML.escape(cp_privatemail) %]"></td>
      </tr>
 
      <tr>
-      <th align="left" nowrap>[% 'Bcc' | $T8 %]</th>
-      <td><input name="bcc" size="40" value="[% HTML.escape(bcc) %]"></td>
+      <th align="left" nowrap>[% 'Birthday' | $T8 %]</th>
+      <td>
+        [% L.date_tag('cp_birthday', cp_birthday) %]
+      </td>
      </tr>
+
      [% IF CUSTOM_VARIABLES.Contacts.size %]
      <tr>
       <td colspan="2"><hr></td>
@@ -128,8 +140,6 @@
 
     </table>
 
-[% IF cp_id %]
-    <input type="submit" id="delete_contact" name="action" value="[% 'Delete Contact' | $T8 %]">
-[% END %]
-
-    <br style="clear: left" />
+    [% IF cp_id %]
+      <input type="button" id="delete_contact" onclick="submitInputButton(this);" name="action" value="[% 'Delete Contact' | $T8 %]">
+    [% END %]