From b77309d242eb334236ee2d62c8adae5ce318e5e5 Mon Sep 17 00:00:00 2001
From: "deb.monish" <monish.deb@jmaconsulting.biz>
Date: Sun, 28 May 2017 15:38:03 +0530
Subject: [PATCH] CRM-20622: contact edit: tags and groups panel layout/styling

---
 .../CRM/Contact/Form/Edit/TagsAndGroups.tpl   | 59 ++++++++++---------
 templates/CRM/common/Tagset.tpl               |  4 +-
 2 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl b/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl
index df271f19d1..9e2da5f8f6 100644
--- a/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl
+++ b/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl
@@ -87,35 +87,38 @@
   <div class="crm-accordion-header">{$title}</div>
   <div class="crm-accordion-body" id="tagGroup">
 {/if}
-    <table class="form-layout-compressed{if $context EQ 'profile'} crm-profile-tagsandgroups{/if}">
-      <tr>
-        {if !$type || $type eq 'group'}
-          <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}
+<div class="form-layout-compressed{if $context EQ 'profile'} crm-profile-tagsandgroups{/if}">
+  {if !$type || $type eq 'group'}
+    <div class="crm-section crm-clearfix">
+      {if $title}
+        <div class="label">{$form.group.label}</div>
+      {/if}
+      {if $groupElementType eq 'select'}
+        <div class="content">{$form.group.html}</div>
+      {else}
+        {foreach key=key item=item from=$tagGroup.group}
+          <div class="group-wrapper">
+            {$form.group.$key.html}
+            {if $item.description}
+              <span class="description">{$item.description}</span>
             {/if}
-          </td>
-        {/if}
-        {if (!$type || $type eq 'tag') && $tree}
-          <td width="70%">{if $title}<span class="label">{$form.tag.label}</span>{/if}
-            <div id="tagtree">
-              {include file="CRM/Contact/Form/Edit/Tagtree.tpl" level=1}
-            </div>
-          </td>
-          <tr><td>{include file="CRM/common/Tagset.tpl"}</td></tr>
-        {/if}
-      </tr>
-    </table>
+          </div>
+        {/foreach}
+      {/if}
+    </div>
+  {/if}
+  {if (!$type || $type eq 'tag') && $tree}
+    <div class="crm-section crm-clearfix">
+      {if $title}
+        <div class="label">{$form.tag.label}</div>
+      {/if}
+      <div class="content" id="tagtree">
+        {include file="CRM/Contact/Form/Edit/Tagtree.tpl" level=1}
+      </div>
+    </div>
+    {include file="CRM/common/Tagset.tpl"}
+  {/if}
+</div>
 {if $title}
   </div>
 </div><!-- /.crm-accordion-wrapper -->
diff --git a/templates/CRM/common/Tagset.tpl b/templates/CRM/common/Tagset.tpl
index 930ed44337..94da2ab0ac 100644
--- a/templates/CRM/common/Tagset.tpl
+++ b/templates/CRM/common/Tagset.tpl
@@ -41,8 +41,8 @@
     {else}
       <div class="crm-section tag-section {$tagsetType}-tagset {$tagsetType}-tagset-{$tagset.parentID}-section">
         <div class="crm-clearfix">
-          {$form.$elemName.$parID.label}
-          {$form.$elemName.$parID.html}
+          <div class="label">{$form.$elemName.$parID.label}</div>
+          <div class="content">{$form.$elemName.$parID.html}</div>
         </div>
       </div>
     {/if}
-- 
2.25.1