From 3bf2f5e358be3021747e44e95515abcb120ad3f1 Mon Sep 17 00:00:00 2001
From: Brian Shaughnessy <brian@lcdservices.biz>
Date: Tue, 7 Mar 2017 10:00:28 -0500
Subject: [PATCH] LCD-3559 revert original change and handle in tpl file

---
 CRM/Contact/Form/Edit/TagsAndGroups.php           |  4 ++--
 templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl | 11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CRM/Contact/Form/Edit/TagsAndGroups.php b/CRM/Contact/Form/Edit/TagsAndGroups.php
index c180327823..def736d726 100644
--- a/CRM/Contact/Form/Edit/TagsAndGroups.php
+++ b/CRM/Contact/Form/Edit/TagsAndGroups.php
@@ -122,8 +122,8 @@ class CRM_Contact_Form_Edit_TagsAndGroups {
           }
           else {
             $form->_tagGroup[$fName][$id]['description'] = $group['description'];
-            $elements[] = &$form->addElement('advcheckbox', $id,NULL, "<b>".$group['title'].'</b>'."<br/>"."<div class='description'>".$group['description']."</div>", $attributes);
-		  }
+            $elements[] = &$form->addElement('advcheckbox', $id, NULL, $group['title'], $attributes);
+          }
         }
 
         if ($groupElementType == 'select' && !empty($groupsOptions)) {
diff --git a/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl b/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl
index ba423175a2..df271f19d1 100644
--- a/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl
+++ b/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl
@@ -93,8 +93,17 @@
           <td>
             {if $groupElementType eq 'select'}
               <span class="label">{if $title}{$form.group.label}{/if}</span>
+              {$form.group.html}
+            {else}
+              {foreach key=key item=item from=$tagGroup.group}
+                <div class="group-wrapper">
+                  {$form.group.$key.html}
+                  {if $item.description}
+                    <div class="description">{$item.description}</div>
+                  {/if}
+                </div>
+              {/foreach}
             {/if}
-            {$form.group.html}
           </td>
         {/if}
         {if (!$type || $type eq 'tag') && $tree}
-- 
2.25.1