Merge pull request #15649 from JMAConsulting/core-1346

core#1346: Tagsets should display vertically in activity/new case forms
civicrm · Nov 14, 2019 · b1a57b5 · b1a57b5
2 parents a3628d0 + f2be88e
commit b1a57b5
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 24 deletions.
diff --git a/templates/CRM/Activity/Form/Activity.tpl b/templates/CRM/Activity/Form/Activity.tpl
@@ -168,7 +168,9 @@
   {/if}
 
   {if $tagsetInfo.activity}
-  <tr class="crm-activity-form-block-tag_set">{include file="CRM/common/Tagset.tpl" tagsetType='activity' tableLayout=true}</tr>
+    <tr class="crm-activity-form-block-tag_set">
+      {include file="CRM/common/Tagset.tpl" tagsetType='activity' tableLayout=true}
+    </tr>
   {/if}
 
   {if $action neq 4 OR $viewCustomData}

diff --git a/templates/CRM/Case/Form/Case.tpl b/templates/CRM/Case/Form/Case.tpl
@@ -103,7 +103,9 @@
     </td>
 </tr>
 
-<tr class="crm-case-form-block-tag_set"><td colspan="2">{include file="CRM/common/Tagset.tpl" tagsetType='case'}</td></tr>
+<tr class="crm-case-form-block-tag_set">
+    {include file="CRM/common/Tagset.tpl" tagsetType='case' tableLayout=true}
+</tr>
 
 </table>
 {/if}

diff --git a/templates/CRM/common/Tagset.tpl b/templates/CRM/common/Tagset.tpl
@@ -10,28 +10,38 @@
 {if empty($tagsetType)}
   {assign var="tagsetType" value="contact"}
 {/if}
-{foreach from=$tagsetInfo.$tagsetType item=tagset}
-  {assign var="elemName" value=$tagset.tagsetElementName}
-  {if empty($tagsetElementName) or $tagsetElementName eq $elemName}
-    {assign var="parID" value=$tagset.parentID}
-    {assign var="skipEntityAction" value=$tagset.skipEntityAction}
-    {if $tableLayout}
-      <td class="label">
-        {$form.$elemName.$parID.label}
-      </td>
-      <td class="{$tagsetType}-tagset {$tagsetType}-tagset-{$tagset.parentID}-section">
-          {$form.$elemName.$parID.html}
-      </td>
-    {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>
-      </div>
-    {/if}
-  {/if}
-{/foreach}
+{if $tableLayout}
+  <td colspan="2" class="crm-content-block">
+    <table>
+{/if}
+    {foreach from=$tagsetInfo.$tagsetType item=tagset}
+      {assign var="elemName" value=$tagset.tagsetElementName}
+      {if empty($tagsetElementName) or $tagsetElementName eq $elemName}
+        {assign var="parID" value=$tagset.parentID}
+        {assign var="skipEntityAction" value=$tagset.skipEntityAction}
+        {if $tableLayout}
+          <tr>
+            <td class="label">
+              {$form.$elemName.$parID.label}
+            </td>
+            <td class="{$tagsetType}-tagset {$tagsetType}-tagset-{$tagset.parentID}-section">
+              {$form.$elemName.$parID.html}
+            </td>
+          </tr>
+        {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>
+          </div>
+        {/if}
+      {/if}
+    {/foreach}
+{if $tableLayout}
+    </table>
+  </td>
+{/if}
 
 {if !$skipEntityAction and empty($form.frozen)}
   <script type="text/javascript">