X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fcustomer_vendor%2Ftabs%2Fcontacts.html;h=4adabb207ec433af006fcd5b2b84003d55359b5f;hb=1dd6d84aa18d0a0ec9e36f02eae743625cd569e9;hp=54770a46ccfaad7401a5100e6a8cc5abef8dfff3;hpb=54f00ed88d7ed5fcd286ac72b9a9052243153c57;p=kivitendo-erp.git

diff --git a/templates/webpages/customer_vendor/tabs/contacts.html b/templates/webpages/customer_vendor/tabs/contacts.html
index 54770a46c..4adabb207 100644
--- a/templates/webpages/customer_vendor/tabs/contacts.html
+++ b/templates/webpages/customer_vendor/tabs/contacts.html
@@ -6,7 +6,7 @@
 <div id="contacts">
   <table>
     <tr>
-      <th align="left">[% 'Contacts' | $T8 %]</th>
+      <th align="right">[% 'Contacts' | $T8 %]</th>
 
       <td>
         [%
@@ -18,13 +18,17 @@
             empty_title = LxERP.t8('New contact'),
             value_key = 'cp_id',
             title_key = 'full_name',
-            onchange = "namespace('kivi.CustomerVendor').selectContact();")
+            onchange = "kivi.CustomerVendor.selectContact({onFormSet: function(){ contactsMapWidget.testInputs(); kivi.reinit_widgets(); }});",
+          )
         %]
       </td>
     </tr>
-
     <tr>
-      <th align="left" nowrap>[% 'Gender' | $T8 %]</th>
+      <th align="right" nowrap>[% 'Main Contact Person' | $T8 %]</th>
+      <td>[% L.yes_no_tag('contact.cp_main', SELF.contact.cp_main) %]</td>
+    </tr>
+    <tr>
+      <th align="right" nowrap>[% 'Gender' | $T8 %]</th>
 
       <td>
         [%
@@ -38,16 +42,20 @@
     </tr>
 
     <tr>
-      <th align="left" nowrap>[% 'Title' | $T8 %]</th>
+      <th align="right" nowrap>[% 'Title' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('contact.cp_title', SELF.contact.cp_title, size = 40 maxlength = 75) %]
-        [% L.select_tag('contact_cp_title_select', SELF.all_titles, with_empty = 1, onchange = '$("#contact_cp_title").val(this.value);') %]
+        [%- IF INSTANCE_CONF.get_contact_titles_use_textfield -%]
+          [% L.input_tag('contact.cp_title', SELF.contact.cp_title, size = 40) %]
+          [% L.select_tag('contact_cp_title_select', SELF.all_contact_titles, default = SELF.contact.cp_title, value_key = 'description', title_key = 'description', with_empty = 1, onchange = '$("#contact_cp_title").val(this.value);') %]
+        [%- ELSE -%]
+          [% L.select_tag('contact.cp_title', SELF.all_contact_titles, default = SELF.contact.cp_title, value_key = 'description', title_key = 'description', with_empty = 1) %]
+        [%- END -%]
       </td>
     </tr>
 
     <tr>
-      <th align="left" nowrap>[% 'Department' | $T8 %]</th>
+      <th align="right" nowrap>[% 'Department' | $T8 %]</th>
 
       <td>
         [% L.input_tag('contact.cp_abteilung', SELF.contact.cp_abteilung, size = 40) %]
@@ -56,31 +64,31 @@
     </tr>
 
     <tr>
-      <th align="left" nowrap>[% 'Function/position' | $T8 %]</th>
+      <th align="right" nowrap>[% 'Function/position' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('contact.cp_position', SELF.contact.cp_position, size = 40, maxlength = 75) %]
+        [% L.input_tag('contact.cp_position', SELF.contact.cp_position, size = 40) %]
       </td>
     </tr>
 
     <tr>
-      <th align="left" nowrap>[% 'Given Name' | $T8 %]</th>
+      <th align="right" nowrap>[% 'Given Name' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('contact.cp_givenname', SELF.contact.cp_givenname, size = 40, maxlength = 75) %]
+        [% L.input_tag('contact.cp_givenname', SELF.contact.cp_givenname, size = 40) %]
       </td>
     </tr>
 
     <tr>
-      <th align="left" nowrap>[% 'Name' | $T8 %]</th>
+      <th align="right" nowrap>[% 'Surname' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('contact.cp_name', SELF.contact.cp_name, size = 40, maxlength = 75) %]
+        [% L.input_tag('contact.cp_name', SELF.contact.cp_name, size = 40) %]
       </td>
     </tr>
 
     <tr>
-      <th align="left" nowrap>[% 'E-mail' | $T8 %]</th>
+      <th align="right" nowrap>[% 'E-mail' | $T8 %]</th>
 
       <td>
         [% L.input_tag('contact.cp_email', SELF.contact.cp_email, size = 40) %]
@@ -88,23 +96,23 @@
     </tr>
 
     <tr>
-      <th align="left" nowrap>[% 'Phone1' | $T8 %]</th>
+      <th align="right" nowrap>[% 'Phone1' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('contact.cp_phone1', SELF.contact.cp_phone1, size = 40, maxlength = 75) %]
+        [% L.input_tag('contact.cp_phone1', SELF.contact.cp_phone1, size = 40) %]
       </td>
     </tr>
 
     <tr>
-      <th align="left" nowrap>[% 'Phone2' | $T8 %]</th>
+      <th align="right" nowrap>[% 'Phone2' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('contact.cp_phone2', SELF.contact.cp_phone2, size = 40, maxlength = 75) %]
+        [% L.input_tag('contact.cp_phone2', SELF.contact.cp_phone2, size = 40) %]
       </td>
     </tr>
 
     <tr>
-      <th align="left" nowrap>[% 'Fax' | $T8 %]</th>
+      <th align="right" nowrap>[% 'Fax' | $T8 %]</th>
 
       <td>
         [% L.input_tag('contact.cp_fax', SELF.contact.cp_fax, size = 40) %]
@@ -112,7 +120,7 @@
     </tr>
 
     <tr>
-      <th align="left" nowrap>[% 'Mobile1' | $T8 %]</th>
+      <th align="right" nowrap>[% 'Mobile1' | $T8 %]</th>
 
       <td>
         [% L.input_tag('contact.cp_mobile1', SELF.contact.cp_mobile1, size = 40) %]
@@ -120,7 +128,7 @@
     </tr>
 
     <tr>
-      <th align="left" nowrap>[% 'Mobile2' | $T8 %]</th>
+      <th align="right" nowrap>[% 'Mobile2' | $T8 %]</th>
 
       <td>
         [% L.input_tag('contact.cp_mobile2', SELF.contact.cp_mobile2, size = 40) %]
@@ -128,7 +136,7 @@
     </tr>
 
     <tr>
-      <th align="left" nowrap>[% 'Sat. Phone' | $T8 %]</th>
+      <th align="right" nowrap>[% 'Sat. Phone' | $T8 %]</th>
 
       <td>
         [% L.input_tag('contact.cp_satphone', SELF.contact.cp_satphone, size = 40) %]
@@ -136,7 +144,7 @@
     </tr>
 
     <tr>
-      <th align="left" nowrap>[% 'Sat. Fax' | $T8 %]</th>
+      <th align="right" nowrap>[% 'Sat. Fax' | $T8 %]</th>
 
       <td>
         [% L.input_tag('contact.cp_satfax', SELF.contact.cp_satfax, size = 40) %]
@@ -144,7 +152,7 @@
     </tr>
 
     <tr>
-      <th align="left" nowrap>[% 'Project' | $T8 %]</th>
+      <th align="right" nowrap>[% 'Project' | $T8 %]</th>
 
       <td>
         [% L.input_tag('contact.cp_project', SELF.contact.cp_project, size = 40) %]
@@ -152,28 +160,31 @@
     </tr>
 
     <tr>
-      <th align="left" nowrap>[% 'Street' | $T8 %]</th>
+      <th align="right" nowrap>[% 'Street' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('contact.cp_street', SELF.contact.cp_street, size = 40, maxlength = 75) %]
-
-        <a href="#" onclick="namespace('kivi.CustomerVendor').showMap('contact_cp_');" title="[% 'Map' | $T8 %]">
-          <img src="image/map.png" alt="[% 'Map' | $T8 %]" />
-        </a>
+        [% L.input_tag('contact.cp_street', SELF.contact.cp_street, size = 40) %]
+        <span id="contact_map"></span>
+        <script type="text/javascript">
+          var contactsMapWidget = new kivi.CustomerVendor.MapWidget('contact_cp_');
+          $(function() {
+            contactsMapWidget.render($('#contact_map'));
+          });
+        </script>
       </td>
     </tr>
 
     <tr>
-      <th align="left" nowrap>[% 'Zip, City' | $T8 %]</th>
+      <th align="right" nowrap>[% 'Zip, City' | $T8 %]</th>
 
       <td>
-        [% L.input_tag('contact.cp_zipcode', SELF.contact.cp_zipcode, size = 5, maxlength = 10) %]
-        [% L.input_tag('contact.cp_city', SELF.contact.cp_city, size = 25, maxlength = 75) %]
+        [% L.input_tag('contact.cp_zipcode', SELF.contact.cp_zipcode, size = 5) %]
+        [% L.input_tag('contact.cp_city', SELF.contact.cp_city, size = 25) %]
       </td>
     </tr>
 
     <tr>
-      <th align="left" nowrap>[% 'Private Phone' | $T8 %]</th>
+      <th align="right" nowrap>[% 'Private Phone' | $T8 %]</th>
 
       <td>
         [% L.input_tag('contact.cp_privatphone', SELF.contact.cp_privatphone, size = 40) %]
@@ -181,7 +192,7 @@
     </tr>
 
     <tr>
-      <th align="left" nowrap>[% 'Private E-mail' | $T8 %]</th>
+      <th align="right" nowrap>[% 'Private E-mail' | $T8 %]</th>
 
       <td>
         [% L.input_tag('contact.cp_privatemail', SELF.contact.cp_privatemail, size = 40) %]
@@ -189,7 +200,7 @@
     </tr>
 
     <tr>
-      <th align="left" nowrap>[% 'Birthday' | $T8 %]</th>
+      <th align="right" nowrap>[% 'Birthday' | $T8 %]</th>
 
       <td>
         [% L.date_tag('contact.cp_birthday', SELF.contact.cp_birthday) %]
@@ -207,12 +218,11 @@
 
       [% FOREACH var = contact_cvars %]
         <tr>
-          <th align="left" valign="top" nowrap>[% var.config.description | html %]</th>
+          <th align="right" valign="top" nowrap>[% var.config.description | html %]</th>
 
           <td valign="top">
-            [%
-              INCLUDE 'customer_vendor/render_cvar_input.html'
-                      cvar_name_prefix = 'contact_cvars.'
+            [% INCLUDE 'common/render_cvar_input.html'
+                       cvar_name_prefix = 'contact_cvars.'
             %]
           </td>
         </tr>
@@ -221,7 +231,7 @@
 
   </table>
 
-  [% L.button_tag('submitInputButton(this);', LxERP.t8('Delete Contact'), name = 'action_delete_contact', class = 'submit') %]
+  [% L.button_tag('submitInputButton("delete_contact");', LxERP.t8('Delete Contact'), id = 'action_delete_contact', class = 'submit') %]
   [% IF ( !SELF.contact.cp_id ) %]
     <script type="text/javascript">
       $('#action_delete_contact').hide();

[% 'Contacts' \| $T8 %]	[% 'Contacts' \| $T8 %]	[% @@ -18,13 +18,17 @@ empty_title = LxERP.t8('New contact'), value_key = 'cp_id', title_key = 'full_name', - onchange = "namespace('kivi.CustomerVendor').selectContact();") + onchange = "kivi.CustomerVendor.selectContact({onFormSet: function(){ contactsMapWidget.testInputs(); kivi.reinit_widgets(); }});", + ) %]
[% 'Gender' \| $T8 %]	[% 'Main Contact Person' \| $T8 %]	[% L.yes_no_tag('contact.cp_main', SELF.contact.cp_main) %]
[% 'Gender' \| $T8 %]	[% @@ -38,16 +42,20 @@
[% 'Title' \| $T8 %]	[% 'Title' \| $T8 %]	- [% L.input_tag('contact.cp_title', SELF.contact.cp_title, size = 40 maxlength = 75) %] - [% L.select_tag('contact_cp_title_select', SELF.all_titles, with_empty = 1, onchange = '$("#contact_cp_title").val(this.value);') %] + [%- IF INSTANCE_CONF.get_contact_titles_use_textfield -%] + [% L.input_tag('contact.cp_title', SELF.contact.cp_title, size = 40) %] + [% L.select_tag('contact_cp_title_select', SELF.all_contact_titles, default = SELF.contact.cp_title, value_key = 'description', title_key = 'description', with_empty = 1, onchange = '$("#contact_cp_title").val(this.value);') %] + [%- ELSE -%] + [% L.select_tag('contact.cp_title', SELF.all_contact_titles, default = SELF.contact.cp_title, value_key = 'description', title_key = 'description', with_empty = 1) %] + [%- END -%]
[% 'Department' \| $T8 %]	[% 'Department' \| $T8 %]	[% L.input_tag('contact.cp_abteilung', SELF.contact.cp_abteilung, size = 40) %] @@ -56,31 +64,31 @@
[% 'Function/position' \| $T8 %]	[% 'Function/position' \| $T8 %]	- [% L.input_tag('contact.cp_position', SELF.contact.cp_position, size = 40, maxlength = 75) %] + [% L.input_tag('contact.cp_position', SELF.contact.cp_position, size = 40) %]
[% 'Given Name' \| $T8 %]	[% 'Given Name' \| $T8 %]	- [% L.input_tag('contact.cp_givenname', SELF.contact.cp_givenname, size = 40, maxlength = 75) %] + [% L.input_tag('contact.cp_givenname', SELF.contact.cp_givenname, size = 40) %]
[% 'Name' \| $T8 %]	[% 'Surname' \| $T8 %]	- [% L.input_tag('contact.cp_name', SELF.contact.cp_name, size = 40, maxlength = 75) %] + [% L.input_tag('contact.cp_name', SELF.contact.cp_name, size = 40) %]
[% 'E-mail' \| $T8 %]	[% 'E-mail' \| $T8 %]	[% L.input_tag('contact.cp_email', SELF.contact.cp_email, size = 40) %] @@ -88,23 +96,23 @@
[% 'Phone1' \| $T8 %]	[% 'Phone1' \| $T8 %]	- [% L.input_tag('contact.cp_phone1', SELF.contact.cp_phone1, size = 40, maxlength = 75) %] + [% L.input_tag('contact.cp_phone1', SELF.contact.cp_phone1, size = 40) %]
[% 'Phone2' \| $T8 %]	[% 'Phone2' \| $T8 %]	- [% L.input_tag('contact.cp_phone2', SELF.contact.cp_phone2, size = 40, maxlength = 75) %] + [% L.input_tag('contact.cp_phone2', SELF.contact.cp_phone2, size = 40) %]
[% 'Fax' \| $T8 %]	[% 'Fax' \| $T8 %]	[% L.input_tag('contact.cp_fax', SELF.contact.cp_fax, size = 40) %] @@ -112,7 +120,7 @@
[% 'Mobile1' \| $T8 %]	[% 'Mobile1' \| $T8 %]	[% L.input_tag('contact.cp_mobile1', SELF.contact.cp_mobile1, size = 40) %] @@ -120,7 +128,7 @@
[% 'Mobile2' \| $T8 %]	[% 'Mobile2' \| $T8 %]	[% L.input_tag('contact.cp_mobile2', SELF.contact.cp_mobile2, size = 40) %] @@ -128,7 +136,7 @@
[% 'Sat. Phone' \| $T8 %]	[% 'Sat. Phone' \| $T8 %]	[% L.input_tag('contact.cp_satphone', SELF.contact.cp_satphone, size = 40) %] @@ -136,7 +144,7 @@
[% 'Sat. Fax' \| $T8 %]	[% 'Sat. Fax' \| $T8 %]	[% L.input_tag('contact.cp_satfax', SELF.contact.cp_satfax, size = 40) %] @@ -144,7 +152,7 @@
[% 'Project' \| $T8 %]	[% 'Project' \| $T8 %]	[% L.input_tag('contact.cp_project', SELF.contact.cp_project, size = 40) %] @@ -152,28 +160,31 @@
[% 'Street' \| $T8 %]	[% 'Street' \| $T8 %]	- [% L.input_tag('contact.cp_street', SELF.contact.cp_street, size = 40, maxlength = 75) %] - - - - + [% L.input_tag('contact.cp_street', SELF.contact.cp_street, size = 40) %] + +
[% 'Zip, City' \| $T8 %]	[% 'Zip, City' \| $T8 %]	- [% L.input_tag('contact.cp_zipcode', SELF.contact.cp_zipcode, size = 5, maxlength = 10) %] - [% L.input_tag('contact.cp_city', SELF.contact.cp_city, size = 25, maxlength = 75) %] + [% L.input_tag('contact.cp_zipcode', SELF.contact.cp_zipcode, size = 5) %] + [% L.input_tag('contact.cp_city', SELF.contact.cp_city, size = 25) %]
[% 'Private Phone' \| $T8 %]	[% 'Private Phone' \| $T8 %]	[% L.input_tag('contact.cp_privatphone', SELF.contact.cp_privatphone, size = 40) %] @@ -181,7 +192,7 @@
[% 'Private E-mail' \| $T8 %]	[% 'Private E-mail' \| $T8 %]	[% L.input_tag('contact.cp_privatemail', SELF.contact.cp_privatemail, size = 40) %] @@ -189,7 +200,7 @@
[% 'Birthday' \| $T8 %]	[% 'Birthday' \| $T8 %]	[% L.date_tag('contact.cp_birthday', SELF.contact.cp_birthday) %] @@ -207,12 +218,11 @@ [% FOREACH var = contact_cvars %]
[% var.config.description \| html %]	[% var.config.description \| html %]	- [% - INCLUDE 'customer_vendor/render_cvar_input.html' - cvar_name_prefix = 'contact_cvars.' + [% INCLUDE 'common/render_cvar_input.html' + cvar_name_prefix = 'contact_cvars.' %]