Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-02-18-07-54-54

[civicrm-core.git] / templates / CRM / Contact / Form / Edit / TagsAndGroups.tpl

diff --git a/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl b/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl
index 48da7766c284622ae2975ef25270ffdb52481205..9ecd2c1b9f1e396b808dd82912fad314b2d44963 100644 (file)
--- a/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl
+++ b/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl
@@ -1,6 +1,6 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.4                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2013                                |
  +--------------------------------------------------------------------+
@@ -30,6 +30,11 @@
 {/if}
     <table class="form-layout-compressed{if $context EQ 'profile'} crm-profile-tagsandgroups{/if}">
       <tr>
+       {if $groupElementType eq 'select'}
+          <td><span class="label">{if $title}{$form.group.label}{/if}</span>
+            {$form.group.html}
+          </td>
+      {/if}
       {foreach key=key item=item from=$tagGroup}
         {* $type assigned from dynamic.tpl *}
         {if !$type || $type eq $key }
@@ -56,7 +61,9 @@
         {/if}
       {/foreach}
     </tr>
-    <tr><td>{include file="CRM/common/Tag.tpl"}</td></tr>
+    {if !$type || $type eq 'tag'}
+      <tr><td>{include file="CRM/common/Tag.tpl"}</td></tr>
+    {/if}
   </table>
 {if $title}
   </div>