Contact summary tabs - simplify styling

diff --git a/css/civicrm.css b/css/civicrm.css
index 3e112c955988886f08769ae1e73d9307c52d9cdf..d5ae236bf966d95fe4c01b7a3d458b2fabfad76f 100644 (file)
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -3592,7 +3592,8 @@ tbody.scrollContent tr.alternateRow {
 #mainTabContainer li.disabled {
   text-decoration: none;
 }
-#mainTabContainer li.disabled a:link {
+#mainTabContainer li.disabled a.ui-tabs-anchor,
+#mainTabContainer li.crm-count-0 a.ui-tabs-anchor {
   color: #999999 !important;
 }
 #crm-container tr.crm-job {

diff --git a/templates/CRM/Contact/Page/View/Summary.tpl b/templates/CRM/Contact/Page/View/Summary.tpl
index 48cc955d0799950746bfdcdae6da07c49f2863df..0225cb63728ed7a4369792611eb3af17e9d3e5ab 100644 (file)
--- a/templates/CRM/Contact/Page/View/Summary.tpl
+++ b/templates/CRM/Contact/Page/View/Summary.tpl
@@ -356,18 +356,12 @@
 {* 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>
 {/literal}

diff --git a/templates/CRM/Tag/Form/Tag.tpl b/templates/CRM/Tag/Form/Tag.tpl
index 9905ae8946a11beb5ea5e17e3488c462673ca810..4a8e70fef0d7d228fb7e019cf196603af41fd31d 100644 (file)
--- a/templates/CRM/Tag/Form/Tag.tpl
+++ b/templates/CRM/Tag/Form/Tag.tpl
@@ -73,7 +73,9 @@
       });
       // showing count of tags in summary tab
       $('a em', $tab).html('' + tags.length);
-      tags.length ? $tab.removeClass('disabled') : $tab.addClass('disabled');
+      $tab
+        .removeClass($tab.attr('class').match(/(crm-count-\d+)/)[0])
+        .addClass('crm-count-' + tags.length);
       // update summary tab
       $("#tags").html(tags.join(', '));
     };

diff --git a/templates/CRM/common/TabHeader.tpl b/templates/CRM/common/TabHeader.tpl
index 353748da812de63ced6e0ef1a45ac240ffe828a4..93d9f898ec6f35c84c8eaa2a59dc44fa0948b181 100644 (file)
--- a/templates/CRM/common/TabHeader.tpl
+++ b/templates/CRM/common/TabHeader.tpl
@@ -24,10 +24,10 @@
  +--------------------------------------------------------------------+
 *}
 
-{* enclosed all tabs and its content in a block *}
 {* include wysiwyg related files*}
 {include file="CRM/common/wysiwyg.tpl" includeWysiwygEditor=true}
 
+{* enclose all tabs and its content in a block *}
 <div class="crm-block crm-content-block">
   {if $tabHeader and count($tabHeader) gt 1}
     <div id="mainTabContainer">