Contact summary tabs - simplify styling

[civicrm-core.git] / templates / CRM / Contact / Page / View / Summary.tpl

diff --git a/templates/CRM/Contact/Page/View/Summary.tpl b/templates/CRM/Contact/Page/View/Summary.tpl
index c29488aac17fdb4374cb7986f58805b7e7f3366e..0225cb63728ed7a4369792611eb3af17e9d3e5ab 100644 (file)
--- a/templates/CRM/Contact/Page/View/Summary.tpl
+++ b/templates/CRM/Contact/Page/View/Summary.tpl
@@ -58,7 +58,7 @@
             </li>
           {/if}
           {* Include Edit button if contact has 'edit contacts' permission OR user is viewing their own contact AND has 'edit my contact' permission. *}
-          {if $permission EQ 'edit' && call_user_func(array('CRM_Core_Permission','check'), 'edit my contact')}
+          {if $permission EQ 'edit' || call_user_func(array('CRM_Core_Permission','check'), 'edit my contact')}
             <li>
               {assign var='editParams' value=$urlParams|cat:"&action=update&cid=$contactId"}
               <a href="{crmURL p='civicrm/contact/add' q=$editParams}" class="edit button" title="{ts}Edit{/ts}">
@@ -168,16 +168,17 @@
             </div> <!-- end of left side -->
             <div class="contactCardRight">
               {crmRegion name="contact-basic-info-right"}
-                {if !empty($imageURL)}
-                  <div id="crm-contact-thumbnail">
-                    {include file="CRM/Contact/Page/ContactImage.tpl"}
-                  </div>
-                {/if}
+              {if !empty($imageURL)}
+                <div id="crm-contact-thumbnail">
+                  {include file="CRM/Contact/Page/ContactImage.tpl"}
+                </div>
+              {/if}
                 <div class="{if !empty($imageURL)} float-left{/if}">
                   <div class="crm-clear crm-summary-block">
                     <div class="crm-summary-row">
                       <div class="crm-label" id="tagLink">
-                        <a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=$contactId&selectedChild=tag"}" title="{ts}Edit Tags{/ts}">{ts}Tags{/ts}</a>
+                        <a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=$contactId&selectedChild=tag"}"
+                           title="{ts}Edit Tags{/ts}">{ts}Tags{/ts}</a>
                       </div>
                       <div class="crm-content" id="tags">{$contactTag}</div>
                     </div>
@@ -188,22 +189,30 @@
                       </div>
                     </div>
                     <div class="crm-summary-row">
-                    <div class="crm-label">
-                      {ts}CiviCRM ID{/ts}{if !empty($userRecordUrl)} / {ts}User ID{/ts}{/if}
+                      <div class="crm-label">
+                        {ts}CiviCRM ID{/ts}{if !empty($userRecordUrl)} / {ts}User ID{/ts}{/if}
+                      </div>
+                      <div class="crm-content">
+                        <span class="crm-contact-contact_id">{$contactId}</span>
+                        {if !empty($userRecordUrl)}
+                          <span class="crm-contact-user_record_id">
+                            &nbsp;/&nbsp;<a title="View user record" class="user-record-link"
+                                            href="{$userRecordUrl}">{$userRecordId}</a>
+                          </span>
+                        {/if}
+                      </div>
                     </div>
-                    <div class="crm-content">
-                      <span class="crm-contact-contact_id">{$contactId}</span>
-                      {if !empty($userRecordUrl)}
-                        <span class="crm-contact-user_record_id">
-                          &nbsp;/&nbsp;<a title="View user record" class="user-record-link" href="{$userRecordUrl}">{$userRecordId}</a>
-                        </span>
-                      {/if}
+                    <div class="crm-summary-row">
+                      <div class="crm-label">{ts}External ID{/ts}</div>
+                      <div class="crm-content crm-contact_external_identifier_label">
+                        {if isset($external_identifier)}{$external_identifier}{/if}
+                      </div>
                     </div>
                   </div>
                 </div>
               {/crmRegion}
             </div>
-          </div> <!-- end of right side -->
+            <!-- end of right side -->
         </div>
         <div class="contact_details">
           <div class="contact_panel">
@@ -332,7 +341,7 @@
       var tabIndex = $('#tab_' + selectedTab).prevAll().length;
       var spinnerImage = '<img src="{$config->resourceBase}i/loading.gif" style="width:10px;height:10px"/>';
       {literal}
-      $("#mainTabContainer").tabs({ selected: tabIndex, spinner: spinnerImage, cache: true, load: stopSpinner});
+      $("#mainTabContainer").tabs({ active: tabIndex, spinner: spinnerImage, cache: true, load: stopSpinner});
       $(".crm-tab-button").addClass("ui-corner-bottom");
       $().crmAccordions();
 
@@ -347,17 +356,11 @@
 {* CRM-10560 *}
 {literal}
 <script type="text/javascript">
-cj(document).ready(function($) {
+cj(function($) {
   $('.crm-inline-edit-container').crmFormContactLock({
     ignoreLabel: "{/literal}{ts escape='js'}Ignore{/ts}{literal}",
     saveAnywayLabel: "{/literal}{ts escape='js'}Save Anyway{/ts}{literal}",
     reloadLabel: "{/literal}{ts escape='js'}Reload Page{/ts}{literal}"
-  });
-       //Enhance styling of "View Contact" tabs to indicate empty/non-empty tags
-  $('div#mainTabContainer ul').find('li').each(function(n){
-    if($(this).find('em').html()==0){
-      $(this).addClass("disabled");
-    }
   });
 });
 </script>