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 7cf07b93609d99d106f0c5fc74f008ec0635b318..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                                |
  +--------------------------------------------------------------------+
@@ -25,43 +25,47 @@
 *}
 {if $title}
 <div class="crm-accordion-wrapper crm-tagGroup-accordion collapsed">
- <div class="crm-accordion-header">
-    {$title}
-  </div><!-- /.crm-accordion-header -->
+  <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>
+      <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 }
-    <td width={cycle name=tdWidth values="70%","30%"}><span class="label">{if $title}{$form.$key.label}{/if}</span>
-        <div id="crm-tagListWrap">
-        <table id="crm-tagGroupTable">
-      {foreach key=k item=it from=$form.$key}
-          {if $k|is_numeric}
-        <tr class={cycle values="'odd-row','even-row'" name=$key} id="crm-tagRow{$k}">
-            <td>
-          <strong>{$it.html}</strong><br />
-          {if $item.$k.description}
-              <div class="description">
-            {$item.$k.description}
-              </div>
-          {/if}
-            </td>
-        </tr>
-          {/if}
+        {* $type assigned from dynamic.tpl *}
+        {if !$type || $type eq $key }
+          <td width={cycle name=tdWidth values="70%","30%"}><span class="label">{if $title}{$form.$key.label}{/if}</span>
+            <div id="crm-tagListWrap">
+              <table id="crm-tagGroupTable">
+                {foreach key=k item=it from=$form.$key}
+                  {if $k|is_numeric}
+                    <tr class={cycle values="'odd-row','even-row'" name=$key} id="crm-tagRow{$k}">
+                      <td>
+                        <strong>{$it.html}</strong><br />
+                        {if $item.$k.description}
+                          <div class="description">
+                            {$item.$k.description}
+                          </div>
+                        {/if}
+                      </td>
+                    </tr>
+                  {/if}
+                {/foreach}
+              </table>
+            </div>
+          </td>
+        {/if}
       {/foreach}
-        </table>
-        </div>
-    </td>
+    </tr>
+    {if !$type || $type eq 'tag'}
+      <tr><td>{include file="CRM/common/Tag.tpl"}</td></tr>
     {/if}
-      {/foreach}
-  </tr>
-  <tr><td>{include file="CRM/common/Tag.tpl"}</td></tr>
-    </table>
+  </table>
 {if $title}
- </div><!-- /.crm-accordion-body -->
+  </div>
 </div><!-- /.crm-accordion-wrapper -->
-
 {/if}