From eb98e026746aea9ca1bc9a5ad7ab1df3158cc419 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 30 Dec 2016 16:12:37 -0500
Subject: [PATCH] CRM-19769 - Show title and more colors for tags

---
 CRM/Contact/Form/Edit/TagsAndGroups.php     |  1 +
 CRM/Core/BAO/Tag.php                        |  1 +
 templates/CRM/Contact/Form/Edit/Tagtree.tpl |  3 +--
 templates/CRM/Contact/Page/View/Summary.tpl |  2 +-
 templates/CRM/Tag/Form/Tag.tpl              | 23 +++++++++-------
 templates/CRM/Tag/Form/Tagtree.hlp          | 30 ---------------------
 templates/CRM/Tag/Form/Tagtree.tpl          |  3 +--
 7 files changed, 18 insertions(+), 45 deletions(-)
 delete mode 100644 templates/CRM/Tag/Form/Tagtree.hlp

diff --git a/CRM/Contact/Form/Edit/TagsAndGroups.php b/CRM/Contact/Form/Edit/TagsAndGroups.php
index 69bf9d34e9..def736d726 100644
--- a/CRM/Contact/Form/Edit/TagsAndGroups.php
+++ b/CRM/Contact/Form/Edit/TagsAndGroups.php
@@ -175,6 +175,7 @@ class CRM_Contact_Form_Edit_TagsAndGroups {
       $form->assign('tag', $tree);
       $form->assign('entityID', $contactId);
       $form->assign('entityTable', 'civicrm_contact');
+      $form->assign('allTags', CRM_Core_BAO_Tag::getTagsUsedFor('civicrm_contact', FALSE));
 
       if ($isRequired) {
         $form->addRule($fName, ts('%1 is a required field.', array(1 => $tagName)), 'required');
diff --git a/CRM/Core/BAO/Tag.php b/CRM/Core/BAO/Tag.php
index fab7bda40a..c1b4ae44f4 100644
--- a/CRM/Core/BAO/Tag.php
+++ b/CRM/Core/BAO/Tag.php
@@ -172,6 +172,7 @@ class CRM_Core_BAO_Tag extends CRM_Core_DAO_Tag {
           $tags[$tag->id]['parent_id'] = $tag->parent_id;
           $tags[$tag->id]['is_tagset'] = $tag->is_tagset;
           $tags[$tag->id]['used_for'] = $tag->used_for;
+          $tags[$tag->id]['description'] = $tag->description;
           $tags[$tag->id]['color'] = !empty($tag->color) ? $tag->color : NULL;
         }
       }
diff --git a/templates/CRM/Contact/Form/Edit/Tagtree.tpl b/templates/CRM/Contact/Form/Edit/Tagtree.tpl
index 118dead205..2f6d1c51b1 100644
--- a/templates/CRM/Contact/Form/Edit/Tagtree.tpl
+++ b/templates/CRM/Contact/Form/Edit/Tagtree.tpl
@@ -29,8 +29,7 @@
     <li id="tagli_{$id}">
       <input name="tag[{$id}]" id="tag_{$id}" class="form-checkbox" type="checkbox" value="1" {if $node.is_selectable EQ 0}disabled=""{/if} {if $form.tag.value.$id EQ 1}checked="checked"{/if}/>
       <span>
-        <label for="tag_{$id}" id="tagLabel_{$id}">{$node.name}</label>
-        {if $node.description}{help id=$id title=$node.name file="CRM/Tag/Form/Tagtree"}{/if}
+        <label for="tag_{$id}" id="tagLabel_{$id}" class="crm-tag-item" {if !empty($allTags.$id.color)}style="background-color: {$allTags.$id.color}; color: {$allTags.$id.color|colorContrast};"{/if} title="{$node.description}">{$node.name}</label>
       </span>
       {if $node.children}
         {* Recurse... *}
diff --git a/templates/CRM/Contact/Page/View/Summary.tpl b/templates/CRM/Contact/Page/View/Summary.tpl
index 31dd626811..3e646f2801 100644
--- a/templates/CRM/Contact/Page/View/Summary.tpl
+++ b/templates/CRM/Contact/Page/View/Summary.tpl
@@ -166,7 +166,7 @@
                       </div>
                       <div class="crm-content" id="tags">
                         {foreach from=$contactTag item=tagName key=tagId}
-                          <span class="crm-tag-item" {if !empty($allTags.$tagId.color)}style="background-color: {$allTags.$tagId.color}; color: {$allTags.$tagId.color|colorContrast};"{/if}>
+                          <span class="crm-tag-item" {if !empty($allTags.$tagId.color)}style="background-color: {$allTags.$tagId.color}; color: {$allTags.$tagId.color|colorContrast};"{/if} title="{$allTags.$tagId.description}">
                             {$tagName}
                           </span>
                         {/foreach}
diff --git a/templates/CRM/Tag/Form/Tag.tpl b/templates/CRM/Tag/Form/Tag.tpl
index 029adb6304..3ccbb5fdd7 100644
--- a/templates/CRM/Tag/Form/Tag.tpl
+++ b/templates/CRM/Tag/Form/Tag.tpl
@@ -26,11 +26,13 @@
 {* this template is used for adding/editing tags  *}
 {literal}
 <style>
-  #tagtree .highlighted {
-    background-color: #fefca6;
+  #tagtree,
+  #tagtree li.highlighted ul {
+    background-color: white;
   }
-  #tagtree .helpicon ins {
-    display: none;
+  #tagtree li.highlighted,
+  #tagtree li.highlighted-child.jstree-closed {
+    background-color: #fefcb0;
   }
   #tagtree ins.jstree-icon {
     cursor: pointer;
@@ -45,12 +47,11 @@
     CRM.updateContactSummaryTags = function() {
       var tags = [];
       $('#tagtree input:checkbox:checked+span label').each(function() {
-        tags.push('<span class="crm-tag-item" style="' + $(this).attr('style') + '">' + $(this).text() + '</span>');
+        tags.push('<span class="crm-tag-item" style="' + $(this).attr('style') + '" title="' + ($(this).attr('title') || '') + '">' + $(this).text() + '</span>');
       });
       $('input.crm-contact-tagset').each(function() {
-        var setTags = _.pluck($(this).select2('data'), 'label');
-        $.each(setTags, function (i, item) {
-          tags.push('<span class="crm-tag-item">' + item + '</span>');
+        $.each($(this).select2('data'), function (i, tag) {
+          tags.push('<span class="crm-tag-item" title="' + (tag.description || '') + '"' + (tag.color ? 'style="color: #fff; background-color: ' + tag.color + ';"' : '') + '>' + tag.label + '</span>');
         });
       });
       // contact summary tabs and search forms both listen for this event
@@ -62,10 +63,11 @@
     $(function() {
       function highlightSelected() {
         $("ul input:not(:checked)", '#tagtree').each(function () {
-          $(this).closest("li").removeClass('highlighted');
+          $(this).closest("li").removeClass('highlighted highlighted-child');
         });
         $("ul input:checked", '#tagtree').each(function () {
-          $(this).parents("li[id^=tag]").addClass('highlighted');
+          $(this).closest("li").addClass('highlighted');
+          $(this).parents("li[id^=tag]").addClass('highlighted-child');
         });
       }
       highlightSelected();
@@ -82,6 +84,7 @@
         //load js tree.
         $("#tagtree").jstree({
           plugins : ["themes", "html_data"],
+          core: {animation: 100},
           themes: {
             "theme": 'classic',
             "dots": false,
diff --git a/templates/CRM/Tag/Form/Tagtree.hlp b/templates/CRM/Tag/Form/Tagtree.hlp
deleted file mode 100644
index df576d2d8c..0000000000
--- a/templates/CRM/Tag/Form/Tagtree.hlp
+++ /dev/null
@@ -1,30 +0,0 @@
-{*
- +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2017                                |
- +--------------------------------------------------------------------+
- | This file is a part of CiviCRM.                                    |
- |                                                                    |
- | CiviCRM is free software; you can copy, modify, and distribute it  |
- | under the terms of the GNU Affero General Public License           |
- | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
- |                                                                    |
- | CiviCRM is distributed in the hope that it will be useful, but     |
- | WITHOUT ANY WARRANTY; without even the implied warranty of         |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
- | See the GNU Affero General Public License for more details.        |
- |                                                                    |
- | You should have received a copy of the GNU Affero General Public   |
- | License and the CiviCRM Licensing Exception along                  |
- | with this program; if not, contact CiviCRM LLC                     |
- | at info[AT]civicrm[DOT]org. If you have questions about the        |
- | GNU Affero General Public License or the licensing of CiviCRM,     |
- | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
- +--------------------------------------------------------------------+
-*}
-
-{htxt id=$id}
-  {crmAPI var='result' entity='tag' action='getsingle' return="description" id=$id}
-  {$result.description}
-{/htxt}
diff --git a/templates/CRM/Tag/Form/Tagtree.tpl b/templates/CRM/Tag/Form/Tagtree.tpl
index fdbb89f358..8102dabb92 100644
--- a/templates/CRM/Tag/Form/Tagtree.tpl
+++ b/templates/CRM/Tag/Form/Tagtree.tpl
@@ -29,10 +29,9 @@
     <li id="tag_{$id}">
       <input name="tagList[{$id}]" id="check_{$id}" type="checkbox" {if $node.is_selectable EQ 0}disabled=""{/if} {if $tagged[$id]}checked="checked"{/if}/>
       <span>
-        <label for="check_{$id}" id="tagLabel_{$id}" {if !empty($allTags.$id.color)}style="background-color: {$allTags.$id.color}; color: {$allTags.$id.color|colorContrast};"{/if}>
+        <label for="check_{$id}" id="tagLabel_{$id}" class="crm-tag-item" {if !empty($allTags.$id.color)}style="background-color: {$allTags.$id.color}; color: {$allTags.$id.color|colorContrast};"{/if} title="{$node.description}">
           {$node.name}
         </label>
-        {if $node.description}{help id=$id title=$node.name file="CRM/Tag/Form/Tagtree"}{/if}
       </span>
       {if $node.children}
         {* Recurse... *}
-- 
2.25.1