Merge pull request #17073 from eileenmcnaughton/msg_template

[civicrm-core.git] / templates / CRM / common / Tagset.tpl

diff --git a/templates/CRM/common/Tagset.tpl b/templates/CRM/common/Tagset.tpl
index 83e781223e01a72141428989afee3f627ffeaa85..b9542431c2af5de1759f8d701a127ace3bd3ba0b 100644 (file)
--- a/templates/CRM/common/Tagset.tpl
+++ b/templates/CRM/common/Tagset.tpl
@@ -1,53 +1,47 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019                                |
- +--------------------------------------------------------------------+
- | 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.   |
+ | Copyright CiviCRM LLC. All rights reserved.                        |
  |                                                                    |
- | 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        |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
 *}
 {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">