X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=templates%2FCRM%2FCase%2FForm%2FActivity.tpl;h=4816a057d38cb30526c59a05996ce44799b49e07;hb=f71cfc024b6d66067487bffa858b847106535b3d;hp=9ee48c06ae19bf23601b3c50f8a8c4c097e2ea1c;hpb=52910807c090423707113d77d4e38ef1d606ad6a;p=civicrm-core.git
diff --git a/templates/CRM/Case/Form/Activity.tpl b/templates/CRM/Case/Form/Activity.tpl
index 9ee48c06ae..4816a057d3 100644
--- a/templates/CRM/Case/Form/Activity.tpl
+++ b/templates/CRM/Case/Form/Activity.tpl
@@ -1,6 +1,6 @@
{*
+--------------------------------------------------------------------+
- | CiviCRM version 4.3 |
+ | CiviCRM version 4.4 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2013 |
+--------------------------------------------------------------------+
@@ -41,50 +41,7 @@
{include file="CRM/common/formButtons.tpl" location="top"}
{* added onload javascript for source contact*}
- {literal}
-
- {/literal}
+ {include file="CRM/Activity/Form/ActivityJs.tpl" tokenContext="case_activity"}
{/if}
@@ -124,7 +81,7 @@
{ts}With Contact{/ts} |
- {include file="CRM/Contact/Form/NewContact.tpl" noLabel=true skipBreak=true multiClient=true}
+ {$form.target_contact_id.html}
» {if not $multiClient}{ts}With client{/ts}{else}{ts}With client(s){/ts}{/if}
@@ -139,19 +96,18 @@
|
{$form.source_contact_id.label} |
- {if $admin}{$form.source_contact_id.html}{/if} |
+ {$form.source_contact_id.html} |
- {ts}Assigned To{/ts} |
+
+ {$form.assignee_contact_id.label}
+ {edit}{help id="assignee_contact_id" title=$form.assignee_contact_id.label file="CRM/Activity/Form/Activity"}{/edit}
+ |
{$form.assignee_contact_id.html}
- {edit}
-
- {ts}You can optionally assign this activity to someone.{/ts}
- {if $activityAssigneeNotification}
- {ts}A copy of this activity will be emailed to each Assignee.{/ts}
- {/if}
-
- {/edit}
+ {if $activityAssigneeNotification}
+
+ {ts}A copy of this activity will be emailed to each Assignee.{/ts}
+ {/if}
|
@@ -272,19 +228,8 @@
{if $form.tag.html}
{$form.tag.label} |
- {$form.tag.html}
- {literal}
-
- {/literal}
-
+ |
+ {$form.tag.html}
|
{/if}
@@ -333,6 +278,7 @@
cj('.crm-with-contact').click(function(){
cj('#with-contacts-widget').toggle();
cj('#with-clients').toggle();
+ return false;
});
});