From f71cfc024b6d66067487bffa858b847106535b3d Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 13 Feb 2014 16:26:03 -0800
Subject: [PATCH] Actvity tpl cleanup

---
 templates/CRM/Activity/Form/Activity.hlp |  6 +++++
 templates/CRM/Activity/Form/Activity.tpl | 33 ++++++++++++------------
 templates/CRM/Case/Form/Activity.tpl     | 19 +++++++-------
 3 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/templates/CRM/Activity/Form/Activity.hlp b/templates/CRM/Activity/Form/Activity.hlp
index 483be04aae..08aceb7fca 100644
--- a/templates/CRM/Activity/Form/Activity.hlp
+++ b/templates/CRM/Activity/Form/Activity.hlp
@@ -29,3 +29,9 @@
 {htxt id="id-is_multi_activity"}
   <p>{ts}By default a single activity record will be created and linked to all the contacts listed above. However, if you think you might be editing the activity later - and entering different information for different contacts - check this box to create separate activity records.{/ts}</p>
 {/htxt}
+
+{htxt id="assignee_contact_id"}
+  <p>
+    {ts}You can optionally assign this activity to someone. Assigned activities will appear in their Activities listing at CiviCRM Home.{/ts}
+  </p>
+{/htxt}
diff --git a/templates/CRM/Activity/Form/Activity.tpl b/templates/CRM/Activity/Form/Activity.tpl
index 4a4011e796..74c3b4ce3e 100644
--- a/templates/CRM/Activity/Form/Activity.tpl
+++ b/templates/CRM/Activity/Form/Activity.tpl
@@ -93,22 +93,21 @@
   </tr>
 
   <tr class="crm-activity-form-block-assignee_contact_id">
-      <td class="label">{$form.assignee_contact_id.label}</td>
+      <td class="label">
+        {$form.assignee_contact_id.label}
+        {edit}{help id="assignee_contact_id" title=$form.assignee_contact_id.label}{/edit}
+      </td>
       <td>
         {$form.assignee_contact_id.html}
         {if $action neq 4}
-        <a href="#" class="crm-hover-button" id="swap_target_assignee" title="{ts}Swap Target and Assignee Contacts{/ts}" style="position:relative; bottom: 1em;">
-          <span><div class="icon swap-icon"></div></span>
-        </a>
-        {/if}
-        <br />
-        {edit}
-          <span class="description">{ts}You can optionally assign this activity to someone. Assigned activities will appear in their Activities listing at CiviCRM Home.{/ts}
+          <a href="#" class="crm-hover-button" id="swap_target_assignee" title="{ts}Swap Target and Assignee Contacts{/ts}" style="position:relative; bottom: 1em;">
+            <span><div class="icon swap-icon"></div></span>
+          </a>
           {if $activityAssigneeNotification}
-            <br />{ts}A copy of this activity will be emailed to each Assignee.{/ts}
+            <br />
+            <span class="description"><span class="icon email-icon"></span>{ts}A copy of this activity will be emailed to each Assignee.{/ts}</span>
           {/if}
-          </span>
-        {/edit}
+        {/if}
       </td>
   </tr>
 
@@ -229,11 +228,13 @@
               <td>{$form.followup_activity_subject.html|crmAddClass:huge}</td>
             </tr>
               <tr>
-                  <td class="label">{$form.followup_assignee_contact_id.label}</td>
-                  <td>{$form.followup_assignee_contact_id.html}
-                      {edit}<span class="description">{ts}You can optionally assign this activity to someone. Assigned activities will appear in their Activities listing at CiviCRM Home.{/ts}
-                          </span>
-                      {/edit}
+                  <td class="label">
+                    {$form.followup_assignee_contact_id.label}
+                    {edit}
+                    {/edit}
+                  </td>
+                  <td>
+                    {$form.followup_assignee_contact_id.html}
                   </td>
               </tr>
           </table>
diff --git a/templates/CRM/Case/Form/Activity.tpl b/templates/CRM/Case/Form/Activity.tpl
index ab14e7057c..4816a057d3 100644
--- a/templates/CRM/Case/Form/Activity.tpl
+++ b/templates/CRM/Case/Form/Activity.tpl
@@ -99,16 +99,15 @@
       <td class="view-value">{$form.source_contact_id.html}</td>
     </tr>
     <tr class="crm-case-activity-form-block-assignee_contact_id">
-      <td class="label">{$form.assignee_contact_id.label}</td>
-      <td>{$form.assignee_contact_id.html}<br />
-        {edit}
-          <span class="description">
-          {ts}You can optionally assign this activity to someone.{/ts}
-          {if $activityAssigneeNotification}
-            <br />{ts}A copy of this activity will be emailed to each Assignee.{/ts}
-          {/if}
-          </span>
-        {/edit}
+      <td class="label">
+        {$form.assignee_contact_id.label}
+        {edit}{help id="assignee_contact_id" title=$form.assignee_contact_id.label file="CRM/Activity/Form/Activity"}{/edit}
+      </td>
+      <td>{$form.assignee_contact_id.html}
+        {if $activityAssigneeNotification}
+          <br />
+          <span class="description"><span class="icon email-icon"></span>{ts}A copy of this activity will be emailed to each Assignee.{/ts}</span>
+        {/if}
       </td>
     </tr>
 
-- 
2.25.1