Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-07-14-13-42-39

[civicrm-core.git] / templates / CRM / Contact / Form / Inline / ContactInfo.tpl

diff --git a/templates/CRM/Contact/Form/Inline/ContactInfo.tpl b/templates/CRM/Contact/Form/Inline/ContactInfo.tpl
index 04980fc742c07e5bf0f198c34b52a46c96e04fe6..4b9c9d3b28fc7f14862c6a2602e2ab2dc0eb1577 100644 (file)
--- a/templates/CRM/Contact/Form/Inline/ContactInfo.tpl
+++ b/templates/CRM/Contact/Form/Inline/ContactInfo.tpl
@@ -1,8 +1,8 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -32,16 +32,15 @@
   <div class="crm-clear">  
     {if $contactType eq 'Individual'}
     <div class="crm-summary-row">
-      <div class="crm-label">{$form.current_employer.label}&nbsp;{help id="id-current-employer" file="CRM/Contact/Form/Contact.hlp"}</div>
+      <div class="crm-label">{$form.employer_id.label}&nbsp;{help id="id-current-employer" file="CRM/Contact/Form/Contact.hlp"}</div>
       <div class="crm-content">
-        {$form.current_employer.html}
-        <div id="employer_address" style="display:none;"></div>
+        {$form.employer_id.html|crmAddClass:big}
       </div>
     </div>
     <div class="crm-summary-row">
       <div class="crm-label">{$form.job_title.label}</div>
       <div class="crm-content">{$form.job_title.html}</div>
-    <div>
+    </div>
     {/if}
     <div class="crm-summary-row">
       <div class="crm-label">{$form.nick_name.label}</div>
@@ -63,7 +62,3 @@
     </div>
   </div> <!-- end of main -->
 </div>
-
-{if $contactType eq 'Individual'}
-  {include file="CRM/Contact/Form/CurrentEmployer.tpl"}
-{/if}