CRM-14395 - Prevent Edit button from being displayed on contact summary if user does...

[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 6146484d31113670ae823eb61f8fff3232da333b..398ac5eeaa7c5e905b7f5de109849ad845db31e1 100644 (file)
--- a/templates/CRM/Contact/Page/View/Summary.tpl
+++ b/templates/CRM/Contact/Page/View/Summary.tpl
@@ -30,9 +30,6 @@
 
   {include file="CRM/common/wysiwyg.tpl" includeWysiwygEditor=true}
 
-  {* include overlay js *}
-  {include file="CRM/common/overlay.tpl"}
-
   <div class="crm-summary-contactname-block crm-inline-edit-container">
     <div class="crm-summary-block" id="contactname-block">
       {include file="CRM/Contact/Page/Inline/ContactName.tpl"}
@@ -57,8 +54,8 @@
               {include file="CRM/Contact/Page/Inline/Actions.tpl"}
             </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')}
+          {* Include Edit button if contact has 'edit contacts' permission OR user is viewing their own contact AND has 'edit my contact' permission. CRM_Contact_Page_View::checkUserPermission handles this and assigns $permission true as needed. *}
+          {if $permission EQ 'edit'}
             <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}">
@@ -133,14 +130,14 @@
   <div class="crm-block crm-content-block crm-contact-page crm-inline-edit-container">
     <div id="mainTabContainer">
       <ul class="crm-contact-tabs-list">
-        <li id="tab_summary" class="crm-tab-button">
+        <li id="tab_summary" class="crm-tab-button ui-corner-all">
           <a href="#contact-summary" title="{ts}Summary{/ts}">
             <span> </span> {ts}Summary{/ts}
-            <em>&nbsp;</em>
+            <em></em>
           </a>
         </li>
         {foreach from=$allTabs key=tabName item=tabValue}
-          <li id="tab_{$tabValue.id}" class="crm-tab-button crm-count-{$tabValue.count}{if isset($tabValue.class)} {$tabValue.class}{/if}">
+          <li id="tab_{$tabValue.id}" class="crm-tab-button ui-corner-all crm-count-{$tabValue.count}{if isset($tabValue.class)} {$tabValue.class}{/if}">
             <a href="{$tabValue.url}" title="{$tabValue.title}">
               <span> </span> {$tabValue.title}
               <em>{$tabValue.count}</em>